From 18394888f67087165deffab063bb266dbd83dd0c Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Sat, 8 Mar 2025 20:07:52 +0330 Subject: [PATCH 1/5] test clear build cache --- .github/workflows/deploy.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 4e7a0f6..6c287c1 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -31,8 +31,5 @@ jobs: script: | cd /root/hshop/ docker compose down - docker compose build --no-cache frontend - docker compose build backend - docker compose build db-backup - docker compose build db + docker compose build docker compose up -d \ No newline at end of file From 69c947122d219a120cfd662037bb60aa4f26fc72 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Sat, 8 Mar 2025 20:19:20 +0330 Subject: [PATCH 2/5] debug building issue of docker test --- backend/dockerfile | 2 +- frontend/dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/dockerfile b/backend/dockerfile index a52545a..16ceef1 100644 --- a/backend/dockerfile +++ b/backend/dockerfile @@ -6,7 +6,7 @@ ENV PYTHONUNBUFFERED 1 WORKDIR /app COPY requirements.txt /app/ -RUN pip install --no-cache-dir -r requirements.txt +RUN pip install -r requirements.txt COPY . /app/ diff --git a/frontend/dockerfile b/frontend/dockerfile index 72f8fd6..ab0000d 100644 --- a/frontend/dockerfile +++ b/frontend/dockerfile @@ -1,11 +1,11 @@ -FROM node:20-alpine as build-stage +FROM node:20-alpine AS build-stage WORKDIR /app COPY package*.json ./ RUN npm install --force COPY . . RUN npm run build -FROM node:20-alpine as production-stage +FROM node:20-alpine AS production-stage WORKDIR /app COPY --from=build-stage /app /app EXPOSE 3000 From 1433b110ae7390cb1b80dcc54c9e46e041256251 Mon Sep 17 00:00:00 2001 From: Mamalizz Date: Sat, 8 Mar 2025 20:25:14 +0330 Subject: [PATCH 3/5] new sw.js version --- frontend/public/sw.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/public/sw.js b/frontend/public/sw.js index b25248c..d8942a8 100644 --- a/frontend/public/sw.js +++ b/frontend/public/sw.js @@ -5,7 +5,7 @@ precacheAndRoute(self.__WB_MANIFEST); // Version -const VERSION = "1.0.9112"; +const VERSION = "1.0.2"; // Service Worker Installation self.addEventListener("install", (event) => { From 6f6d4d98f7364a790ec987a936391b807d7542a3 Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Sat, 8 Mar 2025 20:32:00 +0330 Subject: [PATCH 4/5] update docker build --- frontend/dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/dockerfile b/frontend/dockerfile index ab0000d..72f8fd6 100644 --- a/frontend/dockerfile +++ b/frontend/dockerfile @@ -1,11 +1,11 @@ -FROM node:20-alpine AS build-stage +FROM node:20-alpine as build-stage WORKDIR /app COPY package*.json ./ RUN npm install --force COPY . . RUN npm run build -FROM node:20-alpine AS production-stage +FROM node:20-alpine as production-stage WORKDIR /app COPY --from=build-stage /app /app EXPOSE 3000 From 3a3706f1f9a9a8f8a89751389f12500d31187bfb Mon Sep 17 00:00:00 2001 From: Parsa Nazer Date: Sat, 8 Mar 2025 23:22:25 +0330 Subject: [PATCH 5/5] show otp --- backend/account/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/account/views.py b/backend/account/views.py index 77c067f..64d6fac 100644 --- a/backend/account/views.py +++ b/backend/account/views.py @@ -61,7 +61,7 @@ Code: {otp}""" # response = sms_api.send_otp_sms(otp_input) if response['statusCode'] == 200: - return Response({'detail': 'OTP sent successfully'}, status=status.HTTP_200_OK) + return Response({'detail': f'OTP sent successfully {otp}'}, status=status.HTTP_200_OK) else: print(response) return Response({'detail': f'مشکلی در ارسال کد رخ داد'}, status=status.HTTP_200_OK)