Merge pull request #865 from pruthviraj7714/form-ui-improved

Improved the UI for form & Fixed the Logic
code100x · Aug 14, 2024 · 139ec0b · 139ec0b
2 parents bbb19be + c0df2b6
commit 139ec0b
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 124 deletions.
diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx
@@ -214,68 +214,86 @@ export default function Courses() {
           </Form>
         </CardContent>
       </Card>
-      <Card className="mx-auto w-full max-w-6xl overflow-y-auto lg:mt-10">
+      <Card className="mx-auto w-full max-w-6xl overflow-y-auto lg:my-10">
         <CardHeader>
-          <CardTitle>Allow user another account in cohort 3</CardTitle>
+          <CardTitle>Discord</CardTitle>
         </CardHeader>
-        <CardContent className="grid gap-4 p-4 pt-0">
-          <input
-            type="text"
-            placeholder="Email"
-            onChange={(e) => {
-              setEmail(e.target.value);
-            }}
-          ></input>
-          <input
-            type="text"
-            placeholder="Admin Password"
-            onChange={(e) => {
-              setAdminPassword(e.target.value);
-            }}
-          ></input>
-          <button
-            onClick={() => {
-              axios.post('/api/admin/discordReset', {
-                email,
-                adminPassword,
-              });
-            }}
-          >
-            Reset
-          </button>
-        </CardContent>
-      </Card>
-
-      <Card className="mx-auto w-full max-w-6xl overflow-y-auto lg:mt-10">
-        <CardHeader>
-          <CardTitle>Get users discord username in cohort 3</CardTitle>
-        </CardHeader>
-        <CardContent className="grid gap-4 p-4 pt-0">
-          <input
-            type="text"
-            placeholder="Email"
-            onChange={(e) => {
-              setEmail(e.target.value);
-            }}
-          ></input>
-          <input
-            type="text"
-            placeholder="Admin Password"
-            onChange={(e) => {
-              setAdminPassword(e.target.value);
-            }}
-          ></input>
-          <button
-            onClick={async () => {
-              const res = await axios.post('/api/admin/discordReset/get', {
-                email,
-                adminPassword,
-              });
-              alert(JSON.stringify(res.data));
-            }}
-          >
-            Get
-          </button>
+        <CardContent className="flex flex-col gap-5 lg:flex-row">
+          <Card className="mx-auto w-full max-w-3xl overflow-y-auto">
+            <CardHeader>
+              <CardTitle>Allow user another account in cohort 3</CardTitle>
+            </CardHeader>
+            <CardContent className="grid gap-4 p-4 pt-0">
+              <Input
+                type="text"
+                placeholder="Email"
+                onChange={(e) => {
+                  setEmail(e.target.value);
+                }}
+              ></Input>
+              <Input
+                type="text"
+                placeholder="Admin Password"
+                onChange={(e) => {
+                  setAdminPassword(e.target.value);
+                }}
+              ></Input>
+              <Button
+                onClick={async () => {
+                  try {
+                    const res = await axios.post('/api/admin/discordReset', {
+                      email,
+                      adminPassword,
+                    });
+                    toast(JSON.stringify(res.data.data));
+                  } catch (error) {
+                    toast.error(error.response.data.message);
+                  }
+                }}
+              >
+                Reset
+              </Button>
+            </CardContent>
+          </Card>
+          <Card className="mx-auto w-full max-w-3xl overflow-y-auto">
+            <CardHeader>
+              <CardTitle>Get users discord username in cohort 3</CardTitle>
+            </CardHeader>
+            <CardContent className="grid gap-4 p-4 pt-0">
+              <Input
+                type="text"
+                placeholder="Email"
+                onChange={(e) => {
+                  setEmail(e.target.value);
+                }}
+              ></Input>
+              <Input
+                type="text"
+                placeholder="Admin Password"
+                onChange={(e) => {
+                  setAdminPassword(e.target.value);
+                }}
+              ></Input>
+              <Button
+                onClick={async () => {
+                  try {
+                    const res = await axios.post(
+                      '/api/admin/discordReset/get',
+                      {
+                        email,
+                        adminPassword,
+                      },
+                    );
+                    alert(JSON.stringify(res.data));
+                  } catch (error: any) {
+                    toast.error(error.response.data.message);
+                  }
+                }}
+              >
+                Get
+              </Button>
+            </CardContent>
+          </Card>
         </CardContent>
       </Card>
     </div>

diff --git a/src/app/api/admin/discordReset/get/route.ts b/src/app/api/admin/discordReset/get/route.ts
@@ -12,41 +12,55 @@ export async function POST(req: NextRequest) {
 
   if (!parseResult.success) {
     return NextResponse.json(
-      { error: parseResult.error.message },
+      { error: parseResult.error.message, message: 'Invalid input data' },
       { status: 400 },
     );
   }
 
-  const { adminPassword, email } = parseResult.data;
+  try {
+    const { adminPassword, email } = parseResult.data;
 
-  if (adminPassword !== process.env.ADMIN_SECRET) {
-    return NextResponse.json({}, { status: 401 });
-  }
+    if (adminPassword !== process.env.ADMIN_SECRET) {
+      return NextResponse.json(
+        {
+          message: 'Invalid Admin Password',
+        },
+        { status: 401 },
+      );
+    }
 
-  const user = await db.user.findFirst({
-    where: {
-      email,
-    },
-  });
+    const user = await db.user.findFirst({
+      where: {
+        email,
+      },
+    });
 
-  if (!user) {
-    return NextResponse.json({ msg: 'User not found' }, { status: 404 });
-  }
+    if (!user) {
+      return NextResponse.json({ message: 'User not found' }, { status: 404 });
+    }
 
-  const response = await db.discordConnectBulk.findMany({
-    where: {
-      userId: user.id,
-    },
-    select: {
-      discordId: true,
-      username: true,
-    },
-  });
-
-  return NextResponse.json(
-    { data: response },
-    {
-      status: 200,
-    },
-  );
+    const response = await db.discordConnectBulk.findMany({
+      where: {
+        userId: user.id,
+      },
+      select: {
+        discordId: true,
+        username: true,
+      },
+    });
+
+    return NextResponse.json(
+      { data: response },
+      {
+        status: 200,
+      },
+    );
+  } catch (error) {
+    return NextResponse.json(
+      {
+        message: 'Internal Server Error',
+      },
+      { status: 500 },
+    );
+  }
 }
diff --git a/src/app/api/admin/discordReset/route.ts b/src/app/api/admin/discordReset/route.ts
@@ -12,41 +12,55 @@ export async function POST(req: NextRequest) {
 
   if (!parseResult.success) {
     return NextResponse.json(
-      { error: parseResult.error.message },
+      { error: parseResult.error.message, message: 'Invalid Input data' },
       { status: 400 },
     );
   }
 
-  const { adminPassword, email } = parseResult.data;
+  try {
+    const { adminPassword, email } = parseResult.data;
 
-  if (adminPassword !== process.env.ADMIN_SECRET) {
-    return NextResponse.json({}, { status: 401 });
-  }
+    if (adminPassword !== process.env.ADMIN_SECRET) {
+      return NextResponse.json(
+        {
+          message: 'Invalid Admin Password',
+        },
+        { status: 401 },
+      );
+    }
 
-  const user = await db.user.findFirst({
-    where: {
-      email,
-    },
-  });
+    const user = await db.user.findFirst({
+      where: {
+        email,
+      },
+    });
 
-  if (!user) {
-    return NextResponse.json({ msg: 'User not found' }, { status: 404 });
-  }
+    if (!user) {
+      return NextResponse.json({ message: 'User not found' }, { status: 404 });
+    }
 
-  const response = await db.discordConnectBulk.updateMany({
-    where: {
-      userId: user.id,
-      cohortId: '3',
-    },
-    data: {
-      cohortId: Math.random().toString(),
-    },
-  });
-
-  return NextResponse.json(
-    { data: response },
-    {
-      status: 200,
-    },
-  );
+    const response = await db.discordConnectBulk.updateMany({
+      where: {
+        userId: user.id,
+        cohortId: '3',
+      },
+      data: {
+        cohortId: Math.random().toString(),
+      },
+    });
+
+    return NextResponse.json(
+      { data: response },
+      {
+        status: 200,
+      },
+    );
+  } catch (error) {
+    return NextResponse.json(
+      {
+        message: 'Internal Server Error',
+      },
+      { status: 500 },
+    );
+  }
 }
diff --git a/src/app/error.tsx b/src/app/error.tsx
@@ -8,7 +8,6 @@ export default function ErrorPage({
   error,
 }: {
   error: Error & { digest?: string };
-  reset: () => void;
 }) {
   useEffect(() => {
     // Log the error to an error reporting service

diff --git a/tsconfig.json b/tsconfig.json
@@ -16,14 +16,14 @@
     "incremental": true,
     "plugins": [
       {
-        "name": "next"
-      }
+        "name": "next",
+      },
     ],
     "paths": {
       "@/*": ["./src/*"],
-      "@public/*": ["./public/*"]
-    }
+      "@public/*": ["./public/*"],
+    },
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
 }