refactor: so much shit

7 files changed, 247 insertions, 175 deletions

diff --git a/frontend/src/api/Api.tsx b/frontend/src/api/Api.tsx
index 30c0ad6..6731cb3 100644
--- a/frontend/src/api/Api.tsx
+++ b/frontend/src/api/Api.tsx
@@ -1,197 +1,52 @@
-import axios from 'axios';
-
-import { GameChapter, GamesChapters } from '../types/Chapters';
-import { Game } from '../types/Game';
-import { Map, MapDiscussion, MapDiscussions, MapLeaderboard, MapSummary } from '../types/Map';
 import { MapDiscussionCommentContent, MapDiscussionContent, ModMenuContent } from '../types/Content';
-import { Search } from '../types/Search';
-import { UserProfile } from '../types/Profile';
-import { Ranking } from '../types/Ranking';
+import { delete_token, get_token } from './Auth';
+import { get_user, get_profile, post_profile } from './User';
+import { get_games, get_chapters, get_games_chapters, get_game_maps, get_search } from './Games';
+import { get_official_rankings, get_unofficial_rankings } from './Rankings';
+import { get_map_summary, get_map_leaderboard, get_map_discussions, get_map_discussion, post_map_discussion, post_map_discussion_comment, delete_map_discussion } from './Maps';
+import { delete_map_summary, post_map_summary, put_map_image, put_map_summary } from './Mod';
 
 // add new api call function entries here
 // example usage: API.get_games();
 export const API = {
-  user_logout: () => user_logout(),
-
+  // Auth
+  get_token: () => get_token(),
+  
+  delete_token: () => delete_token(),
+  // User
   get_user: (user_id: string) => get_user(user_id),
+  get_profile: (token: string) => get_profile(token),
+  post_profile: (token: string) => post_profile(token),
+  // Games
   get_games: () => get_games(),
-
   get_chapters: (chapter_id: string) => get_chapters(chapter_id),
   get_games_chapters: (game_id: string) => get_games_chapters(game_id),
   get_game_maps: (game_id: string) => get_game_maps(game_id),
-  get_rankings: () => get_rankings(),
   get_search: (q: string) => get_search(q),
-
+  // Rankings
+  get_official_rankings: () => get_official_rankings(),
+  get_unofficial_rankings: () => get_unofficial_rankings(),
+  // Maps
   get_map_summary: (map_id: string) => get_map_summary(map_id),
   get_map_leaderboard: (map_id: string) => get_map_leaderboard(map_id),
   get_map_discussions: (map_id: string) => get_map_discussions(map_id),
   get_map_discussion: (map_id: string, discussion_id: number) => get_map_discussion(map_id, discussion_id),
 
-  post_map_summary: (map_id: string, content: ModMenuContent) => post_map_summary(map_id, content),
-  post_map_discussion: (map_id: string, content: MapDiscussionContent) => post_map_discussion(map_id, content),
-  post_map_discussion_comment: (map_id: string, discussion_id: number, content: MapDiscussionCommentContent) => post_map_discussion_comment(map_id, discussion_id, content),
-
-  put_map_image: (map_id: string, image: string) => put_map_image(map_id, image),
-  put_map_summary: (map_id: string, content: ModMenuContent) => put_map_summary(map_id, content),
+  post_map_discussion: (token: string, map_id: string, content: MapDiscussionContent) => post_map_discussion(token, map_id, content),
+  post_map_discussion_comment: (token: string, map_id: string, discussion_id: number, comment: string) => post_map_discussion_comment(token, map_id, discussion_id, comment),
 
-  delete_map_summary: (map_id: string, route_id: number) => delete_map_summary(map_id, route_id),
-  delete_map_discussion: (map_id: string, discussion_id: number) => delete_map_discussion(map_id, discussion_id),
+  delete_map_discussion: (token: string, map_id: string, discussion_id: number) => delete_map_discussion(token, map_id, discussion_id),
+  // Mod
+  post_map_summary: (token: string, map_id: string, content: ModMenuContent) => post_map_summary(token, map_id, content),
+  
+  put_map_image: (token: string, map_id: string, image: string) => put_map_image(token, map_id, image),
+  put_map_summary: (token: string, map_id: string, content: ModMenuContent) => put_map_summary(token, map_id, content),
+  
+  delete_map_summary: (token: string, map_id: string, route_id: number) => delete_map_summary(token, map_id, route_id),
 };
 
