Cw/azure net70 (#18)

* added debug .env file * added debug .env file * setting change * added debug .env file * setting change * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * designer env files * ci: add Azure Static Web Apps workflow file on-behalf-of: @Azure [email protected] * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added azure workflow * added log msg to createCustomInstance * added log msg to createCustomInstance * added log msg to createCustomInstance * added log msg to createCustomInstance * added log msg to createCustomInstance * added log msg to createCustomInstance * added log msg to createCustomInstance * moved clearing of token on logout code * added location log message * added location log message * added location log message * removed homepage form package.json * added staticwebapp config file * Added localstorage reset * Added localstorage reset * Added revert changes from dev * Fixed file uploading processing * took out editorRef * config update * added process.env log * added process.env log * added process.env log * added process.env log * added process.env log * added process.env log * added process.env log * added process.env log * added process.env log * cleanup package.json * cleanup package.json * Update azure-static-web-apps-nice-island-07c034910.yml * Update azure-static-web-apps-nice-island-07c034910.yml --------- Co-authored-by: Corey Wirun <[email protected]>
olab · Mar 29, 2024 · 44673ae · 44673ae
1 parent e1be51a
commit 44673ae
Show file tree

Hide file tree

Showing 14 changed files with 195 additions and 119 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,5 @@
 PROJECT_VERSION=4
 PLAYER_PUBLIC_URL=/player
-PUBLIC_URL=/
-xAPI_URL=https://localhost:7071/olab/api/v3
-API_URL=https://olabdevapi.azurewebsites.net/olab/api/v3
+PUBLIC_URL=/designer
+API_URL=https://logan.cardinalcreek.ca/olab/api/v3
 NODE_ENV=production
diff --git a/.env.azure b/.env.azure
@@ -0,0 +1,5 @@
+PROJECT_VERSION=4
+PLAYER_PUBLIC_URL=/player
+PUBLIC_URL=/
+API_URL=https://olabdevapi.azurewebsites.net/olab/api/v3
+NODE_ENV=production
diff --git a/.env.debug b/.env.debug
@@ -0,0 +1,5 @@
+PROJECT_VERSION=4
+PLAYER_PUBLIC_URL=/player
+PUBLIC_URL=/designer
+API_URL=https://logan.cardinalcreek.ca/olab/api/v3
+NODE_ENV=production
diff --git a/.env.development b/.env.development
@@ -0,0 +1,4 @@
+PROJECT_VERSION=4
+PLAYER_PUBLIC_URL=/playerdebug
+PUBLIC_URL=/designerdebug
+API_URL=https://logan.cardinalcreek.ca/olabdebug/api/v3
diff --git a/.env.production b/.env.production
@@ -0,0 +1,4 @@
+PROJECT_VERSION=4
+PLAYER_PUBLIC_URL=/player
+PUBLIC_URL=/designer
+API_URL=https://logan.cardinalcreek.ca/olab/api/v3
diff --git a/.gitignore b/.gitignore
@@ -55,7 +55,7 @@ typings/
 .yarn-integrity
 
 # dotenv environment variables file
-.env
+#.env
 
 # next.js build output
 .next

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,20 +4,33 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "Attach",
+      "address": "10.168.1.85",
+      "port": 9229,
+      "localRoot": "${workspaceRoot}",
+      "remoteRoot": "/home/wirunc/devel/debug/Designer",
+      "restart": false,
+      "sourceMaps": false,
+      "request": "attach",
+      "skipFiles": ["<node_internals>/**"],
+      "type": "node",
+      "envFile": "${workspaceFolder}/.env.debug"
+    },
     {
       "name": "Firefox",
       "type": "firefox",
       "request": "launch",
       "reAttach": true,
-      "url": "http://localhost:4000",
+      "url": "http://localhost:3000",
       "webRoot": "${workspaceFolder}/build"
     },
     {
       "name": "Chrome",
       "request": "launch",
-      "type": "chrome",
-      "url": "http://localhost:4000",
-      "webRoot": "${workspaceFolder}/build"
+      "type": "pwa-chrome",
+      "url": "http://localhost:3000",
+      "webRoot": "${workspaceFolder}"
     }
   ]
 }
diff --git a/build.sh b/build.sh
@@ -1,7 +1,25 @@
 #!/bin/bash
+set -x 
+if [ $# -eq 0 ]
+  then
+    echo "No arguments supplied: release | debug"
+    exit -1
+fi
 git pull
+if [ ! -L "build" ]; then
+  ln -s /var/www/vhosts/olab46/$1/designer$1 build
+fi
+
 npm install
-npm run build
+
+if [ "$1" == "debug" ]; then
+  npx webpack --node-env development
+fi
+
+if [ "$1" == "release" ]; then
+  npx webpack --node-env production
+fi
+
 service nginx restart
 
 
diff --git a/package-lock.json b/package-lock.json