From 1c48eb2a658d7fa8beb4d6d85a2e314cfd1afc1a Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Wed, 27 Dec 2023 14:19:48 -0600 Subject: [PATCH 1/7] basic suspense --- src/index.tsx | 34 ++++++++++++++-------------------- src/routes.tsx | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 20 deletions(-) create mode 100644 src/routes.tsx diff --git a/src/index.tsx b/src/index.tsx index eccc3b6..6a45bf3 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,26 +1,20 @@ import { render } from "preact"; -import { LocationProvider, Router, Route } from "preact-iso"; -import { Home } from "./pages/Home"; -import { NotFound } from "./pages/_404.jsx"; -import { DiscordPage } from "./pages/discord.jsx"; -import { ProxyFrame } from "./pages/ProxyFrame.js"; -import { Settings } from "./pages/Settings/index.js"; +import { Suspense, lazy } from "preact/compat"; +const Routes = lazy(() => import("./routes")); -import "./style.css"; -import "./themes/main.css"; -import "./i18n"; - -export function App() { +export default function App() { return ( - - - - - - - - - + +
loading...
+ + } + > +
+ +
+ ); } diff --git a/src/routes.tsx b/src/routes.tsx new file mode 100644 index 0000000..11d5180 --- /dev/null +++ b/src/routes.tsx @@ -0,0 +1,25 @@ +import { LocationProvider, Router, Route } from "preact-iso"; +import { Home } from "./pages/Home"; +import { NotFound } from "./pages/_404.jsx"; +import { DiscordPage } from "./pages/discord.jsx"; +import { ProxyFrame } from "./pages/ProxyFrame.js"; +import { Settings } from "./pages/Settings/index.js"; + +import "./style.css"; +import "./themes/main.css"; +import "./i18n"; + +export default function Routes() { + return ( + + + + + + + + + + ); +} + From 7c295529acc11bb799599ce08f6e56c53c72653c Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Wed, 27 Dec 2023 14:34:49 -0600 Subject: [PATCH 2/7] forgot to completely remove buggy warning --- src/pages/Settings/Proxy.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Settings/Proxy.tsx b/src/pages/Settings/Proxy.tsx index bf4391d..155d7d6 100644 --- a/src/pages/Settings/Proxy.tsx +++ b/src/pages/Settings/Proxy.tsx @@ -10,7 +10,7 @@ const Proxy = ({ id, active }) => { { id: "automatic", label: t("settings.proxy.automatic") }, { id: "ultraviolet", label: "Ultraviolet" }, { id: "rammerhead", label: "Rammerhead" }, - { id: "dynamic", label: "Dynamic " + t("settings.proxy.buggyWarning") } + { id: "dynamic", label: "Dynamic" } ]; const proxyModes = [ From 6db77d4785eef00dc171566fd614ef6d173b0fac Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Wed, 27 Dec 2023 14:40:51 -0600 Subject: [PATCH 3/7] Coming soon locales --- src/locales/en.json | 3 ++- src/locales/es.json | 3 ++- src/locales/ja.json | 3 ++- src/pages/Settings/Customization.tsx | 35 +++++++++++++++++----------- 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 8cca3c4..9c9a303 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -54,5 +54,6 @@ "settings": "Nebula - Settings", "discord": "Nebula - Discord", "404": "Nebula - 404" - } + }, + "comingsoon": "Coming soon!" } diff --git a/src/locales/es.json b/src/locales/es.json index 68107f3..06d50f8 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -54,5 +54,6 @@ "settings": "Nebula - Ajustes", "discord": "Nebula - Discord", "404": "Nebula - 404" - } + }, + "comingsoon": "¡Próximamente!" } diff --git a/src/locales/ja.json b/src/locales/ja.json index 4a19b46..a342b69 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -54,5 +54,6 @@ "settings": "ネブラ - セッティング", "discord": "ネブラ - Discord", "404": "ネブラ - 404" - } + }, + "comingsoon": "近日公開" } diff --git a/src/pages/Settings/Customization.tsx b/src/pages/Settings/Customization.tsx index 3db78aa..758854c 100644 --- a/src/pages/Settings/Customization.tsx +++ b/src/pages/Settings/Customization.tsx @@ -1,20 +1,27 @@ import { motion } from "framer-motion"; import { tabContentVariant, settingsPageVariant } from "./Variants"; +import { useTranslation } from "react-i18next"; -const Customization = ({ id, active }) => ( - - - -

Coming soon!

+function Customization({ id, active }) { + const { t } = useTranslation(); + return ( + + + +

{t("comingsoon")}

+ - -); + ); +} export default Customization; From c954fab09721ac473a39b5024b64e727f0d225dc Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Wed, 27 Dec 2023 15:09:49 -0600 Subject: [PATCH 4/7] add suspense --- src/LoadSuspense.tsx | 26 ++++++++++++++++++++++++++ src/Suspense.css | 23 +++++++++++++++++++++++ src/index.tsx | 9 ++------- 3 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 src/LoadSuspense.tsx create mode 100644 src/Suspense.css diff --git a/src/LoadSuspense.tsx b/src/LoadSuspense.tsx new file mode 100644 index 0000000..f5eccbc --- /dev/null +++ b/src/LoadSuspense.tsx @@ -0,0 +1,26 @@ +import './Suspense.css' + +export function LoadSuspense() { + return ( +
+ + + + + +
+ ); +} diff --git a/src/Suspense.css b/src/Suspense.css new file mode 100644 index 0000000..acd2526 --- /dev/null +++ b/src/Suspense.css @@ -0,0 +1,23 @@ +.suspenseContainer { + display: flex; + height: 100vh; + width: 100vw; + align-items: center; + justify-content: center; + background-color: var(--background-primary); +} + +@keyframes pulse-brighter { + 0%, + 100% { + opacity: 1; + } + 50% { + opacity: 0.5; + } +} + +.animate-pulse-brighter { + animation: pulse-brighter 2s infinite; + height: 11rem; +} diff --git a/src/index.tsx b/src/index.tsx index 6a45bf3..e17fecb 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,16 +1,11 @@ import { render } from "preact"; import { Suspense, lazy } from "preact/compat"; +import { LoadSuspense } from "./LoadSuspense"; const Routes = lazy(() => import("./routes")); export default function App() { return ( - -
loading...
- - } - > + }>
From 24068f354d6a2a8c60fc215b84787e1b58678a00 Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Wed, 27 Dec 2023 15:13:30 -0600 Subject: [PATCH 5/7] overflow fix --- index.html | 2 +- src/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 4aeb7ad..470d7db 100644 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@ } - +
diff --git a/src/index.tsx b/src/index.tsx index e17fecb..1066191 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,7 +5,7 @@ const Routes = lazy(() => import("./routes")); export default function App() { return ( - }> + }>
From 5e71f49325200cfc5134905b01f1b78f4ec2e613 Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Wed, 27 Dec 2023 15:15:50 -0600 Subject: [PATCH 6/7] accidently pushed broken code --- src/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.tsx b/src/index.tsx index 1066191..e17fecb 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -5,7 +5,7 @@ const Routes = lazy(() => import("./routes")); export default function App() { return ( - }> + }>
From 5c256323dcd06fbcd2c77dbcc86b0020aa09b27a Mon Sep 17 00:00:00 2001 From: rift <117926989+Riftriot@users.noreply.github.com> Date: Wed, 27 Dec 2023 15:16:59 -0600 Subject: [PATCH 7/7] FINAL touch up I swear --- src/Suspense.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Suspense.css b/src/Suspense.css index acd2526..203026c 100644 --- a/src/Suspense.css +++ b/src/Suspense.css @@ -4,7 +4,7 @@ width: 100vw; align-items: center; justify-content: center; - background-color: var(--background-primary); + background-color: #191724; } @keyframes pulse-brighter {