From c9a7d2c3af98d09963a42f03bdcafbd83e9717fd Mon Sep 17 00:00:00 2001 From: IOdan78 Date: Sat, 25 May 2024 16:52:25 +0700 Subject: [PATCH 1/3] feature/SWD-18-GUI-header-footer-Implement --- .../shared/components/footer/AppFooter.scss | 43 +++++++++++++++-- .../shared/components/footer/AppFooter.tsx | 47 ++++++++++++++++++- 2 files changed, 86 insertions(+), 4 deletions(-) diff --git a/frontend/src/modules/shared/components/footer/AppFooter.scss b/frontend/src/modules/shared/components/footer/AppFooter.scss index 1967cf8..85a1c70 100644 --- a/frontend/src/modules/shared/components/footer/AppFooter.scss +++ b/frontend/src/modules/shared/components/footer/AppFooter.scss @@ -1,5 +1,42 @@ +@import '../../../../assets//styles/variables'; + .app-footer { - h1 { - color: blue; + background-color: $app-primary; + + .Footer-Content{ + color: $app-quaternary; + margin-left: 130px; } -} \ No newline at end of file + + .Footer-VersionApp{ + margin-left: 140px; + color: $app-tertiary; + } + + .Footer-Location{ + margin-right: 140px; + color: $app-tertiary; + } + h5{ + color: $app-quaternary; + padding-bottom: 10px; + } + li{ + color: $app-tertiary; + } + p{ + padding-top: 10px; + max-width: 360px; + } + h1{ + color: $app-tertiary; + font-weight: lighter; + font-size: var(--bs-body-font-size); + } + .Thai{ + max-width: 1255px; + display: block; + margin: 0 auto; + } +} + diff --git a/frontend/src/modules/shared/components/footer/AppFooter.tsx b/frontend/src/modules/shared/components/footer/AppFooter.tsx index 8949b7c..5b93e5c 100644 --- a/frontend/src/modules/shared/components/footer/AppFooter.tsx +++ b/frontend/src/modules/shared/components/footer/AppFooter.tsx @@ -1,11 +1,56 @@ import './AppFooter.scss'; import {ReactElement} from 'react'; +import logo from '@assets/images/logo.svg'; + export default function AppFooter(): ReactElement { return ( <>
-

App Footer

+
); From 22a4ab83725deb8f8fba0ef45639e6222f73624a Mon Sep 17 00:00:00 2001 From: thongdanghoang Date: Sat, 25 May 2024 19:02:06 +0700 Subject: [PATCH 2/3] SWD-18: fix lint --- .../shared/components/footer/AppFooter.tsx | 84 ++++++++++++------- 1 file changed, 52 insertions(+), 32 deletions(-) diff --git a/frontend/src/modules/shared/components/footer/AppFooter.tsx b/frontend/src/modules/shared/components/footer/AppFooter.tsx index 5b93e5c..45b136c 100644 --- a/frontend/src/modules/shared/components/footer/AppFooter.tsx +++ b/frontend/src/modules/shared/components/footer/AppFooter.tsx @@ -2,55 +2,75 @@ import './AppFooter.scss'; import {ReactElement} from 'react'; import logo from '@assets/images/logo.svg'; - export default function AppFooter(): ReactElement { return ( <>
- +
+
Swapme Version 12.03.02
+
+ Địa chỉ: Đại học FPT _ E2a-7, Đường D1, Phường Long Thạnh Mỹ, Q9, + Thành phố Thủ Đức, TP.HCM +
+
+
); From 6cc5b0d321240271c21781342df78d9d68b01ffb Mon Sep 17 00:00:00 2001 From: IOdan78 Date: Sat, 25 May 2024 19:59:59 +0700 Subject: [PATCH 3/3] Used class name convention, reformat with prettier --- .../shared/components/footer/AppFooter.scss | 28 +++--- .../shared/components/footer/AppFooter.tsx | 86 ++++++++++++------- 2 files changed, 69 insertions(+), 45 deletions(-) diff --git a/frontend/src/modules/shared/components/footer/AppFooter.scss b/frontend/src/modules/shared/components/footer/AppFooter.scss index 85a1c70..f3877c8 100644 --- a/frontend/src/modules/shared/components/footer/AppFooter.scss +++ b/frontend/src/modules/shared/components/footer/AppFooter.scss @@ -1,42 +1,46 @@ -@import '../../../../assets//styles/variables'; +@import "../../../../assets//styles/variables"; .app-footer { background-color: $app-primary; - .Footer-Content{ + .footer-content { color: $app-quaternary; margin-left: 130px; } - - .Footer-VersionApp{ + + .footer-versionapp { margin-left: 140px; color: $app-tertiary; } - - .Footer-Location{ + + .footer-location { margin-right: 140px; color: $app-tertiary; } - h5{ + + h5 { color: $app-quaternary; padding-bottom: 10px; } - li{ + + li { color: $app-tertiary; } - p{ + + p { padding-top: 10px; max-width: 360px; } - h1{ + + h1 { color: $app-tertiary; font-weight: lighter; font-size: var(--bs-body-font-size); } - .Thai{ + + .line { max-width: 1255px; display: block; margin: 0 auto; } } - diff --git a/frontend/src/modules/shared/components/footer/AppFooter.tsx b/frontend/src/modules/shared/components/footer/AppFooter.tsx index 5b93e5c..e2138c4 100644 --- a/frontend/src/modules/shared/components/footer/AppFooter.tsx +++ b/frontend/src/modules/shared/components/footer/AppFooter.tsx @@ -2,55 +2,75 @@ import './AppFooter.scss'; import {ReactElement} from 'react'; import logo from '@assets/images/logo.svg'; - export default function AppFooter(): ReactElement { return ( <>
- +
+
Swapme Version 12.03.02
+
+ Địa chỉ: Đại học FPT _ E2a-7, Đường D1, Phường Long Thạnh Mỹ, Q9, + Thành phố Thủ Đức, TP.HCM +
+
+
);