refactor(multi): applied latest package.

themeselection · Jan 1, 2025 · 0b1291b · 0b1291b
1 parent a16fcd8
commit 0b1291b
Show file tree

Hide file tree

Showing 55 changed files with 16,191 additions and 11,442 deletions.
diff --git a/javascript-version/.eslintrc-auto-import.json b/javascript-version/.eslintrc-auto-import.json
@@ -3,11 +3,14 @@
     "Component": true,
     "ComponentPublicInstance": true,
     "ComputedRef": true,
+    "DirectiveBinding": true,
     "EffectScope": true,
     "ExtractDefaultPropTypes": true,
     "ExtractPropTypes": true,
     "ExtractPublicPropTypes": true,
     "InjectionKey": true,
+    "MaybeRef": true,
+    "MaybeRefOrGetter": true,
     "PropType": true,
     "Ref": true,
     "VNode": true,
@@ -85,6 +88,7 @@
     "onStartTyping": true,
     "onUnmounted": true,
     "onUpdated": true,
+    "onWatcherCleanup": true,
     "pausableWatch": true,
     "provide": true,
     "provideLocal": true,
@@ -201,6 +205,7 @@
     "useFullscreen": true,
     "useGamepad": true,
     "useGeolocation": true,
+    "useId": true,
     "useIdle": true,
     "useImage": true,
     "useInfiniteScroll": true,
@@ -220,6 +225,7 @@
     "useMemoize": true,
     "useMemory": true,
     "useMin": true,
+    "useModel": true,
     "useMounted": true,
     "useMouse": true,
     "useMouseInElement": true,
@@ -270,6 +276,7 @@
     "useSum": true,
     "useSupported": true,
     "useSwipe": true,
+    "useTemplateRef": true,
     "useTemplateRefsList": true,
     "useTextDirection": true,
     "useTextSelection": true,

