Merge pull request #666 from devsoc-unsw/CHAOS-bugfix-inprogressapplication

hotfix: in progress applications

Author: Plebbaroni

backend/server/src/main.rs

@@ -36,7 +36,7 @@ async fn main() -> Result<(), ChaosError> {
     });
 
 
-    let listener = tokio::net::TcpListener::bind("0.0.0.0:8000").await.unwrap();
+    let listener = tokio::net::TcpListener::bind("0.0.0.0:8080").await.unwrap();
     let server_task = axum::serve(listener, app);
 
     let _ = tokio::join!(server_task, email_task);

frontend-nextjs/src/app/[lang]/campaign/apply/[campaignId]/application/[applicationId]/page.tsx

@@ -7,7 +7,7 @@ import ApplicationReview from "./applicationanswer";
 import { ApplicationDetails } from "@/models/application";
 import { getDictionary } from "@/app/[lang]/dictionaries";
 import { getCampaignRoles, getCampaign } from "@/models/campaign";
-import { getApplication } from "@/models/application";
+import { getApplication, getInProgressApplication } from "@/models/application";
 import { getAllRoleQuestions, getAllCommonQuestions } from "@/models/question";
 import { getAllRoleAnswers, getAllCommonAnswers} from "@/models/answer";
 import { redirect } from "next/navigation";
@@ -23,7 +23,7 @@ async function ApplicationPage({
 
   await queryClient.prefetchQuery({
     queryKey: [`application-${applicationId}`],
-    queryFn: () => getApplication(applicationId)
+    queryFn: () => getInProgressApplication(applicationId)
   })
 
     const application: ApplicationDetails | undefined = queryClient.getQueryData([`application-${applicationId}`]);

frontend-nextjs/src/lib/api.ts

@@ -1,4 +1,4 @@
-const API_BASE_URL = process.env.NEXT_API_BASE_URL || "https://chaos-api.devsoc.cn";
+const API_BASE_URL = process.env.NEXT_API_BASE_URL || "http://localhost:8080";
 
 const isServer = typeof window === "undefined";
 

frontend-nextjs/src/models/application.ts

@@ -31,6 +31,9 @@ export async function getApplication(applicationId: string): Promise<Application
     return await apiRequest<ApplicationDetails>(`/api/v1/application/${applicationId}`);
 }
 
+export async function getInProgressApplication(applicationId: string): Promise<ApplicationDetails> {
+    return await apiRequest<ApplicationDetails>(`/api/v1/application/${applicationId}/inprogress`);
+}
 // export async function getApplicationRating(applicationId: string): Promise<RatingDetails> {
 //     return await apiRequest<RatingDetails>(`/api/v1/application/${applicationId}/rating`);
 // }