From 285c1df67098576769e66b7dd205749f96c3abad Mon Sep 17 00:00:00 2001 From: Mehtab Khan <101495398+MehtabAsHellic@users.noreply.github.com> Date: Fri, 31 May 2024 16:37:42 +0530 Subject: [PATCH 1/6] Add files via upload --- .../Nacto-Care-Logo/Nacto-CARE LOGO No BG.svg | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 public/assets/Nacto-Care-Logo/Nacto-CARE LOGO No BG.svg diff --git a/public/assets/Nacto-Care-Logo/Nacto-CARE LOGO No BG.svg b/public/assets/Nacto-Care-Logo/Nacto-CARE LOGO No BG.svg new file mode 100644 index 0000000..9f61ca1 --- /dev/null +++ b/public/assets/Nacto-Care-Logo/Nacto-CARE LOGO No BG.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + From 5fff7d9d120ee78f2dcada36b63bcf9c2f70415b Mon Sep 17 00:00:00 2001 From: Mehtab Khan <101495398+MehtabAsHellic@users.noreply.github.com> Date: Fri, 31 May 2024 16:39:42 +0530 Subject: [PATCH 2/6] Update Header.jsx with the new logo --- src/components/Header/Header.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index a673824..e524790 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -44,7 +44,7 @@ function Header() {
- Logo + Logo
From 41734fcd30da76bfd3ce79708c2b236ab845d85c Mon Sep 17 00:00:00 2001 From: Mehtab Khan <101495398+MehtabAsHellic@users.noreply.github.com> Date: Fri, 31 May 2024 16:44:04 +0530 Subject: [PATCH 3/6] Update index.html with new logo --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index d9079a1..89f0555 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + Nacto Care From 2911bc98be2a84da2dd3e57d02d81ad354a066c0 Mon Sep 17 00:00:00 2001 From: Mehtab Khan <101495398+MehtabAsHellic@users.noreply.github.com> Date: Fri, 31 May 2024 16:44:53 +0530 Subject: [PATCH 4/6] Update Header.jsx change in the logo size --- src/components/Header/Header.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index e524790..1802b65 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -44,7 +44,7 @@ function Header() {
- Logo + Logo
From ddf52ed1b7497e92e540e77fe19e218600759e65 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 4 Jun 2024 19:48:34 +0530 Subject: [PATCH 5/6] rename --- index.html | 25 +++++++++++-------- ... LOGO No BG.svg => Nacto-CARE-LOGO-BG.svg} | 0 ...acto-CARE LOGO.svg => Nacto-CARE-LOGO.svg} | 0 3 files changed, 14 insertions(+), 11 deletions(-) rename public/assets/Nacto-Care-Logo/{Nacto-CARE LOGO No BG.svg => Nacto-CARE-LOGO-BG.svg} (100%) rename public/assets/Nacto-Care-Logo/{Nacto-CARE LOGO.svg => Nacto-CARE-LOGO.svg} (100%) diff --git a/index.html b/index.html index 89f0555..71b1474 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,16 @@ - - - - - Nacto Care - - -
- - - + + + + + + Nacto Care + + + +
+ + + + \ No newline at end of file diff --git a/public/assets/Nacto-Care-Logo/Nacto-CARE LOGO No BG.svg b/public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO-BG.svg similarity index 100% rename from public/assets/Nacto-Care-Logo/Nacto-CARE LOGO No BG.svg rename to public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO-BG.svg diff --git a/public/assets/Nacto-Care-Logo/Nacto-CARE LOGO.svg b/public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO.svg similarity index 100% rename from public/assets/Nacto-Care-Logo/Nacto-CARE LOGO.svg rename to public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO.svg From be74518530031f2bb84876aa6057d9103f5dd8ac Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 6 Jun 2024 21:33:56 +0530 Subject: [PATCH 6/6] change in path for header --- .../Nacto-Care-Logo/Nacto-CARE-LOGO-BG.svg | 1 + src/components/Header/Header.jsx | 78 ++++++++----------- 2 files changed, 35 insertions(+), 44 deletions(-) diff --git a/public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO-BG.svg b/public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO-BG.svg index 9f61ca1..9226fb0 100644 --- a/public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO-BG.svg +++ b/public/assets/Nacto-Care-Logo/Nacto-CARE-LOGO-BG.svg @@ -1,4 +1,5 @@ + diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index 1802b65..6208126 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -4,7 +4,7 @@ import MenuOverlay from "./MenuOverlay"; import { FaXmark } from "react-icons/fa6"; import '../../index.css' import { ThemeContext } from "../../main"; -import {Switch} from "antd"; +import { Switch } from "antd"; const navLinks = [ { @@ -31,11 +31,11 @@ const navLinks = [ function Header() { const [isNavBarOpen, setIsNavBarOpen] = useState(false); - const { theme, toggleTheme } = useContext(ThemeContext); + const { theme, toggleTheme } = useContext(ThemeContext); const [themes, setThemes] = useState("light"); const handleThemeChange = () => { - toggleTheme(); + toggleTheme(); setThemes((prevTheme) => (prevTheme === "light" ? "dark" : "light")); }; @@ -44,7 +44,7 @@ function Header() {
- Logo + Logo
@@ -53,12 +53,10 @@ function Header() { - `cursor-pointer ${ - theme === "dark" ? "text-white" : "text-gray-800" - } ${ - isActive - ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" - : "text-gray-500" + `cursor-pointer ${theme === "dark" ? "text-white" : "text-gray-800" + } ${isActive + ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" + : "text-gray-500" } hover:text-green-500` } > @@ -67,32 +65,28 @@ function Header() {
  • - - `cursor-pointer transition-all ${ - theme === "dark" ? "text-white" : "text-gray-800" - } ${ - isActive - ? `${theme === "dark" ? "text-white" : "text-black"} nav-link-active` - : "text-gray-500" - } hover:text-green-500` - } - > - Careers - -
    • + + `cursor-pointer transition-all ${theme === "dark" ? "text-white" : "text-gray-800" + } ${isActive + ? `${theme === "dark" ? "text-white" : "text-black"} nav-link-active` + : "text-gray-500" + } hover:text-green-500` + } + > + Careers + +
  • - `cursor-pointer ${ - theme === "dark" ? "text-white" : "text-gray-800" - } ${ - isActive - ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" - : "text-gray-500" + `cursor-pointer ${theme === "dark" ? "text-white" : "text-gray-800" + } ${isActive + ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" + : "text-gray-500" } transition-all hover:text-green-500` } > @@ -104,12 +98,10 @@ function Header() { - `cursor-pointer ${ - theme === "dark" ? "text-white" : "text-gray-800" - } ${ - isActive - ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" - : "text-gray-500" + `cursor-pointer ${theme === "dark" ? "text-white" : "text-gray-800" + } ${isActive + ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" + : "text-gray-500" } transition-all hover:text-green-500` } > @@ -121,12 +113,10 @@ function Header() { - `cursor-pointer ${ - theme === "dark" ? "text-white" : "text-gray-800" - } ${ - isActive - ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" - : "text-gray-500" + `cursor-pointer ${theme === "dark" ? "text-white" : "text-gray-800" + } ${isActive + ? "text-black underline decoration-green-500 underline-offset-[0.5rem] decoration-2" + : "text-gray-500" } transition-all hover:text-green-500` } > @@ -166,7 +156,7 @@ function Header() { Signup
    • - +
    {isNavBarOpen && (