From a1c8dd80ecf09082686748602d3dab196cc057ee Mon Sep 17 00:00:00 2001 From: Umar Adilov <99314948+adilovcode@users.noreply.github.com> Date: Sat, 10 May 2025 15:06:07 +0500 Subject: [PATCH 1/2] Added docker file for building app --- Dockerfile | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e0cee13 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +FROM node:18-alpine AS builder + +# Enable corepack and install pnpm +RUN corepack enable && corepack prepare pnpm@latest --activate + +# Disable interactive prompts +ENV CI=true + +WORKDIR /app +COPY . . + +# Install dependencies and build +RUN pnpm install && pnpm build + +FROM node:18-alpine AS runner + +RUN corepack enable && corepack prepare pnpm@latest --activate + +WORKDIR /app +COPY --from=builder /app ./ + +EXPOSE 3000 + +CMD ["pnpm", "start"] \ No newline at end of file From 6dd88f897c33e34f6ae567f1145d070cdeb94442 Mon Sep 17 00:00:00 2001 From: Umar Adilov <99314948+adilovcode@users.noreply.github.com> Date: Sat, 10 May 2025 16:54:29 +0500 Subject: [PATCH 2/2] Fixed api endpoints for new API --- src/app/api/auth/login/route.ts | 26 +++++++++++++++------ src/app/api/bonus/info/route.ts | 2 +- src/app/api/bonus/transactions/route.ts | 2 +- src/app/api/corporate/transactions/route.ts | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.ts index b156a93..7b7946a 100644 --- a/src/app/api/auth/login/route.ts +++ b/src/app/api/auth/login/route.ts @@ -14,13 +14,25 @@ const routeHandler = async (req: NextRequest) => { .merge(z.object({ type: z.enum(['bonus', 'corporate']) })) .parse(body); - const oriyoResponse = await oriyoClient.get('/client/login', { - params: { - type: validatedBody.type, - phone: validatedBody.phoneNumber, - uid: validatedBody.cardNumber, - }, - }); + const oriyoResponse = await (() => { + switch (validatedBody.type) { + case 'corporate': + return oriyoClient.get('/corporatecard', { + params: { + phone: validatedBody.phoneNumber, + uid: validatedBody.cardNumber, + }, + }); + + default: + return oriyoClient.get('/bonuscard', { + params: { + phone: validatedBody.phoneNumber, + uid: validatedBody.cardNumber, + }, + }); + } + })(); if (oriyoResponse.data.error) return NextResponse.json({ error: 'Credentials error' }, { status: 401 }); diff --git a/src/app/api/bonus/info/route.ts b/src/app/api/bonus/info/route.ts index 5954ca5..cbe7ea3 100644 --- a/src/app/api/bonus/info/route.ts +++ b/src/app/api/bonus/info/route.ts @@ -9,7 +9,7 @@ import { validationErrorHandler } from '../../middlewares/error-handler.middlewa const routeHandler = async (req: NextRequest, requestCookie: RequestCookie) => { const { card_id, token } = JSON.parse(requestCookie.value); - const oriyoResponse = await oriyoClient.get('/client/info', { + const oriyoResponse = await oriyoClient.get('/bonuscardinfo', { params: { card_id, token, diff --git a/src/app/api/bonus/transactions/route.ts b/src/app/api/bonus/transactions/route.ts index f13d29b..e86c618 100644 --- a/src/app/api/bonus/transactions/route.ts +++ b/src/app/api/bonus/transactions/route.ts @@ -20,7 +20,7 @@ const routeHandler = async (req: NextRequest, requestCookie: RequestCookie) => { const { card_id, token } = JSON.parse(requestCookie.value); - const oriyoResponse = await oriyoClient.get('/client/transactions', { + const oriyoResponse = await oriyoClient.get('/bonuscardts', { params: { card_id, token, diff --git a/src/app/api/corporate/transactions/route.ts b/src/app/api/corporate/transactions/route.ts index f61ef9a..63154ac 100644 --- a/src/app/api/corporate/transactions/route.ts +++ b/src/app/api/corporate/transactions/route.ts @@ -20,7 +20,7 @@ const routeHandler = async (req: NextRequest, requestCookie: RequestCookie) => { const { group_id, token } = JSON.parse(requestCookie.value); - const oriyoResponse = await oriyoClient.get('/client/transactions', { + const oriyoResponse = await oriyoClient.get('/corporatecardts', { params: { group_id, token,