From 37286cce05ba15e1ee9023e739bb8a98c28469b8 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sat, 16 Mar 2024 19:12:08 -0700 Subject: [PATCH 1/5] feat: add camera feed configuration in settings And beautify settings page --- client/src/lib/Apps/Camera/Camera.svelte | 5 ++- client/src/lib/Apps/Settings/Settings.svelte | 42 +++++++++++++------ .../lib/Apps/Settings/SettingsInput.svelte | 1 - client/src/lib/Sequences/sequences.ts | 4 +- client/src/lib/stores/settingsStore.ts | 10 +++-- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/client/src/lib/Apps/Camera/Camera.svelte b/client/src/lib/Apps/Camera/Camera.svelte index c43b895..0ce73e0 100644 --- a/client/src/lib/Apps/Camera/Camera.svelte +++ b/client/src/lib/Apps/Camera/Camera.svelte @@ -1,15 +1,16 @@
- +
- +
diff --git a/client/src/lib/Apps/Settings/Settings.svelte b/client/src/lib/Apps/Settings/Settings.svelte index b60def9..394f905 100644 --- a/client/src/lib/Apps/Settings/Settings.svelte +++ b/client/src/lib/Apps/Settings/Settings.svelte @@ -22,17 +22,38 @@ >

Settings

Hover over setting names to see helpful tooltips

-

General

+

General

Disable Annoyances + Voice Prompt Language + +

+ Camera Configuration +

+ Front Camera IP + Rear Camera IP +

Fun

Go WokeSentry Mode RNG Weight - Voice Prompt Language +

Secret

Sentry ModeGo Woke
+
+ + From 8ab9fadc22952bda3b56e139cdb0135bee0a19df Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Sat, 16 Mar 2024 21:06:51 -0700 Subject: [PATCH 3/5] style: update loading screen --- client/public/index.html | 23 +++++++++++++++++++++++ splash-screen/src/lib/Loading.svelte | 10 +++++----- 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 client/public/index.html diff --git a/client/public/index.html b/client/public/index.html new file mode 100644 index 0000000..618d3b9 --- /dev/null +++ b/client/public/index.html @@ -0,0 +1,23 @@ + + + + + + Jankboard 2 + + + + +
+ + diff --git a/splash-screen/src/lib/Loading.svelte b/splash-screen/src/lib/Loading.svelte index 5894a0e..5c2d32f 100644 --- a/splash-screen/src/lib/Loading.svelte +++ b/splash-screen/src/lib/Loading.svelte @@ -1,8 +1,9 @@ - - - -
- - diff --git a/splash-screen/src/assets/background.jpg b/client/public/splash-screen.jpg similarity index 100% rename from splash-screen/src/assets/background.jpg rename to client/public/splash-screen.jpg diff --git a/client/public/splashscreen.html b/client/public/splashscreen.html index a9d4d8a..8644943 100644 --- a/client/public/splashscreen.html +++ b/client/public/splashscreen.html @@ -4,17 +4,17 @@ Jankboard 2 - - diff --git a/splash-screen/README.md b/splash-screen/README.md index 3d1558c..ea0eac7 100644 --- a/splash-screen/README.md +++ b/splash-screen/README.md @@ -44,3 +44,4 @@ screen!** inlined. 4. Rename this outputted `index.html` to `splashscreen.html`, and then move it into `/client/public`, replacing the existing `splashscreen.html`. + Note: the background image will not load in development since it's designed to load `/splash-screen.jpg` from the main app. Update the `splash-screen.jpg` image in `client/public` to change it. diff --git a/splash-screen/src/App.svelte b/splash-screen/src/App.svelte index 679f1d4..9722dd1 100644 --- a/splash-screen/src/App.svelte +++ b/splash-screen/src/App.svelte @@ -3,13 +3,7 @@ - - - - - - - + Jankboard 2 diff --git a/splash-screen/src/lib/Loading.svelte b/splash-screen/src/lib/Loading.svelte index 5c2d32f..2f99b49 100644 --- a/splash-screen/src/lib/Loading.svelte +++ b/splash-screen/src/lib/Loading.svelte @@ -32,7 +32,7 @@