From 1c12d378d66b92b1674acd17640f2bac752da289 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Tue, 25 Mar 2025 14:13:06 -0400 Subject: Converted public dashboard to admin dashboard; Made API have a consistent output message --- web/bun.lockb | Bin 154951 -> 151013 bytes web/package.json | 1 - web/src/app/api/auth/[...nextauth]/route.js | 2 - web/src/app/components/Guilds.jsx | 25 ----------- web/src/app/components/Navbar.jsx | 25 +++++++++++ web/src/app/components/sign-in.jsx | 14 ------ web/src/app/components/sign-out.jsx | 11 +---- web/src/app/dashboard/page.js | 65 +++++++++++++++------------- web/src/app/page.js | 42 ++++++++++++------ web/src/lib/auth.js | 32 -------------- 10 files changed, 89 insertions(+), 128 deletions(-) delete mode 100644 web/src/app/api/auth/[...nextauth]/route.js delete mode 100644 web/src/app/components/Guilds.jsx create mode 100644 web/src/app/components/Navbar.jsx delete mode 100644 web/src/app/components/sign-in.jsx delete mode 100644 web/src/lib/auth.js (limited to 'web') diff --git a/web/bun.lockb b/web/bun.lockb index 8f54964..adc0d02 100644 Binary files a/web/bun.lockb and b/web/bun.lockb differ diff --git a/web/package.json b/web/package.json index 8e69990..cafde52 100644 --- a/web/package.json +++ b/web/package.json @@ -10,7 +10,6 @@ }, "dependencies": { "next": "^15.2.3", - "next-auth": "^5.0.0-beta.25", "react": "^19.0.0", "react-dom": "^19.0.0" }, diff --git a/web/src/app/api/auth/[...nextauth]/route.js b/web/src/app/api/auth/[...nextauth]/route.js deleted file mode 100644 index 5951f83..0000000 --- a/web/src/app/api/auth/[...nextauth]/route.js +++ /dev/null @@ -1,2 +0,0 @@ -import { handlers } from "@/lib/auth" -export const { GET, POST } = handlers diff --git a/web/src/app/components/Guilds.jsx b/web/src/app/components/Guilds.jsx deleted file mode 100644 index 38626e4..0000000 --- a/web/src/app/components/Guilds.jsx +++ /dev/null @@ -1,25 +0,0 @@ - -export default async function Guilds({session}) { - - const response = await fetch("https://discord.com/api/users/@me/guilds", { - headers: { - Authorization: `Bearer ${session.accessToken}`, - }, - }); - const guilds = await response.json(); - - const ADMINISTRATOR = 0x0000000000000008; - const MANAGE_GUILD = 0x00000020; - - const filteredGuilds = guilds.filter((guild) => { - // Convert permissions string to a BigInt for bitwise operations - const permissions = BigInt(guild.permissions); - // Check if user is owner, has ADMINISTRATOR or MANAGE_GUILD permissions - return guild.owner || - (permissions & BigInt(ADMINISTRATOR)) === BigInt(ADMINISTRATOR) || - (permissions & BigInt(MANAGE_GUILD)) === BigInt(MANAGE_GUILD); }); - - return filteredGuilds.map((guild) => ( -
{guild.name}
- )) -} diff --git a/web/src/app/components/Navbar.jsx b/web/src/app/components/Navbar.jsx new file mode 100644 index 0000000..242175c --- /dev/null +++ b/web/src/app/components/Navbar.jsx @@ -0,0 +1,25 @@ +import SignOut from "@/app/components/sign-out"; + +export default function Navbar() { + return ( + + ) +} diff --git a/web/src/app/components/sign-in.jsx b/web/src/app/components/sign-in.jsx deleted file mode 100644 index 3d7142f..0000000 --- a/web/src/app/components/sign-in.jsx +++ /dev/null @@ -1,14 +0,0 @@ -import { signIn } from "@/lib/auth" - -export default function SignIn() { - return ( -
{ - "use server" - await signIn("discord") - }} - > - -
- ) -} diff --git a/web/src/app/components/sign-out.jsx b/web/src/app/components/sign-out.jsx index 69162a4..dd6693d 100644 --- a/web/src/app/components/sign-out.jsx +++ b/web/src/app/components/sign-out.jsx @@ -1,14 +1,5 @@ -import { signOut } from "@/lib/auth" - export default function SignOut() { return ( -
{ - "use server" - await signOut("discord") - }} - > - -
+ ) } diff --git a/web/src/app/dashboard/page.js b/web/src/app/dashboard/page.js index bab3bd8..a252958 100644 --- a/web/src/app/dashboard/page.js +++ b/web/src/app/dashboard/page.js @@ -1,39 +1,44 @@ -import { redirect } from "next/navigation"; -import { auth } from "@/lib/auth"; -import SignOut from "@/app/components/sign-out"; -import Guilds from "@/app/components/Guilds"; - -export default async function Home() { - const session = await auth(); - if (!session) redirect("/"); +import Navbar from "@/app/components/Navbar"; +export default function Dashboard() { return ( <> - -
-
-
Settings
- -
-
-

Logging

-

Channel 1

-

Channel 2

-

Quote of the Day

-

LLM Chatbot

- ) + ); } diff --git a/web/src/app/page.js b/web/src/app/page.js index 76e5d27..99556e8 100644 --- a/web/src/app/page.js +++ b/web/src/app/page.js @@ -1,19 +1,33 @@ -import { redirect } from "next/navigation"; -import { auth } from "@/lib/auth"; +export default function Home() { -export default async function Home() { - const session = await auth(); - if (session) redirect("/dashboard"); - return ( - <> -
-
- - - - + return ( +
+

AleeBot

+ + + + +
- ); } diff --git a/web/src/lib/auth.js b/web/src/lib/auth.js deleted file mode 100644 index 28c34f1..0000000 --- a/web/src/lib/auth.js +++ /dev/null @@ -1,32 +0,0 @@ -import NextAuth from "next-auth" -import Discord from "next-auth/providers/discord" - -export const { handlers, signIn, signOut, auth } = NextAuth({ - providers: [Discord({ - authorization: { - url: "https://discord.com/api/oauth2/authorize", - params: { scope: "identify guilds" }, - } - })], - callbacks: { - async jwt({ token, account }) { - // Persist the OAuth access_token to the token right after sign in - if (account) { - token.accessToken = account.access_token; - } - return token; - }, - async session({ session, token }) { - if (token.accessToken) { - session.user = await fetch('https://discord.com/api/users/@me', { - headers: { - authorization: `Bearer ${token.accessToken}` - } - }).then((r) => r.json()); - session.accessToken = token.accessToken; - } - - return session; - } - } -}) -- cgit v1.2.3