From dd270bdca36742af43d03230c9af7220a2c96b76 Mon Sep 17 00:00:00 2001 From: Bloctans <93960460+Bloctans@users.noreply.github.com> Date: Mon, 11 Mar 2024 09:44:05 -0700 Subject: [PATCH 1/7] intro --- src/lib/OOBE/CustomizePFP.svelte | 2 +- src/lib/OOBE/CustomizeTheme.svelte | 5 +- src/lib/OOBE/Introduction.svelte | 21 +++ src/lib/OOBE/Main.svelte | 25 +++- src/lib/modals/settings/SwitchTheme.svelte | 163 ++++++++++++++------- 5 files changed, 151 insertions(+), 65 deletions(-) create mode 100644 src/lib/OOBE/Introduction.svelte diff --git a/src/lib/OOBE/CustomizePFP.svelte b/src/lib/OOBE/CustomizePFP.svelte index 15b571b3..819bd302 100644 --- a/src/lib/OOBE/CustomizePFP.svelte +++ b/src/lib/OOBE/CustomizePFP.svelte @@ -18,7 +18,7 @@
-

Set your profile picture

+

Select a profile picture

{#if pfpOverflow && $user.pfp_data < 0} diff --git a/src/lib/OOBE/CustomizeTheme.svelte b/src/lib/OOBE/CustomizeTheme.svelte index f8154902..7446b030 100644 --- a/src/lib/OOBE/CustomizeTheme.svelte +++ b/src/lib/OOBE/CustomizeTheme.svelte @@ -8,10 +8,7 @@

Set your theme

- -

+ Click Next when done.
diff --git a/src/lib/OOBE/Introduction.svelte b/src/lib/OOBE/Introduction.svelte new file mode 100644 index 00000000..7f29959a --- /dev/null +++ b/src/lib/OOBE/Introduction.svelte @@ -0,0 +1,21 @@ +
+

Introduction

+
+

Welcome to Meower!

+

Now lets get you setup and ready to chat!

+

This is the OOBE, you might of seen something simillar if you have set up a windows computer (After XP)

+

If you want to skip the OOBE. You can press the skip button down below.

+

Hit the next button to continue

+

And if you ever wanna go back, hit the back button.

+ +
+ + \ No newline at end of file diff --git a/src/lib/OOBE/Main.svelte b/src/lib/OOBE/Main.svelte index 27fccb71..e9cbc2b3 100644 --- a/src/lib/OOBE/Main.svelte +++ b/src/lib/OOBE/Main.svelte @@ -1,14 +1,16 @@ - -

Select a Theme

-
-
- -
- {#if theme === "custom"} -
Custom Theme
- - {:else} -
- {themeCaps + " (" + darkModeStr + ")"} -
- {themeName} - {/if} +{#if !fromoobe} + +

Select a Theme

+
+
+ +
+ {#if theme === "custom"} +
Custom Theme
+ + {:else} +
+ {themeCaps + " (" + darkModeStr + ")"} +
+ {themeName} + {/if} +
+ +
+ {#if error} +

+ Your previous theme was invalid, so it was reset to orange. +

+ {/if} +

(Change the layout in the settings.)

+
+ +
-
- {#if error} -

- Your previous theme was invalid, so it was reset to orange. -

- {/if} -

(Change the layout in the settings.)

-
- - + +{:else} +
+ +
+ {#if theme === "custom"} +
Custom Theme
+ + {:else} +
+ {themeCaps + " (" + darkModeStr + ")"} +
+ {themeName} + {/if}
+ +
+ {#if error} +

+ Your previous theme was invalid, so it was reset to orange. +

+ {/if} +

(Change the layout in the settings.)

+
+ +
- +{/if} diff --git a/src/lib/OOBE/CustomizeSound.svelte b/src/lib/OOBE/CustomizeSound.svelte new file mode 100644 index 00000000..e69de29b diff --git a/src/lib/OOBE/CustomizeTheme.svelte b/src/lib/OOBE/CustomizeTheme.svelte index 7446b030..40a381dc 100644 --- a/src/lib/OOBE/CustomizeTheme.svelte +++ b/src/lib/OOBE/CustomizeTheme.svelte @@ -1,19 +1,21 @@
-

Set your theme

+

Select a theme

+
+
Click Next when done.
diff --git a/src/lib/OOBE/Main.svelte b/src/lib/OOBE/Main.svelte index e9cbc2b3..3f23c5b9 100644 --- a/src/lib/OOBE/Main.svelte +++ b/src/lib/OOBE/Main.svelte @@ -1,6 +1,7 @@ @@ -184,22 +193,6 @@ Your previous theme was invalid, so it was reset to orange.

{/if} -

(Change the layout in the settings.)

-
- - -
{/if} diff --git a/src/lib/OOBE/CustomizePFP.svelte b/src/lib/OOBE/CustomizePFP.svelte index 819bd302..280da9df 100644 --- a/src/lib/OOBE/CustomizePFP.svelte +++ b/src/lib/OOBE/CustomizePFP.svelte @@ -19,6 +19,7 @@

Select a profile picture

+

Select a profile picture to make yourself stand out.

{#if pfpOverflow && $user.pfp_data < 0} diff --git a/src/lib/OOBE/CustomizeSound.svelte b/src/lib/OOBE/CustomizeSound.svelte deleted file mode 100644 index e69de29b..00000000 diff --git a/src/lib/OOBE/CustomizeTheme.svelte b/src/lib/OOBE/CustomizeTheme.svelte index bc5b23d8..19dabaa1 100644 --- a/src/lib/OOBE/CustomizeTheme.svelte +++ b/src/lib/OOBE/CustomizeTheme.svelte @@ -1,13 +1,23 @@
-

Select a theme

-
+

Personalization

+

Here you personalize your layout and theme

-
- Click Next when done. +

Hit the gear icon below to select a layout

+
\ No newline at end of file diff --git a/src/lib/OOBE/End.svelte b/src/lib/OOBE/End.svelte index 83935f03..a8e5a499 100644 --- a/src/lib/OOBE/End.svelte +++ b/src/lib/OOBE/End.svelte @@ -1,22 +1,37 @@

Thats it for now.

You can customize more things via the settings

To access settings, click on your pfp (Profile picture) icon in the bottom left.

-

Or, you can optionally go to the settings here

- -
+

or, you can optionally go to the settings here

+
+ + +

\ No newline at end of file + }}>Exit the OOBE + + \ No newline at end of file diff --git a/src/lib/OOBE/Main.svelte b/src/lib/OOBE/Main.svelte index 498bcb4c..8e351faa 100644 --- a/src/lib/OOBE/Main.svelte +++ b/src/lib/OOBE/Main.svelte @@ -3,12 +3,11 @@ import OOBECustomizeTheme from "./CustomizeTheme.svelte"; import OOBEIntroduction from "./Introduction.svelte"; import OOBEEnd from "./End.svelte"; + import OOBEEasterEgg from "./EasterEgg.svelte" import {OOBERunning, OOBEPage} from "../stores.js"; import * as clm from "../clmanager.js"; - import {goto} from "@roxi/routify"; - import {onMount} from "svelte"; $: allowPrevious = $OOBEPage > 0; @@ -21,8 +20,8 @@
-
-
+
+
{#if $OOBEPage == 0} @@ -32,6 +31,8 @@ {:else if $OOBEPage == 3} + {:else if $OOBEPage == 6} + {:else}

You aren't supposed to be here.

Current Page: {$OOBEPage}

@@ -68,19 +69,21 @@ .wrapper { margin: 0; width: 100%; - height: 100%; - } - - .main { - height: calc(100% - 3em); + height: 100vh; + display: flex; + flex-direction: column; } - .setup { + .pages { text-align: center; - display: table; + flex-grow: 1; + flex-shrink: 1; + overflow: hidden; } .footer { + flex-grow: 0; + flex-shrink: 0; padding-left: 1em; padding-right: 1em; height: 3em; @@ -96,6 +99,11 @@ border: 0; } + .inner { + height: calc(100vh - 3em); + overflow: auto; + } + .fullcenter { width: 100vw; height: calc(100vh - 4rem); diff --git a/src/lib/Sidebar.svelte b/src/lib/Sidebar.svelte index 1249286f..d5d8bf6f 100644 --- a/src/lib/Sidebar.svelte +++ b/src/lib/Sidebar.svelte @@ -242,10 +242,14 @@ width: 100%; z-index: 10; position: absolute; - background-color: var(--background); + background-color: #000000; opacity: 0.33; } + :global(main.layout-old) .locked { + width: 110%; + } + .logo { display: none; flex-grow: 1; diff --git a/src/pages/_layout.svelte b/src/pages/_layout.svelte index 13961994..7791378b 100644 --- a/src/pages/_layout.svelte +++ b/src/pages/_layout.svelte @@ -96,18 +96,15 @@
-
- - {#if $OOBERunning} + {#if $OOBERunning} +
- {:else if !remounting} +
+ {:else if !remounting} +
- {/if} -
+
+ {/if}
{/if} @@ -256,6 +253,20 @@ --view-height: calc(100vh - 0.66em); background-color: var(--background); + transition: 0.25s; + } + + .viewnopad { + flex-grow: 1; + flex-shrink: 1; + + box-sizing: border-box; + overflow: auto; + + --view-height: calc(100vh - 0.66em); + + background-color: var(--background); + transition: 0.25s; } .banner { From 4b0503641abfe1163c631f713dc096fc5aa33979 Mon Sep 17 00:00:00 2001 From: Bloctans <93960460+Bloctans@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:14:00 -0700 Subject: [PATCH 6/7] Quote selection --- src/lib/OOBE/Main.svelte | 9 ++++++--- src/lib/OOBE/Quote.svelte | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 src/lib/OOBE/Quote.svelte diff --git a/src/lib/OOBE/Main.svelte b/src/lib/OOBE/Main.svelte index 8e351faa..a78550ea 100644 --- a/src/lib/OOBE/Main.svelte +++ b/src/lib/OOBE/Main.svelte @@ -4,6 +4,7 @@ import OOBEIntroduction from "./Introduction.svelte"; import OOBEEnd from "./End.svelte"; import OOBEEasterEgg from "./EasterEgg.svelte" + import OOBEQuote from "./Quote.svelte" import {OOBERunning, OOBEPage} from "../stores.js"; import * as clm from "../clmanager.js"; @@ -11,7 +12,7 @@ import {onMount} from "svelte"; $: allowPrevious = $OOBEPage > 0; - $: allowNext = $OOBEPage < 3; + $: allowNext = $OOBEPage < 4; onMount(() => { clm.updateProfile({}); @@ -28,10 +29,12 @@ {:else if $OOBEPage == 1} {:else if $OOBEPage == 2} - + {:else if $OOBEPage == 3} + + {:else if $OOBEPage == 4} - {:else if $OOBEPage == 6} + {:else if $OOBEPage == 8} {:else}

You aren't supposed to be here.

diff --git a/src/lib/OOBE/Quote.svelte b/src/lib/OOBE/Quote.svelte new file mode 100644 index 00000000..2d34c5b6 --- /dev/null +++ b/src/lib/OOBE/Quote.svelte @@ -0,0 +1,32 @@ + + +
+

Quote

+ Give yourself a quote, these can be used as a "Bio" +
+
+ clm.updateProfile({quote: $user.quote})} + /> +
+ + From 4ab6bd8ea6d091edfa42ba8179d604d32eaaca52 Mon Sep 17 00:00:00 2001 From: Bloctans <93960460+Bloctans@users.noreply.github.com> Date: Tue, 12 Mar 2024 12:16:37 -0700 Subject: [PATCH 7/7] a very quick fix for the old layout why vh --- src/lib/OOBE/Main.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/OOBE/Main.svelte b/src/lib/OOBE/Main.svelte index a78550ea..5e888126 100644 --- a/src/lib/OOBE/Main.svelte +++ b/src/lib/OOBE/Main.svelte @@ -72,7 +72,7 @@ .wrapper { margin: 0; width: 100%; - height: 100vh; + height: 100%; display: flex; flex-direction: column; }