mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-19 11:14:06 +00:00
Rename resources/scripts-v2 to resources/scripts and drop @v2 alias
Now that the legacy v1 frontend (commit 064bdf53) is gone, the v2 directory is the only frontend and the v2 suffix is just noise. Renames resources/scripts-v2 to resources/scripts via git mv (so git records the move as renames, preserving blame and log --follow), then bulk-rewrites the 152 files that imported via @v2/... to use @/scripts/... instead. The existing @ alias (resources/) covers the new path with no extra config needed.
Drops the now-unused @v2 alias from vite.config.js and points the laravel-vite-plugin entry at resources/scripts/main.ts. Updates the only blade reference (resources/views/app.blade.php) to match. The package.json test script (eslint ./resources/scripts) automatically targets the right place after the rename without any edit.
Verified: npm run build exits clean and the Vite warning lines now reference resources/scripts/plugins/i18n.ts, confirming every import resolved through the new path. git log --follow on any moved file walks back through its scripts-v2 history.
This commit is contained in:
@@ -0,0 +1,124 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, computed } from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import { required, minLength, email, helpers } from '@vuelidate/validators'
|
||||
import { useVuelidate } from '@vuelidate/core'
|
||||
import { useUserStore } from '../../../../stores/user.store'
|
||||
import { useGlobalStore } from '../../../../stores/global.store'
|
||||
import { useCompanyStore } from '../../../../stores/company.store'
|
||||
|
||||
const LANGUAGE_DEFAULT = 'default'
|
||||
|
||||
const userStore = useUserStore()
|
||||
const globalStore = useGlobalStore()
|
||||
const companyStore = useCompanyStore()
|
||||
const { t } = useI18n()
|
||||
|
||||
const isSaving = ref<boolean>(false)
|
||||
const userForm = computed(() => userStore.userForm)
|
||||
|
||||
const selectedLanguage = computed<string>({
|
||||
get: () => userForm.value.language || LANGUAGE_DEFAULT,
|
||||
set: (v: string) => {
|
||||
userForm.value.language = v === LANGUAGE_DEFAULT ? '' : v
|
||||
},
|
||||
})
|
||||
|
||||
const languageOptions = computed(() => {
|
||||
const languages = (globalStore.config as Record<string, unknown>)?.languages as Array<{ name: string; code: string }> ?? []
|
||||
return [
|
||||
{ name: t('settings.account_settings.default_language'), code: LANGUAGE_DEFAULT },
|
||||
...languages,
|
||||
]
|
||||
})
|
||||
|
||||
const rules = computed(() => ({
|
||||
name: {
|
||||
required: helpers.withMessage(t('validation.required'), required),
|
||||
minLength: helpers.withMessage(t('validation.name_min_length'), minLength(3)),
|
||||
},
|
||||
email: {
|
||||
required: helpers.withMessage(t('validation.required'), required),
|
||||
email: helpers.withMessage(t('validation.email_incorrect'), email),
|
||||
},
|
||||
}))
|
||||
|
||||
const v$ = useVuelidate(rules, userForm)
|
||||
|
||||
async function updateGeneral(): Promise<void> {
|
||||
v$.value.$touch()
|
||||
if (v$.value.$invalid) return
|
||||
|
||||
isSaving.value = true
|
||||
try {
|
||||
const language = userForm.value.language || 'default'
|
||||
|
||||
await userStore.updateUserSettings({ settings: { language } })
|
||||
|
||||
await userStore.updateCurrentUser({
|
||||
name: userForm.value.name,
|
||||
email: userForm.value.email,
|
||||
})
|
||||
|
||||
const effectiveLanguage = (language === 'default' ? '' : language) || companyStore.selectedCompanySettings?.language || 'en'
|
||||
await (window as Record<string, unknown>).loadLanguage?.(effectiveLanguage)
|
||||
} finally {
|
||||
isSaving.value = false
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<form @submit.prevent="updateGeneral">
|
||||
<BaseSettingCard
|
||||
:title="$t('settings.account_settings.general')"
|
||||
:description="$t('settings.account_settings.section_description')"
|
||||
>
|
||||
<BaseInputGrid class="mt-5">
|
||||
<BaseInputGroup
|
||||
:label="$t('settings.account_settings.name')"
|
||||
:error="v$.name.$error && v$.name.$errors[0]?.$message"
|
||||
required
|
||||
>
|
||||
<BaseInput
|
||||
v-model="userForm.name"
|
||||
:invalid="v$.name.$error"
|
||||
@blur="v$.name.$touch()"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
|
||||
<BaseInputGroup
|
||||
:label="$t('settings.account_settings.email')"
|
||||
:error="v$.email.$error && v$.email.$errors[0]?.$message"
|
||||
required
|
||||
>
|
||||
<BaseInput
|
||||
v-model="userForm.email"
|
||||
type="email"
|
||||
:invalid="v$.email.$error"
|
||||
@blur="v$.email.$touch()"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
|
||||
<BaseInputGroup :label="$t('settings.language')">
|
||||
<BaseMultiselect
|
||||
v-model="selectedLanguage"
|
||||
:options="languageOptions"
|
||||
label="name"
|
||||
value-prop="code"
|
||||
track-by="code"
|
||||
:searchable="true"
|
||||
:can-deselect="false"
|
||||
/>
|
||||
</BaseInputGroup>
|
||||
</BaseInputGrid>
|
||||
|
||||
<BaseButton :loading="isSaving" :disabled="isSaving" type="submit" class="mt-6">
|
||||
<template #left="slotProps">
|
||||
<BaseIcon v-if="!isSaving" name="ArrowDownOnSquareIcon" :class="slotProps.class" />
|
||||
</template>
|
||||
{{ $t('settings.company_info.save') }}
|
||||
</BaseButton>
|
||||
</BaseSettingCard>
|
||||
</form>
|
||||
</template>
|
||||
Reference in New Issue
Block a user