feat: add a user context provider to the app

backend/docs/docs.go

@@ -22,9 +22,24 @@ const docTemplate = `{
                     "file"
                 ],
                 "summary": "Upload a file",
+                "parameters": [
+                    {
+                        "type": "file",
+                        "description": "Body with file zip",
+                        "name": "file_data",
+                        "in": "formData",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
-                        "description": "OK"
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.File"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request"
                     }
                 }
             }
@@ -51,6 +66,32 @@ const docTemplate = `{
         }
     },
     "definitions": {
+        "models.File": {
+            "type": "object",
+            "properties": {
+                "file_id": {
+                    "type": "integer"
+                },
+                "file_name": {
+                    "type": "string"
+                },
+                "file_size": {
+                    "type": "integer"
+                },
+                "group_id": {
+                    "type": "integer"
+                },
+                "task_id": {
+                    "type": "integer"
+                },
+                "upload_by": {
+                    "type": "integer"
+                },
+                "upload_date": {
+                    "type": "string"
+                }
+            }
+        },
         "models.Medication": {
             "type": "object",
             "properties": {

backend/docs/swagger.json

@@ -15,9 +15,24 @@
                     "file"
                 ],
                 "summary": "Upload a file",
+                "parameters": [
+                    {
+                        "type": "file",
+                        "description": "Body with file zip",
+                        "name": "file_data",
+                        "in": "formData",
+                        "required": true
+                    }
+                ],
                 "responses": {
                     "200": {
-                        "description": "OK"
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/models.File"
+                        }
+                    },
+                    "400": {
+                        "description": "Bad Request"
                     }
                 }
             }
