Merge pull request #136 from P4-Games/develop

merge develop into main
P4-Games · Oct 27, 2024 · 4b296df · 4b296df
2 parents 2e1cc6e + 7551d26
commit 4b296df
Show file tree

Hide file tree

Showing 54 changed files with 1,453 additions and 1,009 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,5 @@
+
+
 FROM node:18-alpine AS deps
 WORKDIR /app
 COPY package.json package-lock.json ./ 
@@ -15,6 +17,8 @@ ARG BOT_API_TOKEN
 ARG BOT_API_URL
 ARG BOT_API_WAPP_ENABLED
 ARG BACKEND_API_URL
+ARG BACKEND_API_TOKEN
+ARG BACKEND_API_TOKEN_SECRET
 ARG NODE_PROVIDER_SEPOLIA_URL
 ARG NODE_PROVIDER_MUMBAI_URL
 ARG NODE_PROVIDER_SCROLL_URL
@@ -29,7 +33,6 @@ ARG RECAPTCHA_API_KEY
 ARG NEXT_PUBLIC_RECAPTCHA_SITE_KEY
 ARG NEXT_PUBLIC_NFT_IMAGE_REPOSITORY
 ARG NEXT_PUBLIC_NFT_MARKETPLACE_URL
-
 #
 # env
 ENV NODE_ENV production
@@ -41,6 +44,8 @@ ENV BOT_API_TOKEN $BOT_API_TOKEN
 ENV BOT_API_URL $BOT_API_URL
 ENV BOT_API_WAPP_ENABLED $BOT_API_WAPP_ENABLED
 ENV BACKEND_API_URL $BACKEND_API_URL
+ENV BACKEND_API_TOKEN $BACKEND_API_TOKEN
+ENV BACKEND_API_TOKEN_SECRET $BACKEND_API_TOKEN_SECRET
 ENV NODE_PROVIDER_SEPOLIA_URL $NODE_PROVIDER_SEPOLIA_URL
 ENV NODE_PROVIDER_MUMBAI_URL $NODE_PROVIDER_MUMBAI_URL
 ENV NODE_PROVIDER_SCROLL_URL $NODE_PROVIDER_SCROLL_URL
@@ -58,14 +63,19 @@ ENV NEXT_PUBLIC_NFT_MARKETPLACE_URL $NEXT_PUBLIC_NFT_MARKETPLACE_URL
 #
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
+
 RUN echo "***********************"
 RUN env
+RUN echo $BACKEND_API_TOKEN
+RUN echo $BACKEND_API_TOKEN_SECRET
 RUN echo "***********************"
+
 RUN npm run build
 #
 FROM node:18-alpine AS runner
 WORKDIR /app
 ENV NODE_ENV production
+
 RUN addgroup --system --gid 1001 nodejs && adduser --system --uid 1001 nextjs
 COPY --from=builder /app/next.config.js ./
 COPY --from=builder /app/public ./public

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -1,9 +1,8 @@
 steps:
-  # Para para generar un .env para que sea tomado por el step de build.
-  # Las variables serán tomadas de la definición del "trigger",  
-  # "variables de sustitución", en Google Cloud Build.
-  # en gcp, se tiene que poner como nombre de cada variable, el unserscore 
-  # como prefijo. Ejemplo: "_APP_ENV"
+  #
+  # This step is kept as a workaround, generating a .env file that is required by the 
+  # library used with MongoDB. If it is removed, attempting to connect to the database 
+  # throws an error indicating that the URI does not exist in the environment.
   #
   - name: 'gcr.io/cloud-builders/npm'
     id: CreateEnv
@@ -17,6 +16,8 @@ steps:
       - BOT_API_URL=${_BOT_API_URL}
       - BOT_API_WAPP_ENABLED=${_BOT_API_WAPP_ENABLED}
       - BACKEND_API_URL=${_BACKEND_API_URL}
+      - BACKEND_API_TOKEN=${_BACKEND_API_TOKEN}
+      #- BACKEND_API_TOKEN_SECRET=$$BACKEND_API_TOKEN_SECRET
       - NODE_PROVIDER_SEPOLIA_URL=${_NODE_PROVIDER_SEPOLIA_URL}
       - NODE_PROVIDER_MUMBAI_URL=${_NODE_PROVIDER_MUMBAI_URL}
       - NODE_PROVIDER_SCROLL_URL=${_NODE_PROVIDER_SCROLL_URL}
@@ -31,67 +32,97 @@ steps:
       - NEXT_PUBLIC_RECAPTCHA_SITE_KEY=${_NEXT_PUBLIC_RECAPTCHA_SITE_KEY}
       - NEXT_PUBLIC_NFT_IMAGE_REPOSITORY=${_NEXT_PUBLIC_NFT_IMAGE_REPOSITORY}
       - NEXT_PUBLIC_NFT_MARKETPLACE_URL=${_NEXT_PUBLIC_NFT_MARKETPLACE_URL}
