Merge pull request #2 from Advik-Gupta/main

Refactored to use current backend and made submissions page

Author: abhitrueprogrammer

package.json

@@ -31,6 +31,7 @@
     "axios": "^1.7.7",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
+    "firebase": "^12.3.0",
     "geist": "^1.3.0",
     "lucide-react": "^0.437.0",
     "next": "^14.2.4",

pnpm-lock.yaml

@@ -1,7 +1,5 @@
 import { handleAPIError } from "@/lib/error";
 import api from ".";
-// import { generateSampleLeaderboard as generateSampleLeaderBoard } from "./sampleData";
-
 export interface RoundParams {
   round_id: number;
 }
@@ -21,20 +19,3 @@ export async function RoundEnable(data: RoundParams) {
     throw handleAPIError(e);
   }
 }
-
-export async function GetLeaderBoard() {
-  try {
-    const response = await api.get<LeaderBoardUser[]>("/leaderboard");
-    return response.data
-      .filter((user) => user.Score !== null) // Exclude users with null scores
-      .sort((a, b) => b.Score! - a.Score!) // Sort by score in descending order
-      .slice(0, 10); // Take the top 10
-
-    // return generateSampleLeaderBoard()
-    // .filter((user) => user.Score !== null)
-    // .sort((a, b) => b.Score! - a.Score!)
-    // .slice(0, 10);
-  } catch (e) {
-    throw handleAPIError(e);
-  }
-}

src/api/adminDashboard.ts

