From 4fe405f5786eada8d570552c5820d401c5582063 Mon Sep 17 00:00:00 2001
From: Paolo Brasolin <paolo.brasolin@eurac.edu>
Date: Tue, 8 Mar 2022 09:57:51 +0100
Subject: [PATCH] feat: #fe parameterize backend url
---
.editorconfig | 11 +++++++++++
.gitlab-ci.yml | 3 +++
frontend/.env | 1 +
frontend/.env.development | 1 +
frontend/.env.production | 1 +
frontend/.env.staging | 1 +
frontend/src/js/main.js | 3 +--
7 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 .editorconfig
create mode 100644 frontend/.env
create mode 100644 frontend/.env.development
create mode 100644 frontend/.env.production
create mode 100644 frontend/.env.staging
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..07762f4
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{js,ts,json}]
+indent_size = 2
+indent_style = space
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36a0806..fe488dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,6 +117,8 @@ test-be-node-job:
build-fe-node-job:
extends: .fe-node-job
stage: build
+ variables:
+ NODE_ENV: staging
script:
- npm run build
artifacts:
@@ -176,6 +178,7 @@ build-be-job:
eurac/$GAME_NAME:html5
--userversion ${CI_COMMIT_TAG:-$CI_COMMIT_SHORT_SHA}
+# TODO: we need separate build job for prd
prd-fe-deploy-job:
extends: .fe-deploy-job
environment:
diff --git a/frontend/.env b/frontend/.env
new file mode 100644
index 0000000..e3a814a
--- /dev/null
+++ b/frontend/.env
@@ -0,0 +1 @@
+BACKEND_URL=
diff --git a/frontend/.env.development b/frontend/.env.development
new file mode 100644
index 0000000..92a72bc
--- /dev/null
+++ b/frontend/.env.development
@@ -0,0 +1 @@
+BACKEND_URL=http://localhost:8080/
diff --git a/frontend/.env.production b/frontend/.env.production
new file mode 100644
index 0000000..c7bfebb
--- /dev/null
+++ b/frontend/.env.production
@@ -0,0 +1 @@
+BACKEND_URL=https://kommul.eurac.edu/oetzi/
diff --git a/frontend/.env.staging b/frontend/.env.staging
new file mode 100644
index 0000000..23476c8
--- /dev/null
+++ b/frontend/.env.staging
@@ -0,0 +1 @@
+BACKEND_URL=https://kommul-dev.eurac.edu/oetzi/
diff --git a/frontend/src/js/main.js b/frontend/src/js/main.js
index 95229b5..c760f32 100644
--- a/frontend/src/js/main.js
+++ b/frontend/src/js/main.js
@@ -86,8 +86,7 @@ function preload() {
});
}
-// window.OetziWordsSiteUrlPrefix = "http://localhost:8080/oetzi_words/" //use this to develop
-window.OetziWordsSiteUrlPrefix = "http://localhost:8080/"; // use this to deploy
+window.OetziWordsSiteUrlPrefix = process.env.BACKEND_URL;
let gameRunning = false;
let player;
--
GitLab