Skip to content

Commit 6f92e00

Browse files
authored
chore: nuxt updated (#133)
1 parent 0bab5b9 commit 6f92e00

File tree

11 files changed

+1174
-3461
lines changed

11 files changed

+1174
-3461
lines changed

apps/web-app/app/pages/agreement/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
:items="
1616
table?.tableApi
1717
?.getAllColumns()
18-
.filter((column) => column.getCanHide())
19-
.map((column) => ({
18+
.filter((column: any) => column.getCanHide())
19+
.map((column: any) => ({
2020
label: upperFirst(column.id),
2121
type: 'checkbox' as const,
2222
checked: column.getIsVisible(),

apps/web-app/app/pages/head/task/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
:items="
7373
table?.tableApi
7474
?.getAllColumns()
75-
.filter((column) => column.getCanHide())
76-
.map((column) => ({
75+
.filter((column: any) => column.getCanHide())
76+
.map((column: any) => ({
7777
label: upperFirst(column.id),
7878
type: 'checkbox' as const,
7979
checked: column.getIsVisible(),

apps/web-app/app/pages/kitchen/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
:items="
1616
table?.tableApi
1717
?.getAllColumns()
18-
.filter((column) => column.getCanHide())
19-
.map((column) => ({
18+
.filter((column: any) => column.getCanHide())
19+
.map((column: any) => ({
2020
label: upperFirst(column.id),
2121
type: 'checkbox' as const,
2222
checked: column.getIsVisible(),

apps/web-app/app/pages/print/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
:items="
3535
table?.tableApi
3636
?.getAllColumns()
37-
.filter((column) => column.getCanHide())
38-
.map((column) => ({
37+
.filter((column: any) => column.getCanHide())
38+
.map((column: any) => ({
3939
label: upperFirst(column.id),
4040
type: 'checkbox' as const,
4141
checked: column.getIsVisible(),

apps/web-app/app/pages/product/[productId]/usage.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
:items="
1414
table?.tableApi
1515
?.getAllColumns()
16-
.filter((column) => column.getCanHide())
17-
.map((column) => ({
16+
.filter((column: any) => column.getCanHide())
17+
.map((column: any) => ({
1818
label: upperFirst(column.id),
1919
type: 'checkbox' as const,
2020
checked: column.getIsVisible(),

apps/web-app/app/pages/product/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
:items="
2525
table?.tableApi
2626
?.getAllColumns()
27-
.filter((column) => column.getCanHide())
28-
.map((column) => ({
27+
.filter((column: any) => column.getCanHide())
28+
.map((column: any) => ({
2929
label: upperFirst(column.id),
3030
type: 'checkbox' as const,
3131
checked: column.getIsVisible(),

apps/web-app/shared/utils/helpers.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,25 @@ export function getResolutionIcon(resolution: Resolution) {
3131
}
3232
}
3333

34-
export function getPatentStatus(status: AgreementPatentStatus) {
34+
export function getPatentStatus(status: AgreementPatentStatus): string {
3535
switch (status) {
36-
case 'in_work':
37-
return 'В работе'
3836
case 'not_paid':
3937
return 'Не оплачен'
38+
case 'in_work':
39+
return 'В работе'
4040
case 'on_registration':
4141
return 'На регистрации'
4242
case 'registered':
4343
return 'Зарегистрирован'
44+
default:
45+
return ''
4446
}
4547
}
4648

4749
export function getPatentStatusForSelect(): { value: AgreementPatentStatus, label: string }[] {
4850
return [
49-
{ value: 'in_work', label: 'В работе' },
5051
{ value: 'not_paid', label: 'Не оплачен' },
52+
{ value: 'in_work', label: 'В работе' },
5153
{ value: 'on_registration', label: 'На регистрации' },
5254
{ value: 'registered', label: 'Зарегистрирован' },
5355
]

packages/database/src/tables.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export const partnerAgreements = pgTable('partner_agreements', {
125125
minMarketingFeePerMonth: numeric('min_marketing_fee_per_month', { mode: 'number' }).notNull().default(0),
126126
lumpSumPayment: numeric('lump_sum_payment', { mode: 'number' }).notNull().default(0),
127127
comment: varchar('comment'),
128-
patentStatus: varchar('patent_status').notNull().default('in_work').$type<AgreementPatentStatus>(),
128+
patentStatus: varchar('patent_status').notNull().default('not_paid').$type<AgreementPatentStatus>(),
129129
legalEntityId: cuid2('legal_entity_id').references(() => partnerLegalEntities.id),
130130
})
131131

packages/database/src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export type UserType = 'staff'
1818
| 'bot'
1919
export type UserGender = 'male' | 'female' | 'unknown'
2020

21-
export type AgreementPatentStatus = 'in_work' | 'not_paid' | 'on_registration' | 'registered'
21+
export type AgreementPatentStatus = 'not_paid' | 'in_work' | 'on_registration' | 'registered'
2222

2323
export type WeightUnit = 'G' | 'KG' | 'ML' | 'L' | 'OZ' | 'LB'
2424

pnpm-lock.yaml

Lines changed: 1151 additions & 3440 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)