diff --git a/resources/scripts-v2/App.vue b/resources/scripts/App.vue similarity index 100% rename from resources/scripts-v2/App.vue rename to resources/scripts/App.vue diff --git a/resources/scripts-v2/InvoiceShelf.ts b/resources/scripts/InvoiceShelf.ts similarity index 100% rename from resources/scripts-v2/InvoiceShelf.ts rename to resources/scripts/InvoiceShelf.ts diff --git a/resources/scripts-v2/api/client.ts b/resources/scripts/api/client.ts similarity index 100% rename from resources/scripts-v2/api/client.ts rename to resources/scripts/api/client.ts diff --git a/resources/scripts-v2/api/endpoints.ts b/resources/scripts/api/endpoints.ts similarity index 100% rename from resources/scripts-v2/api/endpoints.ts rename to resources/scripts/api/endpoints.ts diff --git a/resources/scripts-v2/api/index.ts b/resources/scripts/api/index.ts similarity index 100% rename from resources/scripts-v2/api/index.ts rename to resources/scripts/api/index.ts diff --git a/resources/scripts-v2/api/services/auth.service.ts b/resources/scripts/api/services/auth.service.ts similarity index 94% rename from resources/scripts-v2/api/services/auth.service.ts rename to resources/scripts/api/services/auth.service.ts index eb68a21f..874a895c 100644 --- a/resources/scripts-v2/api/services/auth.service.ts +++ b/resources/scripts/api/services/auth.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { User } from '@v2/types/domain/user' -import type { ApiResponse } from '@v2/types/api' +import type { User } from '@/scripts/types/domain/user' +import type { ApiResponse } from '@/scripts/types/api' export interface LoginPayload { email: string diff --git a/resources/scripts-v2/api/services/backup.service.ts b/resources/scripts/api/services/backup.service.ts similarity index 100% rename from resources/scripts-v2/api/services/backup.service.ts rename to resources/scripts/api/services/backup.service.ts diff --git a/resources/scripts-v2/api/services/bootstrap.service.ts b/resources/scripts/api/services/bootstrap.service.ts similarity index 83% rename from resources/scripts-v2/api/services/bootstrap.service.ts rename to resources/scripts/api/services/bootstrap.service.ts index c9a241b3..90561331 100644 --- a/resources/scripts-v2/api/services/bootstrap.service.ts +++ b/resources/scripts/api/services/bootstrap.service.ts @@ -1,9 +1,9 @@ import { client } from '../client' import { API } from '../endpoints' -import type { User, UserSetting } from '@v2/types/domain/user' -import type { Company } from '@v2/types/domain/company' -import type { Currency } from '@v2/types/domain/currency' -import type { Ability } from '@v2/types/domain/role' +import type { User, UserSetting } from '@/scripts/types/domain/user' +import type { Company } from '@/scripts/types/domain/company' +import type { Currency } from '@/scripts/types/domain/currency' +import type { Ability } from '@/scripts/types/domain/role' export interface MenuItem { title: string diff --git a/resources/scripts-v2/api/services/company.service.ts b/resources/scripts/api/services/company.service.ts similarity index 96% rename from resources/scripts-v2/api/services/company.service.ts rename to resources/scripts/api/services/company.service.ts index e66a2e22..89f18f12 100644 --- a/resources/scripts-v2/api/services/company.service.ts +++ b/resources/scripts/api/services/company.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Company } from '@v2/types/domain/company' -import type { ApiResponse } from '@v2/types/api' +import type { Company } from '@/scripts/types/domain/company' +import type { ApiResponse } from '@/scripts/types/api' export interface UpdateCompanyPayload { name: string diff --git a/resources/scripts-v2/api/services/custom-field.service.ts b/resources/scripts/api/services/custom-field.service.ts similarity index 90% rename from resources/scripts-v2/api/services/custom-field.service.ts rename to resources/scripts/api/services/custom-field.service.ts index b7a224f4..577fe4e6 100644 --- a/resources/scripts-v2/api/services/custom-field.service.ts +++ b/resources/scripts/api/services/custom-field.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { CustomField } from '@v2/types/domain/custom-field' -import type { ApiResponse, ListParams } from '@v2/types/api' +import type { CustomField } from '@/scripts/types/domain/custom-field' +import type { ApiResponse, ListParams } from '@/scripts/types/api' export interface CustomFieldListParams extends ListParams { model_type?: string diff --git a/resources/scripts-v2/api/services/customer.service.ts b/resources/scripts/api/services/customer.service.ts similarity index 94% rename from resources/scripts-v2/api/services/customer.service.ts rename to resources/scripts/api/services/customer.service.ts index f305fd2a..fb083497 100644 --- a/resources/scripts-v2/api/services/customer.service.ts +++ b/resources/scripts/api/services/customer.service.ts @@ -1,11 +1,11 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Customer, CreateCustomerPayload } from '@v2/types/domain/customer' +import type { Customer, CreateCustomerPayload } from '@/scripts/types/domain/customer' import type { ApiResponse, ListParams, DeletePayload, -} from '@v2/types/api' +} from '@/scripts/types/api' export interface CustomerListParams extends ListParams { display_name?: string diff --git a/resources/scripts-v2/api/services/dashboard.service.ts b/resources/scripts/api/services/dashboard.service.ts similarity index 100% rename from resources/scripts-v2/api/services/dashboard.service.ts rename to resources/scripts/api/services/dashboard.service.ts diff --git a/resources/scripts-v2/api/services/disk.service.ts b/resources/scripts/api/services/disk.service.ts similarity index 98% rename from resources/scripts-v2/api/services/disk.service.ts rename to resources/scripts/api/services/disk.service.ts index 7c259c74..2aeb7595 100644 --- a/resources/scripts-v2/api/services/disk.service.ts +++ b/resources/scripts/api/services/disk.service.ts @@ -1,6 +1,6 @@ import { client } from '../client' import { API } from '../endpoints' -import type { ApiResponse, ListParams, PaginatedResponse } from '@v2/types/api' +import type { ApiResponse, ListParams, PaginatedResponse } from '@/scripts/types/api' export type DiskDriverValue = | 'local' diff --git a/resources/scripts-v2/api/services/estimate.service.ts b/resources/scripts/api/services/estimate.service.ts similarity index 94% rename from resources/scripts-v2/api/services/estimate.service.ts rename to resources/scripts/api/services/estimate.service.ts index 1f6256fb..93c5002d 100644 --- a/resources/scripts-v2/api/services/estimate.service.ts +++ b/resources/scripts/api/services/estimate.service.ts @@ -1,14 +1,14 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Estimate, CreateEstimatePayload } from '@v2/types/domain/estimate' -import type { Invoice } from '@v2/types/domain/invoice' +import type { Estimate, CreateEstimatePayload } from '@/scripts/types/domain/estimate' +import type { Invoice } from '@/scripts/types/domain/invoice' import type { ApiResponse, ListParams, DateRangeParams, NextNumberResponse, DeletePayload, -} from '@v2/types/api' +} from '@/scripts/types/api' export interface EstimateListParams extends ListParams, DateRangeParams { status?: string diff --git a/resources/scripts-v2/api/services/exchange-rate.service.ts b/resources/scripts/api/services/exchange-rate.service.ts similarity index 96% rename from resources/scripts-v2/api/services/exchange-rate.service.ts rename to resources/scripts/api/services/exchange-rate.service.ts index bb8181ea..7718591b 100644 --- a/resources/scripts-v2/api/services/exchange-rate.service.ts +++ b/resources/scripts/api/services/exchange-rate.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { ExchangeRateProvider, Currency } from '@v2/types/domain/currency' -import type { ApiResponse, ListParams } from '@v2/types/api' +import type { ExchangeRateProvider, Currency } from '@/scripts/types/domain/currency' +import type { ApiResponse, ListParams } from '@/scripts/types/api' export interface CreateExchangeRateProviderPayload { driver: string diff --git a/resources/scripts-v2/api/services/expense.service.ts b/resources/scripts/api/services/expense.service.ts similarity index 97% rename from resources/scripts-v2/api/services/expense.service.ts rename to resources/scripts/api/services/expense.service.ts index a552d776..3de1bd6b 100644 --- a/resources/scripts-v2/api/services/expense.service.ts +++ b/resources/scripts/api/services/expense.service.ts @@ -1,12 +1,12 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Expense, ExpenseCategory, CreateExpensePayload } from '@v2/types/domain/expense' +import type { Expense, ExpenseCategory, CreateExpensePayload } from '@/scripts/types/domain/expense' import type { ApiResponse, ListParams, DateRangeParams, DeletePayload, -} from '@v2/types/api' +} from '@/scripts/types/api' export interface ExpenseListParams extends ListParams, DateRangeParams { expense_category_id?: number diff --git a/resources/scripts-v2/api/services/index.ts b/resources/scripts/api/services/index.ts similarity index 100% rename from resources/scripts-v2/api/services/index.ts rename to resources/scripts/api/services/index.ts diff --git a/resources/scripts-v2/api/services/invoice.service.ts b/resources/scripts/api/services/invoice.service.ts similarity index 96% rename from resources/scripts-v2/api/services/invoice.service.ts rename to resources/scripts/api/services/invoice.service.ts index a424e4ce..14e70597 100644 --- a/resources/scripts-v2/api/services/invoice.service.ts +++ b/resources/scripts/api/services/invoice.service.ts @@ -1,6 +1,6 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Invoice, CreateInvoicePayload } from '@v2/types/domain/invoice' +import type { Invoice, CreateInvoicePayload } from '@/scripts/types/domain/invoice' import type { ApiResponse, PaginatedResponse, @@ -8,7 +8,7 @@ import type { DateRangeParams, NextNumberResponse, DeletePayload, -} from '@v2/types/api' +} from '@/scripts/types/api' export interface InvoiceListParams extends ListParams, DateRangeParams { status?: string diff --git a/resources/scripts-v2/api/services/item.service.ts b/resources/scripts/api/services/item.service.ts similarity index 96% rename from resources/scripts-v2/api/services/item.service.ts rename to resources/scripts/api/services/item.service.ts index f587eefa..8ab5848c 100644 --- a/resources/scripts-v2/api/services/item.service.ts +++ b/resources/scripts/api/services/item.service.ts @@ -1,11 +1,11 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Item, Unit } from '@v2/types/domain/item' +import type { Item, Unit } from '@/scripts/types/domain/item' import type { ApiResponse, ListParams, DeletePayload, -} from '@v2/types/api' +} from '@/scripts/types/api' export interface ItemListParams extends ListParams { filter?: Record diff --git a/resources/scripts-v2/api/services/mail.service.ts b/resources/scripts/api/services/mail.service.ts similarity index 100% rename from resources/scripts-v2/api/services/mail.service.ts rename to resources/scripts/api/services/mail.service.ts diff --git a/resources/scripts-v2/api/services/member.service.ts b/resources/scripts/api/services/member.service.ts similarity index 94% rename from resources/scripts-v2/api/services/member.service.ts rename to resources/scripts/api/services/member.service.ts index a91c83bb..28fdd83b 100644 --- a/resources/scripts-v2/api/services/member.service.ts +++ b/resources/scripts/api/services/member.service.ts @@ -1,8 +1,8 @@ import { client } from '../client' import { API } from '../endpoints' -import type { User } from '@v2/types/domain/user' -import type { CompanyInvitation } from '@v2/types/domain/company' -import type { ApiResponse, PaginatedResponse, ListParams } from '@v2/types/api' +import type { User } from '@/scripts/types/domain/user' +import type { CompanyInvitation } from '@/scripts/types/domain/company' +import type { ApiResponse, PaginatedResponse, ListParams } from '@/scripts/types/api' export interface MemberListParams extends ListParams { display_name?: string diff --git a/resources/scripts-v2/api/services/module.service.ts b/resources/scripts/api/services/module.service.ts similarity index 97% rename from resources/scripts-v2/api/services/module.service.ts rename to resources/scripts/api/services/module.service.ts index 45b083e4..516f3468 100644 --- a/resources/scripts-v2/api/services/module.service.ts +++ b/resources/scripts/api/services/module.service.ts @@ -1,6 +1,6 @@ import { client } from '../client' import { API } from '../endpoints' -import type { ApiResponse } from '@v2/types/api' +import type { ApiResponse } from '@/scripts/types/api' export interface Module { name: string diff --git a/resources/scripts-v2/api/services/note.service.ts b/resources/scripts/api/services/note.service.ts similarity index 88% rename from resources/scripts-v2/api/services/note.service.ts rename to resources/scripts/api/services/note.service.ts index 128743c5..9d9b75ed 100644 --- a/resources/scripts-v2/api/services/note.service.ts +++ b/resources/scripts/api/services/note.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Note } from '@v2/types/domain/note' -import type { ApiResponse, ListParams } from '@v2/types/api' +import type { Note } from '@/scripts/types/domain/note' +import type { ApiResponse, ListParams } from '@/scripts/types/api' export interface CreateNotePayload { type: string diff --git a/resources/scripts-v2/api/services/payment.service.ts b/resources/scripts/api/services/payment.service.ts similarity index 97% rename from resources/scripts-v2/api/services/payment.service.ts rename to resources/scripts/api/services/payment.service.ts index 2f668dbf..6ed49438 100644 --- a/resources/scripts-v2/api/services/payment.service.ts +++ b/resources/scripts/api/services/payment.service.ts @@ -1,12 +1,12 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Payment, PaymentMethod, CreatePaymentPayload } from '@v2/types/domain/payment' +import type { Payment, PaymentMethod, CreatePaymentPayload } from '@/scripts/types/domain/payment' import type { ApiResponse, ListParams, NextNumberResponse, DeletePayload, -} from '@v2/types/api' +} from '@/scripts/types/api' export interface PaymentListParams extends ListParams { customer_id?: number diff --git a/resources/scripts-v2/api/services/pdf.service.ts b/resources/scripts/api/services/pdf.service.ts similarity index 100% rename from resources/scripts-v2/api/services/pdf.service.ts rename to resources/scripts/api/services/pdf.service.ts diff --git a/resources/scripts-v2/api/services/recurring-invoice.service.ts b/resources/scripts/api/services/recurring-invoice.service.ts similarity index 96% rename from resources/scripts-v2/api/services/recurring-invoice.service.ts rename to resources/scripts/api/services/recurring-invoice.service.ts index 3bbfb4e0..c3456067 100644 --- a/resources/scripts-v2/api/services/recurring-invoice.service.ts +++ b/resources/scripts/api/services/recurring-invoice.service.ts @@ -1,11 +1,11 @@ import { client } from '../client' import { API } from '../endpoints' -import type { RecurringInvoice, CreateRecurringInvoicePayload } from '@v2/types/domain/recurring-invoice' +import type { RecurringInvoice, CreateRecurringInvoicePayload } from '@/scripts/types/domain/recurring-invoice' import type { ApiResponse, ListParams, DeletePayload, -} from '@v2/types/api' +} from '@/scripts/types/api' export interface RecurringInvoiceListParams extends ListParams { status?: string diff --git a/resources/scripts-v2/api/services/report.service.ts b/resources/scripts/api/services/report.service.ts similarity index 96% rename from resources/scripts-v2/api/services/report.service.ts rename to resources/scripts/api/services/report.service.ts index e39a363b..4427a2dc 100644 --- a/resources/scripts-v2/api/services/report.service.ts +++ b/resources/scripts/api/services/report.service.ts @@ -1,6 +1,6 @@ import { client } from '../client' import { API } from '../endpoints' -import type { DateRangeParams } from '@v2/types/api' +import type { DateRangeParams } from '@/scripts/types/api' export interface ReportParams extends DateRangeParams { report_type?: string diff --git a/resources/scripts-v2/api/services/role.service.ts b/resources/scripts/api/services/role.service.ts similarity index 90% rename from resources/scripts-v2/api/services/role.service.ts rename to resources/scripts/api/services/role.service.ts index f7eb0220..4e0aeb3c 100644 --- a/resources/scripts-v2/api/services/role.service.ts +++ b/resources/scripts/api/services/role.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Role, Ability } from '@v2/types/domain/role' -import type { ApiResponse, ListParams } from '@v2/types/api' +import type { Role, Ability } from '@/scripts/types/domain/role' +import type { ApiResponse, ListParams } from '@/scripts/types/api' export interface CreateRolePayload { name: string diff --git a/resources/scripts-v2/api/services/setting.service.ts b/resources/scripts/api/services/setting.service.ts similarity index 95% rename from resources/scripts-v2/api/services/setting.service.ts rename to resources/scripts/api/services/setting.service.ts index 4b4411c1..0f66cac7 100644 --- a/resources/scripts-v2/api/services/setting.service.ts +++ b/resources/scripts/api/services/setting.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { Country } from '@v2/types/domain/customer' -import type { Currency } from '@v2/types/domain/currency' +import type { Country } from '@/scripts/types/domain/customer' +import type { Currency } from '@/scripts/types/domain/currency' export interface DateFormat { display_date: string diff --git a/resources/scripts-v2/api/services/tax-type.service.ts b/resources/scripts/api/services/tax-type.service.ts similarity index 90% rename from resources/scripts-v2/api/services/tax-type.service.ts rename to resources/scripts/api/services/tax-type.service.ts index a0ea12aa..d35d91a2 100644 --- a/resources/scripts-v2/api/services/tax-type.service.ts +++ b/resources/scripts/api/services/tax-type.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { TaxType } from '@v2/types/domain/tax' -import type { ApiResponse, ListParams } from '@v2/types/api' +import type { TaxType } from '@/scripts/types/domain/tax' +import type { ApiResponse, ListParams } from '@/scripts/types/api' export interface CreateTaxTypePayload { name: string diff --git a/resources/scripts-v2/api/services/update.service.ts b/resources/scripts/api/services/update.service.ts similarity index 100% rename from resources/scripts-v2/api/services/update.service.ts rename to resources/scripts/api/services/update.service.ts diff --git a/resources/scripts-v2/api/services/user.service.ts b/resources/scripts/api/services/user.service.ts similarity index 91% rename from resources/scripts-v2/api/services/user.service.ts rename to resources/scripts/api/services/user.service.ts index 8e85b7ec..16f4f0e5 100644 --- a/resources/scripts-v2/api/services/user.service.ts +++ b/resources/scripts/api/services/user.service.ts @@ -1,7 +1,7 @@ import { client } from '../client' import { API } from '../endpoints' -import type { User } from '@v2/types/domain/user' -import type { ApiResponse } from '@v2/types/api' +import type { User } from '@/scripts/types/domain/user' +import type { ApiResponse } from '@/scripts/types/api' export interface UpdateProfilePayload { name: string diff --git a/resources/scripts-v2/components/base/BaseBadge.vue b/resources/scripts/components/base/BaseBadge.vue similarity index 100% rename from resources/scripts-v2/components/base/BaseBadge.vue rename to resources/scripts/components/base/BaseBadge.vue diff --git a/resources/scripts-v2/components/base/BaseButton.vue b/resources/scripts/components/base/BaseButton.vue similarity index 98% rename from resources/scripts-v2/components/base/BaseButton.vue rename to resources/scripts/components/base/BaseButton.vue index 22b0c69d..089d6d8e 100644 --- a/resources/scripts-v2/components/base/BaseButton.vue +++ b/resources/scripts/components/base/BaseButton.vue @@ -1,6 +1,6 @@ diff --git a/resources/scripts-v2/layouts/index.ts b/resources/scripts/layouts/index.ts similarity index 100% rename from resources/scripts-v2/layouts/index.ts rename to resources/scripts/layouts/index.ts diff --git a/resources/scripts-v2/layouts/partials/CompanySwitcher.vue b/resources/scripts/layouts/partials/CompanySwitcher.vue similarity index 95% rename from resources/scripts-v2/layouts/partials/CompanySwitcher.vue rename to resources/scripts/layouts/partials/CompanySwitcher.vue index 0e8012d0..8d11551e 100644 --- a/resources/scripts-v2/layouts/partials/CompanySwitcher.vue +++ b/resources/scripts/layouts/partials/CompanySwitcher.vue @@ -191,13 +191,13 @@ import { ref, watch } from 'vue' import { onClickOutside } from '@vueuse/core' import { useRoute, useRouter } from 'vue-router' import { useI18n } from 'vue-i18n' -import { useCompanyStore } from '@v2/stores/company.store' -import { useGlobalStore } from '@v2/stores/global.store' -import { useUserStore } from '@v2/stores/user.store' -import { useModalStore } from '@v2/stores/modal.store' -import CompanyModal from '@v2/features/company/settings/components/CompanyModal.vue' -import type { Company, CompanyInvitation } from '@v2/types/domain/company' -import type { Role } from '@v2/types/domain/role' +import { useCompanyStore } from '@/scripts/stores/company.store' +import { useGlobalStore } from '@/scripts/stores/global.store' +import { useUserStore } from '@/scripts/stores/user.store' +import { useModalStore } from '@/scripts/stores/modal.store' +import CompanyModal from '@/scripts/features/company/settings/components/CompanyModal.vue' +import type { Company, CompanyInvitation } from '@/scripts/types/domain/company' +import type { Role } from '@/scripts/types/domain/role' interface PendingInvitation { id: number diff --git a/resources/scripts-v2/layouts/partials/GlobalSearchBar.vue b/resources/scripts/layouts/partials/GlobalSearchBar.vue similarity index 98% rename from resources/scripts-v2/layouts/partials/GlobalSearchBar.vue rename to resources/scripts/layouts/partials/GlobalSearchBar.vue index 71b8cd28..940d0889 100644 --- a/resources/scripts-v2/layouts/partials/GlobalSearchBar.vue +++ b/resources/scripts/layouts/partials/GlobalSearchBar.vue @@ -112,8 +112,8 @@ import { ref, watch } from 'vue' import { onClickOutside, useDebounceFn } from '@vueuse/core' import { useRoute } from 'vue-router' -import { client } from '@v2/api/client' -import { API } from '@v2/api/endpoints' +import { client } from '@/scripts/api/client' +import { API } from '@/scripts/api/endpoints' interface SearchResult { id: number diff --git a/resources/scripts-v2/layouts/partials/ImpersonationBanner.vue b/resources/scripts/layouts/partials/ImpersonationBanner.vue similarity index 88% rename from resources/scripts-v2/layouts/partials/ImpersonationBanner.vue rename to resources/scripts/layouts/partials/ImpersonationBanner.vue index 2582486d..552a9d13 100644 --- a/resources/scripts-v2/layouts/partials/ImpersonationBanner.vue +++ b/resources/scripts/layouts/partials/ImpersonationBanner.vue @@ -17,9 +17,9 @@