-
-  # build the container images
-  - name: "gcr.io/cloud-builders/docker"
+    secretEnv: [
+      'BACKEND_API_TOKEN_SECRET'
+    ]
+  #
+  # Build docker imagen.
+  # Variables with a prefix '_' are from Cloud Build 'substitution' (declared in the job).
+  # Variables with a prefix '$$' are from Secret Manager.
+  #
+  - name: 'gcr.io/cloud-builders/docker'
     id: Build
     args: [
-      "build", 
-      "--no-cache", 
-      "-t", 
-      "$_AR_HOSTNAME/$PROJECT_ID/cloud-run-source-deploy/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA", 
-      "--build-arg", "APP_ENV=${_APP_ENV}",
-      "--build-arg", "MONGODB=${_MONGODB}",
-      "--build-arg", "MONGODB_BOT=${_MONGODB_BOT}",
-      "--build-arg", "DB_CHATTERPAY_NAME=${_DB_CHATTERPAY_NAME}",
-      "--build-arg", "RECAPTCHA_API_KEY=${_RECAPTCHA_API_KEY}",
-      "--build-arg", "NEXT_PUBLIC_RECAPTCHA_SITE_KEY=${_NEXT_PUBLIC_RECAPTCHA_SITE_KEY}",
-      "--build-arg", "NEXT_PUBLIC_NFT_IMAGE_REPOSITORY=${_NEXT_PUBLIC_NFT_IMAGE_REPOSITORY}",
-      "--build-arg", "NEXT_PUBLIC_NFT_MARKETPLACE_URL=${_NEXT_PUBLIC_NFT_MARKETPLACE_URL}",
-      "--build-arg", "BOT_API_TOKEN=${_BOT_API_TOKEN}",
-      "--build-arg", "BOT_API_URL=${_BOT_API_URL}",
-      "--build-arg", "BOT_API_WAPP_ENABLED=${_BOT_API_WAPP_ENABLED}",
-      "--build-arg", "BACKEND_API_URL=${_BACKEND_API_URL}",      
-      "--build-arg", "NODE_PROVIDER_SEPOLIA_URL=${_NODE_PROVIDER_SEPOLIA_URL}",
-      "--build-arg", "NODE_PROVIDER_MUMBAI_URL=${_NODE_PROVIDER_MUMBAI_URL}",
-      "--build-arg", "NODE_PROVIDER_SCROLL_URL=${_NODE_PROVIDER_SCROLL_URL}",
-      "--build-arg", "HANDLE_VERCEL_FREE_PLAN_TIMEOUT=${_HANDLE_VERCEL_FREE_PLAN_TIMEOUT}",
-      "--build-arg", "NEXT_PUBLIC_USE_MOCK=${_NEXT_PUBLIC_USE_MOCK}",
-      "--build-arg", "API3_ENABLED=${_API3_ENABLED}",
-      "--build-arg", "JWT_SECRET=${_JWT_SECRET}",
-      "--build-arg", "NEXT_PUBLIC_FROM_ICP=${_NEXT_PUBLIC_FROM_ICP}",
-      "--build-arg", "NEXT_PUBLIC_UI_URL=${_NEXT_PUBLIC_UI_URL}",
-      "--build-arg", "NEXT_PUBLIC_ALLOWED_ORIGINS=${_NEXT_PUBLIC_ALLOWED_ORIGINS}",
-      "."
+      'build', 
+      '--no-cache', 
+      '-t', 
+      '$_AR_HOSTNAME/$PROJECT_ID/cloud-run-source-deploy/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA', 
+      '--build-arg', 'APP_ENV=${_APP_ENV}',
+      '--build-arg', 'MONGODB=${_MONGODB}',
+      '--build-arg', 'MONGODB_BOT=${_MONGODB_BOT}',
+      '--build-arg', 'DB_CHATTERPAY_NAME=${_DB_CHATTERPAY_NAME}',
+      '--build-arg', 'RECAPTCHA_API_KEY=${_RECAPTCHA_API_KEY}',
+      '--build-arg', 'NEXT_PUBLIC_RECAPTCHA_SITE_KEY=${_NEXT_PUBLIC_RECAPTCHA_SITE_KEY}',
+      '--build-arg', 'NEXT_PUBLIC_NFT_IMAGE_REPOSITORY=${_NEXT_PUBLIC_NFT_IMAGE_REPOSITORY}',
+      '--build-arg', 'NEXT_PUBLIC_NFT_MARKETPLACE_URL=${_NEXT_PUBLIC_NFT_MARKETPLACE_URL}',
+      '--build-arg', 'BOT_API_TOKEN=${_BOT_API_TOKEN}',
+      '--build-arg', 'BOT_API_URL=${_BOT_API_URL}',
+      '--build-arg', 'BOT_API_WAPP_ENABLED=${_BOT_API_WAPP_ENABLED}',
+      '--build-arg', 'BACKEND_API_URL=${_BACKEND_API_URL}',
+      '--build-arg', 'BACKEND_API_TOKEN=${_BACKEND_API_TOKEN}',
+      '--build-arg', 'BACKEND_API_TOKEN_SECRET=$$BACKEND_API_TOKEN_SECRET',
+      '--build-arg', 'NODE_PROVIDER_SEPOLIA_URL=${_NODE_PROVIDER_SEPOLIA_URL}',
+      '--build-arg', 'NODE_PROVIDER_MUMBAI_URL=${_NODE_PROVIDER_MUMBAI_URL}',
+      '--build-arg', 'NODE_PROVIDER_SCROLL_URL=${_NODE_PROVIDER_SCROLL_URL}',
+      '--build-arg', 'HANDLE_VERCEL_FREE_PLAN_TIMEOUT=${_HANDLE_VERCEL_FREE_PLAN_TIMEOUT}',
+      '--build-arg', 'NEXT_PUBLIC_USE_MOCK=${_NEXT_PUBLIC_USE_MOCK}',
+      '--build-arg', 'API3_ENABLED=${_API3_ENABLED}',
+      '--build-arg', 'JWT_SECRET=${_JWT_SECRET}',
+      '--build-arg', 'NEXT_PUBLIC_FROM_ICP=${_NEXT_PUBLIC_FROM_ICP}',
+      '--build-arg', 'NEXT_PUBLIC_UI_URL=${_NEXT_PUBLIC_UI_URL}',
+      '--build-arg', 'NEXT_PUBLIC_ALLOWED_ORIGINS=${_NEXT_PUBLIC_ALLOWED_ORIGINS}',
+      '.'
+    ]  
+    secretEnv: [
+      'BACKEND_API_TOKEN_SECRET'
     ]
 
