Skip to content

Commit

Permalink
614-AddFaviconsAndLogoFile (#963)
Browse files Browse the repository at this point in the history
* 614-AddFaviconsAndLogoFile

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* #614 - Add logo on login page and ignore .ico and .xml files in prettier

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
Adishone and pre-commit-ci[bot] authored Jul 14, 2021
1 parent 751b2e1 commit 3fe7f10
Show file tree
Hide file tree
Showing 18 changed files with 139 additions and 0 deletions.
2 changes: 2 additions & 0 deletions frontend-project/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ LICENSE
*.lock
yarn-error.log
.history
*.xml
*.ico
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions frontend-project/public/favicons/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig>
<msapplication>
<tile>
<square150x150logo src="/favicons/mstile-150x150.png"/>
<TileColor>#da532c</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file added frontend-project/public/favicons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend-project/public/favicons/favicon.ico
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend-project/public/favicons/mstile-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions frontend-project/public/favicons/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions frontend-project/public/favicons/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/favicons/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/favicons/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
41 changes: 41 additions & 0 deletions frontend-project/src/assets/watchdog_eod_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions frontend-project/src/layouts/LoginLayout.less
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,11 @@
color: @text-color-secondary;
font-size: @font-size-base;
}

.eodLogo {
display: flex;
align-self: center;
width: 150px;
margin-top: 10px;
margin-bottom: 10px;
}
9 changes: 9 additions & 0 deletions frontend-project/src/layouts/LoginLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { connect } from 'dva';
import SelectLang from '@/components/SelectLang';
import { ConnectState, Route } from '@/models/connect';
import logo from '../assets/logo.png';
import eodLogo from '../assets/watchdog_eod_logo.svg';
import styles from './LoginLayout.less';

export interface LoginLayoutProps {
Expand Down Expand Up @@ -43,6 +44,13 @@ const LoginLayout: FC<LoginLayoutProps> = props => {
<Helmet>
<title>{title}</title>
<meta name="description" content={title} />
<link rel="apple-touch-icon" sizes="180x180" href="/favicons/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicons/favicon-16x16.png" />
<link rel="manifest" href="/favicons/site.webmanifest" />
<link rel="mask-icon" href="/favicons/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
</Helmet>

<div className={styles.container}>
Expand All @@ -54,6 +62,7 @@ const LoginLayout: FC<LoginLayoutProps> = props => {
<div className={styles.header}>
<Link to="/" className={styles.headerLink}>
<img alt="logo" className={styles.logo} src={logo} />
<img alt="logo aplikacji elektroniczny obieg dokumentów" className={styles.eodLogo} src={eodLogo} />
<h1 className={styles.title}>Small EOD</h1>
</Link>
</div>
Expand Down

0 comments on commit 3fe7f10

Please sign in to comment.