Merge pull request #391 from systragroup/dev

4.8.0

.env.development

@@ -1,13 +1,14 @@
-U2FsdGVkX1+v5qIUW7B6a2x+/ipmyF02QlJ1lmATCI8dzTUDcjlGW9DpMAOqtE7E
-uUtAFZm0OE0F8V7jP3q2PynbkxT9p6jGL1dlAAlav8/05CaS+0oZJnc0KZIzn7XM
-0pmbBn9aOMNy1inEAVbUsljWPtQjfgZA7NmPy13RNgzqnaVOWWO7Y71UC0EBuNee
-cD8pD0cyOr8U9JnyB99t7fdRTRKSRnnPUqjv6CQByLiieyWTWisFiCh75020/WS3
-xDTipRWddKwA38Ku7KfKruJpB/piCfIkk5ChGzCuQDdUhTVhyvGizDLHL+BNUvMT
-0zjvuWwtlPIoq2JIFrxsOnsw3FCvE6xxqiHHnYyHSMeMuk/+7krjqFIFMnufr8+4
-2A+EskqmSSDU0utQwzY+AaKcjyq+gCjJKtMsm+9A4/MHnTg/liu8b7oMezozpT0A
-dhY6mebQjpHiDEUhcot66kr91bkDiK/EZzEzS4JWSlmAP5sR5b2yxeC/bUQRdjHw
-XD/5UXihY0qjFNlmVqB+KsyLIg63Ys+67MuT3x9+sR1bjFHeSy5Qb7brQjZwGL7O
-rJRbhHERc+aKs6t1T0W/0WDL38HHBAKXwudRh402jrFJRIKyQI3iKZ8p5z/M5b6L
-pohL/W4aR92rJnXa1qaPl3BSEdkWZRXYxL5msMbwCvyqY2pP7bf79oKS6P69mhV+
-17ENzXj3YEgeL8P12/eVwfSXENRXGgq+5xD3iex75IBMUzBgd8EC8BetLabWPLN2
-npEGw36nXb9yzcvA1QsW7sAlEN1/BbckfB7imjoLKEM=
+U2FsdGVkX1+v5qIUW7B6a6anmMxIcGlMni5if3SQ7ujQalY9Y7yKwZmMUF8kv02d
+knoRkP32yNOLXARyY+7gCEtN6bWPkf3YnAuljmWoDScBS3/SgHXmJMCEfXHTyB6w
+4dzl5h0Fb7eYl8cYAYzIxvHHhMWfvkRTtb5tT7aRc5FzwOsGsMRvthyKMiLu7ctq
+dPNQTziq+QAwomUrUIrHrt+s2sjio345DOX7FcAPgQLMdZYCEi2DgqbCosXbYzkf
+Kbzl5HAv8bB5d8QkQwqpzP7YI9ojFehF6iXnoVgd3AcS/WfN2L6rWjXAmlRaT8e+
+IY/nFYKTkOaghO5zL+hF60bxXy4S6xCoLQcJZwrl5blMAz0PGwQIp0tWaG2ahu8n
+zhI/D+m+8eiDU6zo8bwDMZS9pKzDZmc6ZgETzRqXTF+gwMnQIsoRC02vhFjvs3pj
+wI6B8vn3vR5dT/kq8oFzlNirODHobtNidQt2Xf8dWBzKC1/x/5s0AXDOBSj0mlsK
+FFfRva1XBX3XSlNQuY45LUMswum5xcjsWPJOdTugUePT6QQoxRudNI0++Ntveggt
+HQW+uytQJFnBVnsecwegSCdbk8b2qY1mjcBEoHsv2raxiIP5mIY012/oeCYvpN1A
+/r3vJbkKrAvhiHOF2El1uBc+EyeZEykK6WMsY6ny57pNyCWhYrEq9vThA0gVcwnG
+HOO4HNDhbbZ24nndXfCVeQDeepMa2287SVEttOSRdiysxqAf92VTHjpA5r/iOTez
+gwVi1WMrvAjD8yZzXM3i97dEwFzSHl4U2RbUyIzNnjj6+X6+doOFIBYIpnw0B1TE
+yQZfDWaMZlGs1ASWOx9TxA==

.env.production

