From 0362640b82596a8984666252e5668ec1ff0baa3b Mon Sep 17 00:00:00 2001 From: Deep Panchal Date: Fri, 5 Aug 2022 18:52:15 -0500 Subject: [PATCH] --wip-- [skip ci] --- .eslintrc.js | 7 +- .storybook/preview.js | 32 +- public/index.html => index.html | 5 +- package.json | 16 +- src/App.vue | 239 +- src/components/FormSelect.vue | 2 +- src/components/FormTree.vue | 6 +- src/components/TreeMenu.vue | 2 +- src/components/WorksiteImageSection.vue | 4 +- src/components/WorksiteImport.vue | 9 +- src/components/dialogs/ComponentDialog.vue | 2 +- src/components/navigation/NavMenu.vue | 2 +- src/layouts/Authenticated.vue | 73 +- src/main.ts | 296 +- src/pages/admin/AdminDashboard.vue | 30 +- src/pages/admin/routes.js | 4 +- src/pages/home/RequestPasswordReset.vue | 2 +- src/pages/home/routes.js | 2 +- .../phone_legacy/ConnectFirstIntegration.vue | 4 +- src/pages/phone_legacy/Index.vue | 4 +- .../phone_legacy/{routes.js => routes.jsx} | 6 +- .../unauthenticated/InvitationSignup.vue | 8 +- src/pages/unauthenticated/ResetPassword.vue | 2 +- src/pages/unauthenticated/routes.js | 6 +- src/use/useCan.ts | 6 +- vite.config.ts | 24 + yarn.lock | 6696 ++--------------- 27 files changed, 1227 insertions(+), 6262 deletions(-) rename public/index.html => index.html (99%) rename src/pages/phone_legacy/{routes.js => routes.jsx} (89%) create mode 100644 vite.config.ts diff --git a/.eslintrc.js b/.eslintrc.js index f32f50d7c..9ae977836 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -70,9 +70,12 @@ module.exports = { settings: { 'import/resolver': { - webpack: { - config: './node_modules/@vue/cli-service/webpack.config.js', + node: { + paths: ['src'], + extensions: ['.js', '.jsx', '.ts', '.tsx'], + moduleDirectory: ['node_modules', 'src/'], }, + typescript: {}, }, }, }; diff --git a/.storybook/preview.js b/.storybook/preview.js index 50b4df82a..62a26a930 100644 --- a/.storybook/preview.js +++ b/.storybook/preview.js @@ -1,17 +1,17 @@ import '@/assets/css/tailwind.css'; -import Autocomplete from '@/components/Autocomplete'; -import Badge from '@/components/Badge'; -import BaseButton from '@/components/BaseButton'; -import BaseCheckbox from '@/components/BaseCheckbox'; -import BaseIcon from '@/components/BaseIcon'; -import BaseInput from '@/components/BaseInput'; -import BaseLink from '@/components/BaseLink'; -import BaseRadio from '@/components/BaseRadio'; -import BaseText from '@/components/BaseText'; -import FormSelect from '@/components/FormSelect'; -import Modal from '@/components/Modal'; -import Spinner from '@/components/Spinner'; -import Tag from '@/components/Tag'; +import Autocomplete from '@/components/Autocomplete.vue'; +import Badge from '@/components/Badge.vue'; +import BaseButton from '@/components/BaseButton.vue'; +import BaseCheckbox from '@/components/BaseCheckbox.vue'; +import BaseIcon from '@/components/BaseIcon.vue'; +import BaseInput from '@/components/BaseInput.vue'; +import BaseLink from '@/components/BaseLink.vue'; +import BaseRadio from '@/components/BaseRadio.vue'; +import BaseText from '@/components/BaseText.vue'; +import FormSelect from '@/components/FormSelect.vue'; +import Modal from '@/components/Modal.vue'; +import Spinner from '@/components/Spinner.vue'; +import Tag from '@/components/Tag.vue'; import VueCompositionApi from '@vue/composition-api'; import VueI18n from 'vue-i18n'; import { @@ -22,8 +22,8 @@ import { secondsToHm, snakeToTitleCase, } from '@/filters'; -import Authenticated from '@/layouts/Authenticated'; -import Unauthenticated from '@/layouts/Unauthenticated'; +import Authenticated from '@/layouts/Authenticated.vue'; +import Unauthenticated from '@/layouts/Unauthenticated.vue'; import { library } from '@fortawesome/fontawesome-svg-core'; import { fas } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'; @@ -42,7 +42,6 @@ import Vue from 'vue'; import VueAutosuggest from 'vue-autosuggest'; import VueAxios from 'vue-axios'; import Popover from 'vue-js-popover'; -import * as ModalDialogs from 'vue-modal-dialogs'; import vSelect from 'vue-select'; import Toasted from 'vue-toasted'; // Import Vue plugins @@ -80,7 +79,6 @@ Vue.config.productionTip = false; Vue.use(VueResize); Vue.use(VueAutosuggest); Vue.use(VTooltip); -Vue.use(ModalDialogs); Vue.use(VueAxios, axios); Vue.use(require('vue-moment'), { moment }); diff --git a/public/index.html b/index.html similarity index 99% rename from public/index.html rename to index.html index bc24c8f07..eee35748b 100644 --- a/public/index.html +++ b/index.html @@ -10,7 +10,7 @@ ;NREUM.info={beacon:"bam.nr-data.net",errorBeacon:"bam.nr-data.net",licenseKey:"NRJS-15c5a88c5d87c10da34",applicationID:"1046769301",sa:1} - + @@ -34,6 +34,7 @@ We're sorry but crisiscleanup doesn't work properly without JavaScript enabled. Please enable it to continue.
- + + diff --git a/package.json b/package.json index a6a9a04a6..25623b203 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "lint-staged": "lint-staged", "postinstall": "yarn cache clean", "prettify": "prettier --write {.,**}/*.js **/*.vue **/**/*.{vue,js}", - "serve-dev": "cross-env NODE_ENV=development NODE_IS_WATCH=1 vue-cli-service serve --mode development", + "dev": "vite --port 8080", + "serve-dev": "cross-env NODE_ENV=development NODE_IS_WATCH=1 vite", "serve-prod": "cross-env NODE_ENV=production NODE_IS_WATCH=1 vue-cli-service serve --mode production", "serve-staging": "cross-env NODE_ENV=staging NODE_IS_WATCH=1 vue-cli-service serve --mode staging", "storybook": "cross-env NODE_ENV=storybook start-storybook -p 6006", @@ -57,7 +58,6 @@ "@turf/turf": "^5.1.6", "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1", "@vue/babel-preset-jsx": "^1.2.4", - "@vue/cli": "4.5.17", "@vue/compat": "^3.1.0", "@vuex-orm/core": "^0.36.3", "@vuex-orm/plugin-axios": "^0.9.4", @@ -188,13 +188,9 @@ "@types/lodash": "^4.14.182", "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", + "@vitejs/plugin-vue": "^3.0.1", + "@vitejs/plugin-vue-jsx": "^2.0.0", "@vue/babel-preset-app": "^4.5.4", - "@vue/cli-plugin-babel": "^4.5.11", - "@vue/cli-plugin-e2e-cypress": "^4.5.6", - "@vue/cli-plugin-eslint": "^4.5.6", - "@vue/cli-plugin-typescript": "~4.5.17", - "@vue/cli-plugin-unit-jest": "^5.0.4", - "@vue/cli-service": "^4.5.4", "@vue/compiler-sfc": "^3.1.0", "@vue/eslint-config-typescript": "^7.0.0", "@vue/test-utils": "^1.1.0", @@ -220,12 +216,13 @@ "eslint": "7.32.0", "eslint-config-airbnb-base": "^14.2.0", "eslint-config-prettier": "^6.12.0", + "eslint-import-resolver-typescript": "^3.4.0", "eslint-import-resolver-webpack": "^0.12.2", "eslint-plugin-babel": "^5.3.1", "eslint-plugin-cypress": "^2.11.2", "eslint-plugin-import": "^2.22.0", "eslint-plugin-prettier": "^3.1.4", - "eslint-plugin-vue": "^6.2.2", + "eslint-plugin-vue": "^9.3.0", "eslint-plugin-vue-types": "^2.0.0", "husky": "^8.0.1", "is-ci": "^3.0.1", @@ -267,6 +264,7 @@ "tailwindcss": "npm:@tailwindcss/postcss7-compat", "thread-loader": "^3.0.4", "typescript": "~4.1.5", + "vite": "^3.0.4", "vue-cli-plugin-cypress-experimental": "~1.1.0", "vue-docgen-api": "^4.32.4", "vue-docgen-loader": "^1.5.0", diff --git a/src/App.vue b/src/App.vue index 69b490e82..73e4d5891 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,134 +13,133 @@ -