cleanup

6 files changed, 25 insertions, 16 deletions

diff --git a/api/internal/router/router.go b/api/internal/router/router.go
index 3c86b8c..a71c3e6 100644
--- a/api/internal/router/router.go
+++ b/api/internal/router/router.go
@@ -30,10 +30,10 @@ func SetupRouter() *gin.Engine {
         stats := api.Group("/stats")
         stats.Use(middleware.TokenRequired())
         {
-                stats.GET("/", controllers.GetAllStatistics)
-                stats.POST("/", controllers.PostNewStatistic)
-                stats.GET("weekly/", controllers.GetWeeklyStatistics)
-                stats.GET("daily/", controllers.GetDailyUserStatistics)
+                stats.GET("", controllers.GetAllStatistics)
+                stats.POST("", controllers.PostNewStatistic)
+                stats.GET("weekly", controllers.GetWeeklyStatistics)
+                stats.GET("daily", controllers.GetDailyUserStatistics)
                 stats.GET("user/:uuid", controllers.GetUserStatistics)
                 stats.PATCH("user/:uuid", controllers.UpdateUserStatistic)
                 stats.DELETE("user/:uuid", controllers.DeleteUserStatistic)
diff --git a/fe/src/lib/DataView.svelte b/fe/src/lib/DataView.svelte
index 5e81a5a..ffc2fe8 100644
--- a/fe/src/lib/DataView.svelte
+++ b/fe/src/lib/DataView.svelte
@@ -9,6 +9,7 @@
     import Card from "./Card.svelte";
     import Column from "./Column.svelte";
     import AddForm from "./forms/AddForm.svelte";
+    import { apiURL } from "../utils";
 
     let json: Promise<any>;
 
@@ -24,7 +25,7 @@
     let userTotalsData: number[];
 
     async function fetchData() {
-        const res = await fetch("http://localhost:8080/api/v1/stats/", {
+        const res = await fetch(apiURL("stats"), {
             method: "GET",
             headers: {
                 Authorization: `Bearer ${$token}`
@@ -38,7 +39,7 @@
     }
 
     async function fetchDailyUserStatistics() {
-        const res = await fetch("http://localhost:8080/api/v1/stats/daily/", {
+        const res = await fetch(apiURL("stats/daily"), {
             method: "GET",
             headers: {
                 Authorization: `Bearer ${$token}`
@@ -57,7 +58,7 @@
     }
 
     async function fetchWeeklyTotals() {
-        const res = await fetch("http://localhost:8080/api/v1/stats/weekly/", {
+        const res = await fetch(apiURL("stats/weekly"), {
             method: "GET",
             headers: {
                 Authorization: `Bearer ${$token}`
diff --git a/fe/src/lib/LoginForm.svelte b/fe/src/lib/LoginForm.svelte
index 8c3c288..cf5febf 100644
--- a/fe/src/lib/LoginForm.svelte
+++ b/fe/src/lib/LoginForm.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { token, user, preferences } from "../stores/auth";
   import Card from "./Card.svelte";
+  import { apiURL } from "../utils";
 
   let credentials: CredentialObject = {
     username: "",
@@ -28,7 +29,7 @@
     }
     const auth = prepareCredentials(credentials);
 
-    const response = await fetch("http://localhost:8080/api/v1/auth", {
+    const response = await fetch(apiURL("auth"), {
       method: "POST",
       headers: {
         Authorization: `Basic ${auth}`,
diff --git a/fe/src/lib/PreferencesForm.svelte b/fe/src/lib/PreferencesForm.svelte
index 875393c..74b8a63 100644
--- a/fe/src/lib/PreferencesForm.svelte
+++ b/fe/src/lib/PreferencesForm.svelte
@@ -2,6 +2,7 @@
   import { user, preferences, token } from "../stores/auth";
   import { createEventDispatcher, onDestroy, onMount } from "svelte";
   import type { User } from "../types";
+  import { apiURL } from "../utils";
 
   export let open: boolean;
 
@@ -13,9 +14,10 @@
 
   const unsubscribe = preferences.subscribe(
     (value: any) => {
-        console.log('update value: ', value);
-      color = value.color;
-      selectedSize = value.size_id;
+      if (value) {
+        color = value.color;
+        selectedSize = value.size_id;
+      }
     },
   );
 
@@ -24,7 +26,7 @@
   }
 
   async function updateUserPreferences() {
-    const res = await fetch("http://localhost:8080/api/v1/user/preferences", {
+    const res = await fetch(apiURL("user/preferences"), {
       method: "PATCH",
       headers: {
         Authorization: `Bearer ${$token}`,
@@ -34,8 +36,7 @@
   }
 
   async function getUserPreferences() {
-    const res = await fetch(
-      `http://localhost:8080/api/v1/user/${($user as User)!.id}/preferences`,
+    const res = await fetch(apiURL(`user/${($user as User)!.id}/preferences`),
       {
         method: "GET",
         headers: {
@@ -61,7 +62,7 @@
   }
 
   onMount(() => {
-    fetch("http://localhost:8080/api/v1/sizes", {
+    fetch(apiURL("sizes"), {
       method: "GET",
       headers: {
         Authorization: `Bearer ${$token}`,
diff --git a/fe/src/lib/forms/AddForm.svelte b/fe/src/lib/forms/AddForm.svelte
index 4520b1b..f85cce6 100644
--- a/fe/src/lib/forms/AddForm.svelte
+++ b/fe/src/lib/forms/AddForm.svelte
@@ -2,6 +2,7 @@
     import { createEventDispatcher } from "svelte";
     import { token, user } from "../../stores/auth";
     import type { Statistic } from "../../types";
+    import { apiURL } from "../../utils";
 
     export let open: boolean;
 
@@ -37,7 +38,7 @@
     async function handleSubmitStat()
     {
         const { date, quantity } = statistic;
-        await fetch("http://localhost:8080/api/v1/stats/", {
+        await fetch(apiURL("stats"), {
             method: "POST",
             headers: {
                 Authorization: `Bearer ${$token}`
diff --git a/fe/src/utils.ts b/fe/src/utils.ts
index e78556c..9fddf41 100644
--- a/fe/src/utils.ts
+++ b/fe/src/utils.ts
@@ -7,3 +7,8 @@ export function processFormInput(form: HTMLFormElement) {
   }
   return data;
 }
+
+export function apiURL (path: string): string {
+  const baseUrl = import.meta.env?.VITE_API_BASE_URL ?? "http://localhost:8080/api/v1";
+  return `${baseUrl}${path}`
+}