add image upload, fix styles

src/app/actions/action.ts

@@ -0,0 +1,54 @@
+'use server'
+import { getSessionData } from '@/app/actions/session';
+import { localDevelopmentUrl } from '@/app/actions/definitions';
+
+const API_BASE_URL = process.env.NODE_ENV === 'development'
+	? localDevelopmentUrl
+	: 'http://app:8080';
+
+const FRUITS_URL = 'https://www.fruityvice.com/api/fruit/';
+const ALL = 'all';
+
+export async function fetchFruits() {
+	try {
+		const response = await fetch(FRUITS_URL + ALL, { 'method': 'GET' });
+		let parsed = await response.json();
+		return parsed;
+	} catch (error) {
+		console.error('Error:', error);
+		throw new Error('Failed to fetch fruits data.');
+	}
+}
+
+export async function fetchFruit(id: number) {
+	try {
+		const response = await fetch(FRUITS_URL + id, { 'method': 'GET' });
+		let parsed = await response.json();
+		return parsed;
+	} catch (error) {
+		console.error('Error:', error);
+		throw new Error('Failed to fetch fruits data.');
+	}
+}
+
+export async function getUserData() {
+	const userEmail = await getSessionData('email');
+	const token = await getSessionData('token');
+
+	try {
+		const response = await fetch(`${API_BASE_URL}/v1/api/user?email=${userEmail}`, {
+			method: 'GET',
+			headers: {
+				"Content-Type": "application/json",
+				"Accept": "application/json",
+				"Authorization": `Bearer ${token}`,
+			}
+		});
+
+		if (response.ok) {
+			return await response.json();
+		}
+	} catch (error) {
+		console.error('error');
+	}
+}

src/app/actions/auth.ts

@@ -1,7 +1,7 @@
 'use server'
 
-import { SignupFormSchema, loginFormSchema, localDevelopmentUrl } from '@/app/lib/definitions';
-import { createSession, deleteSession, getSessionData } from '@/app/lib/session';
+import { SignupFormSchema, loginFormSchema, localDevelopmentUrl } from '@/app/actions/definitions';
+import { createSession, deleteSession, getSessionData } from '@/app/actions/session';
 import { redirect } from 'next/navigation';
 
 const API_BASE_URL = process.env.NODE_ENV === 'development'

src/app/actions/definitions.ts

@@ -0,0 +1,62 @@
+import * as z from 'zod'
+
+export type FormState =
+	| {
+		errors?: {
+			name?: string[]
+			email?: string[]
+			password?: string[]
+		}
+		message?: string
+	}
+	| undefined
+
+export type FormAction = (
+	state: FormState,
+	formData: FormData
+) => Promise<FormState>
+
+export const SignupFormSchema = z
+	.object({
+		full_name: z
+			.string()
+			.min(3, { error: 'Имя должно содержать не менее 3 символов.' })
+			.trim(),
+		email: z.email({ error: 'Пожалуйста, введите правильный адрес электронной почты.' }).trim(),
+		phone: z
+			.string()
+			.min(12, { error: 'Пожалуйста, введите телефонный номер.' }),
+		password: z
+			.string()
+			.min(8, { error: 'Длина пароля должна быть не менее 8 символов.' })
+			.regex(/[a-zA-Z]/, { error: 'Пароль должен содержать как минимум 1 букву.' })
+			.regex(/[0-9]/, { error: 'Пароль должен содержать как минимум 1 цифру.' })
+			.refine((value) => !/[а-яёА-ЯЁ]/.test(value),
+			{
+				message: 'Пароль не должен содержать кириллицу.'
+			})
+			.trim(),
+		confirm_password: z
+			.string(),
+		agree: z
+			.string()
+			.min(2, { error: 'Пожалуйста, ознакомьтесь с условиями использования и политикой конфиденциальности.' })
+	})
+	.refine((data) => data.password === data.confirm_password, {
+		message: 'Повторите пароль',
+		path: ['confirm_password'],
+	});
+
+export const loginFormSchema = z
+	.object({
+		email: z
+			.string()
+			.min(1, { error: 'Адрес электронной почты не должен быть пустым.' })
+			.trim(),
+		password: z
+			.string()
+			.min(1, { error: 'Пароль не должен быть пустым.' })
+			.trim(),
+	})
+
+export const localDevelopmentUrl = 'http://localhost:80';

src/app/actions/session.ts

@@ -0,0 +1,68 @@
+import 'server-only'
+import { cookies } from 'next/headers'
+import { SignJWT, jwtVerify } from 'jose'
+/* import { SessionPayload } from '@/app/lib/definitions' */
+
+/* const secretKey = process.env.SESSION_SECRET */
+const secretKey = 'AAA+sq1yKte/gMgUUu/B/OyXqr45/LMYplPVOlWc+uo='
+const encodedKey = new TextEncoder().encode(secretKey)
+
+export async function encrypt(payload: any) {
+	return new SignJWT(payload)
+		.setProtectedHeader({ alg: 'HS256' })
+		.setIssuedAt()
+		.setExpirationTime('7d')
+		.sign(encodedKey)
+}
+
+export async function decrypt(session: string | undefined = '') {
+	try {
+		const { payload } = await jwtVerify(session, encodedKey, {
+			algorithms: ['HS256'],
+		})
+		return payload
+	} catch (error) {
+		console.log('Failed to verify session')
+	}
+}
+
+export async function createSession(token: string, email: string) {
+	const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
+	const session = await encrypt({
+		token,
+		email,
+		expiresAt
+	});
+	const cookieStore = await cookies();
+
+	cookieStore.set('session', session, {
+		httpOnly: true,
+		secure: false,
+		expires: expiresAt,
+		sameSite: 'lax',
+		path: '/',
+	});
+}
+
+export async function getSessionData(type: 'token' | 'email'): Promise<string | null> {
+	const cookieStore = await cookies();
+	const sessionCookie = cookieStore.get('session')?.value;
+
+	if (!sessionCookie) {
+		return null;
+	}
+
+	const payload = await decrypt(sessionCookie);
+
+	if (payload && typeof payload === 'object' && type in payload) {
+		return payload[type] as string;
+	}
+
+	return null;
+}
+
+
+export async function deleteSession() {
+	const cookieStore = await cookies()
+	cookieStore.delete('session');
+}

src/app/actions/sessions.ts

@@ -0,0 +1,23 @@
+import 'server-only'
+import { cookies } from 'next/headers'
+import { decrypt } from '@/app/actions/session'
+
+export async function updateSession() {
+	const session = (await cookies()).get('session')?.value
+	const payload = await decrypt(session)
+
+	if (!session || !payload) {
+		return null
+	}
+
+	const expires = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000)
+
+	const cookieStore = await cookies()
+	cookieStore.set('session', session, {
+		httpOnly: true,
+		secure: true,
+		expires: expires,
+		sameSite: 'lax',
+		path: '/',
+	})
+}