diff --git a/package.json b/package.json index 6429837..c86445e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "no-copy-frontend", - "version": "0.42.0", + "version": "0.43.0", "private": true, "scripts": { "dev": "next dev -p 2999", diff --git a/src/app/[locale]/login/page.tsx b/src/app/[locale]/login/page.tsx index fa94248..423d00c 100644 --- a/src/app/[locale]/login/page.tsx +++ b/src/app/[locale]/login/page.tsx @@ -7,6 +7,8 @@ import LanguageSwitcher from '@/app/components/LanguageSwitcher'; import { useTranslations } from 'next-intl'; import VKLogin from '@/app/components/VKLogin'; import YandexAuthWithScript from '@/app/components/YandexLogin'; +import { getHealt } from '@/app/actions/action'; +import { Suspense } from 'react'; export const metadata: Metadata = { title: 'Login', @@ -15,57 +17,69 @@ export const metadata: Metadata = { export default function Page() { const t = useTranslations('Login-register-form'); + async function HealthData() { + const data = await getHealt(); + if (!data) { + return
Сервер временно не работает
+ } else { + return null + } + } + return ( -
-{/*
+ Loading...
}> + +
+ {/*
*/} -
-
- -

NO COPY

-

- {t('copyright-protection')} -

-
- -
- - {t('or-log-in-via')} - -
-
- -
-
- -
-
-

{t('no-account')}? - {t('register')} -

-
-
-
- - - - {t('protecting-watermark')} +
+
+ +

NO COPY

+

+ {t('copyright-protection')} +

-
- - - - {t('monitoring-violations')} + +
+ + {t('or-log-in-via')} +
-
- - - - {t('safe-storage')} +
+ +
+
+ +
+
+

{t('no-account')}? + {t('register')} +

+
+
+
+ + + + {t('protecting-watermark')} +
+
+ + + + {t('monitoring-violations')} +
+
+ + + + {t('safe-storage')} +
-
+ ); } diff --git a/src/app/actions/action.ts b/src/app/actions/action.ts index 71458cc..86b8f2b 100644 --- a/src/app/actions/action.ts +++ b/src/app/actions/action.ts @@ -158,4 +158,24 @@ export async function fetchINN(inn: string) { } catch (error) { return null } +} + +export async function getHealt() { + try { + const response = await fetch(`${API_BASE_URL}/check/api/healt`, { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + 'Accept': 'application/json' + } + }); + + if (response.ok) { + return await response.json(); + } else { + return null + } + } catch (error) { + return null + } } \ No newline at end of file diff --git a/src/app/actions/yooKassa.ts b/src/app/actions/yooKassa.ts index c76bedc..899abde 100644 --- a/src/app/actions/yooKassa.ts +++ b/src/app/actions/yooKassa.ts @@ -27,7 +27,7 @@ export async function yooKasaCreatePayment(amount: number, tariff: string) { return_url: 'test' }, metadata: { - userId: userEmail, + userMail: userEmail, tariff: tariff } }; diff --git a/src/app/ui/forms/login-form.tsx b/src/app/ui/forms/login-form.tsx index d97c2fa..8777100 100644 --- a/src/app/ui/forms/login-form.tsx +++ b/src/app/ui/forms/login-form.tsx @@ -19,7 +19,6 @@ export default function LoginForm() { setShowPassword(!showPassword); } - const checkBoxRememberMe = useRef(null); return (