fixed up client baseApi

dashboard/src/main/Login.tsx

@@ -39,7 +39,7 @@ export default class Login extends Component<PropsType, StateType> {
       api.logInUser('<token>', {
         email: email,
         password: password
-      }, (err: any, res: any) => {
+      }, {}, (err: any, res: any) => {
         // TODO: case and set credential error
 
         console.log(err)

dashboard/src/main/Main.tsx

@@ -20,8 +20,8 @@ type StateType = {
 export default class Main extends Component<PropsType, StateType> {
   state = {
     isLoading: false,
-    isLoggedIn: true,
-    uninitialized: false,
+    isLoggedIn: false,
+    uninitialized: true,
   };
 
   componentDidMount() {

dashboard/src/main/Register.tsx

@@ -47,7 +47,7 @@ export default class Register extends Component<PropsType, StateType> {
       api.registerUser('', {
         email: email,
         password: password
-      }, (err: any, res: any) => {
+      }, {}, (err: any, res: any) => {
         err ? setCurrentError(JSON.stringify(err)) : authenticate();
       });
     } 

dashboard/src/main/home/sidebar/ClusterSection.tsx

@@ -2,7 +2,9 @@ import React, { Component } from 'react';
 import styled from 'styled-components';
 import drawerBg from '../../../assets/drawer-bg.png';
 
+import api from '../../../shared/api';
 import { Context } from '../../../shared/Context';
+
 import Drawer from './Drawer';
 
 type PropsType = {
@@ -13,7 +15,8 @@ type PropsType = {
 type StateType = {
   configExists: boolean,
   showDrawer: boolean,
-  initializedDrawer: boolean
+  initializedDrawer: boolean,
+  clusters: any[]
 };
 
 export default class ClusterSection extends Component<PropsType, StateType> {
@@ -23,10 +26,21 @@ export default class ClusterSection extends Component<PropsType, StateType> {
     configExists: false,
     showDrawer: false,
     initializedDrawer: false,
+    clusters: [],
   };
 
   componentDidMount() {
-    // TODO: Check if
+    let { setCurrentError } = this.context;
+
+    api.getClusters('<token>', {}, { id: 0 }, (err: any, res: any) => {      
+      if (err) {
+        setCurrentError(JSON.stringify(err));
+      } else {
+        // TODO: need a separate query for checking if config has been set
+
+        this.setState({ clusters: res.data.clusters });
+      }
+    });
   }
 
   // Need to override showDrawer when the sidebar is closed

dashboard/src/main/home/sidebar/Sidebar.tsx

@@ -81,7 +81,7 @@ export default class Sidebar extends Component<PropsType, StateType> {
     let { setCurrentError } = this.context;
 
     // Attempt user logout
-    api.logOutUser('<token>', {}, (err, res) => {
+    api.logOutUser('<token>', {}, {}, (err: any, res: any) => {
       // TODO: case and set logout error
       
       err ? setCurrentError(JSON.stringify(err)) : logOut();

dashboard/src/shared/api.tsx

@@ -21,9 +21,14 @@ const logInUser = baseApi<{
 
 const logOutUser = baseApi<{}>('GET', '/api/logout');
 
+const getClusters = baseApi<{}, { id: number }>('GET', (pathParams) => {
+  return `/api/users/${pathParams.id}/clusters`;
+});
+
 // Bundle export to allow default api import
 export default {
   registerUser,
   logInUser,
-  logOutUser
+  logOutUser,
+  getClusters
 }

dashboard/src/shared/baseApi.tsx

@@ -1,15 +1,15 @@
 import axios from 'axios';
 
 // Partial function that accepts a generic params type and returns an api method
-export const baseApi = <T extends {}, S = {}>(requestType: string, endpoint: ((pathParams?: S) => string) | string) => {
-  return (token: string, params: T, callback?: (err: any, res: any) => void) => {
+export const baseApi = <T extends {}, S = {}>(requestType: string, endpoint: ((pathParams: S) => string) | string) => {
+  return (token: string, params: T, pathParams: S, callback?: (err: any, res: any) => void) => {
 
     // Generate endpoint literal
     let endpointString: ((pathParams: S) => string) | string;
     if (typeof endpoint === 'string') {
       endpointString = endpoint;
     } else {
-      endpointString = 'fuck'
+      endpointString = endpoint(pathParams);
     }
 
     // Handle request type (can refactor)