#3013 merge conflcits

Northeastern-Electric-Racing · Jan 1, 2025 · 237450d · 237450d
2 parents ac8253d + 5255209
commit 237450d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/src/frontend/src/apis/onboarding.api.ts b/src/frontend/src/apis/onboarding.api.ts
@@ -1,8 +1,7 @@
 import { Checklist } from 'shared';
 import { apiUrls } from '../utils/urls';
 import axios from '../utils/axios';
-import { ChecklistCreateArgs } from '../hooks/onboarding.hook';
-import { ToggleChecklistPayload } from '../hooks/onboarding.hook';
+import { ChecklistCreateArgs, ToggleChecklistPayload } from '../hooks/onboarding.hook';
 
 /**
  * API call to fetch all the checklists
@@ -32,7 +31,6 @@ export const getCheckedChecklists = () => {
 };
 
 /**
->>>>>>> feature/recruitment_and_onboarding
  * API call to fetch all the users checklists
  */
 export const getUsersChecklists = () => {
@@ -42,9 +40,14 @@ export const getUsersChecklists = () => {
 };
 
 /**
- * API call to create a checklist
- * @param payload the checklist data
+ * API call to toggle a checklist
  */
+export const toggleChecklist = (payload: ToggleChecklistPayload) => {
+  return axios.post<Checklist>(apiUrls.toggleChecklist(payload.checklistId), {
+    ...payload
+  });
+};
+
 export const createChecklist = (payload: ChecklistCreateArgs) => {
   return axios.post(apiUrls.createChecklist(), {
     ...payload
@@ -59,14 +62,6 @@ export const editChecklist = (checklistId: string, payload: ChecklistCreateArgs)
     ...payload
   });
 };
-/**
- * API call to toggle a checklist
- */
-export const toggleChecklist = (payload: ToggleChecklistPayload) => {
-  return axios.post<Checklist>(apiUrls.toggleChecklist(payload.checklistId), {
-    ...payload
-  });
-};
 
 /**
  * API Call to download a google image

diff --git a/src/frontend/src/hooks/onboarding.hook.ts b/src/frontend/src/hooks/onboarding.hook.ts
@@ -6,9 +6,9 @@ import {
   getUsersChecklists,
   downloadGoogleImage,
   toggleChecklist,
-  getCheckedChecklists,
   createChecklist,
-  editChecklist
+  editChecklist,
+  getCheckedChecklists
 } from '../apis/onboarding.api';
 
 export interface ToggleChecklistPayload {