From 8022e3a6629d865c939f4a40fd963de1a0dba606 Mon Sep 17 00:00:00 2001 From: Md Asif Date: Mon, 30 Sep 2024 20:23:47 +0530 Subject: [PATCH 1/4] Refactor language selector and separator components --- src/components/LanguageSelector.jsx | 2 +- src/components/Separator.jsx | 2 +- src/pages/Home.jsx | 22 +++++++++++++++------- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/components/LanguageSelector.jsx b/src/components/LanguageSelector.jsx index 2e52453..abded28 100644 --- a/src/components/LanguageSelector.jsx +++ b/src/components/LanguageSelector.jsx @@ -9,7 +9,7 @@ const LanguageSelector = () => { return (
- diff --git a/src/components/Separator.jsx b/src/components/Separator.jsx index 05efc82..77b6fb6 100644 --- a/src/components/Separator.jsx +++ b/src/components/Separator.jsx @@ -1,7 +1,7 @@ function Separator() { return (
-
+
) } diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx index 540e0d2..dc2de1f 100644 --- a/src/pages/Home.jsx +++ b/src/pages/Home.jsx @@ -1,25 +1,33 @@ import FormBox from "../components/FormBox"; import { useTranslation } from "react-i18next"; +import { getUserInfoFromSession } from "../util/util"; function Home() { const { t } = useTranslation(); const holidayList = [{ date: '23 May, 2024', name: 'Buddha Purnima' }, { date: '15 June, 2024', name: 'Raja Sankranti' }]; const homePageNotifications = ['hpn_complete_before_31', 'hpn_npa', 'hpn_helpdesk_contact', 'hpn_rupay_kcc_time', 'hpn_rupay_kcc_atm']; + const userInformation = getUserInfoFromSession(); return (
- -

Welcome to the Home Page

+ +
    + {holidayList.map((holiday, index) => ( +
  • {holiday.date} - {holiday.name}
    • + ))} +
- -
    - {holidayList.map((holiday, index) => ( -
  • {holiday.date} - {holiday.name}
    • - ))} + +
      + { + Object.keys(userInformation).map((key, index) => ( +
    • {t(key)}: {t(userInformation[key])}
      • + )) + }
From 45bc3eff579c5ea179733ad5cb75d314aa7926b3 Mon Sep 17 00:00:00 2001 From: Md Asif Date: Mon, 30 Sep 2024 23:43:30 +0530 Subject: [PATCH 2/4] completed homepage design --- package-lock.json | 14 ++++++++++++-- package.json | 1 + src/components/Footer.jsx | 5 +++-- src/components/FormBox.jsx | 10 ++++++---- src/components/MenuBar.jsx | 6 +++--- src/components/Separator.jsx | 2 +- src/pages/Home.jsx | 9 ++++----- tailwind.config.js | 17 +++++++++++------ 8 files changed, 41 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8935e4b..a922a97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,14 @@ { - "name": "my-project", + "name": "osaka", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "my-project", + "name": "osaka", "version": "0.0.0", "dependencies": { + "clsx": "^2.1.1", "i18next": "^23.15.1", "i18next-browser-languagedetector": "^8.0.0", "i18next-http-backend": "^2.6.1", @@ -1907,6 +1908,15 @@ "node": ">= 6" } }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", diff --git a/package.json b/package.json index 64b7d1c..e527be6 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "preview": "vite preview" }, "dependencies": { + "clsx": "^2.1.1", "i18next": "^23.15.1", "i18next-browser-languagedetector": "^8.0.0", "i18next-http-backend": "^2.6.1", diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index fdce956..c36945a 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -1,7 +1,8 @@ function Footer() { return ( -