@@ -8,6 +8,7 @@ interface CustomAxiosRequestConfig extends InternalAxiosRequestConfig {
 
 const api = axios.create({
   baseURL: process.env.NEXT_PUBLIC_BASEURL,
+  withCredentials: true,
 });
 
 // Add a request interceptor
@@ -34,13 +35,11 @@ api.interceptors.response.use(
 
       try {
         await api.post<ApiResponse>(
-          `${process.env.NEXT_PUBLIC_BASEURL}/token/refresh`,
+          "/refreshToken",
           {},
-          {
-            withCredentials: true,
-          },
+          { withCredentials: true },
         );
-        return api(originalRequest); // Use the api instance to retry the request
+        return api(originalRequest);
       } catch {
         // Handle refresh token error or redirect to login
         toast.error("Session expired. Please login again.");

src/api/index.ts

@@ -6,7 +6,7 @@ import api from ".";
 
 export async function login(body: z.infer<typeof loginFormSchema>) {
   try {
-    const { data } = await api.post<ApiResponse>(`/login/user`, body);
+    const { data } = await api.post<ApiResponse>(`/login`, body);
     return data.message;
   } catch (e) {
     throw handleAPIError(e);

src/api/login.ts

@@ -1,25 +1,44 @@
 import { handleAPIError } from "@/lib/error";
 import api from ".";
-// import { generateSampleData } from "./sampleData";
+
+export interface CreateQuestionParams {
+  ID?: string;
+  Description: string;
+  Title: string;
+  Qtype: string;
+  Isbountyactive?: boolean;
+  InputFormat: string[];
+  Points: number;
+  Round: number;
+  Constraints: string[];
+  OutputFormat: string[];
+  SampleTestInput: string[];
+  SampleTestOutput: string[];
+  Explanation: string[];
+}
 
 export interface UpdateQuestionParams {
-  id: string;
-  description: string;
-  title: string;
-  input_format: string[];
-  points: number;
-  round: number;
-  constraints: string[];
-  output_format: string[];
-  sample_test_input: string[];
-  sample_test_output: string[];
-  sample_explanation: string[];
+  ID: string;
+  Description: string;
+  Title: string;
+  Qtype: string;
+  Isbountyactive: boolean;
+  InputFormat: string[];
+  Points: number;
+  Round: number;
+  Constraints: string[];
+  OutputFormat: string[];
+  SampleTestInput: string[];
+  SampleTestOutput: string[];
+  Explanation: string[];
 }
 
 export interface QuestionResponse {
   ID: string;
   Description: string;
   Title: string;
+  Qtype: string;
+  Isbountyactive: boolean;
   InputFormat: string[];
   Points: number;
   Round: number;
@@ -30,47 +49,41 @@ export interface QuestionResponse {
   Explanation: string[];
 }
 
-export interface CreateQuestionParams {
-  description: string;
-  title: string;
-  input_format: string[];
-  points: number;
-  round: number;
-  constraints: string[];
-  output_format: string[];
-  sample_test_input: string[];
-  sample_test_output: string[];
-  sample_explanation: string[];
+export interface QuestionsIdApiResponse {
+  question: QuestionResponse[];
+  status: string;
+}
+
+export interface QuestionsApiResponse {
+  questions: QuestionResponse[];
+  status: string;
 }
 
-interface DeleteQuestionResponse {
+export interface DeleteQuestionResponse {
+  status: string;
   message: string;
 }
-// GET REQUEST
+
 export async function GetAllQuestions() {
   try {
-    const response = await api.get<QuestionResponse[]>("/questions");
-    return response.data;
-    // return generateSampleData()
+    const response = await api.get<QuestionsApiResponse>("/question");
+    return response.data.questions;
   } catch (e) {
     console.log(e);
     return [];
   }
 }
 
-// POST REQUEST
 export async function CreateQuestion(data: CreateQuestionParams) {
   try {
-    console.log(data);
-    const response = await api.post<QuestionResponse>("/question/create", data);
+    const response = await api.post<QuestionResponse>("/question", data);
     return response.data;
   } catch (e) {
     console.log(e);
     throw handleAPIError(e);
   }
 }
 
-// DELETE REQUEST
 export async function DeleteQuestion(id: string) {
   try {
     const response = await api.delete<DeleteQuestionResponse>(
@@ -83,14 +96,16 @@ export async function DeleteQuestion(id: string) {
 }
 
 export async function GetQuestionById(id: string) {
-  const response = await api.get<QuestionResponse>(`/question/${id}`);
+  const response = await api.get<QuestionsIdApiResponse>(`/question/${id}`);
   return response.data;
 }
 
-// PATCH REQUEST
 export async function UpdateQuestion(data: UpdateQuestionParams) {
   try {
-    const response = await api.patch<QuestionResponse>("/question", data);
+    const response = await api.put<QuestionResponse>(
+      `/question/${data.ID}`,
+      data,
+    );
     return response.data;
   } catch (e) {
     throw handleAPIError(e);

src/api/questions.ts

@@ -0,0 +1,69 @@
+import { handleAPIError } from "@/lib/error";
+import api from ".";
+
+export interface User {
+  ID: string;
+  Email: string;
+  RegNo: string;
+  Role: string;
+  RoundQualified: number;
+  Score: number;
+  Name: string;
+  IsBanned: boolean;
+}
+
+export interface Submission {
+  ID: string;
+  QuestionID: string;
+  TestcasesPassed?: number;
+  TestcasesFailed?: number;
+  Runtime?: number;
+  SubmissionTime: string;
+  SourceCode: string;
+  LanguageID: number;
+  Description?: string;
+  Memory?: number;
+  UserID?: string;
+  Status?: string;
+}
+
+export interface SubmissionResult {
+  ID: string;
+  TestcaseID?: string;
+  SubmissionID: string;
+  Runtime?: number;
+  Memory?: number;
+  PointsAwarded: number;
+  Status: string;
+  Description?: string;
+}
+
+export interface Testcase {
+  ID: string;
+  Input: string;
+  ExpectedOutput: string;
+  Hidden: boolean;
+}
+
+export type SubmissionWithResultsAndTestcases = {
+  submission: Submission;
+  results: (SubmissionResult & { testcase?: Testcase })[];
+};
+
+export type UserWithSubmissions = {
+  user: User;
+  submissions: SubmissionWithResultsAndTestcases[];
+};
+
+export async function getUserSubmissions(
+  userID: string,
+): Promise<UserWithSubmissions> {
+  try {
+    const response = await api.get<UserWithSubmissions>(
+      `/admin/users/${userID}/submissions`,
+    );
+    return response.data;
+  } catch (error) {
+    throw handleAPIError(error);
+  }
+}