alexismch · alexismch · Feb 11, 2023 · Feb 11, 2023 · Feb 12, 2023 · Feb 12, 2023
diff --git a/.env.example b/.env.example
@@ -1,6 +1,6 @@
 # DISCORD secrets
-DISCORD_TOKEN=
 DISCORD_CLIENT_ID=
+DISCORD_TOKEN=
 
 DATABASE_URL=
 

diff --git a/apps/front/app/App.tsx b/apps/front/app/App.tsx
diff --git a/apps/front/app/error.tsx b/apps/front/app/error.tsx
@@ -0,0 +1,56 @@
+'use client';
+
+import React from 'react';
+import { InternalError, NotFound, Unauthorized } from '../utils/errors';
+import Link from 'next/link';
+
+type BaseError = {
+   code: number;
+   title: string;
+
+   description: string;
+};
+
+const Error = ({ error: thrownError }: { error: Error }) => {
+   let error: BaseError;
+   switch (thrownError.message) {
+      case Unauthorized.title:
+         error = Unauthorized;
+         break;
+      case NotFound.title:
+         error = NotFound;
+         break;
+      default:
+         error = InternalError;
+   }
+
+   return (
+      <div className="grid place-items-center py-24 px-6 sm:py-32 lg:px-8">
+         <div className="text-center">
+            <p className="text-base font-semibold text-light-primary dark:text-dark-primary">
+               {error.code}
+            </p>
+            <h1 className="mt-4 text-3xl font-bold tracking-tight text-light-dark-grey dark:text-dark-white sm:text-5xl">
+               {error.title}
+            </h1>
+            <p className="mt-6 text-base leading-7 text-light-light-grey dark:text-white">
+               {error.description}
+            </p>
+            <div className="mt-10 flex items-center justify-center gap-x-6">
+               <Link
+                  href="/"
+                  className="rounded-md bg-none px-3.5 py-2.5 text-sm font-semibold text-light-primary dark:text-dark-primary shadow-sm border-2 border-light-primary dark:border-dark-primary hover:bg-light-primary dark:hover:bg-dark-primary hover:text-light-white dark:hover:text-dark-black">
+                  Go back home
+               </Link>
+               <Link
+                  href="mailto:[email protected]"
+                  className="text-sm font-semibold text-light-dark-grey dark:text-dark-white hover:underline">
+                  Contact support <span aria-hidden="true">&rarr;</span>
+               </Link>
+            </div>
+         </div>
+      </div>
+   );
+};
+
+export default Error;
diff --git a/apps/front/app/guilds/layout.tsx b/apps/front/app/guilds/layout.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+
+export const metadata = {
+   title: {
+      default: 'Guilds',
+      template: '%s | Guilds',
+   },
+};
+
+export default function RootLayout({ children }) {
+   return <>{children}</>;
+}
diff --git a/apps/front/app/guilds/page.tsx b/apps/front/app/guilds/page.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { getServerSession } from 'next-auth';
+import { authOptions } from '../../pages/api/auth/[...nextauth]';
+import Guilds from '../../components/app/guilds/Guilds';
+import Unauthorized from '../../components/errors/Unauthorized';
+
+export const dynamic = 'force-dynamic';
+
+const GuildsPage = async () => {
+   const user = (await getServerSession(authOptions))?.user;
+   if (!user) {
+      return <Unauthorized />;
+   }
+
+   return (
+      <>
+         {/* @ts-expect-error waiting for TypeScript fix */}
+         <Guilds user={user} />
+      </>
+   );
+};
+
+export default GuildsPage;
diff --git a/apps/front/app/layout.tsx b/apps/front/app/layout.tsx
@@ -6,16 +6,19 @@ export const metadata = {
       default: 'Ch43 Bot',
       template: '%s | Ch43 Bot',
    },