+  #
   # push the container images to Container Registry
-  - name: "gcr.io/cloud-builders/docker"
+  #
+  - name: 'gcr.io/cloud-builders/docker'
     id: Push
     args: [
-      "push", 
-      "$_AR_HOSTNAME/$PROJECT_ID/cloud-run-source-deploy/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA"
+      'push', 
+      '$_AR_HOSTNAME/$PROJECT_ID/cloud-run-source-deploy/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA'
     ]
-
+  #
   # Deploy container images to Cloud Run
-  - name: "gcr.io/cloud-builders/gcloud"
+  #
+  - name: 'gcr.io/cloud-builders/gcloud'
     id: Deploy
     entrypoint: gcloud
     args: [
-      "run",
-      "deploy",
-      "$_SERVICE_NAME",
-      "--platform",
-      "managed",
-      "--region",
-      "$_DEPLOY_REGION",
-      "--image",
-      "$_AR_HOSTNAME/$PROJECT_ID/cloud-run-source-deploy/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA",
-      "--labels",
-      "managed-by=gcp-cloud-build-deploy-cloud-run,commit-sha=$COMMIT_SHA,gcb-build-id=$BUILD_ID,gcb-trigger-id=$_TRIGGER_ID",
-      "--quiet",
-      "--allow-unauthenticated",
+      'run',
+      'deploy',
+      '$_SERVICE_NAME',
+      '--platform',
+      'managed',
+      '--region',
+      '$_DEPLOY_REGION',
+      '--image',
+      '$_AR_HOSTNAME/$PROJECT_ID/cloud-run-source-deploy/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA',
+      '--labels',
+      'managed-by=gcp-cloud-build-deploy-cloud-run,commit-sha=$COMMIT_SHA,gcb-build-id=$BUILD_ID,gcb-trigger-id=$_TRIGGER_ID',
+      '--quiet',
+      '--allow-unauthenticated',
     ]
+  #
+  # print secret variables
+  #
+  - name: 'bash'
+    script: |
+      #!/usr/bin/env bash
+      echo 'BACKEND_API_TOKEN en cloudbuild.yaml 1: $BACKEND_API_TOKEN_SECRET'
+    secretEnv: [
+      'BACKEND_API_TOKEN_SECRET'
+    ]
+
+availableSecrets:
+  secretManager:
+    - versionName: 'projects/$PROJECT_ID/secrets/${_BACKEND_API_TOKEN_SECRET_NAME}/versions/latest'
+      env: 'BACKEND_API_TOKEN_SECRET'
+
 images:
   - $_AR_HOSTNAME/$PROJECT_ID/cloud-run-source-deploy/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA
 

