diff --git a/package.json b/package.json index c8da7a6dc..f4bef5741 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "private": true, "scripts": { "dev": "vite", - "build": "vite build", + "build": "vite build --target=es2020", "serve": "vite preview", "test": "eslint ./resources/scripts --ext .js,.vue" }, @@ -18,22 +18,22 @@ "eslint": "^7.27.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-vue": "^7.0.0-beta.4", - "laravel-vite": "^0.0.7", "postcss": "^8.4.5", "prettier": "^2.3.0", "sass": "^1.32.12", "tailwind-scrollbar": "^1.3.1", "tailwindcss": "^3.0.6", - "vite": "^2.6.1" + "vite": "^2.5" }, "dependencies": { - "@headlessui/vue": "^1.4.0", + "@headlessui/vue": "^1.5.0", "@heroicons/vue": "^1.0.1", "@popperjs/core": "^2.9.2", "@stripe/stripe-js": "^1.21.2", "@tailwindcss/line-clamp": "^0.3.0", "@tiptap/core": "^2.0.0-beta.85", "@tiptap/extension-text-align": "^2.0.0-beta.29", + "@tiptap/pm": "^2.0.0-beta.220", "@tiptap/starter-kit": "^2.0.0-beta.81", "@tiptap/vue-3": "^2.0.0-beta.38", "@vuelidate/components": "^1.1.12", @@ -43,16 +43,18 @@ "axios": "^0.19", "chart.js": "^2.7.3", "guid": "0.0.12", + "laravel-vite-plugin": "^0.0.1", "lodash": "^4.17.13", "maska": "^1.4.6", "mini-svg-data-uri": "^1.3.3", "moment": "^2.29.1", "pinia": "^2.0.4", - "v-money3": "^3.13.5", + "v-calendar": "3.0.0-alpha.8", + "v-money3": "3.16.1", "v-tooltip": "^4.0.0-alpha.1", - "vue": "^3.2.0-beta.5", + "vue": "^3.2", "vue-flatpickr-component": "^9.0.3", - "vue-i18n": "^9.1.7", + "vue-i18n": "9.1", "vue-router": "^4.0.8", "vue3-colorpicker": "^1.0.5", "vuedraggable": "^4.1.0" diff --git a/resources/scripts/admin/components/CopyInputField.vue b/resources/scripts/admin/components/CopyInputField.vue index 851a0bc4e..66049440d 100644 --- a/resources/scripts/admin/components/CopyInputField.vue +++ b/resources/scripts/admin/components/CopyInputField.vue @@ -7,6 +7,7 @@ py-2 rounded-lg bg-opacity-40 bg-gray-300 + dark:bg-gray-700 dark:border-gray-600 whitespace-nowrap flex-col mt-1 @@ -19,6 +20,7 @@ text-sm font-medium text-black + dark:text-white truncate select-all select-color " diff --git a/resources/scripts/admin/components/SelectNotePopup.vue b/resources/scripts/admin/components/SelectNotePopup.vue index 822a8e2c6..bcc81cca0 100644 --- a/resources/scripts/admin/components/SelectNotePopup.vue +++ b/resources/scripts/admin/components/SelectNotePopup.vue @@ -43,6 +43,12 @@ max-w-full left-0 top-3 + bg-white + dark:border + dark:border-white/10 + dark:text-white + dark:bg-gray-800 + dark:shadow-glass " >
- |
-
- |
-
- |
-
+
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+ |
---|
+
{{ $t('customers.portal_access_text') }}
@@ -425,9 +425,7 @@+
{{ gIndex }}
+
{{ $t('settings.disk.is_default') }}
+
{{ $t('settings.disk.is_default') }}
+
{{ $t('settings.disk.is_default') }}
+
{{ $t('settings.disk.is_default') }}
+
{{
$t('modules.api_token_description', {
url: globalStore.config.base_url.replace(/^http:\/\//, ''),
diff --git a/resources/scripts/admin/views/payments/Create.vue b/resources/scripts/admin/views/payments/Create.vue
index 39888302e..1a6461d0a 100644
--- a/resources/scripts/admin/views/payments/Create.vue
+++ b/resources/scripts/admin/views/payments/Create.vue
@@ -82,9 +82,9 @@
required
>
{{ $t('payments.no_matching_payments') }}
diff --git a/resources/scripts/admin/views/recurring-invoices/Index.vue b/resources/scripts/admin/views/recurring-invoices/Index.vue index 2977d1f70..f0436e5b4 100644 --- a/resources/scripts/admin/views/recurring-invoices/Index.vue +++ b/resources/scripts/admin/views/recurring-invoices/Index.vue @@ -121,6 +121,7 @@ mt-5 list-none border-b-2 border-gray-200 border-solid + dark:border-gray-600 " > @@ -150,12 +151,12 @@ " > {{ $t('general.actions') }} -+
{{ $t('recurring_invoices.send_automatically') }}
{{ $t('recurring_invoices.send_automatically_desc') }} diff --git a/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue b/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue index 42445324c..d444fdfa8 100644 --- a/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue +++ b/resources/scripts/admin/views/recurring-invoices/partials/RecurringInvoiceViewSidebar.vue @@ -152,6 +152,7 @@ onSearched = debounce(onSearched, 500) xl:ml-64 w-88 xl:block + dark:bg-gray-800 " >
{{ $t('invoices.no_matching_invoices') }}
diff --git a/resources/scripts/admin/views/settings/BackupSetting.vue b/resources/scripts/admin/views/settings/BackupSetting.vue index f62e348b5..f0a60d013 100644 --- a/resources/scripts/admin/views/settings/BackupSetting.vue +++ b/resources/scripts/admin/views/settings/BackupSetting.vue @@ -51,14 +51,14 @@{{ $tc('settings.company_info.delete_company_description') }}
@@ -160,6 +173,7 @@ let isSaving = ref(false) const companyForm = reactive({ name: null, + slug: null, logo: null, address: { address_street_1: '', @@ -193,7 +207,14 @@ const rules = computed(() => { name: { required: helpers.withMessage(t('validation.required'), required), minLength: helpers.withMessage( - t('validation.name_min_length'), + t('validation.name_min_length', { count: 3 }), + minLength(3) + ), + }, + slug: { + required: helpers.withMessage(t('validation.required'), required), + minLength: helpers.withMessage( + t('validation.name_min_length', { count: 3 }), minLength(3) ), }, diff --git a/resources/scripts/admin/views/settings/CustomFieldsSetting.vue b/resources/scripts/admin/views/settings/CustomFieldsSetting.vue index 1cad62b00..bc39c082d 100644 --- a/resources/scripts/admin/views/settings/CustomFieldsSetting.vue +++ b/resources/scripts/admin/views/settings/CustomFieldsSetting.vue @@ -27,7 +27,7 @@ > {{ row.data.name }} - ({{ row.data.slug }}) + ({{ row.data.slug }}) @@ -60,7 +60,7 @@
{{ $t('settings.exchange_rate.providers_description') }}
diff --git a/resources/scripts/admin/views/settings/FileDiskSetting.vue b/resources/scripts/admin/views/settings/FileDiskSetting.vue
index 5e5bda80b..99be2f420 100644
--- a/resources/scripts/admin/views/settings/FileDiskSetting.vue
+++ b/resources/scripts/admin/views/settings/FileDiskSetting.vue
@@ -45,27 +45,30 @@
{{ $t('settings.update_app.update_warning') }}
{{ $t('settings.update_app.progress_text') }}
@@ -150,18 +135,11 @@
{{ $t(step.translationKey) }} {{ $t(step.translationKey) }}
- {{
+
+
{{ element.description }}
- {{ $t('settings.customization.estimates.convert_estimate_description') }}
-
+
{{ $t('general.note') }}
-
{{ i }}
@@ -136,7 +121,7 @@
{{ $t('settings.update_app.update_progress') }}
- {{ $t(`settings.customization.${type}s.${type}_number_format`) }}
-
-
@@ -29,6 +29,7 @@
leading-5
text-left text-gray-700
border-t border-b border-gray-200 border-solid
+ dark:border-gray-600
"
>
Component
@@ -55,6 +57,7 @@
leading-5
text-left text-gray-700
border-t border-b border-gray-200 border-solid
+ dark:text-gray-300 dark:border-gray-600
"
>
Parameter
@@ -69,13 +72,14 @@
leading-5
text-left text-gray-700
border-t border-b border-gray-200 border-solid
+ dark:border-gray-600
"
>
+
-