+   description: 'The Ch43 bot to ensure students validity & uniqueness.',
    icons: {
       icon: '/vinci-logo.png',
    },
 };
 
 export default function RootLayout({ children }) {
    return (
-      <html>
+      <html lang="en" className="light">
          <body>
-            <div className="App">{children}</div>
+            <div className="text-center min-h-screen flex items-center justify-center flex-col text-light-black dark:text-dark-white text-[calc(10px+2vmin)]">
+               {children}
+            </div>
          </body>
       </html>
    );

diff --git a/apps/front/app/loading.tsx b/apps/front/app/loading.tsx
@@ -1,5 +1,26 @@
+import React from 'react';
+
 const Loading = () => {
-   return <div>Loading...</div>;
+   return (
+      <div role="status">
+         <svg
+            aria-hidden="true"
+            className="inline w-10 h-10 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-light-primary dark:fill-dark-primary"
+            viewBox="0 0 100 101"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg">
+            <path
+               d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+               fill="currentColor"
+            />
+            <path
+               d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+               fill="currentFill"
+            />
+         </svg>
+         <span className="sr-only">Loading...</span>
+      </div>
+   );
 };
 
 export default Loading;
diff --git a/apps/front/app/not-found.tsx b/apps/front/app/not-found.tsx
@@ -1,11 +1,14 @@
-// import { redirect } from 'next/navigation';
-import React from 'react';
+'use client';
+
+import { NotFound as NotFoundError } from '../utils/errors';
+import { useEffect } from 'react';
 
 const NotFound = () => {
-   //TODO : change when debugged
-   // redirect('/');
+   useEffect(() => {
+      throw new NotFoundError();
+   }, []);
 
-   return <p>404 - Not found</p>;
+   return <></>;
 };
 
 export default NotFound;
diff --git a/apps/front/app/page.tsx b/apps/front/app/page.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
-import App from './App';
+import Unauthenticated from '../components/app/Unauthenticated';
+import Authenticated from '../components/app/Authenticated';
 import { authOptions } from '../pages/api/auth/[...nextauth]';
 import { getServerSession } from 'next-auth';
 
@@ -15,7 +16,9 @@ const Home = async () => {
    return (
       <>
          <p>Welcome to Ch43 Bot</p>
-         <App user={user} />
+         <span className="text-light-primary dark:text-dark-primary">
+            {!user ? <Unauthenticated /> : <Authenticated user={user} />}
+         </span>
       </>
    );
 };

diff --git a/apps/front/app/verify/[id]/page.tsx b/apps/front/app/verify/[id]/page.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { notFound } from 'next/navigation';
 import { getUserToVerify } from '../../../utils/getters';
-import Unauthenticated from './Unauthenticated';
-import Authenticated from './Authenticated';
+import Authenticated from '../../../components/app/verify/[id]/Authenticated';
+import Unauthenticated from '../../../components/app/verify/[id]/Unauthenticated';
 import { getServerSession } from 'next-auth';
 import { authOptions } from '../../../pages/api/auth/[...nextauth]';
 

diff --git a/apps/front/components/app/Authenticated.tsx b/apps/front/components/app/Authenticated.tsx
@@ -0,0 +1,21 @@
+'use client';
+
+import React from 'react';
+import { useLogin } from '../../utils/hooks';
+
+const Authenticated = ({ user }: { user: { name?: string } }) => {
+   const { logout } = useLogin();
+
+   return (
+      <>
+         {user.name}
+         <p>
+            <button className="login-button" onClick={logout}>
+               LOGOUT
+            </button>
+         </p>
+      </>
+   );
+};
+
+export default Authenticated;
diff --git a/apps/front/components/app/Unauthenticated.tsx b/apps/front/components/app/Unauthenticated.tsx
@@ -0,0 +1,18 @@
+'use client';
+
+import React from 'react';
+import { useLogin } from '../../utils/hooks';
+
+const Unauthenticated = () => {
+   const { login } = useLogin();
+
+   return (
+      <>
+         <button className="login-button" onClick={login}>
+            LOGIN
+         </button>
+      </>
+   );
+};
+
+export default Unauthenticated;
diff --git a/apps/front/components/app/guilds/Guild.tsx b/apps/front/components/app/guilds/Guild.tsx
@@ -0,0 +1,31 @@
+'use client';
+
+import React from 'react';
+import Image from 'next/image';
+import Link from 'next/link';
+
+const Guild = ({ guild }) => {
+   return (
+      <div className="w-60 h-44 shadow-md bg-white dark:bg-dark-dark-grey rounded h-fit overflow-hidden flex flex-col justify-between">
+         {guild.icon && (
+            <Image
+               src={guild.icon}
+               alt={guild.name}
+               width={50}
+               height={50}
+               className="rounded-full mx-auto mt-4"
+            />
+         )}
+         <p className="w-max text-xl mx-auto text-light-black dark:text-dark-white">
+            {guild.name}
+         </p>
+         <Link
+            href={`/guilds/${guild.id}`}
+            className="block w-full bg-none px-3.5 py-2.5 text-sm font-semibold text-light-primary dark:text-dark-primary border-t-[1px] border-light-primary dark:border-dark-primary hover:bg-light-primary dark:hover:bg-dark-primary hover:text-light-white dark:hover:text-dark-dark-grey">
+            Details
+         </Link>
+      </div>
+   );
+};
+
+export default Guild;
diff --git a/apps/front/components/app/guilds/Guilds.tsx b/apps/front/components/app/guilds/Guilds.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { getUserGuilds } from '../../../utils/getters';
+import Guild from './Guild';
+import Unauthorized from '../../errors/Unauthorized';
+import Link from 'next/link';
+
+const Guilds = async ({ user }) => {
+   const guilds = await getUserGuilds(user as { email: string });
+   if (!guilds.length) {
+      return <Unauthorized />;
+   }
+
+   return (
+      <div>
+         <h1 className="mb-8 sm:mb-16 text-3xl sm:text-5xl font-bold text-light-primary dark:text-dark-primary">
+            Your administrable guilds
+         </h1>
+         <div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4 place-items-center">
+            {guilds.map((guild) => (
+               <Guild key={guild.id} guild={guild} />
+            ))}
+            <div className="w-60 h-44 shadow-md bg-white dark:bg-dark-dark-grey hover:bg-light-primary dark:hover:bg-dark-primary rounded h-fit overflow-hidden flex justify-center items-center text-light-primary dark:text-dark-primary hover:text-light-white dark:hover:text-dark-dark-grey">
+               <Link
+                  href={`https://discord.com/api/oauth2/authorize?client_id=${process.env.DISCORD_CLIENT_ID}&permissions=8&scope=bot`}
+                  target="_blank">
+                  +
+               </Link>
+            </div>
+         </div>
+      </div>
+   );
+};
+
+export default Guilds;
diff --git a/apps/front/app/verify/[id]/Authenticated.tsx → ...ponents/app/verify/[id]/Authenticated.tsx b/apps/front/app/verify/[id]/Authenticated.tsx → ...ponents/app/verify/[id]/Authenticated.tsx
@@ -41,7 +41,9 @@ const Authenticated = ({
    return (
       <>
          <p>{message}</p>
-         <span className="App-title">{user.name}</span>
+         <span className="text-light-primary dark:text-dark-primary">
+            {user.name}
+         </span>
       </>
    );
 };

diff --git a/...front/app/verify/[id]/Unauthenticated.tsx → ...nents/app/verify/[id]/Unauthenticated.tsx b/...front/app/verify/[id]/Unauthenticated.tsx → ...nents/app/verify/[id]/Unauthenticated.tsx
@@ -1,15 +1,15 @@
 'use client';
 
 import React from 'react';
-import { useLogin } from '../../../utils/hooks';
+import { useLogin } from '../../../../utils/hooks';
 
 const Unauthenticated = () => {
    const { login } = useLogin();
 
    return (
       <>
          <p>Click on the button below in order to complete the verification</p>
-         <button className="App-button" onClick={login}>
+         <button className="login-button" onClick={login}>
             CONFIRM
          </button>
       </>

diff --git a/apps/front/components/errors/Unauthorized.tsx b/apps/front/components/errors/Unauthorized.tsx
@@ -0,0 +1,14 @@
+'use client';
+
+import { useEffect } from 'react';
+import { Unauthorized as UnauthorizedError } from '../../utils/errors';
+
+const Unauthorized = () => {
+   useEffect(() => {
+      throw new UnauthorizedError();
+   }, []);
+
+   return <></>;
+};
+
+export default Unauthorized;