updated package + routes with new items added

GenerateNU · Feb 15, 2024 · d829b62 · d829b62
1 parent 6345784
commit d829b62
Show file tree

Hide file tree

Showing 5 changed files with 258 additions and 13 deletions.
diff --git a/backend/src/routes/etrade.go b/backend/src/routes/etrade.go
@@ -11,9 +11,9 @@ func SetupETradeRoutes(router *gin.Engine, db *gorm.DB) {
 	etradeService := services.NewETradeService(db)
 	etradeController := controllers.NewETradeController(etradeService)
 
-	etradeRoutes := router.Group("/users/:user_id")
+	etradeRoutes := router.Group("/users/")
 	{
-		etradeRoutes.GET("/etrade-redirect", etradeController.GetRedirectURL)
-		etradeRoutes.POST("/etrade-verify", etradeController.Verify)
+		etradeRoutes.GET("/etrade-redirect/:user_id", etradeController.GetRedirectURL)
+		etradeRoutes.POST("/etrade-verify/:user_id", etradeController.Verify)
 	}
 }
diff --git a/backend/src/routes/user.go b/backend/src/routes/user.go
@@ -20,14 +20,14 @@ func SetupUserRoutes(router *gin.Engine, db *gorm.DB) {
 		userRoutes.PUT("/:id", userController.UpdateUserById)
 		userRoutes.DELETE("/:id", userController.DeleteUserById)
 
-		userRoutes.POST("/:user_id/create-long-term-goal", userController.CreateLongTermGoalForUser)
-		userRoutes.GET("/:user_id/get-long-term-goals", userController.GetLongTermGoalsForUser)
-		userRoutes.PUT("/:user_id/update-long-term-goal/:goal_id", userController.UpdateLongTermGoalForUser)
-		userRoutes.DELETE("/:user_id/delete-long-term-goal/:goal_id", userController.DeleteLongTermGoalForUser)
+		userRoutes.POST("/long-term-goal/:user_id", userController.CreateLongTermGoalForUser)
+		userRoutes.GET("/long-term-goal/:user_id/", userController.GetLongTermGoalsForUser)
+		userRoutes.PUT("/long-term-goal/:user_id/:goal_id", userController.UpdateLongTermGoalForUser)
+		userRoutes.DELETE("/long-term-goal/:user_id/:goal_id", userController.DeleteLongTermGoalForUser)
 
-		userRoutes.POST("/:user_id/create-short-term-goal", userController.CreateShortTermGoalForUser)
-		userRoutes.GET("/:user_id/get-short-term-goals", userController.GetShortTermGoalsForUser)
-		userRoutes.PUT("/:user_id/update-short-term-goal/:goal_id", userController.UpdateShortTermGoalForUser)
-		userRoutes.DELETE("/:user_id/delete-short-term-goal/:goal_id", userController.DeleteShortTermGoalForUser)
+		userRoutes.POST("/short-term-goal/:user_id/", userController.CreateShortTermGoalForUser)
+		userRoutes.GET("/short-term-goal/:user_id/", userController.GetShortTermGoalsForUser)
+		userRoutes.PUT("/short-term-goal/:user_id/:goal_id", userController.UpdateShortTermGoalForUser)
+		userRoutes.DELETE("/short-term-goal/:user_id/:goal_id", userController.DeleteShortTermGoalForUser)
 	}
 }
diff --git a/frontend/App.tsx b/frontend/App.tsx
@@ -7,7 +7,7 @@ import { User } from './types/types';
 export default function App() {
   const [users, setUsers] = useState<User[]>();
   useEffect(() => {
-    getAllUsers().then((data) => setUsers(data))
+    getAllUsers().then((data) => setUsers(data.slice(10)))
   }, [])
   return (
     <View style={styles.container}>

diff --git a/frontend/package.json b/frontend/package.json
@@ -10,6 +10,7 @@
     "web": "expo start --web"
   },
   "dependencies": {
+    "@expo/ngrok": "^4.1.0",
     "@react-navigation/native": "^6.1.9",
     "autoprefixer": "^10.4.16",
     "axios": "^1.6.4",