Merge pull request #17 from Programming-Club-Ahmedabad-University/sty…

…le/customized-login-page successfully migrated to page router...rip app router
Programming-Club-Ahmedabad-University · Aug 21, 2023 · 1452838 · 1452838
2 parents deffb18 + 46974c9
commit 1452838
Show file tree

Hide file tree

Showing 19 changed files with 278 additions and 128 deletions.
diff --git a/client/app/Test/page.tsx b/client/app/Test/page.tsx
diff --git a/client/app/api/auth/[...nextauth]/route.ts b/client/app/api/auth/[...nextauth]/route.ts
diff --git a/client/app/components/UserCard/UserCard.tsx b/client/app/components/UserCard/UserCard.tsx
diff --git a/client/app/providers.tsx b/client/app/providers.tsx
diff --git a/client/next.config.js b/client/next.config.js
@@ -1,4 +1,18 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {}
+const nextConfig = {
+  webpack(config) {
+    config.resolve.extensions.push(".ts", ".tsx");
+    return config;
+  },
+  images: {
+    remotePatterns: [
+      {
+        protocol: "https",
+        hostname: "firebasestorage.googleapis.com",
+        port: "",
+      },
+    ],
+  },
+};
 
-module.exports = nextConfig
+module.exports = nextConfig;
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -9,7 +9,7 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@nextui-org/react": "^2.0.22",
+    "@nextui-org/react": "^2.0.24",
     "@types/node": "20.5.0",
     "@types/react": "18.2.20",
     "@types/react-dom": "18.2.7",

diff --git a/client/app/layout.tsx → client/pages/Layout.tsx b/client/app/layout.tsx → client/pages/Layout.tsx
@@ -1,7 +1,6 @@
-import "./globals.css";
+// import "./globals.css";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
-import { Providers } from "./providers";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -17,9 +16,7 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en" className="dark" suppressHydrationWarning={true}>
-      <body>
-        <Providers>{children}</Providers>
-      </body>
+      <body>{children}</body>
     </html>
   );
 }
diff --git a/client/pages/Test/page.tsx b/client/pages/Test/page.tsx
@@ -0,0 +1,19 @@
+"use client";
+import { useEffect, useState } from "react";
+
+export default function Test() {
+  // const ws = new WebSocket("ws://localhost:3001");
+  const [data, setData] = useState(null);
+  // useEffect(() => {
+  // 	ws.onmessage = (e) => {
+  // 		// a message was received
+
+  // 		setData(e.data);
+  // 	};
+  // 	return () => {
+  // 		ws.close();
+  // 	};
+  // }, []);
+
+  return <div>{data}</div>;
+}
diff --git a/client/pages/_app.tsx b/client/pages/_app.tsx
@@ -0,0 +1,22 @@
+import { SessionProvider } from "next-auth/react";
+
+import type { AppProps } from "next/app";
+import type { Session } from "next-auth";
+import "./globals.css";
+
+import { NextUIProvider } from "@nextui-org/react";
+
+export default function App({
+  Component,
+  pageProps: { session, ...pageProps },
+}: AppProps<{ session: Session }>) {
+  return (
+    <SessionProvider session={session}>
+      <NextUIProvider>
+        <main className="dark text-foreground bg-background">
+          <Component {...pageProps} />
+        </main>
+      </NextUIProvider>
+    </SessionProvider>
+  );
+}
diff --git a/client/pages/api/auth/[...nextauth]/index.ts b/client/pages/api/auth/[...nextauth]/index.ts
@@ -0,0 +1,18 @@
+import NextAuth from "next-auth";
+import GoogleProvider from "next-auth/providers/google";
+if (!process.env.GOOGLE_CLIENT_ID) {
+  throw Error("GOOGLE_CLIENT_ID is not available in .env");
+} else if (!process.env.GOOGLE_CLIENT_SECRET) {
+  throw Error("GOOGLE_CLIENT_SECRET is not available in .env");
+}
+
+const handler = NextAuth({
+  providers: [
+    GoogleProvider({
+      clientId: process.env.GOOGLE_CLIENT_ID!,
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET!,
+    }),
+  ],
+});
+
+export default handler;
diff --git a/.../components/SignInButton/SignInButton.tsx → .../components/SignInButton/SignInButton.tsx b/.../components/SignInButton/SignInButton.tsx → .../components/SignInButton/SignInButton.tsx
diff --git a/client/app/components/SignInButton/page.tsx → ...t/pages/components/SignInButton/index.tsx b/client/app/components/SignInButton/page.tsx → ...t/pages/components/SignInButton/index.tsx