mirror of
https://github.com/gotson/komga.git
synced 2025-12-15 21:12:27 +01:00
bump vuetify and update rules usage
This commit is contained in:
parent
eb57a74634
commit
1ca235abde
6 changed files with 15 additions and 25 deletions
8
next-ui/package-lock.json
generated
8
next-ui/package-lock.json
generated
|
|
@ -18,7 +18,7 @@
|
|||
"pinia-plugin-persistedstate": "^4.3.0",
|
||||
"vue": "^3.5.16",
|
||||
"vue-intl": "^6.5.25",
|
||||
"vuetify": "^3.8.5"
|
||||
"vuetify": "^3.8.11"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@chromatic-com/storybook": "^4.0.0",
|
||||
|
|
@ -10619,9 +10619,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/vuetify": {
|
||||
"version": "3.8.5",
|
||||
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.8.5.tgz",
|
||||
"integrity": "sha512-W/mTaNDyO6NRqAQmnkMUn9TYvRb//BPF/vk7h3+2xNJOyI9ev90JmYjrihOtb+6QDrB79wVUH0Y+0OjYK73GsA==",
|
||||
"version": "3.8.11",
|
||||
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.8.11.tgz",
|
||||
"integrity": "sha512-sF5U364CFWq/K3zhC1z90DPHDp1EL6bepKpgzfIfHN6I2BoC1qjbH+hEqozqaGETrIBK7+ShccAzZ8CHL56YZQ==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": "^12.20 || >=14.13"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
"pinia-plugin-persistedstate": "^4.3.0",
|
||||
"vue": "^3.5.16",
|
||||
"vue-intl": "^6.5.25",
|
||||
"vuetify": "^3.8.5"
|
||||
"vuetify": "^3.8.11"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@chromatic-com/storybook": "^4.0.0",
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
</slot>
|
||||
|
||||
<v-text-field
|
||||
:rules="[rules.sameAs(validateText)]"
|
||||
:rules="[['sameAs', validateText]]"
|
||||
hide-details
|
||||
class="mt-2"
|
||||
/>
|
||||
|
|
@ -70,8 +70,6 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { useRules } from 'vuetify/labs/rules'
|
||||
|
||||
const showDialog = defineModel<boolean>('dialog', { required: false })
|
||||
const emit = defineEmits<{
|
||||
confirm: []
|
||||
|
|
@ -79,8 +77,6 @@ const emit = defineEmits<{
|
|||
|
||||
const formValid = ref<boolean>(false)
|
||||
|
||||
const rules = useRules()
|
||||
|
||||
function submitForm(isActive: Ref<boolean, boolean>) {
|
||||
if (formValid.value) {
|
||||
emit('confirm')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<template>
|
||||
<v-text-field
|
||||
v-model="newPassword"
|
||||
:rules="[rules.required()]"
|
||||
:rules="['required']"
|
||||
:label="
|
||||
$formatMessage({
|
||||
description: 'User password change dialog: New Password field label',
|
||||
|
|
@ -19,14 +19,15 @@
|
|||
v-model="confirmPassword"
|
||||
class="mt-2"
|
||||
:rules="[
|
||||
rules.sameAs(
|
||||
[
|
||||
'sameAs',
|
||||
newPassword,
|
||||
$formatMessage({
|
||||
description: 'User password change dialog: Error message if passwords differ',
|
||||
defaultMessage: 'Passwords must be identical',
|
||||
id: 'LaxrEO',
|
||||
}),
|
||||
),
|
||||
],
|
||||
]"
|
||||
:label="
|
||||
$formatMessage({
|
||||
|
|
@ -45,9 +46,6 @@
|
|||
<script setup lang="ts">
|
||||
import mdiEye from '~icons/mdi/eye'
|
||||
import mdiEyeOff from '~icons/mdi/eye-off'
|
||||
import { useRules } from 'vuetify/labs/rules'
|
||||
|
||||
const rules = useRules()
|
||||
|
||||
const newPassword = defineModel<string>({ required: true })
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<v-text-field
|
||||
v-model="user!.email"
|
||||
autofocus
|
||||
:rules="[rules.required(), rules.email()]"
|
||||
:rules="['required', 'email']"
|
||||
:label="
|
||||
$formatMessage({
|
||||
description: 'User creation dialog: Email field',
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<v-text-field
|
||||
v-model="user.password"
|
||||
class="mt-1 mb-2"
|
||||
:rules="[rules.required()]"
|
||||
:rules="['required']"
|
||||
:label="
|
||||
$formatMessage({
|
||||
description: 'User creation dialog: Password field',
|
||||
|
|
@ -149,7 +149,7 @@
|
|||
})
|
||||
"
|
||||
:min="0"
|
||||
:rules="[rules.required()]"
|
||||
:rules="['required']"
|
||||
/>
|
||||
</v-col>
|
||||
</v-row>
|
||||
|
|
@ -226,12 +226,10 @@ import mdiBookMultiple from '~icons/mdi/book-multiple'
|
|||
import mdiFolderLock from '~icons/mdi/folder-lock'
|
||||
import { UserRoles } from '@/types/UserRoles'
|
||||
import type { components } from '@/generated/openapi/komga'
|
||||
import { useRules } from 'vuetify/labs/rules'
|
||||
import { useLibraries } from '@/colada/queries/libraries'
|
||||
import { useSharingLabels } from '@/colada/queries/referential'
|
||||
import { useIntl } from 'vue-intl'
|
||||
|
||||
const rules = useRules()
|
||||
const intl = useIntl()
|
||||
|
||||
interface UserExtend {
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
})
|
||||
"
|
||||
autofocus
|
||||
:rules="[rules.required(), rules.email()]"
|
||||
:rules="['required', 'email']"
|
||||
/>
|
||||
</v-col>
|
||||
</v-row>
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
})
|
||||
"
|
||||
type="password"
|
||||
:rules="[rules.required()]"
|
||||
:rules="['required']"
|
||||
:error-messages="loginError"
|
||||
@update:modelValue="loginError = ''"
|
||||
/>
|
||||
|
|
@ -116,12 +116,10 @@
|
|||
<script lang="ts" setup>
|
||||
import { type ErrorCause, komgaClient } from '@/api/komga-client'
|
||||
import { useMutation, useQueryCache } from '@pinia/colada'
|
||||
import { useRules } from 'vuetify/labs/rules'
|
||||
import { useMessagesStore } from '@/stores/messages'
|
||||
import { useIntl } from 'vue-intl'
|
||||
import { commonMessages } from '@/utils/i18n/common-messages'
|
||||
|
||||
const rules = useRules()
|
||||
const messagesStore = useMessagesStore()
|
||||
const intl = useIntl()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue