fix: dev env

Author: Angular2Guy

backend/pkd/controller/basecontroller.go

@@ -28,28 +28,29 @@ import (
 )
 
 func Start(embeddedFiles fs.FS) {
+	apiBase := "/api"
 	router := gin.Default()
 	router.Use(gzip.Gzip(gzip.DefaultCompression))
-	router.POST("/appuser/signin", postSignin)
-	router.POST("/appuser/login", postLogin)
-	router.GET("/appuser/logout", token.CheckToken, getLogout)
-	router.GET("/appuser/location", token.CheckToken, getLocation)
-	router.GET("/appuser/refreshtoken", token.CheckToken, getRefreshToken)
-	router.POST("/appuser/locationradius", token.CheckToken, postUserLocationRadius)
-	router.POST("/appuser/targetprices", token.CheckToken, postTargetPrices)
-	router.GET("/config/updategs", token.CheckToken, gsclient.UpdateGasStations)
-	router.GET("/config/updatepc", token.CheckToken, getPostCodeCoordinates)
-	router.GET("/config/updatestatescounties", token.CheckToken, getStateCountyData)
-	router.GET("/config/recalcAvgs", token.CheckToken, getRecalcAvgs)
-	router.GET("/gasprice/:id", token.CheckToken, getGasPriceByGasStationId)
-	router.GET("/gasstation/:id", token.CheckToken, getGasStationById)
-	router.GET("/gasprice/avgs/:postcode", token.CheckToken, getAveragePrices)
-	router.POST("/gasstation/search/place", token.CheckToken, searchGasStationPlace)
-	router.POST("/gasstation/search/location", token.CheckToken, searchGasStationLocation)
-	router.GET("/usernotification/new/:useruuid", token.CheckToken, getNewUserNotifications)
-	router.GET("/usernotification/current/:useruuid", token.CheckToken, getCurrentUserNotifications)
-	router.GET("/postcode/countytimeslots/:postcode", token.CheckToken, getCountyDataByIdWithTimeSlots)
-	router.GET("/gasstation/countytimeslots/recalc", token.CheckToken, getRecalcTimeSlots)
+	router.POST(apiBase+"/appuser/signin", postSignin)
+	router.POST(apiBase+"/appuser/login", postLogin)
+	router.GET(apiBase+"/appuser/logout", token.CheckToken, getLogout)
+	router.GET(apiBase+"/appuser/location", token.CheckToken, getLocation)
+	router.GET(apiBase+"/appuser/refreshtoken", token.CheckToken, getRefreshToken)
+	router.POST(apiBase+"/appuser/locationradius", token.CheckToken, postUserLocationRadius)
+	router.POST(apiBase+"/appuser/targetprices", token.CheckToken, postTargetPrices)
+	router.GET(apiBase+"/config/updategs", token.CheckToken, gsclient.UpdateGasStations)
+	router.GET(apiBase+"/config/updatepc", token.CheckToken, getPostCodeCoordinates)
+	router.GET(apiBase+"/config/updatestatescounties", token.CheckToken, getStateCountyData)
+	router.GET(apiBase+"/config/recalcAvgs", token.CheckToken, getRecalcAvgs)
+	router.GET(apiBase+"/gasprice/:id", token.CheckToken, getGasPriceByGasStationId)
+	router.GET(apiBase+"/gasstation/:id", token.CheckToken, getGasStationById)
+	router.GET(apiBase+"/gasprice/avgs/:postcode", token.CheckToken, getAveragePrices)
+	router.POST(apiBase+"/gasstation/search/place", token.CheckToken, searchGasStationPlace)
+	router.POST(apiBase+"/gasstation/search/location", token.CheckToken, searchGasStationLocation)
+	router.GET(apiBase+"/usernotification/new/:useruuid", token.CheckToken, getNewUserNotifications)
+	router.GET(apiBase+"/usernotification/current/:useruuid", token.CheckToken, getCurrentUserNotifications)
+	router.GET(apiBase+"/postcode/countytimeslots/:postcode", token.CheckToken, getCountyDataByIdWithTimeSlots)
+	router.GET(apiBase+"/gasstation/countytimeslots/recalc", token.CheckToken, getRecalcTimeSlots)
 
 	myPort := strings.TrimSpace(os.Getenv("PORT"))
 	portNum, err := strconv.ParseInt(myPort, 10, 0)

frontend/app/service/http-client.ts

@@ -25,7 +25,7 @@ const fetchGasStations = async function (jwtToken: string, controller: AbortCont
     body: JSON.stringify({ Longitude: globalUserDataState.Longitude, Latitude: globalUserDataState.Latitude, Radius: globalUserDataState.SearchRadius }),
     signal: controller?.signal
   }
-  const result = await fetch('/gasstation/search/location', requestOptions2);
+  const result = await fetch('/api/gasstation/search/location', requestOptions2);
   const myResult = result.json() as Promise<GasStation[]>;
   return myResult;
 };
@@ -36,7 +36,7 @@ const fetchPriceAvgs = async function (jwtToken: string, controller: AbortContro
     headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${jwtToken}` },
     signal: controller?.signal
   }
-  const result = await fetch(`/gasprice/avgs/${myPostcode}`, requestOptions3);
+  const result = await fetch(`/api/gasprice/avgs/${myPostcode}`, requestOptions3);
   return result.json() as Promise<GasPriceAvgs>;
 }
 
@@ -46,7 +46,7 @@ const fetchUserNotifications = async function (jwtToken: string, controller: Abo
     headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${jwtToken}` },
     signal: controller?.signal
   }
-  const result = await fetch(`/usernotification/current/${globalUserUuidState}`, requestOptions1);
+  const result = await fetch(`/api/usernotification/current/${globalUserUuidState}`, requestOptions1);
   return result.json() as Promise<Notification[]>;
 }
 
@@ -56,20 +56,20 @@ const fetchTimeSlots = async function (jwtToken: string, controller: AbortContro
     headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${jwtToken}` },
     signal: controller?.signal
   }
-  const result = await fetch(`/postcode/countytimeslots/${myPostcode}`, requestOptions2);
+  const result = await fetch(`/api/postcode/countytimeslots/${myPostcode}`, requestOptions2);
   const myResult = result.json() as Promise<TimeSlotResponse[]>;
   return myResult;
 }
 
 const postLogin = async function (userName: string, password1: string, controller: AbortController | null): Promise<UserResponse> {
   const requestOptions = loginSigninOptions(userName, password1, controller);
-  const result = await fetch('/appuser/login', requestOptions);
+  const result = await fetch('/api/appuser/login', requestOptions);
   return result.json() as Promise<UserResponse>;
 }
 
 const postSignin = async function (userName: string, password1: string, controller: AbortController | null): Promise<UserResponse> {
   const requestOptions = loginSigninOptions(userName, password1, controller);
-  const result = await fetch('/appuser/signin', requestOptions);
+  const result = await fetch('/api/appuser/signin', requestOptions);
   return result.json() as Promise<UserResponse>;
 }
 
@@ -89,7 +89,7 @@ const postLocationRadius = async function (jwtToken: string, controller: AbortCo
     body: requestString,
     signal: controller?.signal
   };
-  const response = await fetch('/appuser/locationradius', requestOptions);
+  const response = await fetch('/api/appuser/locationradius', requestOptions);
   const userResponse = response.json() as UserResponse;
   return userResponse;
 }
@@ -100,7 +100,7 @@ const fetchLocation = async function (jwtToken: string, controller: AbortControl
     headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${jwtToken}` },
     signal: controller?.signal
   };
-  const response = await fetch(`/appuser/location?location=${location}`, requestOptions);
+  const response = await fetch(`/api/appuser/location?location=${location}`, requestOptions);
   const locations = response.json() as Promise<PostCodeLocation[]>;
   return locations;
 }
@@ -112,7 +112,7 @@ const postTargetPrices = async function (jwtToken: string, controller: AbortCont
     body: requestString,
     signal: controller?.signal
   };
-  const response = await fetch('/appuser/targetprices', requestOptions);
+  const response = await fetch('/api/appuser/targetprices', requestOptions);
   const result = response.json() as Promise<UserResponse>;
   return result;
 }

frontend/vite.config.ts

@@ -17,4 +17,14 @@ import tsconfigPaths from "vite-tsconfig-paths";
 
 export default defineConfig({
   plugins: [tailwindcss(), reactRouter(), tsconfigPaths()],
+   server: {
+    proxy: {
+      // Proxy all requests starting with /api to http://localhost:3000
+      '/api': {
+        target: 'http://localhost:3000',
+        changeOrigin: true,
+        //rewrite: (path) => path.replace(/^\/api/, ''), // remove /api prefix
+      },
+    },
+  },
 });