@@ -44,6 +59,32 @@
         }
     },
     "definitions": {
+        "models.File": {
+            "type": "object",
+            "properties": {
+                "file_id": {
+                    "type": "integer"
+                },
+                "file_name": {
+                    "type": "string"
+                },
+                "file_size": {
+                    "type": "integer"
+                },
+                "group_id": {
+                    "type": "integer"
+                },
+                "task_id": {
+                    "type": "integer"
+                },
+                "upload_by": {
+                    "type": "integer"
+                },
+                "upload_date": {
+                    "type": "string"
+                }
+            }
+        },
         "models.Medication": {
             "type": "object",
             "properties": {

backend/docs/swagger.yaml

@@ -1,5 +1,22 @@
 basePath: /
 definitions:
+  models.File:
+    properties:
+      file_id:
+        type: integer
+      file_name:
+        type: string
+      file_size:
+        type: integer
+      group_id:
+        type: integer
+      task_id:
+        type: integer
+      upload_by:
+        type: integer
+      upload_date:
+        type: string
+    type: object
   models.Medication:
     properties:
       medication_id:
@@ -16,9 +33,19 @@ paths:
   /files/upload:
     post:
       description: Upload a file to database and S3 bucket
+      parameters:
+      - description: Body with file zip
+        in: formData
+        name: file_data
+        required: true
+        type: file
       responses:
         "200":
           description: OK
+          schema:
+            $ref: '#/definitions/models.File'
+        "400":
+          description: Bad Request
       summary: Upload a file
       tags:
       - file

backend/schema/files/routes.go

@@ -28,10 +28,13 @@ func GetFileGroup(v1 *gin.RouterGroup, c *PgModel) *gin.RouterGroup {
 //	@summary		Upload a file
 //	@description	Upload a file to database and S3 bucket
 //	@tags			file
-//	@success		200
+//	@param			file_data	formData	file	true	"Body with file zip"
+//
+//	@success		200			{object}	models.File
+//	@failure		400
 //	@router			/files/upload [post]
 func (pg *PgModel) UploadFileRoute(c *gin.Context) {
-	// TODO: Ensure Swagger Knows about there bad request returns!!!
+	// TODO: Ensure Swagger Knows about the bad request returns!!!
 	var file models.File
 
 	if err := c.Bind(&file); err != nil {

client/App.tsx

@@ -1,57 +1,14 @@
 import * as React from 'react';
-import { Text } from 'react-native';
-import { createNativeStackNavigator } from '@react-navigation/native-stack';
-import { NavigationContainer, NavigationProp } from '@react-navigation/native';
-import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
-import LoginPage from './screens/Login';
-import MedList from './screens/Medication';
-import Home from './assets/home.svg';
-import DocPickerButton from './components/DocPickerButton';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import Router from './navigation/Router';
+import UserContext from './contexts/userContext';
 
-export type ScreenNames = ['BottomNav', 'Landing', 'TEMP-FileUpload', 'Login'];
-export type RootStackParamList = Record<ScreenNames[number], any>;
-export type StackNavigation = NavigationProp<RootStackParamList>;
-
-const Stack = createNativeStackNavigator<RootStackParamList>();
-const Tab = createBottomTabNavigator();
-
-// TODO: figure out a way to do this better, I didnt enjoy this way of doing it in SaluTemp there HAS to be a better way
 export default function App() {
   return (
-    <NavigationContainer>
-      <Stack.Navigator>
-        <Stack.Screen
-          name="Login"
-          options={{ headerShown: true }}
-          component={LoginPage}
-        />
-        <Stack.Screen
-          name="BottomNav"
-          options={{ headerShown: false }}
-          component={Tabs}
-        />
-        <Stack.Screen
-          name="TEMP-FileUpload"
-          options={{ headerShown: true }}
-          component={DocPickerButton}
-        />
-      </Stack.Navigator>
-    </NavigationContainer>
-  );
-}
-
-function Tabs() {
-  return (
-    <Tab.Navigator>
-      <Tab.Screen
-        name="Landing"
-        options={{
-          headerShown: true,
-          tabBarIcon: () => <Home color={'gray'} />,
-          tabBarLabel: () => <Text>Landing</Text>
-        }}
-        component={MedList}
-      />
-    </Tab.Navigator>
+    <UserContext>
+      <SafeAreaView className="flex-1">
+        <Router />
+      </SafeAreaView>
+    </UserContext>
   );
 }

client/components/Card.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
-import { StyleSheet, View, GestureResponderEvent, Text } from 'react-native';
+import { StyleSheet } from 'react-native';
 import { Card } from 'react-native-paper';
-import { useNavigation } from '@react-navigation/native';
+import { Medication } from '../types/medication';
 
 interface ClickableCardProps {
   med: Medication[];

client/components/PopupModal.tsx

@@ -6,6 +6,7 @@ import {
   Button,
   Provider as PaperProvider
 } from 'react-native-paper';
+import { Medication } from '../types/medication';
 
 interface PopupModalProps {
   med: Medication[];

client/contexts/userContext.tsx

@@ -0,0 +1,45 @@
+import React, { createContext, useContext, useEffect, useState } from 'react';
+import { getAuth, onAuthStateChanged } from 'firebase/auth';
+import { User } from '../types/user';
+
+type UserContextData = {
+  user: User;
+};
+
+const UserContext = createContext({} as UserContextData);
+
+// TODO: Add Group ID, and User Role to this.
+// TODO: Should maybe be a group prop and not inside user.
+// TODO: make name more generic
+export default function UserProvider({ children }: { children: any }) {
+  const [user, setUser] = useState({} as User);
+  const auth = getAuth();
+
+  useEffect(() => {
+    onAuthStateChanged(auth, (user) => {
+      const signedInUser: User = {
+        userID: user?.uid ?? '',
+        userEmail: user?.email ?? ''
+      };
+      setUser(signedInUser);
+    });
+  }, []);
+
+  const UserStore: UserContextData = {
+    user: user
+  };
+
+  return (
+    <UserContext.Provider value={UserStore}>{children}</UserContext.Provider>
+  );
+}
+
+export const useUser = (): UserContextData => {
+  const context = useContext(UserContext);
+
+  if (!context) {
+    throw new Error('useUser must be used within a UserProvider');
+  }
+
+  return context;
+};

client/navigation/AppNavigation.tsx

@@ -0,0 +1,28 @@
+import React from 'react';
+import { NavigationProp } from '@react-navigation/native';
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+import LoginPage from '../screens/Login';
+import AppStackBottomTabNavigator from './BottomTabNavigator';
+
+export type AppScreenNames = ['BottomNavScreens', 'Landing', 'Login'];
+type AppStackParamList = Record<AppScreenNames[number], any>;
+
+export type AppStackNavigation = NavigationProp<AppStackParamList>;
+const AppStack = createNativeStackNavigator<AppStackParamList>();
+
+export default function AppNavigation() {
+  return (
+    <AppStack.Navigator>
+      <AppStack.Screen
+        name="Login"
+        options={{ headerShown: true }}
+        component={LoginPage}
+      />
+      <AppStack.Screen
+        name="BottomNavScreens"
+        options={{ headerShown: false }}
+        component={AppStackBottomTabNavigator}
+      />
+    </AppStack.Navigator>
+  );
+}

client/navigation/BottomTabNavigator.tsx

@@ -0,0 +1,23 @@
+import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
+import React from 'react';
+import MedList from '../screens/Medication';
+import { Text } from 'react-native';
+import Home from '../assets/home.svg';
+
+const AppStackBottomTab = createBottomTabNavigator();
+
+export default function AppStackBottomTabNavigator() {
+  return (
+    <AppStackBottomTab.Navigator>
+      <AppStackBottomTab.Screen
+        name="Landing"
+        options={{
+          headerShown: true,
+          tabBarIcon: () => <Home color={'gray'} />,
+          tabBarLabel: () => <Text>Landing</Text>
+        }}
+        component={MedList}
+      />
+    </AppStackBottomTab.Navigator>
+  );
+}

client/navigation/Router.tsx

@@ -0,0 +1,11 @@
+import React from 'react';
+import { NavigationContainer } from '@react-navigation/native';
+import AppNavigation from './AppNavigation';
+
+export default function Router() {
+  return (
+    <NavigationContainer>
+      <AppNavigation />
+    </NavigationContainer>
+  );
+}