Merge pull request #96 from FrostByteOrg/FROS-Cleanup

FROS-Lots of fun

Author: Stan-l-e-y

.env.example

@@ -2,8 +2,8 @@ NEXT_PUBLIC_SUPABASE_URL=http://localhost:54321
 NEXT_PUBLIC_SUPABASE_ANON_KEY=<YOUR ANON KEY HERE>
 PROJECT_ID=<YOUR PROJECT ID HERE>
 
-LK_API_KEY=devkey
-LK_API_SECRET=secret
+NEXT_PUBLIC_LK_API_KEY=devkey
+NEXT_PUBLIC_LK_API_SECRET=secret
 
 NEXT_PUBLIC_LK_TOKEN_ENDPOINT=/api/v1/auth/livekit
 NEXT_PUBLIC_LK_SERVER_URL=ws://localhost:7880

.eslintrc.json

@@ -10,10 +10,8 @@
   },
   "plugins": ["@typescript-eslint"],
   "rules": {
-    "brace-style": ["error", "stroustrup", { "allowSingleLine": true }],
-    "indent": ["error", 2, {"SwitchCase": 1}],
     "semi": ["error", "always"],
-    "quotes": ["error", "single"],
+
     "@typescript-eslint/prefer-ts-expect-error": "warn",
     "@typescript-eslint/ban-ts-comment": "error",
     "@next/next/no-img-element": "off"

.vscode/settings.json

@@ -1,3 +1,5 @@
 {
-    "editor.tabSize": 2
-}
+  "editor.tabSize": 2,
+  "typescript.tsdk": "node_modules\\typescript\\lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
+}

pages/_app.tsx _app.tsxpages/_app.tsx renamed to _app.tsx

@@ -1,5 +1,5 @@
 import '@/styles/globals.css';
-import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs';
+import { createPagesBrowserClient } from '@supabase/auth-helpers-nextjs';
 import { SessionContextProvider, Session } from '@supabase/auth-helpers-react';
 import { AppProps } from 'next/app';
 import { Source_Sans_3 } from '@next/font/google';
@@ -19,9 +19,7 @@ function App({
 }: AppProps<{
   initialSession: Session;
 }>) {
-  const [supabaseClient] = useState(() =>
-    createBrowserSupabaseClient<Database>()
-  );
+  const [supabaseClient] = useState(() => createPagesBrowserClient<Database>());
 
   return (
     <SessionContextProvider

pages/api/v1/@me/channels.ts app/api/v1/@me/channels.tspages/api/v1/@me/channels.ts renamed to app/api/v1/@me/channels.ts

@@ -2,14 +2,20 @@ import type { NextApiRequest, NextApiResponse } from 'next';
 import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs';
 import { getProfile, updateUserProfile } from '@/services/profile.service';
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse
+) {
   const { method } = req;
 
   // Create authenticated Supabase Client.
   const supabaseServerClient = createServerSupabaseClient({ req, res });
 
   // Now fetch the user
-  const { data: { user }, error: userError } = await supabaseServerClient.auth.getUser();
+  const {
+    data: { user },
+    error: userError,
+  } = await supabaseServerClient.auth.getUser();
 
   // No user, return unauthorized error
   if (!user) {
@@ -39,8 +45,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
       supabaseServerClient,
       user.id,
       req.body.full_name,
-      req.body.avatar_url || null,
-      req.body.website || null,
+      req.body.website || null
     );
 
     if (error) {
@@ -50,7 +55,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     return res.status(200).send(profile);
   }
-
   else {
     res.setHeader('Allow', ['GET', 'PUT']);
     return res.status(405).end(`Method ${method} Not Allowed`);

pages/api/v1/@me/profile.ts app/api/v1/@me/profile.tspages/api/v1/@me/profile.ts renamed to app/api/v1/@me/profile.ts

@@ -1,9 +1,16 @@
-import { deleteServer, getServer, updateServer } from '@/services/server.service';
+import {
+  deleteServer,
+  getServer,
+  updateServer,
+} from '@/services/server.service';
 import { Database } from '@/types/database.supabase';
 import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs';
 import type { NextApiRequest, NextApiResponse } from 'next';
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+export default async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse
+) {
   const { method } = req;
 
   let serverId: number;
@@ -12,24 +19,28 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
   try {
     serverId = parseInt(req.query.serverId as string);
   }
-
   catch (err: any) {
     console.error(err);
     return res.status(400).send({ error: 'Invalid server ID' });
   }
 
-  const supabaseServerClient = createServerSupabaseClient<Database>({ req, res });
+  const supabaseServerClient = createServerSupabaseClient<Database>({
+    req,
+    res,
+  });
 
   if (method === 'GET') {
-    const { data: server, error } = await getServer(supabaseServerClient, serverId);
+    const { data: server, error } = await getServer(
+      supabaseServerClient,
+      serverId
+    );
 
     if (error) {
       return res.status(400).send({ error });
     }
 
     return res.status(200).send(server);
   }
-
   else if (method === 'PUT') {
     const { data: server, error } = await updateServer(
       supabaseServerClient,
@@ -44,14 +55,15 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     return res.status(200).send(server);
   }
-
   else if (method === 'DELETE') {
-    const { data: { user }, error: userError } = await supabaseServerClient.auth.getUser();
+    const {
+      data: { user },
+      error: userError,
+    } = await supabaseServerClient.auth.getUser();
 
     if (user) {
       const { data: server, error } = await deleteServer(
         supabaseServerClient,
-        user.id,
         serverId
       );
 
@@ -68,7 +80,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     return res.status(400).json({ message: 'Invalid request' });
   }
-
   else {
     res.setHeader('Allow', ['GET', 'PUT', 'DELETE']);
     res.status(405).json({ message: 'Method not allowed' });