From c5ef11e37470f7f8ec9450d09de450e752d4ca20 Mon Sep 17 00:00:00 2001 From: Yevhen Odynets Date: Wed, 5 Feb 2025 09:02:03 +0200 Subject: [PATCH] fix linting errors --- actions/auth/common.ts | 1 + actions/auth/login.ts | 2 +- components/shared/sidebar/app-catalog-render.tsx | 5 +++-- components/shared/sidebar/app-catalog.tsx | 8 ++++++-- components/temp-component.tsx | 2 +- i18n/routing.ts | 2 +- messages/ru.json | 3 ++- messages/uk.json | 10 ++++++++++ 8 files changed, 25 insertions(+), 8 deletions(-) diff --git a/actions/auth/common.ts b/actions/auth/common.ts index 6915515..9cd939b 100644 --- a/actions/auth/common.ts +++ b/actions/auth/common.ts @@ -1,5 +1,6 @@ 'use server' +// @ts-ignore import {getUserWithAccount} from '@prisma/client/sql' import {getAccountByUserId} from '@/data/accout' diff --git a/actions/auth/login.ts b/actions/auth/login.ts index 2238d81..aa57457 100644 --- a/actions/auth/login.ts +++ b/actions/auth/login.ts @@ -17,7 +17,7 @@ export const login = async (data: z.infer) => { // If the data is invalid, return an error if (!validatedData) { - return {error: t('Invalid input data')} + return {error: t('Error.invalid-input-data')} } // Destructure the validated data diff --git a/components/shared/sidebar/app-catalog-render.tsx b/components/shared/sidebar/app-catalog-render.tsx index 94aa6d4..f0ef31c 100644 --- a/components/shared/sidebar/app-catalog-render.tsx +++ b/components/shared/sidebar/app-catalog-render.tsx @@ -1,11 +1,12 @@ 'use client' +import {Category} from '@prisma/client' import {useLocale} from 'next-intl' import {Link} from '@/i18n/routing' import {Button} from '@/ui/button' -export default function AppCatalogRender(items: Array) { +export default function AppCatalogRender(data: {items: Category[]}) { const locale = useLocale() return ( @@ -24,7 +25,7 @@ export default function AppCatalogRender(items: Array) {
    - {items?.items.map((item: any) => ( + {data?.items.map((item: any) => (
  • { +const appCatalog = async (): Promise => { return db.category.findMany({ include: { locales: true @@ -12,5 +14,7 @@ const appCatalog = async () => { } export default async function AppCatalog() { - return + const categories: Category[] | null = await appCatalog() + // @ts-ignore + return } diff --git a/components/temp-component.tsx b/components/temp-component.tsx index 9a01118..4784cb5 100644 --- a/components/temp-component.tsx +++ b/components/temp-component.tsx @@ -4,7 +4,7 @@ import {useLocale} from 'next-intl' import {Link} from '@/i18n/routing' -export default function TempComponent(data: object[]) { +export default function TempComponent(data: {data: object[]}) { const locale = useLocale() /*console.log(data)*/ diff --git a/i18n/routing.ts b/i18n/routing.ts index ee6745a..d835400 100644 --- a/i18n/routing.ts +++ b/i18n/routing.ts @@ -7,7 +7,7 @@ export const locales = i18n.locales.map(locale => locale.code) export const routing = defineRouting({ locales, - defaultLocale: i18n.defaultLocale, + defaultLocale: 'uk', localePrefix: 'as-needed', localeCookie: { // Expire in one year diff --git a/messages/ru.json b/messages/ru.json index 2bf551f..1b67658 100644 --- a/messages/ru.json +++ b/messages/ru.json @@ -59,7 +59,8 @@ "success": "Пользователь успешно авторизован!" }, "Error": { - "user-not-found": "Пользователь не найден" + "user-not-found": "Пользователь не найден", + "invalid-input-data": "invalid-input-data" } } } diff --git a/messages/uk.json b/messages/uk.json index c1d346d..adfad7e 100644 --- a/messages/uk.json +++ b/messages/uk.json @@ -59,5 +59,15 @@ "surname": "Прізвище" } } + }, + "Auth": { + "Login": { + "label": "Войти", + "success": "Пользователь успешно авторизован!" + }, + "Error": { + "user-not-found": "Пользователь не найден", + "invalid-input-data": "Недійсні вхідні дані" + } } }