diff --git a/.gitea/workflows/deploy-api.yaml b/.gitea/workflows/deploy-api.yaml index bff3cdb..b86417e 100644 --- a/.gitea/workflows/deploy-api.yaml +++ b/.gitea/workflows/deploy-api.yaml @@ -5,8 +5,8 @@ run-name: "${{ gitea.event.head_commit.message }}: Deploy API" on: push: - branches: - - main + #branches: + # - main paths: - "api/**" - ".gitea/workflows/deploy-api.yaml" diff --git a/.gitignore b/.gitignore index 7869988..6e48099 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ # empty for now # .env # urrp I eated it :33 + +# this one is for real though +client/.env diff --git a/client/src/api/UsersApi.ts b/client/src/api/UsersApi.ts index 3c8d01b..b5d27d9 100644 --- a/client/src/api/UsersApi.ts +++ b/client/src/api/UsersApi.ts @@ -9,8 +9,9 @@ import type { User } from "../models/User.ts"; const API_URL: string = "/users"; +const baseUrl: string = import.meta.env.DEV ? import.meta.env.VITE_DEV_API_URL : import.meta.env.VITE_PROD_API_URL; // TODO: overarching api service const api = axios.create({ - baseURL: "http://10.145.164.106:5227/api" + baseURL: baseUrl }); export const getUsers = () => api.get(`${API_URL}`); diff --git a/scripts/execute_all.sh b/scripts/execute_all.sh index b0ac7d1..3d17957 100755 --- a/scripts/execute_all.sh +++ b/scripts/execute_all.sh @@ -1,4 +1,9 @@ # idk yet -dotnet ./api/test.cs +#dotnet ./api/test.cs + +set ASPNETCORE_ENVIRONMENT=Development +dotnet run + +npm run dev