watchdogpolska#614 - Add logo on login page and ignore .ico and .xml …

…files in prettier
Adishone · May 22, 2021 · 6f997cb · 6f997cb
1 parent 61a2509
commit 6f997cb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/frontend-project/.prettierignore b/frontend-project/.prettierignore
@@ -18,3 +18,5 @@ LICENSE
 *.lock
 yarn-error.log
 .history
+*.xml
+*.ico
diff --git a/...tend-project/public/watchdog_eod_logo.svg → ...-project/src/assets/watchdog_eod_logo.svg b/...tend-project/public/watchdog_eod_logo.svg → ...-project/src/assets/watchdog_eod_logo.svg
diff --git a/frontend-project/src/layouts/LoginLayout.less b/frontend-project/src/layouts/LoginLayout.less
@@ -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;
+}
diff --git a/frontend-project/src/layouts/LoginLayout.tsx b/frontend-project/src/layouts/LoginLayout.tsx
@@ -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 {
@@ -61,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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,3 +18,5 @@ LICENSE @@
     *.lock
     yarn-error.log
     .history
+    *.xml
+    *.ico