Skip to content

Commit

Permalink
Merge branch 'master' into user-context
Browse files Browse the repository at this point in the history
  • Loading branch information
Mogge authored Apr 22, 2024
2 parents 9aaba6e + 414ecf2 commit 4913bfd
Show file tree
Hide file tree
Showing 11 changed files with 1,267 additions and 684 deletions.
348 changes: 177 additions & 171 deletions admin/package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,24 @@
"@types/express": "^4.17.21",
"@types/node": "^20.12.7",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/compiler-sfc": "^3.4.21",
"@vue/server-renderer": "3.4.21",
"@vuepress/theme-default": "^2.0.0-rc.24",
"@vue/compiler-sfc": "^3.4.23",
"@vue/server-renderer": "3.4.23",
"@vuepress/theme-default": "^2.0.0-rc.25",
"compression": "^1.7.4",
"cross-env": "^7.0.3",
"express": "^4.19.2",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1",
"sass": "^1.75.0",
"sass-loader": "^14.2.0",
"sass-loader": "^14.2.1",
"sirv": "^2.0.4",
"ts-node": "^10.9.2",
"typescript": "^5.4.5",
"vike": "^0.4.168",
"vite": "^5.2.8",
"vue": "3.4.21",
"vue-i18n": "^9.12.0",
"vuetify": "^3.5.15"
"vite": "^5.2.10",
"vue": "3.4.23",
"vue-i18n": "^9.13.0",
"vuetify": "^3.5.16"
},
"devDependencies": {
"@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
Expand All @@ -98,8 +98,8 @@
"@storybook/testing-library": "^0.2.2",
"@storybook/vue3": "^8.0.8",
"@storybook/vue3-vite": "^8.0.8",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"@vitest/coverage-v8": "^1.5.0",
"@vue/test-utils": "^2.4.5",
"@vuepress/bundler-vite": "^2.0.0-rc.9",
Expand All @@ -115,8 +115,8 @@
"eslint-plugin-security": "^3.0.0",
"eslint-plugin-storybook": "^0.8.0",
"eslint-plugin-vitest": "^0.4.1",
"eslint-plugin-vue": "^9.24.1",
"eslint-plugin-vuetify": "^2.3.0",
"eslint-plugin-vue": "^9.25.0",
"eslint-plugin-vuetify": "^2.4.0",
"eslint-plugin-yml": "^1.14.0",
"happy-dom": "^14.7.1",
"prettier": "^3.2.5",
Expand All @@ -130,7 +130,7 @@
"storybook": "^8.0.8",
"stylelint": "^16.3.1",
"stylelint-config-css-modules": "^4.4.0",
"stylelint-config-recess-order": "^5.0.0",
"stylelint-config-recess-order": "^5.0.1",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-config-standard-scss": "^13.1.0",
Expand Down
6 changes: 3 additions & 3 deletions admin/src/pages/app/__snapshots__/Page.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ exports[`AppPage > renders 1`] = `
>
<a
class="v-list-item v-list-item--active v-list-item--link v-theme--light v-list-item--density-default v-list-item--one-line v-list-item--variant-text"
class="v-list-item v-list-item--active v-list-item--link v-theme--light v-list-item--density-default v-list-item--one-line rounded-0 v-list-item--variant-text"
href="/app"
tabindex="-2"
>
Expand Down Expand Up @@ -61,7 +61,7 @@ exports[`AppPage > renders 1`] = `
<!---->
</a>
<a
class="v-list-item v-list-item--link v-theme--light v-list-item--density-default v-list-item--one-line v-list-item--variant-text"
class="v-list-item v-list-item--link v-theme--light v-list-item--density-default v-list-item--one-line rounded-0 v-list-item--variant-text"
href="/app/inc"
tabindex="-2"
>
Expand Down Expand Up @@ -94,7 +94,7 @@ exports[`AppPage > renders 1`] = `
role="separator"
/>
<a
class="v-list-item v-list-item--link v-theme--light v-list-item--density-default v-list-item--one-line v-list-item--variant-text"
class="v-list-item v-list-item--link v-theme--light v-list-item--density-default v-list-item--one-line rounded-0 v-list-item--variant-text"
href="/app/reset"
tabindex="-2"
>
Expand Down
Loading

0 comments on commit 4913bfd

Please sign in to comment.