-const BASE_API_URL: string = "https://lp.ardapektezol.com/api/v1/"
+const BASE_API_URL: string = "/api/v1/"
 
-function url(path: string): string {
+export function url(path: string): string {
   return BASE_API_URL + path;
-}
-
-// USER
-
-const user_logout = async () => {
-  await axios.delete(url("token"));
-};
-
-const get_user = async (user_id: string): Promise<UserProfile> => {
-  const response = await axios.get(url(`users/${user_id}`))
-  return response.data.data;
-};
-
-
-// GAMES
-
-const get_games = async (): Promise<Game[]> => {
-  const response = await axios.get(url("games"))
-  return response.data.data;
-};
-
-const get_chapters = async (chapter_id: string): Promise<GameChapter> => {
-  const response = await axios.get(url(`chapters/${chapter_id}`));
-  return response.data.data;
-}
-
-const get_games_chapters = async (game_id: string): Promise<GamesChapters> => {
-  const response = await axios.get(url(`games/${game_id}`));
-  return response.data.data;
-};
-
-const get_game_maps = async (game_id: string): Promise<Map[]> => {
-  const response = await axios.get(url(`games/${game_id}/maps`))
-  return response.data.data.maps;
-};
-
-
-// RANKINGS
-const get_rankings = async (): Promise<Ranking> => {
-  const response = await axios.get(url(`rankings`));
-  return response.data.data;
-}
-
-// SEARCH
-
-const get_search = async (q: string): Promise<Search> => {
-  const response = await axios.get(url(`search?q=${q}`))
-  return response.data.data;
-};
-
-// MAP SUMMARY
-
-const put_map_image = async (map_id: string, image: string): Promise<boolean> => {
-  const response = await axios.put(url(`maps/${map_id}/image`), {
-    "image": image,
-  });
-  return response.data.success;
-};
-
-const get_map_summary = async (map_id: string): Promise<MapSummary> => {
-  const response = await axios.get(url(`maps/${map_id}/summary`))
-  return response.data.data;
-};
-
-const post_map_summary = async (map_id: string, content: ModMenuContent): Promise<boolean> => {
-  const response = await axios.post(url(`maps/${map_id}/summary`), {
-    "user_name": content.name,
-    "score_count": content.score,
-    "record_date": content.date,
-    "showcase": content.showcase,
-    "description": content.description,
-  });
-  return response.data.success;
-};
-
-const put_map_summary = async (map_id: string, content: ModMenuContent): Promise<boolean> => {
-  const response = await axios.put(url(`maps/${map_id}/summary`), {
-    "route_id": content.id,
-    "user_name": content.name,
-    "score_count": content.score,
-    "record_date": content.date,
-    "showcase": content.showcase,
-    "description": content.description,
-  });
-  return response.data.success;
-};
-
-const delete_map_summary = async (map_id: string, route_id: number): Promise<boolean> => {
-  const response = await axios.delete(url(`maps/${map_id}/summary`), {
-    data: {
-      "route_id": route_id,
-    }
-  });
-  return response.data.success;
-};
-
-// MAP LEADERBOARDS
-
-const get_map_leaderboard = async (map_id: string): Promise<MapLeaderboard | undefined> => {
-  const response = await axios.get(url(`maps/${map_id}/leaderboards`))
-  if (!response.data.success) {
-    return undefined;
-  }
-  const data = response.data.data;
-  // map the kind of leaderboard
-  data.records = data.records.map((record: any) => {
-    if (record.host && record.partner) {
-      return { ...record, kind: 'multiplayer' };
-    } else {
-      return { ...record, kind: 'singleplayer' };
-    }
-  });
-  // should be unreachable
-  return undefined;
-};
-
-// MAP DISCUSSIONS
-
-const get_map_discussions = async (map_id: string): Promise<MapDiscussions | undefined> => {
-  const response = await axios.get(url(`maps/${map_id}/discussions`));
-  if (!response.data.data.discussions) {
-    return undefined;
-  }
-  return response.data.data;
-};
-
-const get_map_discussion = async (map_id: string, discussion_id: number): Promise<MapDiscussion | undefined> => {
-  const response = await axios.get(url(`maps/${map_id}/discussions/${discussion_id}`));
-  if (!response.data.data.discussion) {
-    return undefined;
-  }
-  return response.data.data;
-};
-
-const post_map_discussion = async (map_id: string, content: MapDiscussionContent): Promise<boolean> => {
-  const response = await axios.post(url(`maps/${map_id}/discussions`), {
-    "title": content.title,
-    "content": content.content,
-  });
-  return response.data.success;
-};
-
-const post_map_discussion_comment = async (map_id: string, discussion_id: number, content: MapDiscussionCommentContent): Promise<boolean> => {
-  const response = await axios.post(url(`maps/${map_id}/discussions/${discussion_id}`), {
-    "comment": content.comment,
-  });
-  return response.data.success;
-};
-
-const delete_map_discussion = async (map_id: string, discussion_id: number): Promise<boolean> => {
-  const response = await axios.delete(url(`maps/${map_id}/discussions/${discussion_id}`));
-  return response.data.success;
 };
diff --git a/frontend/src/api/Auth.tsx b/frontend/src/api/Auth.tsx
new file mode 100644
index 0000000..09269e6
--- /dev/null
+++ b/frontend/src/api/Auth.tsx
@@ -0,0 +1,14 @@
+import axios from "axios";
+import { url } from "./Api";
+
+export const get_token = async (): Promise<string | undefined> => {
+  const response = await axios.get(url(`token`))
+  if (!response.data.success) {
+    return undefined;
+  }
+  return response.data.data.token;
+};
+
+export const delete_token = async () => {
+  await axios.delete(url("token"));
+};
diff --git a/frontend/src/api/Games.tsx b/frontend/src/api/Games.tsx
new file mode 100644
index 0000000..84b5f74
--- /dev/null
+++ b/frontend/src/api/Games.tsx
@@ -0,0 +1,31 @@
+import axios from "axios";
+import { url } from "./Api";
+import { GameChapter, GamesChapters } from "../types/Chapters";
+import { Game } from "../types/Game";
+import { Map } from "../types/Map";
+import { Search } from "../types/Search";
+
+export const get_games = async (): Promise<Game[]> => {
+  const response = await axios.get(url(`games`))
+  return response.data.data;
+};
+
+export const get_chapters = async (chapter_id: string): Promise<GameChapter> => {
+  const response = await axios.get(url(`chapters/${chapter_id}`));
+  return response.data.data;
+}
+
+export const get_games_chapters = async (game_id: string): Promise<GamesChapters> => {
+  const response = await axios.get(url(`games/${game_id}`));
+  return response.data.data;
+};
+
+export const get_game_maps = async (game_id: string): Promise<Map[]> => {
+  const response = await axios.get(url(`games/${game_id}/maps`))
+  return response.data.data.maps;
+};
+
+export const get_search = async (q: string): Promise<Search> => {
+  const response = await axios.get(url(`search?q=${q}`))
+  return response.data.data;
+};
diff --git a/frontend/src/api/Maps.tsx b/frontend/src/api/Maps.tsx
new file mode 100644
index 0000000..fbad78c
--- /dev/null
+++ b/frontend/src/api/Maps.tsx
@@ -0,0 +1,76 @@
+import axios from "axios";
+import { url } from "./Api";
+import { MapDiscussionContent } from "../types/Content";
+import { MapSummary, MapLeaderboard, MapDiscussions, MapDiscussion } from "../types/Map";
+
+export const get_map_summary = async (map_id: string): Promise<MapSummary> => {
+  const response = await axios.get(url(`maps/${map_id}/summary`))
+  return response.data.data;
+};
+
+export const get_map_leaderboard = async (map_id: string): Promise<MapLeaderboard | undefined> => {
+  const response = await axios.get(url(`maps/${map_id}/leaderboards`));
+  console.log(response)
+  if (!response.data.success) {
+    return undefined;
+  }
+  const data = response.data.data;
+  console.log(data.records)
+  // map the kind of leaderboard
+  data.records = data.records.map((record: any) => {
+    if (record.host && record.partner) {
+      return { ...record, kind: 'multiplayer' };
+    } else {
+      return { ...record, kind: 'singleplayer' };
+    }
+  });
+  return data;
+};
+
+export const get_map_discussions = async (map_id: string): Promise<MapDiscussions | undefined> => {
+  const response = await axios.get(url(`maps/${map_id}/discussions`));
+  if (!response.data.data.discussions) {
+    return undefined;
+  }
+  return response.data.data;
+};
+
+export const get_map_discussion = async (map_id: string, discussion_id: number): Promise<MapDiscussion | undefined> => {
+  const response = await axios.get(url(`maps/${map_id}/discussions/${discussion_id}`));
+  if (!response.data.data.discussion) {
+    return undefined;
+  }
+  return response.data.data;
+};
+
+export const post_map_discussion = async (token: string, map_id: string, content: MapDiscussionContent): Promise<boolean> => {
+  const response = await axios.post(url(`maps/${map_id}/discussions`), {
+    "title": content.title,
+    "content": content.content,
+  }, {
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.success;
+};
+
+export const post_map_discussion_comment = async (token: string, map_id: string, discussion_id: number, comment: string): Promise<boolean> => {
+  const response = await axios.post(url(`maps/${map_id}/discussions/${discussion_id}`), {
+    "comment": comment,
+  }, {
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.success;
+};
+
+export const delete_map_discussion = async (token: string, map_id: string, discussion_id: number): Promise<boolean> => {
+  const response = await axios.delete(url(`maps/${map_id}/discussions/${discussion_id}`), {
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.success;
+};
diff --git a/frontend/src/api/Mod.tsx b/frontend/src/api/Mod.tsx
new file mode 100644
index 0000000..9091379
--- /dev/null
+++ b/frontend/src/api/Mod.tsx
@@ -0,0 +1,58 @@
+import axios from "axios";
+import { url } from "./Api";
+import { ModMenuContent } from "../types/Content";
+
+export const put_map_image = async (token: string, map_id: string, image: string): Promise<boolean> => {
+  const response = await axios.put(url(`maps/${map_id}/image`), {
+    "image": image,
+  }, {
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.success;
+};
+
+export const post_map_summary = async (token: string, map_id: string, content: ModMenuContent): Promise<boolean> => {
+  const response = await axios.post(url(`maps/${map_id}/summary`), {
+    "category_id": content.category_id,
+    "user_name": content.name,
+    "score_count": content.score,
+    "record_date": content.date,
+    "showcase": content.showcase,
+    "description": content.description,
+  }, {
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.success;
+};
+
+export const put_map_summary = async (token: string, map_id: string, content: ModMenuContent): Promise<boolean> => {
+  const response = await axios.put(url(`maps/${map_id}/summary`), {
+    "route_id": content.id,
+    "user_name": content.name,
+    "score_count": content.score,
+    "record_date": content.date,
+    "showcase": content.showcase,
+    "description": content.description,
+  }, {
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.success;
+};
+
+export const delete_map_summary = async (token: string, map_id: string, route_id: number): Promise<boolean> => {
+  const response = await axios.delete(url(`maps/${map_id}/summary`), {
+    data: {
+      "route_id": route_id,
+    },
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.success;
+};
diff --git a/frontend/src/api/Rankings.tsx b/frontend/src/api/Rankings.tsx
new file mode 100644
index 0000000..384f826
--- /dev/null
+++ b/frontend/src/api/Rankings.tsx
@@ -0,0 +1,13 @@
+import axios from "axios";
+import { url } from "./Api";
+import { Ranking, SteamRanking } from "../types/Ranking";
+
+export const get_official_rankings = async (): Promise<Ranking> => {
+  const response = await axios.get(url(`rankings/lphub`));
+  return response.data.data;
+};
+
+export const get_unofficial_rankings = async (): Promise<SteamRanking> => {
+  const response = await axios.get(url(`rankings/steam`));
+  return response.data.data;
+};
diff --git a/frontend/src/api/User.tsx b/frontend/src/api/User.tsx
new file mode 100644
index 0000000..c4d1944
--- /dev/null
+++ b/frontend/src/api/User.tsx
@@ -0,0 +1,25 @@
+import axios from "axios";
+import { url } from "./Api";
+import { UserProfile } from "../types/Profile";
+
+export const get_user = async (user_id: string): Promise<UserProfile> => {
+  const response = await axios.get(url(`users/${user_id}`));
+  return response.data.data;
+};
+
+export const get_profile = async (token: string): Promise<UserProfile> => {
+  const response = await axios.get(url(`profile`), {
+    headers: {
+      "Authorization": token,
+    }
+  });
+  return response.data.data;
+};
+
+export const post_profile = async (token: string) => {
+  const _ = await axios.post(url(`profile`), {}, {
+    headers: {
+      "Authorization": token,
+    }
+  });
+};