Merge branch 'dev' into staging

ludchieng · Nov 23, 2022 · decb7d9 · decb7d9
2 parents 93ca575 + 4f9dc49
commit decb7d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ node_modules
 
 
 # local env files
+.env
 .env.local
 .env.*.local
 

diff --git a/src/App.vue b/src/App.vue
@@ -27,7 +27,7 @@ export default Vue.extend({
       })
     }
     // Ping server to wake it up
-    fetch('https://idfm-prim.herokuapp.com/')
+    fetch(process.env.VUE_APP_API_URL)
   },
   watch: {
     '$route.params.tab': {

diff --git a/src/utils/fetcher.ts b/src/utils/fetcher.ts
@@ -34,7 +34,7 @@ export const fetchTimetables = async (
   return new Promise((resolve) => {
     for (const mref of mrefs) {
       // TODO Cancel fetch on stop change
-      fetch(`https://idfm-prim.herokuapp.com/stop-monitoring?MonitoringRef=STIF:StopPoint:Q:${mref}:`, {
+      fetch(`${process.env.VUE_APP_API_URL}/stop-monitoring?MonitoringRef=STIF:StopPoint:Q:${mref}:`, {
         ...(abortSignal && { signal: abortSignal }),
       })
         .then(res => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ node_modules @@
     # local env files
+    .env
     .env.local
     .env.*.local
@@ Expand Down @@