From 416d91a0e6e097a27935f52ba0a589d47060c08c Mon Sep 17 00:00:00 2001 From: Florian Sylvain Date: Fri, 13 Jan 2023 17:30:46 +0100 Subject: [PATCH] Fix URLs tentative --- README.md | 3 ++- cmd/main.go | 10 +++++----- web/admin-gui/src/utils/api.ts | 2 +- web/admin-gui/src/utils/database.ts | 1 - 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5a659a8..63da8ae 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ docker-compose up TODO ## Environment variables - ./env - - APP_HOST_ADDRESS + - APP_API_ADDRESS + - APP_FRONT_ADDRESS - APP_API_PORT - APP_FRONT_PORT - APP_JWT_SECRET diff --git a/cmd/main.go b/cmd/main.go index 7958fa9..30023d0 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -11,9 +11,9 @@ import ( ) var ( - ginMode string - apiPort string - hostAddress string + ginMode string + apiPort string + apiAddress string ) func initEnvVariables() { @@ -23,7 +23,7 @@ func initEnvVariables() { ginMode = os.Getenv("APP_GIN_MODE") apiPort = os.Getenv("APP_API_PORT") - hostAddress = os.Getenv("APP_HOST_ADDRESS") + apiAddress = os.Getenv("APP_FRONT_ADDRESS") } func initJWT() { @@ -40,7 +40,7 @@ func initBasicRoutes(r *gin.Engine) { } func corsMiddleware(c *gin.Context) { - c.Writer.Header().Set("Access-Control-Allow-Origin", fmt.Sprintf("http://%v", hostAddress)) + c.Writer.Header().Set("Access-Control-Allow-Origin", fmt.Sprintf("http://%v", apiAddress)) c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") diff --git a/web/admin-gui/src/utils/api.ts b/web/admin-gui/src/utils/api.ts index 1267014..af2a962 100644 --- a/web/admin-gui/src/utils/api.ts +++ b/web/admin-gui/src/utils/api.ts @@ -1 +1 @@ -export const baseApiUrl = `http://${__APP_ENV__.APP_HOST_ADDRESS}` \ No newline at end of file +export const baseApiUrl = `http://${__APP_ENV__.APP_API_ADDRESS}` \ No newline at end of file diff --git a/web/admin-gui/src/utils/database.ts b/web/admin-gui/src/utils/database.ts index 5d8f9da..a56c126 100644 --- a/web/admin-gui/src/utils/database.ts +++ b/web/admin-gui/src/utils/database.ts @@ -1,4 +1,3 @@ -import { useAuthStore } from "@/stores/AuthStore" import { baseApiUrl } from "@/utils/api" export interface Article {