From 7329817649e70b53a33ba3c0feb3db619543e388 Mon Sep 17 00:00:00 2001 From: Yi Lei Feng Date: Tue, 14 May 2024 13:58:15 -0400 Subject: [PATCH] merge and add support for dev deployment branch changes --- .env | 6 +- .eslintrc.js | 7 +- index-ca-en.html | 11 +- index-ca-fr.html | 10 +- index.html | 3 +- package-lock.json | 40833 +++------------- package.json | 3 +- {public/scripts => scripts}/ramp4/ramp.css | 0 {public/scripts => scripts}/ramp4/ramp.esm.js | 0 {public/scripts => scripts}/ramp4/ramp.js | 0 server/index.js | 16 +- server/package-lock.json | 1514 +- server/package.json | 2 +- src/app.vue | 2 +- src/components/map-editor.vue | 2 +- src/components/metadata-editor.vue | 41 +- src/components/preview.vue | 39 +- src/lang/lang.csv | 26 +- src/main.ts | 15 +- src/stores/userStore.ts | 6 +- src/types.d.ts | 2 + tsconfig.json | 2 +- vite.config.mts | 23 +- 23 files changed, 6194 insertions(+), 36369 deletions(-) rename {public/scripts => scripts}/ramp4/ramp.css (100%) rename {public/scripts => scripts}/ramp4/ramp.esm.js (100%) rename {public/scripts => scripts}/ramp4/ramp.js (100%) diff --git a/.env b/.env index fc254837..792805a7 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -VUE_APP_API_URL=#{API_URL}# -VUE_APP_CURR_ENV=#{CURR_ENV}# -VUE_APP_NET_API_URL=#{NET_API_URL}# \ No newline at end of file +VITE_APP_API_URL=#{API_URL}# +VITE_APP_CURR_ENV=#{CURR_ENV}# +VITE_APP_NET_API_URL=#{NET_API_URL}# \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index 74f2d1f4..3d5ca672 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,8 +1,7 @@ module.exports = { root: true, env: { - node: true, - es2022: true + node: true }, extends: [ 'plugin:vue/essential', @@ -15,8 +14,8 @@ module.exports = { ecmaVersion: 2020 }, rules: { - 'no-console': import.meta.env.NODE_ENV === 'production' ? 'warn' : 'off', - 'no-debugger': import.meta.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'prettier/prettier': ['error', { endOfLine: 'auto' }], 'sort-imports': ['error', {"ignoreCase": true, "ignoreDeclarationSort": true }], '@typescript-eslint/no-var-requires': 'off' diff --git a/index-ca-en.html b/index-ca-en.html index 693f3195..0a2cb27c 100644 --- a/index-ca-en.html +++ b/index-ca-en.html @@ -9,6 +9,7 @@ + - - - -
d<%= require('html-loader!../src/assets/static/cdts/top-en.html') %>
+
- + - - +