diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
new file mode 100644
index 0000000..d94fd85
--- /dev/null
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/web.iml b/.idea/web.iml
index ae6b85c..533e365 100644
--- a/.idea/web.iml
+++ b/.idea/web.iml
@@ -11,5 +11,6 @@
+
\ No newline at end of file
diff --git a/package.json b/package.json
index 68cf48e..9a0f683 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
"eslint-config-next": "13.1.5",
"feather-icons": "^4.29.0",
"firebase": "^9.17.1",
+ "firebase-admin": "^11.5.0",
"firebase-functions": "^4.2.1",
"fireschema": "^4.0.4",
"localforage": "^1.10.0",
@@ -36,6 +37,8 @@
"pino": "^8.11.0",
"pino-logflare": "^0.3.12",
"react": "18.2.0",
+ "react-daisyui": "^3.0.3",
+ "react-device-detect": "^2.2.3",
"react-dom": "18.2.0",
"react-dropzone": "^14.2.3",
"react-feather": "^2.0.10",
diff --git a/src/app/(auth)/login/page.tsx b/src/app/(auth)/login/page.tsx
index 4a5faa5..4199985 100644
--- a/src/app/(auth)/login/page.tsx
+++ b/src/app/(auth)/login/page.tsx
@@ -1,4 +1,4 @@
-import { LoginPage } from "@/components/auth";
+import { LoginPage } from "@/components/pages/auth";
import React from "react";
const Login = async () => {
diff --git a/src/app/(auth)/signup/page.tsx b/src/app/(auth)/signup/page.tsx
index 8cbc469..deb0220 100644
--- a/src/app/(auth)/signup/page.tsx
+++ b/src/app/(auth)/signup/page.tsx
@@ -1,7 +1,8 @@
import React from "react";
+import { SignupPage } from "@/components/pages/auth";
const Signup = async () => {
- return Coming soon
;
+ return
;
};
export default Signup;
diff --git a/src/app/head.tsx b/src/app/head.tsx
index b1f28b8..a5e9c7c 100644
--- a/src/app/head.tsx
+++ b/src/app/head.tsx
@@ -1,4 +1,7 @@
+import React from "react";
+
export default function Head() {
+
return (
<>
Radio::Otherway
@@ -27,6 +30,8 @@ export default function Head() {
/>
+ {/*need to include this here to avoid the FLUC on initial load*/}
+
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 79de6da..cd40d92 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,41 +4,38 @@ import "./globals.css";
import { Raleway } from "@next/font/google";
import { NavBar, PushNotificationWrapper } from "@/components/layout";
import { AuthUserProvider } from "@/lib/auth/authUserContext";
-import { Toaster } from "react-hot-toast";
-import { defaults } from "@/lib/constants";
+import { themeChange } from "theme-change";
const font = Raleway({
weight: ["400", "700"],
subsets: ["latin"],
- variable: "--font-raleway",
+ variable: "--font-raleway"
});
export default function RootLayout({
- children,
-}: {
+ children
+ }: {
children: React.ReactNode;
}) {
React.useEffect(() => {
- const theme = localStorage.getItem("theme") || defaults.defaultTheme;
- if (theme && !document.body.dataset.theme) {
- document.body.dataset.theme = theme;
- }
+ themeChange(false);
}, []);
+
return (
-
-