api work

src/api/endpoints/authentication.ts

@@ -1,11 +1,11 @@
 import client from "../client";
 
-export interface ILoginRequest {
+export interface LoginRequest {
   username: string;
   password: string;
 }
 
-export interface ILoginResponse {
+export interface LoginResponse {
   token: string;
   id: number;
   image: string;
@@ -14,13 +14,13 @@ export interface ILoginResponse {
 export async function login(
   username: string,
   password: string,
-): Promise<ILoginResponse> {
-  const data: ILoginRequest = {
+): Promise<LoginResponse> {
+  const data: LoginRequest = {
     username: username,
     password: password,
   };
 
-  const response = await client.post<ILoginResponse>("/api-token-auth/", data, {
+  const response = await client.post<LoginResponse>("/api-token-auth/", data, {
     headers: {
       Authorization: "", // Skip auth interceptor
     },
@@ -29,7 +29,7 @@ export async function login(
   return response.data;
 }
 
-export interface ICreateUserResponse {
+export interface CreateUserResponse {
   token: string;
   id: number;
   image: string;
@@ -38,13 +38,13 @@ export interface ICreateUserResponse {
 export async function createUser(
   username: string,
   password: string,
-): Promise<ICreateUserResponse> {
-  const data: ILoginRequest = {
+): Promise<CreateUserResponse> {
+  const data: LoginRequest = {
     username: username,
     password: password,
   };
 
-  const response = await client.post<ILoginResponse>("/api/users/", data, {
+  const response = await client.post<LoginResponse>("/api/users/", data, {
     headers: {
       Authorization: "", // Skip auth interceptor
     },

src/api/endpoints/game.ts

@@ -1,65 +1,35 @@
 import client from "../client";
+import { Game } from "../models/game";
 
-export interface IPostStartRequest {
+export interface PostStartRequest {
   tokens: string[];
   official: boolean;
 }
 
 export async function postStart(
   tokens: string[],
   official: boolean,
-): Promise<IGameState> {
-  const data: IPostStartRequest = {
+): Promise<Game> {
+  const data: PostStartRequest = {
     tokens: tokens,
     official: official,
   };
 
   return (await client.post("/api/games/", data)).data;
 }
 
-export interface IGameState {
-  id: number;
-  start_datetime: string;
-  end_datetime?: string;
-  description: string;
-  official: boolean;
-  dnf: boolean;
-  shuffle_indices: number[];
-  cards: ICard[];
-  players: IPlayer[];
-  sips_per_beer: number;
-  has_ended: boolean;
-  description_html: string;
-  location: ILocation;
-  image?: string;
-  token: string;
-}
-
-export interface IPlayer {
-  id: number;
-  username: string;
-  is_superuser: boolean;
-  image_url: string;
-}
-
-export interface ILocation {
-  latitude: number;
-  longitude: number;
-  accuracy: number;
-}
-
-export interface ICard {
-  value: number;
-  suit: string;
-  start_delta_ms?: number;
-  chug_start_start_delta_ms?: number;
-  chug_end_start_delta_ms?: number;
-}
-
-export async function postUpdate(gameState: IGameState): Promise<void> {
+export async function postUpdate(
+  token: string,
+  gameState: Game,
+): Promise<void> {
   return await client.post(
     `/api/games/${gameState.id}/update_state/`,
     gameState,
+    {
+      headers: {
+        Authorization: `GameToken ${token}`,
+      },
+    },
   );
 }
 
@@ -78,7 +48,7 @@ export async function deletePhoto(gameId: number): Promise<void> {
   return await client.delete(`/api/games/${gameId}/delete_image/`);
 }
 
-export interface IResumableGame {
+export interface ResumableGame {
   id: number;
   start_datetime: string;
   players: {
@@ -90,8 +60,8 @@ export interface IResumableGame {
 
 export async function getResumableGames(
   token: string,
-): Promise<IResumableGame[]> {
-  const response = await client.get<IResumableGame[]>("/api/games/resumable/", {
+): Promise<ResumableGame[]> {
+  const response = await client.get<ResumableGame[]>("/api/games/resumable/", {
     headers: {
       Authorization: `Token ${token}`,
     },
@@ -103,7 +73,7 @@ export async function getResumableGames(
 export async function postResumeGame(
   token: string,
   gameId: number,
-): Promise<IGameState> {
+): Promise<Game> {
   const response = await client.post(
     `/api/games/${gameId}/resume/`,
     {},

src/api/endpoints/stats.ts

@@ -1,20 +1,19 @@
 import client from "../client";
 
-export interface IRankedCardResponse {
+export interface RankedCardResponse {
   user_id: number;
   user_username: string;
   user_image: string;
   ranking_name: string;
   ranking_value: string;
 }
 
-export async function getRankedCards(): Promise<IRankedCardResponse[]> {
-  const response =
-    await client.get<IRankedCardResponse[]>("/api/ranked_cards/");
+export async function getRankedCards(): Promise<RankedCardResponse[]> {
+  const response = await client.get<RankedCardResponse[]>("/api/ranked_cards/");
   return response.data;
 }
 
-export interface IUserStatsResponse {
+export interface UserStatsResponse {
   season_number: number;
   total_games: number;
   total_time_played_seconds: number;
@@ -29,11 +28,7 @@ export interface IUserStatsResponse {
   average_chug_time_seconds: number;
 }
 
-export async function getUserStats(
-  userId: number,
-): Promise<IUserStatsResponse> {
-  const response = await client.get<IUserStatsResponse>(
-    `/api/stats/${userId}/`,
-  );
+export async function getUserStats(userId: number): Promise<UserStatsResponse> {
+  const response = await client.get<UserStatsResponse>(`/api/stats/${userId}/`);
   return response.data;
 }

src/api/models/card.ts

@@ -0,0 +1,7 @@
+export interface Card {
+  value: number;
+  suit: string;
+  start_delta_ms?: number;
+  chug_start_start_delta_ms?: number;
+  chug_end_start_delta_ms?: number;
+}

src/api/models/game.ts

@@ -0,0 +1,21 @@
+import { Card } from "./card";
+
+export interface Game {
+  start_datetime: string;
+  official: boolean;
+  player_names: string[];
+  cards: Card[];
+
+  has_ended: boolean;
+  description?: string;
+  dnf: boolean;
+
+  dnf_player_ids: number[];
+
+  id: number;
+  player_ids: number[];
+  token: string;
+  shuffle_indices: number[];
+
+  location?: Location;
+}

src/api/models/location.ts

@@ -0,0 +1,5 @@
+export interface Location {
+  latitude: number;
+  longitude: number;
+  accuracy: number;
+}

src/api/models/player.ts

@@ -0,0 +1,6 @@
+export interface Player {
+  id: number;
+  username: string;
+  is_superuser: boolean;
+  image_url: string;
+}

src/models/card.ts

@@ -7,6 +7,10 @@ type CardSuit = (typeof CardSuits)[number];
 interface Card {
   value: CardValue;
   suit: CardSuit;
+
+  start_delta_ms?: number;
+  chug_start_start_delta_ms?: number;
+  chug_end_start_delta_ms?: number;
 }
 
 const getCardASCIISymbol = (card: Card): string => {
@@ -71,11 +75,11 @@ const getCardImageURI = (card: Card): string => {
 };
 
 export {
+  CardSuits,
+  CardValues,
   getCardASCIISymbol,
-  getCardSuitColor,
   getCardImageURI,
+  getCardSuitColor,
   getCardSuitName,
-  CardValues,
-  CardSuits,
 };
-export type { Card, CardValue, CardSuit };
+export type { Card, CardSuit, CardValue };

src/models/chug.ts

@@ -1,5 +1,6 @@
 interface Chug {
-  duration: number;
+  start_start_delta_ms: number;
+  end_start_delta_ms: number;
 }
 
 export type { Chug };

src/models/game.ts

@@ -0,0 +1,24 @@
+import { Card } from "./card";
+import { Location } from "./location";
+
+interface Game {
+  start_datetime: string;
+  official: boolean;
+  player_names: string[];
+  cards: Card[];
+
+  has_ended: boolean;
+  description?: string;
+  dnf: boolean;
+
+  dnf_player_ids: number[];
+
+  id?: number;
+  player_ids?: number[];
+  token?: string;
+  shuffle_indices?: number[];
+
+  location?: Location;
+}
+
+export type { Game };

src/models/location.ts

@@ -0,0 +1,7 @@
+interface Location {
+  latitude: number;
+  longitude: number;
+  accuracy: number;
+}
+
+export type { Location };

src/stores/game.mapper.ts

@@ -45,4 +45,4 @@ const mapToLocal = (state: IGameState): GameState => {
   };
 };
 
-export { mapToRemote, mapToLocal };
+export { mapToLocal, mapToRemote };