Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/hotwax/preorder into release
Browse files Browse the repository at this point in the history
  • Loading branch information
ravilodhi committed Dec 22, 2023
2 parents 74e62e5 + 0d273bb commit 053e03a
Show file tree
Hide file tree
Showing 11 changed files with 11,170 additions and 55,350 deletions.
5 changes: 1 addition & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ module.exports = {
files: [
'**/__tests__/*.{j,t}s?(x)',
'**/tests/unit/**/*.spec.{j,t}s?(x)'
],
env: {
jest: true
}
]
}
]
}
66,388 changes: 11,158 additions & 55,230 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 7 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@casl/ability": "^6.0.0",
"@hotwax/app-version-info": "^1.0.0",
"@hotwax/apps-theme": "^1.2.3",
"@hotwax/dxp-components": "1.7.5",
"@hotwax/dxp-components": "1.11.0",
"@hotwax/oms-api": "^1.10.0",
"@ionic/core": "6.7.5",
"@ionic/vue": "6.7.5",
Expand All @@ -38,27 +38,22 @@
"devDependencies": {
"@capacitor/cli": "2.4.6",
"@intlify/vue-i18n-loader": "^2.0.0-rc.3",
"@types/jest": "^27.5.0",
"@types/luxon": "^3.2.0",
"@typescript-eslint/eslint-plugin": "~5.26.0",
"@typescript-eslint/parser": "~5.26.0",
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-e2e-cypress": "~4.5.0",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-e2e-cypress": "~5.0.8",
"@vue/cli-plugin-eslint": "~5.0.8",
"@vue/cli-plugin-pwa": "^4.5.11",
"@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-plugin-typescript": "~4.5.0",
"@vue/cli-plugin-unit-jest": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/cli-plugin-pwa": "^5.0.8",
"@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-plugin-typescript": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/compiler-sfc": "^3.0.0-0",
"@vue/eslint-config-typescript": "^9.1.0",
"@vue/test-utils": "^2.0.0-0",
"@vue/vue3-jest": "^28.0.0",
"cypress": "^8.3.0",
"eslint": "^7.32.0",
"eslint-plugin-vue": "^8.0.3",
"jest": "^28.1.0",
"ts-jest": "^28.0.8",
"typescript": "~4.7.4",
"vue-cli-plugin-i18n": "^1.0.1"
}
Expand Down
6 changes: 3 additions & 3 deletions src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Orders from '../views/orders.vue'
import Catalog from '../views/catalog.vue'
import Settings from '../views/settings.vue'
import store from '@/store';
import { Login, useAuthStore } from '@hotwax/dxp-components';
import { DxpLogin, useAuthStore } from '@hotwax/dxp-components';
import { loader } from '@/user-utils';
import { hasPermission } from '@/authorization';
import { showToast } from '@/utils';
Expand Down Expand Up @@ -47,8 +47,8 @@ const routes: Array<RouteRecordRaw> = [
},
{
path: '/login',
name: 'login',
component: Login,
name: 'dxp-login',
component: DxpLogin,
beforeEnter: loginGuard
},
{
Expand Down
12 changes: 0 additions & 12 deletions tests/e2e/.eslintrc.js

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e/plugins/index.js

This file was deleted.

8 changes: 0 additions & 8 deletions tests/e2e/specs/test.js

This file was deleted.

25 changes: 0 additions & 25 deletions tests/e2e/support/commands.js

This file was deleted.

20 changes: 0 additions & 20 deletions tests/e2e/support/index.js

This file was deleted.

9 changes: 0 additions & 9 deletions tests/unit/example.spec.ts

This file was deleted.

3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"sourceMap": true,
"baseUrl": ".",
"types": [
"webpack-env",
"jest"
"webpack-env"
],
"paths": {
"@/*": [
Expand Down

0 comments on commit 053e03a

Please sign in to comment.