From e189bec3f6faa93a600d6b4d5d7d0e892b8e5e8b Mon Sep 17 00:00:00 2001 From: Slegede2024 Date: Fri, 21 Mar 2025 12:52:31 -0700 Subject: [PATCH 1/2] update Header section --- client/public/Logo.png | Bin 0 -> 3740 bytes client/src/Component/Header/Header.jsx | 37 +++--- client/src/Component/Header/Header.module.css | 107 ++++++------------ 3 files changed, 50 insertions(+), 94 deletions(-) create mode 100644 client/public/Logo.png diff --git a/client/public/Logo.png b/client/public/Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b854796fe9a01a87417b54f7c75b1c088fc22059 GIT binary patch literal 3740 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 { setIsLoggedIn((prevState) => !prevState); - navigate(isLoggedIn ? "/login" : "/dashboard"); + navigate(isLoggedIn ? "/login" : "/dashboard"); }; return ( -
- {/* Logo (Clickable for Navigation) */} -
navigate("/HomePages")}> - /HomePage +
+
+
+ /Home +
- - {/* Navigation Links */} - - - {/* Authentication Button */} -
-
diff --git a/client/src/Component/Header/Header.module.css b/client/src/Component/Header/Header.module.css index 11781d6..afccdc5 100644 --- a/client/src/Component/Header/Header.module.css +++ b/client/src/Component/Header/Header.module.css @@ -1,71 +1,36 @@ -* { - padding: 0; - margin: 0; - box-sizing: border-box; -} - -/* HEADER CONTAINER */ -.headerContainer { - display: flex; - justify-content: space-between; - align-items: center; - padding: 15px 40px; - background-color: white; - border-bottom: 1px solid #ddd; - box-shadow: 2px 2px 5px whitesmoke; - width: 100%; - height: 100px; -} - -/* LOGO CONTAINER */ -.innerClass { - display: flex; - align-items: center; - padding: 50px; - justify-content: center; - /* margin: 0 auto; */ -} - -/* LOGO */ -.headerImg { - height: 30px; -} - -/* NAVIGATION LINKS */ -.navLinks { - display: flex; - gap: 20px; - margin-left: 0 50px auto; -} - -.navLinks a { - text-decoration: none; - color: #344767;; - font-size: 20px; - font-weight: 500; - gap: 20px; - -} - -/* AUTH BUTTON */ -.authButton { - display: flex; - align-items: center; -} - -.signInButton, -.logoutButton { - background-color: #4c6ef5; - color: white; - border: none; - padding: 20px 90px; - border-radius: 5px; - font-size: 14px; - cursor: pointer; - -} - -.signInButton:hover, -.logoutButton:hover { - background-color: #3b5bdb; -} +.header_container{ +display: flex; +/* background-color: blue; */ + padding: 20px; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.2); +} +.header_container .logo_div +{ + width: 60%; + text-align: center; +} +.logo_div .logo img{ +height: 25px; +} + + +/* second div */ +.login_logout_div{ +display: flex; +gap: 20px; +justify-content: center; +align-items: center; +} +.login_logout_div a{ + text-decoration: none; + color: black; + font-family: sans-serif; + font-size: 15px; +} +.login_logout_div button{ + padding: 7px 60px; + border-radius: 5px; + border: none; + background-color: #516CF0; + color: rgb(236, 226, 226) +} \ No newline at end of file From d220f663e23cec2e12779f33d2ba48f69734e336 Mon Sep 17 00:00:00 2001 From: Slegede2024 Date: Sat, 22 Mar 2025 09:51:11 -0700 Subject: [PATCH 2/2] Added Footer component with icons and CSS module --- client/package-lock.json | 10 +++ client/package.json | 1 + client/public/logo-footer.png | Bin 0 -> 3436 bytes client/src/App.jsx | 2 + client/src/Component/Footer/Footer.jsx | 57 +++++++++++++++ client/src/Component/Footer/Footer.module.css | 65 ++++++++++++++++++ .../Component/Footer/Image/logo-footer.png | Bin 0 -> 3436 bytes 7 files changed, 135 insertions(+) create mode 100644 client/public/logo-footer.png create mode 100644 client/src/Component/Footer/Footer.jsx create mode 100644 client/src/Component/Footer/Footer.module.css create mode 100644 client/src/Component/Footer/Image/logo-footer.png diff --git a/client/package-lock.json b/client/package-lock.json index 89009d1..6ed4585 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "react": "^19.0.0", "react-dom": "^19.0.0", + "react-icons": "^5.5.0", "react-router-dom": "^7.4.0" }, "devDependencies": { @@ -2424,6 +2425,15 @@ "react": "^19.0.0" } }, + "node_modules/react-icons": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz", + "integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==", + "license": "MIT", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-refresh": { "version": "0.14.2", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", diff --git a/client/package.json b/client/package.json index 802e8da..6fe288a 100644 --- a/client/package.json +++ b/client/package.json @@ -12,6 +12,7 @@ "dependencies": { "react": "^19.0.0", "react-dom": "^19.0.0", + "react-icons": "^5.5.0", "react-router-dom": "^7.4.0" }, "devDependencies": { diff --git a/client/public/logo-footer.png b/client/public/logo-footer.png new file mode 100644 index 0000000000000000000000000000000000000000..3d3dd23053b8423a1c3aa70c92db3d6822035014 GIT binary patch literal 3436 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 O0000
+