@@ -1,15 +1,16 @@
-U2FsdGVkX1+v5qIUW7B6a2x+/ipmyF02QlJ1lmATCI8dzTUDcjlGW9DpMAOqtE7E
-uUtAFZm0OE0F8V7jP3q2PynbkxT9p6jGL1dlAAlav8/05CaS+0oZJnc0KZIzn7XM
-0pmbBn9aOMNy1inEAVbUsljWPtQjfgZA7NmPy13RNgzqnaVOWWO7Y71UC0EBuNee
-cD8pD0cyOr8U9JnyB99t7VosIn9kHMqAKYZlfMEoT8u9/dCFoyDMQTMrnor15A4E
-NodAf8KlMeoOIaXEvroH3JtoSYskIT6G+WGPtgK1+AQXyU6vhSNTG9bZNGYtcD9U
-nK3GqHk9Xl4etXisM+yz5kvyC2Jb9+0pW2RFZcXJrem3C3HEsXyC29Ki+kxXFVsh
-5dKQgmUKw/2RTJEsXW2w+G32W3fcxQ+823OKlNaFBYuozaEOK3ASoL4X1J1hq7WZ
-VPEcfx+Fbb+lqhuByX/loJEHXTvWf91bFbwqMnyOHJsI8/UnHFKNbe2o4G356xze
-ohJk0XYgjxNwLzDGE1WF5XOvdtCaIxLv8SljCfdZZZNiGv2lQ+vy6c15yc/FmFpM
-R7mLdjNAXxsy7nUUEFxXwFc4hYwC5rm/r7f3+xJYWyRuOGgiB0iUJYdIzVbsCJJ7
-Ql6eunbWKMgGW43kkt7smYLukB0PGCi5M8wbyzqOBM4X6QaVCMrVLuobSbi9cw6G
-TwtMsXnw5w+zza9yQX7upt7XHqa0waRBY2FADcUhstdPLE3W+22hTHEB/TbGTmpb
-J8Gx4GiVoaRDJohxNa0Fn/pJzVUE+oLPJJYpNtKwQjMJsBHr6DAZSmM5jQGexE6r
-kwxd4GHuHTAjePWxJwtLMtf3t5WO2FPdtBIyqLmI3ulJBs6nrSL390hTwqgtLOHA
-M0VENY3PjJr9muANgDTPMw==
+U2FsdGVkX1+v5qIUW7B6a6anmMxIcGlMni5if3SQ7ujQalY9Y7yKwZmMUF8kv02d
+knoRkP32yNOLXARyY+7gCEtN6bWPkf3YnAuljmWoDScBS3/SgHXmJMCEfXHTyB6w
+4dzl5h0Fb7eYl8cYAYzIxvHHhMWfvkRTtb5tT7aRc5FzwOsGsMRvthyKMiLu7ctq
+dPNQTziq+QAwomUrUIrHrt+s2sjio345DOX7FcAPgQLMdZYCEi2DgqbCosXbYzkf
+Kbzl5HAv8bB5d8QkQwqpzEHjS6tTo15QER5p3gnwIlT1uRW0MhtHe38ovFQYH5yX
+U+P8vK8+8nTFhwPEEPBQeJEFw1jQITqnFVj9Bd4epDZ5ZB7VFRV7R8qzUyNVOQ8O
+cjZhQKCmprW5C1T78L7NW0rMTt8ct5XPycPtyLuyZSftT5D0SnpSS8IE0xU/vwiC
+Fijr9EXWiWk022tpeUpsAkbklk6qgG8BdJHF7TQKDax2U121sfe3dhe5NObYmrur
+bLimuof/4E8ZaiAckv6IAwyasjAsguHf7VuRh/DjA8wBv6rlJU2H9oPKnpQN0Rg8
+xWHPqjtFOluzQxQykMg1xG7VMR3kk4OM2e1WFMpIzQI0coo6SenYqzz8jq0Uy50S
+PX9NCXj5iF+9iquRibsD1GOHzy0ScxcLqr/M9SqqHuZokhldeEhIDg++vHP+21p3
+nuas0B9u68AHjx+cjrSAPJrA/uvowdGImOUceQJqnyUz2h1POyixghkA7lCiIr2X
+uiCtlmSA5TrEGAf4/YIqOBfCsKOsXrwq8ZfmkjmHy4E2dS4iutkSbFRZTCYri27a
+k4fPLDEOXm/jPFkzP8TEQ4ffZV5RSeS3MFeeCIH2ZLwShPUp1+GtZvMJ9ZuAYZ5+
+DOSq7uEF4FOSvj+1JpcsJfdjECdZW/drh8qJtFn/8Zmvzi+PsbW+TSOHNo//dKRN
+vDDFAk97qgwG/0tEaCUvEQ==

