From 04890477b0e1ad6ae327a56a65b03b4d0ef80ab2 Mon Sep 17 00:00:00 2001 From: J-onasJones Date: Sun, 17 Sep 2023 00:26:58 +0200 Subject: [PATCH] code refactor --- src/app.d.ts | 2 +- src/app.html | 25 +- src/components/FontAwesome.svelte | 7 +- src/components/Footer.svelte | 32 +- src/components/InfiniteImageSelector.svelte | 175 +++--- src/components/NavBar.svelte | 557 ++++++++++---------- src/components/ParallaxBg.svelte | 38 +- src/components/TooSmallDimsOverlay.svelte | 16 +- src/routes/+error.svelte | 18 +- src/routes/+page.css | 45 +- src/routes/+page.svelte | 38 +- src/routes/406/+page.svelte | 6 +- src/routes/409/+page.svelte | 5 +- src/routes/about/+page.svelte | 69 ++- src/routes/alpha/+page.svelte | 5 +- src/routes/projects/+page.svelte | 307 ++++++----- 16 files changed, 734 insertions(+), 611 deletions(-) diff --git a/src/app.d.ts b/src/app.d.ts index f59b884..50f31d2 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -9,4 +9,4 @@ declare global { } } -export {}; +export { }; diff --git a/src/app.html b/src/app.html index 7def3ad..423a444 100644 --- a/src/app.html +++ b/src/app.html @@ -1,13 +1,16 @@ - - - - - - %sveltekit.head% - - -
%sveltekit.body%
- - + + + + + + + %sveltekit.head% + + + +
%sveltekit.body%
+ + + \ No newline at end of file diff --git a/src/components/FontAwesome.svelte b/src/components/FontAwesome.svelte index b05e6bc..263bd0f 100644 --- a/src/components/FontAwesome.svelte +++ b/src/components/FontAwesome.svelte @@ -1,4 +1,7 @@ - - + + diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index 7ee808b..d9a8cbd 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -1,21 +1,21 @@
-

Website by Jonas_Jones 2021 - 2023

+

Website by Jonas_Jones 2021 - 2023

diff --git a/src/components/InfiniteImageSelector.svelte b/src/components/InfiniteImageSelector.svelte index 4f60520..9cdcdf0 100644 --- a/src/components/InfiniteImageSelector.svelte +++ b/src/components/InfiniteImageSelector.svelte @@ -1,87 +1,96 @@ - - - -
- {#each images as image} - {`Image toggleSquareSelection(image)} - /> - {/each} - - {#if loading} -

Loading...

- {/if} -
- -
-

Selected squares: {Array.from(selectedSquares).join(', ')}

-
\ No newline at end of file + }); + + // Initial load + fetchImages(); + + +
+ {#each images as image} + {`Image toggleSquareSelection(image)} + /> + {/each} + + {#if loading} +

Loading...

+ {/if} +
+ +
+

Selected squares: {Array.from(selectedSquares).join(", ")}

+
+ + diff --git a/src/components/NavBar.svelte b/src/components/NavBar.svelte index 5d170f2..a7ded3b 100644 --- a/src/components/NavBar.svelte +++ b/src/components/NavBar.svelte @@ -1,13 +1,88 @@ + +
-
-
-
+
+
+
@@ -21,23 +96,26 @@
- + - +
-

-

+

+

-
-
-
-
+
+
+
+
    {#each navLinks as link} @@ -45,89 +123,13 @@ {/each}
-
- - - + @media only screen and (max-width: 375px) and (min-width: 300px) { + .lastfm #lastfm_title, + .lastfm #lastfm_artist { + display: none; + } + .lastfm { + width: 50px; + } + .nav-links { + display: none; + } + .hamburger-menu { + display: block; + } + .logo { + display: none; + } + } + + @media only screen and (max-width: 300px) and (min-width: 0px) { + .lastfm #lastfm_title, + .lastfm #lastfm_artist { + display: none; + } + .lastfm { + width: 50px; + } + .nav-links { + display: none; + } + .hamburger-menu { + display: block; + } + .logo { + display: none; + } + } + diff --git a/src/components/ParallaxBg.svelte b/src/components/ParallaxBg.svelte index 7efeee3..3aba98a 100644 --- a/src/components/ParallaxBg.svelte +++ b/src/components/ParallaxBg.svelte @@ -10,9 +10,26 @@ mouseY = event.clientY; } - + +
+
+ Parallax Background +
+ + +
+ - -
-
- Parallax Background - -
- - -
- \ No newline at end of file diff --git a/src/components/TooSmallDimsOverlay.svelte b/src/components/TooSmallDimsOverlay.svelte index 9f86bf9..5fbc21b 100644 --- a/src/components/TooSmallDimsOverlay.svelte +++ b/src/components/TooSmallDimsOverlay.svelte @@ -1,3 +1,12 @@ +
+
+

+ Your screen resolution isn't supported by this website. if You're on a + computer, try zooming out or resizing the window. +

+
+
+ - -
-
-

Your screen resolution isn't supported by this website. if You're on a computer, try zooming out or resizing the window.

-
-
- \ No newline at end of file diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index d634cb9..a5ac6ed 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -11,13 +11,13 @@ } function toggleTaeyong() { - const taeyong = document.querySelector('.taeyong'); - taeyong.style.display = 'block'; + const taeyong = document.querySelector(".taeyong"); + taeyong.style.display = "block"; } function toggleTaeyongoff() { - const taeyong = document.querySelector('.taeyong'); - taeyong.style.display = 'none'; + const taeyong = document.querySelector(".taeyong"); + taeyong.style.display = "none"; } @@ -34,7 +34,7 @@
Toggle GIF @@ -44,7 +44,13 @@
- taeyong + taeyong
- - - - Projects -
- - -

Projects

-
- - - - - - - - - {searchResults.length} results -
-
- {#each searchResults as project} -
- -

{project.title}

{project.status}{project.version}

-

{project.description}

-
- -
- - -
- -
-
- More Info -
-
- {/each} -
- -
-