diff --git a/javascript-version/@core/scss/template/libs/vuetify/_variables.scss b/javascript-version/@core/scss/template/libs/vuetify/_variables.scss
@@ -4,7 +4,7 @@ $font-family-custom: "Inter", sans-serif, -apple-system, blinkmacsystemfont, "Se
 @forward "../../../base/libs/vuetify/variables" with (
   $body-font-family: $font-family-custom !default,
   $border-radius-root: 6px,
-  
+
   $rounded: (
     "sm": 4px,
     "shaped": 25px 0,
@@ -36,7 +36,7 @@ $font-family-custom: "Inter", sans-serif, -apple-system, blinkmacsystemfont, "Se
       "weight": 500,
       "line-height": 2.375rem,
       "letter-spacing": normal,
-    ), 
+    ),
     "h5": (
       "size": 1.125rem,
       "weight": 500,

diff --git a/javascript-version/@core/scss/template/pages/misc.scss b/javascript-version/@core/scss/template/pages/misc.scss
@@ -16,7 +16,6 @@
 
     .misc-footer-tree, .misc-footer-tree-1 {
       position: absolute;
-      z-index: 1;
     }
 
     .misc-footer-tree {

diff --git a/javascript-version/@core/scss/template/pages/page-auth.scss b/javascript-version/@core/scss/template/pages/page-auth.scss
@@ -1,44 +1,61 @@
-.auth-wrapper {
-  min-block-size: calc(var(--vh, 1vh) * 100);
-}
+.layout-blank {
+  .auth-wrapper {
+    min-block-size: 100dvh;
+  }
 
-.auth-footer-mask {
-  position: absolute;
-  inset-block-end: 0;
-  min-inline-size: 100%;
-}
+  .auth-footer-mask {
+    position: absolute;
+    inset-block-end: 0;
+    max-inline-size: 100%;
+    min-inline-size: 100%;
+  }
 
-.auth-card {
-  z-index: 1 !important;
-}
+  .auth-footer-tree{
+    position: absolute !important;
+    inset-block-end: 70px;
+    inset-inline-start: 70px;
+  }
 
-.auth-footer-start-tree,
-.auth-footer-end-tree {
-  position: absolute;
-  z-index: 1;
-}
+  .auth-footer-start-tree, .auth-footer-end-tree{
+    position: absolute !important;
+    z-index: 1 !important;
+  }
 
-.auth-footer-start-tree {
-  inset-block-end: 0;
-  inset-inline-start: 0;
-}
+  .auth-footer-start-tree{
+    inset-block-end: 3.75rem;
+    inset-inline-start: 3.75rem;
+  }
 
-.auth-footer-end-tree {
-  inset-block-end: 0;
-  inset-inline-end: 0;
+  .auth-footer-end-tree{
+    inset-block-end: 4.625rem;
+    inset-inline-end: 5rem;
+  }
+
+  .auth-card, .auth-card-v2, .auth-illustration {
+    z-index: 1 !important;
+  }
 }
 
-.auth-illustration {
-  z-index: 1;
+@media (min-width: 960px) {
+  .skin--bordered {
+    .auth-card-v2 {
+      border-inline-start: 1px solid rgba(var(--v-border-color), var(--v-border-opacity)) !important;
+    }
+  }
 }
 
+
 .auth-logo {
   position: absolute;
-  z-index: 1;
+  z-index: 2;
   inset-block-start: 2rem;
   inset-inline-start: 2.3rem;
 }
 
-.auth-bg {
-  background-color: rgb(var(--v-theme-surface));
+.auth-title{
+  font-size: 1.5rem;
+  font-weight: 600;
+  letter-spacing: 0.273px;
+  line-height: normal;
+  text-transform: capitalize;
 }
diff --git a/javascript-version/@core/scss/template/placeholders/_vertical-nav.scss b/javascript-version/@core/scss/template/placeholders/_vertical-nav.scss
@@ -69,10 +69,10 @@
 
 // Vertical nav item badge styles
 %vertical-nav-item-badge {
-  font-size: 0.75rem;
+  font-size: .8125rem;
   line-height: 20px;
-  padding-block: 1px;
-  padding-inline: 0.625rem;
+  padding-block: 0.125rem;
+  padding-inline: 0.75rem;
 }
 
 // Nav items styles (including section title)

diff --git a/javascript-version/@layouts/components/VerticalNav.vue b/javascript-version/@layouts/components/VerticalNav.vue
@@ -44,6 +44,7 @@ const handleNavScroll = evt => {
   <Component
     :is="props.tag"
     ref="refNav"
+    data-allow-mismatch
     class="layout-vertical-nav"
     :class="[
       {

diff --git a/javascript-version/@layouts/components/VerticalNavLayout.vue b/javascript-version/@layouts/components/VerticalNavLayout.vue
@@ -1,6 +1,6 @@
 <script>
-import { useDisplay } from 'vuetify'
 import VerticalNav from '@layouts/components/VerticalNav.vue'
+import { useDisplay } from 'vuetify'
 
 export default defineComponent({
   setup(props, { slots }) {

diff --git a/javascript-version/layouts/blank.vue b/javascript-version/layouts/blank.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="layout-wrapper layout-blank">
+  <div
+    class="layout-wrapper layout-blank"
+    data-allow-mismatch
+  >
     <slot />
   </div>
 </template>

diff --git a/javascript-version/layouts/components/DefaultLayoutWithVerticalNav.vue b/javascript-version/layouts/components/DefaultLayoutWithVerticalNav.vue
@@ -2,6 +2,8 @@
 import NavItems from '@/layouts/components/NavItems.vue'
 import logo from '@images/logo.svg?raw'
 import VerticalNavLayout from '@layouts/components/VerticalNavLayout.vue'
+
+// Components
 import Footer from '@/layouts/components/Footer.vue'
 import NavbarThemeSwitcher from '@/layouts/components/NavbarThemeSwitcher.vue'
 import UserProfile from '@/layouts/components/UserProfile.vue'

diff --git a/javascript-version/nuxt.config.ts b/javascript-version/nuxt.config.ts
@@ -121,4 +121,5 @@ export default defineNuxtConfig({
   },
 
   modules: ['@vueuse/nuxt', '@nuxtjs/device', '@pinia/nuxt'],
+  compatibilityDate: '2025-01-01',
 })
diff --git a/javascript-version/package.json b/javascript-version/package.json
@@ -1,6 +1,6 @@
 {
   "name": "materio-vuetify-nuxtjs-admin-template-free",
-  "version": "1.0.1",
+  "version": "2.2.2",
   "private": true,
   "type": "module",
   "scripts": {
@@ -15,63 +15,62 @@
     "@floating-ui/dom": "1.6.8",
     "@iconify-json/bxl": "^1.1.10",
     "@stylistic/stylelint-config": "^1.0.1",
-    "@vueuse/core": "^10.5.0",
-    "@vueuse/math": "^10.5.0",
-    "apexcharts": "3.51.0",
-    "nuxt": "^3.12.2",
-    "pinia": "^2.1.7",
+    "@vueuse/core": "^10.11.1",
+    "@vueuse/math": "^10.11.1",
+    "apexcharts": "^3.54.1",
+    "nuxt": "3.14.1592",
+    "pinia": "^2.3.0",
     "prismjs": "^1.29.0",
     "roboto-fontface": "^0.10.0",
     "vue-flatpickr-component": "11.0.5",
     "vue-prism-component": "^2.0.0",
-    "vue3-apexcharts": "^1.5.2",
+    "vue3-apexcharts": "1.5.2",
     "vue3-perfect-scrollbar": "^2.0.0",
-    "vuetify": "3.6.13",
+    "vuetify": "3.7.5",
     "webfontloader": "^1.6.28"
   },
   "devDependencies": {
     "@antfu/eslint-config-vue": "^0.43.1",
     "@antfu/utils": "^0.7.10",
-    "@iconify-json/ri": "^1.1.21",
-    "@iconify/tools": "^4.0.0",
+    "@iconify-json/ri": "^1.2.5",
+    "@iconify/tools": "^4.0.7",
     "@iconify/utils": "^2.1.13",
     "@iconify/vue": "4.1.2",
-    "@nuxtjs/device": "^3.1.1",
-    "@pinia/nuxt": "^0.5.2",
-    "@vueuse/nuxt": "^10.11.0",
-    "eslint": "^8.56.0",
+    "@nuxtjs/device": "^3.2.4",
+    "@pinia/nuxt": "^0.9.0",
+    "@vueuse/nuxt": "^12.2.0",
+    "eslint": "^8.57.1",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-case-police": "^0.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-promise": "^6.6.0",
     "eslint-plugin-regex": "^1.10.0",
     "eslint-plugin-regexp": "^2.6.0",
     "eslint-plugin-sonarjs": "^0.24.0",
     "eslint-plugin-unicorn": "^51.0.1",
-    "eslint-plugin-vue": "^9.19.2",
-    "postcss-html": "^1.5.0",
+    "eslint-plugin-vue": "^9.32.0",
+    "postcss-html": "^1.7.0",
     "postcss-scss": "^4.0.9",
-    "sass": "^1.76.0",
-    "stylelint": "16.7.0",
+    "sass": "~1.76.0",
+    "stylelint": "16.8.0",
     "stylelint-codeguide": "2.0.0",
     "stylelint-config-idiomatic-order": "10.0.0",
     "stylelint-config-standard-scss": "13.1.0",
     "stylelint-use-logical-spec": "5.0.1",
-    "tsx": "^4.7.0",
-    "vite": "^5.3.1",
+    "tsx": "^4.19.2",
+    "vite": "^5.4.11",
     "vite-plugin-vuetify": "2.0.3",
-    "vite-svg-loader": "^5.1.0",
-    "vue": "3.3.13"
+    "vite-svg-loader": "^5.1.0"
   },
   "resolutions": {
+    "postcss": "^8",
     "stylelint-order": "6.0.3",
-    "sass": "1.76.0",
-    "vue": "3.3.13"
+    "@types/video.js": "^7"
   },
   "overrides": {
+    "postcss": "^8",
     "stylelint-order": "6.0.3",
-    "sass": "1.76.0",
-    "vue": "3.3.13"
+    "@types/video.js": "^7"
   }
 }
diff --git a/javascript-version/pages/login.vue b/javascript-version/pages/login.vue
@@ -63,6 +63,7 @@ definePageMeta({ layout: 'blank' })
             <!-- email -->
             <VCol cols="12">
               <VTextField
+                :id="useId()"
                 v-model="form.email"
                 label="Email"
                 type="email"
@@ -72,17 +73,20 @@ definePageMeta({ layout: 'blank' })
             <!-- password -->
             <VCol cols="12">
               <VTextField
+                :id="useId()"
                 v-model="form.password"
                 label="Password"
                 placeholder="············"
                 :type="isPasswordVisible ? 'text' : 'password'"
+                autocomplete="password"
                 :append-inner-icon="isPasswordVisible ? 'ri-eye-off-line' : 'ri-eye-line'"
                 @click:append-inner="isPasswordVisible = !isPasswordVisible"
               />
 
               <!-- remember me checkbox -->
               <div class="d-flex align-center justify-space-between flex-wrap my-6">
                 <VCheckbox
+                  :id="useId()"
                   v-model="form.remember"
                   label="Remember me"
                 />

diff --git a/javascript-version/pages/register.vue b/javascript-version/pages/register.vue
@@ -64,6 +64,7 @@ definePageMeta({ layout: 'blank' })
             <!-- Username -->
             <VCol cols="12">
               <VTextField
+                :id="useId()"
                 v-model="form.username"
                 label="Username"
                 placeholder="Johndoe"
@@ -72,6 +73,7 @@ definePageMeta({ layout: 'blank' })
             <!-- email -->
             <VCol cols="12">
               <VTextField
+                :id="useId()"
                 v-model="form.email"
                 label="Email"
                 placeholder="johndoe@email.com"
@@ -82,10 +84,12 @@ definePageMeta({ layout: 'blank' })
             <!-- password -->
             <VCol cols="12">
               <VTextField
+                :id="useId()"
                 v-model="form.password"
                 label="Password"
                 placeholder="············"
                 :type="isPasswordVisible ? 'text' : 'password'"
+                autocomplete="password"
                 :append-inner-icon="isPasswordVisible ? 'ri-eye-off-line' : 'ri-eye-line'"
                 @click:append-inner="isPasswordVisible = !isPasswordVisible"
               />
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,4 +121,5 @@ export default defineNuxtConfig({ @@
       },
       modules: ['@vueuse/nuxt', '@nuxtjs/device', '@pinia/nuxt'],
+      compatibilityDate: '2025-01-01',
     })