fixing commit bugs

Author: WilliamRChiu

frontend/src/data/response.ts

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 export interface MainCommandResponse {
   id: number;
   name: string
@@ -23,3 +24,30 @@ export interface CommandResponse {
 export interface CommandListResponse {
   data: CommandResponse[]
 }
+=======
+export interface MainCommandResponse {
+  id: number;
+  name: string
+  params: string | null;
+  format: string | null;
+  data_size: number;
+  total_size: number;
+}
+
+export interface MainCommandListResponse {
+  data: MainCommandResponse[]
+}
+
+export interface CommandResponse {
+  id: number
+  name: string
+  params: string | null
+  format: string | null
+  created_on: string
+  updated_on: string
+}
+
+export interface CommandListReponse {
+  data: CommandResponse[]
+}
+>>>>>>> parent of bcd74d4 (Made changes to frontend based on Kashif's feedback (#3))

frontend/src/display/command_api.ts

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import axios from "axios";
 import { CommandListResponse } from "../data/response";
 import { API_URL } from "../environment";
@@ -20,3 +21,18 @@ export const getCommands = async (): Promise<CommandListResponse> => {
  * @param id: command to delete
  * @returns Promise<CommandListResponse>: list of commands after the command with the given id was deleted
  */
+=======
+import axios from "axios";
+import { CommandListReponse } from "../data/response";
+import { API_URL } from "../environment";
+
+export const getCommands = async (): Promise<CommandListReponse> => {
+  try {
+    const { data } = await axios.get<CommandListReponse>(`${API_URL}/commands/`)
+    return data;
+  } catch (error) {
+    console.error(error)
+    throw error
+  }
+}
+>>>>>>> parent of bcd74d4 (Made changes to frontend based on Kashif's feedback (#3))

frontend/src/display/row.tsx

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { CommandStatusMapping } from "../data/other";
 import { CommandResponse } from "../data/response";
 
@@ -20,3 +21,26 @@ const CommandRow = ({ id, command_type, params, status, created_on, updated_on,
 }
 
 export default CommandRow;
+=======
+import { CommandResponse } from "../data/response";
+
+interface CommandRowProp extends CommandResponse {
+  handleDelete: () => void;
+}
+
+const CommandRow = ({ id, name, params, format, created_on, updated_on, handleDelete }: CommandRowProp) => {
+  return (
+    <tr>
+      <th>{id}</th>
+      <th>{name}</th>
+      <th>{params}</th>
+      <th>{format}</th>
+      <th>{created_on}</th>
+      <th>{updated_on}</th>
+      <th><button onClick={handleDelete}>Delete {id}</button></th>
+    </tr>
+  )
+}
+
+export default CommandRow;
+>>>>>>> parent of bcd74d4 (Made changes to frontend based on Kashif's feedback (#3))

frontend/src/display/table.tsx

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { useEffect, useState } from "react"
 import { CommandResponse } from "../data/response"
 import { getCommands } from "./command_api"
@@ -44,3 +45,50 @@ const CommandTable = () => {
 }
 
 export default CommandTable;
+=======
+import { useEffect, useState } from "react"
+import { CommandResponse } from "../data/response"
+import { getCommands } from "./command_api"
+import CommandRow from "./row"
+
+const CommandTable = () => {
+  const [commands, setCommands] = useState<CommandResponse[]>([])
+
+  const getCommandsFn = async () => {
+    const data = await getCommands();
+    setCommands(data.data)
+  }
+
+  useEffect(() => {
+    getCommandsFn();
+  }, [])
+
+  const handleDelete = (id: number) => {
+    return () => {
+      // TODO: (Member) Handle delete logic here
+
+    }
+  }
+
+  return (
+    <table>
+      <thead>
+        <tr>
+          <th>ID: </th>
+          <th>Name: </th>
+          <th>Params: </th>
+          <th>Format: </th>
+          <th>Created On: </th>
+          <th>Updated On: </th>
+          <th>Delete</th>
+        </tr>
+      </thead>
+      <thead>
+        {commands.map(value => (<CommandRow {...value} handleDelete={handleDelete(value.id)} />))}
+      </thead>
+    </table>
+  )
+}
+
+export default CommandTable;
+>>>>>>> parent of bcd74d4 (Made changes to frontend based on Kashif's feedback (#3))

frontend/src/input/input_api.ts

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { API_URL } from "../environment";
 import { CommandRequest } from "../data/request";
 import axios from "axios";
@@ -23,3 +24,30 @@ export const getMainCommands = async (): Promise<MainCommandListResponse> => {
     throw error;
   }
 }
+=======
+import { API_URL } from "../environment";
+import { CommandRequest } from "../data/request";
+import axios from "axios";
+import { CommandResponse, MainCommandListResponse } from "../data/response";
+
+export const createCommand = async (requestData: CommandRequest): Promise<CommandResponse | undefined> => {
+  try {
+    const { data } = await axios.post<CommandResponse>(`${API_URL}/commands`, requestData);
+    return data
+  } catch (error) {
+    console.error(error);
+    throw error;
+  }
+}
+
+export const getMainCommands = async (): Promise<MainCommandListResponse> => {
+  try {
+    const { data } = await axios.get<MainCommandListResponse>(`${API_URL}/main-commands/`);
+    console.log(data)
+    return data;
+  } catch (error) {
+    console.error(error)
+    throw error;
+  }
+}
+>>>>>>> parent of bcd74d4 (Made changes to frontend based on Kashif's feedback (#3))