diff --git a/example_env b/example_env
@@ -8,6 +8,7 @@ APP_ENV='development'
 BOT_API_TOKEN={api token}
 BOT_API_URL=http://localhost:3000
 BACKEND_API_URL=https://dev.back.chatterpay.net
+BACKEND_API_TOKEN='backend token'
 BOT_API_WAPP_ENABLED=true
 MONGODB='mongodb://localhost:27017'
 MONGODB_BOT='BOT mongo db url'

diff --git a/next.config.js b/next.config.js
@@ -19,6 +19,7 @@ module.exports = {
       'storage.googleapis.com', 
       'cilxj-yiaaa-aaaag-alkxq-cai.icp0.io', 
       'gateway.pinata.cloud', 
+      'w.wallhaven.cc',
       'img.freepik.com'],
     remotePatterns: [
       {
@@ -44,6 +45,12 @@ module.exports = {
         hostname: 'img.freepik.com',
         port: '',
         pathname: '/**',
+      },
+      {
+        protocol: 'https',
+        hostname: 'w.wallhaven.cc',
+        port: '',
+        pathname: '/**',
       }
     ],
   },

diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh
@@ -15,19 +15,23 @@ docker build \
   --build-arg MONGODB="$MONGODB" \
   --build-arg MONGODB_BOT="$MONGODB_BOT" \
   --build-arg DB_CHATTERPAY_NAME="$DB_CHATTERPAY_NAME" \
+  --build-arg RECAPTCHA_API_KEY="$RECAPTCHA_API_KEY" \
+  --build-arg NEXT_PUBLIC_RECAPTCHA_SITE_KEY="$NEXT_PUBLIC_RECAPTCHA_SITE_KEY" \
+  --build-arg NEXT_PUBLIC_NFT_IMAGE_REPOSITORY="$NEXT_PUBLIC_NFT_IMAGE_REPOSITORY" \
+  --build-arg NEXT_PUBLIC_NFT_MARKETPLACE_URL="$NEXT_PUBLIC_NFT_MARKETPLACE_URL" \
   --build-arg BOT_API_TOKEN="$BOT_API_TOKEN" \
   --build-arg BOT_API_URL="$BOT_API_URL" \
+  --build-arg BOT_API_WAPP_ENABLED="$BOT_API_WAPP_ENABLED" \
+  --build-arg BACKEND_API_URL="$BACKEND_API_URL" \
+  --build-arg BACKEND_API_TOKEN="$BACKEND_API_TOKEN" \
   --build-arg NODE_PROVIDER_SEPOLIA_URL="$NODE_PROVIDER_SEPOLIA_URL" \
   --build-arg NODE_PROVIDER_MUMBAI_URL="$NODE_PROVIDER_MUMBAI_URL" \
   --build-arg NODE_PROVIDER_SCROLL_URL="$NODE_PROVIDER_SCROLL_URL" \
+  --build-arg HANDLE_VERCEL_FREE_PLAN_TIMEOUT="$HANDLE_VERCEL_FREE_PLAN_TIMEOUT" \
+  --build-arg NEXT_PUBLIC_USE_MOCK="$NEXT_PUBLIC_USE_MOCK" \
   --build-arg API3_ENABLED="$API3_ENABLED" \
   --build-arg JWT_SECRET="$JWT_SECRET" \
   --build-arg NEXT_PUBLIC_FROM_ICP="$NEXT_PUBLIC_FROM_ICP" \
-  --build-arg NEXT_PUBLIC_USE_MOCK="$NEXT_PUBLIC_USE_MOCK" \
   --build-arg NEXT_PUBLIC_UI_URL="$NEXT_PUBLIC_UI_URL" \
   --build-arg NEXT_PUBLIC_ALLOWED_ORIGINS="$NEXT_PUBLIC_ALLOWED_ORIGINS" \
-  --build-arg RECAPTCHA_API_KEY="$RECAPTCHA_API_KEY" \
-  --build-arg NEXT_PUBLIC_RECAPTCHA_SITE_KEY="$NEXT_PUBLIC_RECAPTCHA_SITE_KEY" \
-  --build-arg NEXT_PUBLIC_NFT_IMAGE_REPOSITORY="$NEXT_PUBLIC_NFT_IMAGE_REPOSITORY" \
-  --build-arg NEXT_PUBLIC_NFT_MARKETPLACE_URL="$NEXT_PUBLIC_NFT_MARKETPLACE_URL" \
   -t my-nextjs-app ..
diff --git a/src/app/api/_data/_mock/_countries.ts → src/app/api/_data/_countries.ts b/src/app/api/_data/_mock/_countries.ts → src/app/api/_data/_countries.ts
diff --git a/src/app/api/_data/_mock/_mock.ts b/src/app/api/_data/_mock/_mock.ts
diff --git a/src/app/api/_data/_mock/_others.ts b/src/app/api/_data/_mock/_others.ts