.env.test

@@ -1,15 +1,16 @@
-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
+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

.eslintrc.js

@@ -1,6 +1,13 @@
 module.exports = {
+  parser: 'vue-eslint-parser',
   parserOptions: {
-    parser: 'babel-eslint',
+    requireConfigFile: false,
+    parser: '@babel/eslint-parser',
+    babelOptions: {
+      parserOpts: {
+        plugins: ['jsx'],
+      },
+    },
   },
   extends: [
     'plugin:vue/recommended',

build/setup.sh

@@ -4,6 +4,14 @@ cd "$(dirname "$0")"/..
 
 echo -n "Use the config-secret file if you have the the secret Keys. \n"
 
+
+DEFAULT_BASE_PATH='/quetzal-network-editor/'
+echo -n "(BASE_PATH) for vue router: [$BASE_PATH] "
+read BASE_PATH
+if [ -z "$BASE_PATH" ]; then
+  BASE_PATH="$BASE_PATH"
+fi
+
 echo -n "(MAPBOX_TOKEN) Mapbox public access token: "
 read -r MAPBOX_TOKEN
 
@@ -55,6 +63,7 @@ fi
 
 
 sed -r \
+  -e "s|###BASE_PATH###|$BASE_PATH|;" \
   -e "s|###MAPBOX_PUBLIC_KEY###|$MAPBOX_TOKEN|;" \
   -e "s|###COGNITO_REDIRECT_URI###|$REDIRECT_URL|;" \
   -e "s|###COGNITO_REDIRECT_URI_SIGNOUT###|$SIGNOUT_URL|;" \
@@ -66,6 +75,7 @@ sed -r \
   -e "s|###COGNITO_REGION###|$COGNITO_REGION|;" \
   config.env.dist > .env.development
 sed -r \
+  -e "s|###BASE_PATH###|$BASE_PATH|;" \
   -e "s|###MAPBOX_PUBLIC_KEY###|$MAPBOX_TOKEN|;" \
   -e "s|###COGNITO_REDIRECT_URI###|$REDIRECT_URL|;" \
   -e "s|###COGNITO_REDIRECT_URI_SIGNOUT###|$SIGNOUT_URL|;" \
@@ -76,3 +86,15 @@ sed -r \
   -e "s|###COGNITO_IDENTITY_POOL_ID###|$COGNITO_IDENTITY_POOL_ID|;" \
   -e "s|###COGNITO_REGION###|$COGNITO_REGION|;" \
   config.env.dist > .env.production
+  sed -r \
+  -e "s|###BASE_PATH###|$BASE_PATH|;" \
+  -e "s|###MAPBOX_PUBLIC_KEY###|$MAPBOX_TOKEN|;" \
+  -e "s|###COGNITO_REDIRECT_URI###|$REDIRECT_URL|;" \
+  -e "s|###COGNITO_REDIRECT_URI_SIGNOUT###|$SIGNOUT_URL|;" \
+  -e "s|###APP_URL###|$APP_URL|;" \
+  -e "s|###COGNITO_USERPOOL_ID###|$COGNITO_USERPOOL_ID|;" \
+  -e "s|###COGNITO_APP_DOMAIN###|$COGNITO_APP_DOMAIN|;" \
+  -e "s|###COGNITO_CLIENT_ID###|$COGNITO_CLIENT_ID|;" \
+  -e "s|###COGNITO_IDENTITY_POOL_ID###|$COGNITO_IDENTITY_POOL_ID|;" \
+  -e "s|###COGNITO_REGION###|$COGNITO_REGION|;" \
+  config.env.dist > .env.test

build/test_webpack.config.js

@@ -14,7 +14,7 @@ module.exports = {
   ],
   output: {
     filename: 'build.js',
-    publicPath: '/quetzal-network-editor/',
+    publicPath: '/quetzal-network-editor-dev/',
   },
   resolve: {
     alias: {

config.env.dist

@@ -1,3 +1,4 @@
+VUE_APP_BASE_PATH=###BASE_PATH###
 VUE_APP_MAPBOX_PUBLIC_KEY=###MAPBOX_PUBLIC_KEY###
 
 VUE_APP_COGNITO_REDIRECT_URI=###COGNITO_REDIRECT_URI###