From 285287a9cb1b23bf0f69127dee787959e54608c1 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 8 Jun 2023 11:07:37 +0200 Subject: [PATCH 01/15] Add MsgBox Lib & Try out custom error pages --- src/app.scss | 2 +- src/lib/modules/Modal.svelte | 1 + src/lib/modules/MsgBox.svelte | 65 ++++++++++++++++++++++++++++++++ src/routes/+error.svelte | 6 +++ src/routes/examples/+page.svelte | 13 +++++++ 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 src/lib/modules/Modal.svelte create mode 100644 src/lib/modules/MsgBox.svelte create mode 100644 src/routes/+error.svelte create mode 100644 src/routes/examples/+page.svelte diff --git a/src/app.scss b/src/app.scss index 9ca8649..7258301 100644 --- a/src/app.scss +++ b/src/app.scss @@ -4,7 +4,7 @@ /* Write your global styles here, in SCSS syntax. Variables and mixins from the src/variables.scss file are available here without importing */ -body { +h1, h2, body { font-family: 'IBM Plex Mono', monospace; // background-color: #ffffff; // color: #000000; diff --git a/src/lib/modules/Modal.svelte b/src/lib/modules/Modal.svelte new file mode 100644 index 0000000..833a539 --- /dev/null +++ b/src/lib/modules/Modal.svelte @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/lib/modules/MsgBox.svelte b/src/lib/modules/MsgBox.svelte new file mode 100644 index 0000000..4c5c67d --- /dev/null +++ b/src/lib/modules/MsgBox.svelte @@ -0,0 +1,65 @@ + + +
+

+ {#if prefix}{prefix}{/if} + {@html message} +

+
+ + \ No newline at end of file diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte new file mode 100644 index 0000000..5e05cb5 --- /dev/null +++ b/src/routes/+error.svelte @@ -0,0 +1,6 @@ + + +

{$page.status}: {$page.error.message}

+

AHDJIUASHDILAUHSDIUSHD ERRORRRRS

\ No newline at end of file diff --git a/src/routes/examples/+page.svelte b/src/routes/examples/+page.svelte new file mode 100644 index 0000000..319458b --- /dev/null +++ b/src/routes/examples/+page.svelte @@ -0,0 +1,13 @@ + + + + {#if showModal} + + {/if} + \ No newline at end of file From 79fe45ece3c22907d56d0edb020910f45ef389a3 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 8 Jun 2023 18:14:02 +0200 Subject: [PATCH 02/15] progress --- src/lib/modules/MsgBox.svelte | 6 +- src/routes/+error.svelte | 16 ++++- src/routes/+page.svelte | 78 ++++++++------------- src/routes/Header.svelte | 2 +- src/routes/download/+page.svelte | 9 --- src/routes/{download => downloads}/+page.js | 0 src/routes/downloads/+page.svelte | 14 ++++ src/routes/modlist/+page.svelte | 1 + 8 files changed, 62 insertions(+), 64 deletions(-) delete mode 100644 src/routes/download/+page.svelte rename src/routes/{download => downloads}/+page.js (100%) create mode 100644 src/routes/downloads/+page.svelte create mode 100644 src/routes/modlist/+page.svelte diff --git a/src/lib/modules/MsgBox.svelte b/src/lib/modules/MsgBox.svelte index 4c5c67d..34e1705 100644 --- a/src/lib/modules/MsgBox.svelte +++ b/src/lib/modules/MsgBox.svelte @@ -38,12 +38,14 @@ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b76cabe..278bda4 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,7 +1,5 @@ @@ -11,54 +9,36 @@

ExploreCraft

-

Welcome to the ExploreCraft website!

+

+ This is ExploreCraft! A modpack for Minecraft 1.19.2 (Quilt) designed to keep you moving.
+ You may never know what you'll find, after all +

+

Have a look around. You can download the modpack and play, have a look in our gallery, or take a look at our modlist.

+
+ Download + Modlist +
+ + - - - + \ No newline at end of file diff --git a/src/routes/Header.svelte b/src/routes/Header.svelte index afd4e65..7f4b794 100644 --- a/src/routes/Header.svelte +++ b/src/routes/Header.svelte @@ -18,7 +18,7 @@ Home
  • - Download + Download
  • Gallery diff --git a/src/routes/download/+page.svelte b/src/routes/download/+page.svelte deleted file mode 100644 index 0f7abea..0000000 --- a/src/routes/download/+page.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - Downloads - - - -
    -

    Downloads

    -

    Here you'll find all downloads.

    -
    diff --git a/src/routes/download/+page.js b/src/routes/downloads/+page.js similarity index 100% rename from src/routes/download/+page.js rename to src/routes/downloads/+page.js diff --git a/src/routes/downloads/+page.svelte b/src/routes/downloads/+page.svelte new file mode 100644 index 0000000..f463090 --- /dev/null +++ b/src/routes/downloads/+page.svelte @@ -0,0 +1,14 @@ + + Downloads + + + + + +
    +

    Downloads

    +

    Here you'll find all downloads.

    +
    + diff --git a/src/routes/modlist/+page.svelte b/src/routes/modlist/+page.svelte new file mode 100644 index 0000000..9399773 --- /dev/null +++ b/src/routes/modlist/+page.svelte @@ -0,0 +1 @@ +

    YAY

    \ No newline at end of file From 27e79c6dcba16370dce8229d2a7de75095683e07 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 8 Jun 2023 18:15:57 +0200 Subject: [PATCH 03/15] progress --- src/routes/Header.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/Header.svelte b/src/routes/Header.svelte index 7f4b794..adf658a 100644 --- a/src/routes/Header.svelte +++ b/src/routes/Header.svelte @@ -18,7 +18,7 @@ Home
  • - Download + Download
  • Gallery From 8b63920c219705573a6fce97220f9885b4daed14 Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 8 Jun 2023 21:36:35 +0200 Subject: [PATCH 04/15] progress --- .prettierrc | 4 ++ src/lib/assets/pictures/pic0.png | 0 src/routes/+page.svelte | 20 +++++++--- src/routes/Header.svelte | 42 ++++++++++---------- src/routes/downloads/+page.js | 9 ----- src/routes/downloads/+page.svelte | 65 ++++++++++++++++++++++++++----- src/routes/gallery/+page.js | 9 ----- 7 files changed, 96 insertions(+), 53 deletions(-) create mode 100644 .prettierrc create mode 100644 src/lib/assets/pictures/pic0.png delete mode 100644 src/routes/downloads/+page.js delete mode 100644 src/routes/gallery/+page.js diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..222861c --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "tabWidth": 2, + "useTabs": false +} diff --git a/src/lib/assets/pictures/pic0.png b/src/lib/assets/pictures/pic0.png new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 278bda4..e693985 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,5 +1,16 @@ @@ -20,15 +31,14 @@ Modlist - + \ No newline at end of file diff --git a/src/routes/gallery/+page.js b/src/routes/gallery/+page.js deleted file mode 100644 index e739ef4..0000000 --- a/src/routes/gallery/+page.js +++ /dev/null @@ -1,9 +0,0 @@ -import { dev } from '$app/environment'; - -// we don't need any JS on this page, though we'll load -// it in dev so that we get hot module replacement -export const csr = dev; - -// since there's no dynamic data here, we can prerender -// it so that it gets served as a static asset in production -export const prerender = true; From 965f0d3561c79a619fdba106e81066f7b08e4d2a Mon Sep 17 00:00:00 2001 From: Sangelo Date: Thu, 8 Jun 2023 23:19:09 +0200 Subject: [PATCH 05/15] Progress on Downloads Page - Moved Pictures to different directory - Modifications on Header and Menu Items - Progress on Downloads Page --- src/app.scss | 9 +- .../{pictures => images/gallery}/pic0.png | 0 .../{pictures => images/gallery}/pic1.png | Bin .../{pictures => images/gallery}/pic10.png | Bin .../{pictures => images/gallery}/pic11.png | Bin .../{pictures => images/gallery}/pic12.png | Bin .../{pictures => images/gallery}/pic13.png | Bin .../{pictures => images/gallery}/pic14.png | Bin .../{pictures => images/gallery}/pic2.png | Bin .../{pictures => images/gallery}/pic3.png | Bin .../{pictures => images/gallery}/pic4.png | Bin .../{pictures => images/gallery}/pic5.png | Bin .../{pictures => images/gallery}/pic6.png | Bin .../{pictures => images/gallery}/pic7.png | Bin .../{pictures => images/gallery}/pic8.png | Bin .../{pictures => images/gallery}/pic9.png | Bin src/routes/+page.svelte | 12 +-- src/routes/Header.svelte | 22 ++++- src/routes/downloads/+page.svelte | 86 +++++++++++++----- 19 files changed, 94 insertions(+), 35 deletions(-) rename src/lib/assets/{pictures => images/gallery}/pic0.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic1.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic10.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic11.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic12.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic13.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic14.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic2.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic3.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic4.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic5.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic6.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic7.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic8.png (100%) rename src/lib/assets/{pictures => images/gallery}/pic9.png (100%) diff --git a/src/app.scss b/src/app.scss index 7258301..d02a1d0 100644 --- a/src/app.scss +++ b/src/app.scss @@ -4,7 +4,7 @@ /* Write your global styles here, in SCSS syntax. Variables and mixins from the src/variables.scss file are available here without importing */ -h1, h2, body { +h1, h2, h3, h4, h5, h6, body { font-family: 'IBM Plex Mono', monospace; // background-color: #ffffff; // color: #000000; @@ -48,6 +48,11 @@ h1, h2, body { --switch-checked-background-color: var(--primary); } -p { +p, li { cursor: text; +} + +article { + border-radius: 10px; + box-shadow: 0px 0px 15px rgba(32, 32, 32, 0.2); } \ No newline at end of file diff --git a/src/lib/assets/pictures/pic0.png b/src/lib/assets/images/gallery/pic0.png similarity index 100% rename from src/lib/assets/pictures/pic0.png rename to src/lib/assets/images/gallery/pic0.png diff --git a/src/lib/assets/pictures/pic1.png b/src/lib/assets/images/gallery/pic1.png similarity index 100% rename from src/lib/assets/pictures/pic1.png rename to src/lib/assets/images/gallery/pic1.png diff --git a/src/lib/assets/pictures/pic10.png b/src/lib/assets/images/gallery/pic10.png similarity index 100% rename from src/lib/assets/pictures/pic10.png rename to src/lib/assets/images/gallery/pic10.png diff --git a/src/lib/assets/pictures/pic11.png b/src/lib/assets/images/gallery/pic11.png similarity index 100% rename from src/lib/assets/pictures/pic11.png rename to src/lib/assets/images/gallery/pic11.png diff --git a/src/lib/assets/pictures/pic12.png b/src/lib/assets/images/gallery/pic12.png similarity index 100% rename from src/lib/assets/pictures/pic12.png rename to src/lib/assets/images/gallery/pic12.png diff --git a/src/lib/assets/pictures/pic13.png b/src/lib/assets/images/gallery/pic13.png similarity index 100% rename from src/lib/assets/pictures/pic13.png rename to src/lib/assets/images/gallery/pic13.png diff --git a/src/lib/assets/pictures/pic14.png b/src/lib/assets/images/gallery/pic14.png similarity index 100% rename from src/lib/assets/pictures/pic14.png rename to src/lib/assets/images/gallery/pic14.png diff --git a/src/lib/assets/pictures/pic2.png b/src/lib/assets/images/gallery/pic2.png similarity index 100% rename from src/lib/assets/pictures/pic2.png rename to src/lib/assets/images/gallery/pic2.png diff --git a/src/lib/assets/pictures/pic3.png b/src/lib/assets/images/gallery/pic3.png similarity index 100% rename from src/lib/assets/pictures/pic3.png rename to src/lib/assets/images/gallery/pic3.png diff --git a/src/lib/assets/pictures/pic4.png b/src/lib/assets/images/gallery/pic4.png similarity index 100% rename from src/lib/assets/pictures/pic4.png rename to src/lib/assets/images/gallery/pic4.png diff --git a/src/lib/assets/pictures/pic5.png b/src/lib/assets/images/gallery/pic5.png similarity index 100% rename from src/lib/assets/pictures/pic5.png rename to src/lib/assets/images/gallery/pic5.png diff --git a/src/lib/assets/pictures/pic6.png b/src/lib/assets/images/gallery/pic6.png similarity index 100% rename from src/lib/assets/pictures/pic6.png rename to src/lib/assets/images/gallery/pic6.png diff --git a/src/lib/assets/pictures/pic7.png b/src/lib/assets/images/gallery/pic7.png similarity index 100% rename from src/lib/assets/pictures/pic7.png rename to src/lib/assets/images/gallery/pic7.png diff --git a/src/lib/assets/pictures/pic8.png b/src/lib/assets/images/gallery/pic8.png similarity index 100% rename from src/lib/assets/pictures/pic8.png rename to src/lib/assets/images/gallery/pic8.png diff --git a/src/lib/assets/pictures/pic9.png b/src/lib/assets/images/gallery/pic9.png similarity index 100% rename from src/lib/assets/pictures/pic9.png rename to src/lib/assets/images/gallery/pic9.png diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index e693985..a6e4600 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,6 +1,6 @@
    diff --git a/src/routes/Counter.svelte b/src/routes/Counter.svelte deleted file mode 100644 index 69a5b2a..0000000 --- a/src/routes/Counter.svelte +++ /dev/null @@ -1,102 +0,0 @@ - - -
    - - -
    -
    - - {Math.floor($displayed_count)} -
    -
    - - -
    - - diff --git a/src/routes/gallery/+page.svelte b/src/routes/gallery/+page.svelte index 4fd89e3..d4e5463 100644 --- a/src/routes/gallery/+page.svelte +++ b/src/routes/gallery/+page.svelte @@ -1,6 +1,6 @@ Gallery - +
    diff --git a/src/routes/styles.css b/src/routes/styles.css deleted file mode 100644 index a57318c..0000000 --- a/src/routes/styles.css +++ /dev/null @@ -1,107 +0,0 @@ -/* @import '@fontsource/fira-mono'; - -:root { - --font-body: Arial, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, - Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; - --font-mono: 'Fira Mono', monospace; - --color-bg-0: rgb(202, 216, 228); - --color-bg-1: hsl(209, 36%, 86%); - --color-bg-2: hsl(224, 44%, 95%); - --color-theme-1: #ff3e00; - --color-theme-2: #4075a6; - --color-text: rgba(0, 0, 0, 0.7); - --column-width: 42rem; - --column-margin-top: 4rem; - font-family: var(--font-body); - color: var(--color-text); -} - -body { - min-height: 100vh; - margin: 0; - background-attachment: fixed; - background-color: var(--color-bg-1); - background-size: 100vw 100vh; - background-image: radial-gradient( - 50% 50% at 50% 50%, - rgba(255, 255, 255, 0.75) 0%, - rgba(255, 255, 255, 0) 100% - ), - linear-gradient(180deg, var(--color-bg-0) 0%, var(--color-bg-1) 15%, var(--color-bg-2) 50%); -} - -h1, -h2, -p { - font-weight: 400; -} - -p { - line-height: 1.5; -} - -a { - color: var(--color-theme-1); - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -h1 { - font-size: 2rem; - text-align: center; -} - -h2 { - font-size: 1rem; -} - -pre { - font-size: 16px; - font-family: var(--font-mono); - background-color: rgba(255, 255, 255, 0.45); - border-radius: 3px; - box-shadow: 2px 2px 6px rgb(255 255 255 / 25%); - padding: 0.5em; - overflow-x: auto; - color: var(--color-text); -} - -.text-column { - display: flex; - max-width: 48rem; - flex: 0.6; - flex-direction: column; - justify-content: center; - margin: 0 auto; -} - -input, -button { - font-size: inherit; - font-family: inherit; -} - -button:focus:not(:focus-visible) { - outline: none; -} - -@media (min-width: 720px) { - h1 { - font-size: 2.4rem; - } -} - -.visually-hidden { - border: 0; - clip: rect(0 0 0 0); - height: auto; - margin: 0; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; - white-space: nowrap; -} */ From 89390fa1eb47f4caa2634b5bd23cf99cb109504d Mon Sep 17 00:00:00 2001 From: LogolicusYZ Date: Fri, 9 Jun 2023 11:04:56 +0200 Subject: [PATCH 07/15] Move assets from lib to static --- src/routes/+page.svelte | 5 ++--- src/routes/Header.svelte | 3 +-- src/routes/Switcher.svelte | 6 ++---- src/routes/celebrate/+page.svelte | 3 +-- {src/lib => static}/assets/audio/8bit-win.mp3 | Bin {src/lib => static}/assets/icons/moon.svg | 0 {src/lib => static}/assets/icons/sun.svg | 0 {src/lib => static}/assets/images/gallery/pic0.png | 0 {src/lib => static}/assets/images/gallery/pic1.png | Bin {src/lib => static}/assets/images/gallery/pic10.png | Bin {src/lib => static}/assets/images/gallery/pic11.png | Bin {src/lib => static}/assets/images/gallery/pic12.png | Bin {src/lib => static}/assets/images/gallery/pic13.png | Bin {src/lib => static}/assets/images/gallery/pic14.png | Bin {src/lib => static}/assets/images/gallery/pic2.png | Bin {src/lib => static}/assets/images/gallery/pic3.png | Bin {src/lib => static}/assets/images/gallery/pic4.png | Bin {src/lib => static}/assets/images/gallery/pic5.png | Bin {src/lib => static}/assets/images/gallery/pic6.png | Bin {src/lib => static}/assets/images/gallery/pic7.png | Bin {src/lib => static}/assets/images/gallery/pic8.png | Bin {src/lib => static}/assets/images/gallery/pic9.png | Bin {src/lib => static}/assets/logo/explorecraft.svg | 0 .../assets/logo/explorecraft_full.svg | 0 {src/lib => static}/assets/logo/gitpot_icon.svg | 0 25 files changed, 6 insertions(+), 11 deletions(-) rename {src/lib => static}/assets/audio/8bit-win.mp3 (100%) rename {src/lib => static}/assets/icons/moon.svg (100%) rename {src/lib => static}/assets/icons/sun.svg (100%) rename {src/lib => static}/assets/images/gallery/pic0.png (100%) rename {src/lib => static}/assets/images/gallery/pic1.png (100%) rename {src/lib => static}/assets/images/gallery/pic10.png (100%) rename {src/lib => static}/assets/images/gallery/pic11.png (100%) rename {src/lib => static}/assets/images/gallery/pic12.png (100%) rename {src/lib => static}/assets/images/gallery/pic13.png (100%) rename {src/lib => static}/assets/images/gallery/pic14.png (100%) rename {src/lib => static}/assets/images/gallery/pic2.png (100%) rename {src/lib => static}/assets/images/gallery/pic3.png (100%) rename {src/lib => static}/assets/images/gallery/pic4.png (100%) rename {src/lib => static}/assets/images/gallery/pic5.png (100%) rename {src/lib => static}/assets/images/gallery/pic6.png (100%) rename {src/lib => static}/assets/images/gallery/pic7.png (100%) rename {src/lib => static}/assets/images/gallery/pic8.png (100%) rename {src/lib => static}/assets/images/gallery/pic9.png (100%) rename {src/lib => static}/assets/logo/explorecraft.svg (100%) rename {src/lib => static}/assets/logo/explorecraft_full.svg (100%) rename {src/lib => static}/assets/logo/gitpot_icon.svg (100%) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index a6e4600..c0cb225 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,7 +1,6 @@
    - +
    ExploreCraft
     diff --git a/src/routes/Switcher.svelte b/src/routes/Switcher.svelte index 677094e..873510a 100644 --- a/src/routes/Switcher.svelte +++ b/src/routes/Switcher.svelte @@ -1,8 +1,6 @@