From dc6815261f7ceee463eb57ab13b8b0f5e94c1e22 Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 10:47:45 +0200 Subject: [PATCH 01/11] added beck to mobile navbar --- next-env.d.ts | 5 +++++ public/Online_hvit_o.svg | 18 ++++++++++++++++++ public/bekk_white.svg | 22 ++++++++++++++++++++++ src/components/all/Navbar.tsx | 13 +++++++++---- tsconfig.json | 34 ++++++++++++++++++++++++++++++++-- 5 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 next-env.d.ts create mode 100644 public/Online_hvit_o.svg create mode 100644 public/bekk_white.svg diff --git a/next-env.d.ts b/next-env.d.ts new file mode 100644 index 0000000..4f11a03 --- /dev/null +++ b/next-env.d.ts @@ -0,0 +1,5 @@ +/// +/// + +// NOTE: This file should not be edited +// see https://nextjs.org/docs/basic-features/typescript for more information. diff --git a/public/Online_hvit_o.svg b/public/Online_hvit_o.svg new file mode 100644 index 0000000..1bc5db7 --- /dev/null +++ b/public/Online_hvit_o.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/public/bekk_white.svg b/public/bekk_white.svg new file mode 100644 index 0000000..67818f7 --- /dev/null +++ b/public/bekk_white.svg @@ -0,0 +1,22 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index 610eb20..fc94d90 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -50,6 +50,15 @@ const Navbar = () => { )} > {/* MOBILE HAMBURGER MENU */} + + + Online Logo + + + + Bekk Logo + +
{
- - Logo - - {/* DESKTOP NAVBAR */}
{navLinks.map((link) => ( diff --git a/tsconfig.json b/tsconfig.json index 1ffef60..a526a3c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,37 @@ { "files": [], "references": [ - { "path": "./tsconfig.app.json" }, - { "path": "./tsconfig.node.json" } + { + "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.node.json" + } + ], + "compilerOptions": { + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "allowJs": true, + "skipLibCheck": true, + "strict": false, + "noEmit": true, + "incremental": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve" + }, + "include": [ + "next-env.d.ts", + "**/*.ts", + "**/*.tsx" + ], + "exclude": [ + "node_modules" ] } From 08ded9f02f0102819dbfbba898b67f9bbe2790cd Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 10:52:23 +0200 Subject: [PATCH 02/11] merge fix --- src/components/all/Navbar.tsx | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index d6deaa8..efc6ce2 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -47,7 +47,7 @@ const Navbar = () => {
{/* MOBILE HAMBURGER MENU */} @@ -60,26 +60,6 @@ const Navbar = () => { Bekk Logo -
- -
- {navLinks.map((link) => ( - - {link.title} - - ))} -
-
- {/* DESKTOP NAVBAR */}
{navLinks.map((link) => ( From 6e825f81cab2e50542c64c4ec2fbc7bd8297bb85 Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 10:55:59 +0200 Subject: [PATCH 03/11] dropdown menu will now disapear when an item has been clicked --- src/components/all/Navbar.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index efc6ce2..d48e851 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -88,6 +88,7 @@ const Navbar = () => { key={link.title} to={link.path} className="block py-2 px-4 hover:bg-[#1e2334] transition text-lg" + onClick={() => setShowNavMenu(false)} > {link.title} From 68240c8767bdb180b0c9d453fc98116be6fe3ef3 Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 11:17:33 +0200 Subject: [PATCH 04/11] fix desktop position --- public/Online_hvit.svg | 38 +++++++++++++++++++++++++++++++++++ src/components/all/Navbar.tsx | 27 +++++++++++++++++++------ 2 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 public/Online_hvit.svg diff --git a/public/Online_hvit.svg b/public/Online_hvit.svg new file mode 100644 index 0000000..66b0b07 --- /dev/null +++ b/public/Online_hvit.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index d48e851..d070408 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -51,13 +51,28 @@ const Navbar = () => { )} > {/* MOBILE HAMBURGER MENU */} - - - Online Logo - - +
+ + Online Logo + + + Online Logo + +
- Bekk Logo + Bekk Logo {/* DESKTOP NAVBAR */} From 9015079957ac7b50b021e90b40e23076da843f6b Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 12:52:03 +0200 Subject: [PATCH 05/11] reintroduce onlinefondet + delete some files --- .gitignore | 2 ++ public/Bekk_navnetrekk_hvit.svg | 22 ------------------ public/Online_hvit.png | Bin 12143 -> 0 bytes public/Online_hvit.svg | 38 -------------------------------- src/components/all/Navbar.tsx | 11 +++++---- 5 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 public/Bekk_navnetrekk_hvit.svg delete mode 100644 public/Online_hvit.png delete mode 100644 public/Online_hvit.svg diff --git a/.gitignore b/.gitignore index 85ff08a..ef8488a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ dist-ssr *.sln *.sw? +.env.local + .next/ \ No newline at end of file diff --git a/public/Bekk_navnetrekk_hvit.svg b/public/Bekk_navnetrekk_hvit.svg deleted file mode 100644 index 4f9b281..0000000 --- a/public/Bekk_navnetrekk_hvit.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - diff --git a/public/Online_hvit.png b/public/Online_hvit.png deleted file mode 100644 index f5e07ddc9a5f29a8a0c6561ad5cbb66cdf6d6beb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12143 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 ZWT?lVp{ssv0wdcXZFPOM>PPl3{tuU`0g?a! diff --git a/public/Online_hvit.svg b/public/Online_hvit.svg deleted file mode 100644 index 66b0b07..0000000 --- a/public/Online_hvit.svg +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index d070408..b0912ce 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -52,12 +52,11 @@ const Navbar = () => { > {/* MOBILE HAMBURGER MENU */}
- - Online Logo + + Onlinefondet Date: Mon, 16 Sep 2024 13:05:38 +0200 Subject: [PATCH 06/11] delete werid file --- next-env.d.ts | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 next-env.d.ts diff --git a/next-env.d.ts b/next-env.d.ts deleted file mode 100644 index 4f11a03..0000000 --- a/next-env.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -/// -/// - -// NOTE: This file should not be edited -// see https://nextjs.org/docs/basic-features/typescript for more information. From 51ce87a1f91f27d31029aa8bab91768289ceaae8 Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 13:07:45 +0200 Subject: [PATCH 07/11] fix styling --- src/components/all/Navbar.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index b0912ce..dbcde50 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -54,7 +54,7 @@ const Navbar = () => {
Onlinefondet @@ -116,7 +116,7 @@ const Navbar = () => { target="_blank" className="hidden p-2 transition md:block hover:opacity-50" > - Bekk logo + Bekk logo
); From d9ef8f5f893426b1af51a900a4313eb7badf84b0 Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 13:16:10 +0200 Subject: [PATCH 08/11] revert tsConfig --- tsconfig.json | 36 +++--------------------------------- 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index a526a3c..c452f43 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,37 +1,7 @@ { "files": [], "references": [ - { - "path": "./tsconfig.app.json" - }, - { - "path": "./tsconfig.node.json" - } - ], - "compilerOptions": { - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], - "allowJs": true, - "skipLibCheck": true, - "strict": false, - "noEmit": true, - "incremental": true, - "esModuleInterop": true, - "module": "esnext", - "moduleResolution": "node", - "resolveJsonModule": true, - "isolatedModules": true, - "jsx": "preserve" - }, - "include": [ - "next-env.d.ts", - "**/*.ts", - "**/*.tsx" - ], - "exclude": [ - "node_modules" + { "path": "./tsconfig.app.json" }, + { "path": "./tsconfig.node.json" } ] -} +} \ No newline at end of file From d6e61b12f4edd7f47ec235cc1e31098ba38b8aa3 Mon Sep 17 00:00:00 2001 From: Julian Date: Mon, 16 Sep 2024 14:22:12 +0200 Subject: [PATCH 09/11] seperated mobile and desktop navbar --- src/components/all/Navbar.tsx | 135 +++++++++++++++++++--------------- 1 file changed, 74 insertions(+), 61 deletions(-) diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index dbcde50..e433aad 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -13,16 +13,39 @@ const navLinks = [ const Navbar = () => { const [showNavbar, setShowNavbar] = useState(true); const [lastScroll, setLastScroll] = useState(0); - const [showNavMenu, setShowNavMenu] = useState(false); - const dropdownRef = useRef(null); + useEffect(() => { + const controlNavbar = () => { + const currentScroll = window.scrollY; + + setShowNavbar(currentScroll <= lastScroll); + setLastScroll(currentScroll); + }; + window.addEventListener('scroll', controlNavbar); + + return () => { + window.removeEventListener('scroll', controlNavbar); + }; + }, [lastScroll]); + + return ( +
+ + +
+ ); +}; - const controlNavbar = () => { - const currentScroll = window.scrollY; +export default Navbar; - setShowNavbar(currentScroll <= lastScroll); - setLastScroll(currentScroll); - }; +const MobileNavbar = () => { + const [showNavMenu, setShowNavMenu] = useState(false); + const dropdownRef = useRef(null); useEffect(() => { const handleClickOutside = (event: MouseEvent) => { @@ -35,60 +58,31 @@ const Navbar = () => { }; document.addEventListener('mousedown', handleClickOutside); - window.addEventListener('scroll', controlNavbar); return () => { document.removeEventListener('mousedown', handleClickOutside); - window.removeEventListener('scroll', controlNavbar); }; - }, [lastScroll]); + }, []); return ( -
- {/* MOBILE HAMBURGER MENU */} -
- - Onlinefondet - - - Online Logo - -
- - Bekk Logo +
+ + Bekk logo - {/* DESKTOP NAVBAR */} -
- {navLinks.map((link) => ( - - {link.title} - - ))} -
+ + Onlinefondet + - {/* MOBILE HAMBURGER MENU */} -
+ {/* HAMBURGER MENU */} +
{showNavMenu && ( { )}
- - - Bekk logo -
); }; -export default Navbar; +const DesktopNavbar = () => ( +
+ + Onlinefondet + + + {/* NAV-ITEMS */} +
+ {navLinks.map((link) => ( + + {link.title} + + ))} +
+ + + Bekk logo + +
+); From b05bcdfb565fbe91e4f255459d02a229c05b18e7 Mon Sep 17 00:00:00 2001 From: fredrir Date: Mon, 16 Sep 2024 14:58:32 +0200 Subject: [PATCH 10/11] remove bekk from mobile navbar --- src/components/all/Navbar.tsx | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index dbcde50..f3e719c 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -51,27 +51,12 @@ const Navbar = () => { )} > {/* MOBILE HAMBURGER MENU */} -
- - Onlinefondet - - - Online Logo - -
- - Bekk Logo + + + Onlinefondet {/* DESKTOP NAVBAR */} From bc81ff26bfebf46e236087e8e4f24caba50f030b Mon Sep 17 00:00:00 2001 From: Julian Date: Mon, 16 Sep 2024 15:58:43 +0200 Subject: [PATCH 11/11] removed bekk --- src/components/all/Navbar.tsx | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/components/all/Navbar.tsx b/src/components/all/Navbar.tsx index e433aad..c687949 100644 --- a/src/components/all/Navbar.tsx +++ b/src/components/all/Navbar.tsx @@ -32,7 +32,7 @@ const Navbar = () => {
@@ -66,23 +66,15 @@ const MobileNavbar = () => { return (
- - Bekk logo - - Onlinefondet {/* HAMBURGER MENU */} -
+
{showNavMenu && (