Merge pull request #379 from P4-Games/feature/version

merge feature/version into develop

.gitignore

@@ -21,6 +21,7 @@ hardhat.config.ts
 # misc
 .DS_Store
 *.pem
+.todo.md
 
 # debug
 npm-debug.log*

Dockerfile

@@ -28,6 +28,7 @@ ARG MAIL_SG_FROM
 ARG NEXT_PUBLIC_STORAGE_URL_ALPHA
 ARG NEXT_PUBLIC_STORAGE_URL_GAMMA
 ARG NEXT_PUBLIC_ADMIN_ACCOUNTS
+ARG NEXT_PUBLIC_NOF_VERSION
 
 
 # env
@@ -52,6 +53,7 @@ ENV MAIL_SG_FROM $MAIL_SG_FROM
 ENV NEXT_PUBLIC_STORAGE_URL_ALPHA $NEXT_PUBLIC_STORAGE_URL_ALPHA
 ENV NEXT_PUBLIC_STORAGE_URL_GAMMA $NEXT_PUBLIC_STORAGE_URL_GAMMA
 ENV NEXT_PUBLIC_ADMIN_ACCOUNTS $NEXT_PUBLIC_ADMIN_ACCOUNTS
+ENV NEXT_PUBLIC_NOF_VERSION $NEXT_PUBLIC_NOF_VERSION
 
 
 COPY --from=deps /app/node_modules ./node_modules

README.md

@@ -55,6 +55,7 @@ NEXT_PUBLIC_APP_ENV='development'
 NEXT_PUBLIC_STORAGE_URL_ALPHA='https://storage.googleapis.com/nof-alpha'
 NEXT_PUBLIC_STORAGE_URL_GAMMA='https://storage.googleapis.com/nof-gamma'
 NEXT_PUBLIC_ADMIN_ACCOUNTS='0x35dad65F60c1A32c9895BE97f6bcE57D32792E83,0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
+NEXT_PUBLIC_NOF_VERSION='v0.0.0'
 
 # Only por local environment to put contracts addresses from hardhat
 NEXT_PUBLIC_NOF_DAI_HARDHAT_CONTRACT_ADDRESS=''

cloudbuild.yaml

@@ -30,7 +30,7 @@ steps:
       - NEXT_PUBLIC_STORAGE_URL_ALPHA=${_NEXT_PUBLIC_STORAGE_URL_ALPHA}
       - NEXT_PUBLIC_STORAGE_URL_GAMMA=${_NEXT_PUBLIC_STORAGE_URL_GAMMA}
       - NEXT_PUBLIC_ADMIN_ACCOUNTS=${_NEXT_PUBLIC_ADMIN_ACCOUNTS}
-
+      - NEXT_PUBLIC_NOF_VERSION=${_NEXT_PUBLIC_NOF_VERSION}
 
   # build the container images
   - name: "gcr.io/cloud-builders/docker"
@@ -61,7 +61,7 @@ steps:
       "--build-arg", "NEXT_PUBLIC_STORAGE_URL_ALPHA=${_NEXT_PUBLIC_STORAGE_URL_ALPHA}",
       "--build-arg", "NEXT_PUBLIC_STORAGE_URL_GAMMA=${_NEXT_PUBLIC_STORAGE_URL_GAMMA}",
       "--build-arg", "NEXT_PUBLIC_ADMIN_ACCOUNTS=${_NEXT_PUBLIC_ADMIN_ACCOUNTS}",
-
+      "--build-arg", "NEXT_PUBLIC_NOF_VERSION=${_NEXT_PUBLIC_NOF_VERSION}",
       "."
     ]
 

example_env

@@ -20,6 +20,7 @@ NEXT_PUBLIC_APP_ENV='development'
 NEXT_PUBLIC_STORAGE_URL_ALPHA='https://storage.googleapis.com/nof-alpha'
 NEXT_PUBLIC_STORAGE_URL_GAMMA='https://storage.googleapis.com/nof-gamma'
 NEXT_PUBLIC_ADMIN_ACCOUNTS='0x...,0X....,0xfa3....' // accounts separated by a comma
+NEXT_PUBLIC_NOF_VERSION='v0.1.219'
 
 // Only por local environment to put contracts addresses from hardhat
 NEXT_PUBLIC_NOF_DAI_CONTRACT_CURRENT_ADDRESS=''

package.json

@@ -22,7 +22,9 @@
     "git-config": "git config --global core.autocrlf true",
     "git-log": "git log --oneline --decorate",
     "gitp": "git log --pretty=”%s”",
-    "commitlint-check-comit-msg": "npx --no-install commitlint --edit \"$1\""
+    "commitlint-check-comit-msg": "npx --no-install commitlint --edit \"$1\"",
+    "docker:build": "bash ./scripts/docker-build.sh",
+    "docker:run": "bash docker run -d -p 3000:3000 --name my-nextjs-container my-nextjs-app"
   },
   "dependencies": {
     "@next/eslint-plugin-next": "^14.0.1",

scripts/docker-build.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Mover al directorio raíz del proyecto
+cd "$(dirname "$0")/.."
+
+# Exportar variables de entorno desde el archivo .env
+export $(grep -v '^#' .env | xargs)
+
+# Volver al directorio scripts
+cd scripts
+
+# Ejecutar docker build con las variables de entorno como argumentos de compilación
+docker build \
+  --build-arg APP_ENV="$APP_ENV" \
+  --build-arg NODE_ENV="$NODE_ENV" \
+  --build-arg MONGODB="$MONGODB" \
+  --build-arg GAMMA_SERVICE_URL="$GAMMA_SERVICE_URL" \
+  --build-arg GRAPH_URL="$GRAPH_URL" \
+  --build-arg WALLET_CONNECT_PROJECT_ID="$WALLET_CONNECT_PROJECT_ID" \
+  --build-arg NODE_PROVIDER_MUMBAI_URL="$NODE_PROVIDER_MUMBAI_URL" \
+  --build-arg NODE_PROVIDER_BSC_TESTNET_URL="$NODE_PROVIDER_BSC_TESTNET_URL" \
+  --build-arg NODE_PROVIDER_OPBNB_TESTNET="$NODE_PROVIDER_OPBNB_TESTNET" \
+  --build-arg MAIL_CLIENT="$MAIL_CLIENT" \
+  --build-arg MAIL_FROM="$MAIL_FROM" \
+  --build-arg MAIL_TO="$MAIL_TO" \
+  --build-arg MAIL_ETHEREAL_HOST="$MAIL_ETHEREAL_HOST" \
+  --build-arg MAIL_ETHEREAL_PORT="$MAIL_ETHEREAL_PORT" \
+  --build-arg MAIL_ETHEREAL_USER="$MAIL_ETHEREAL_USER" \
+  --build-arg MAIL_ETHEREAL_PSWD="$MAIL_ETHEREAL_PSWD" \
+  --build-arg MAIL_SG_KEY="$MAIL_SG_KEY" \
+  --build-arg MAIL_SG_FROM="$MAIL_SG_FROM" \
+  --build-arg NEXT_PUBLIC_STORAGE_URL_ALPHA="$NEXT_PUBLIC_STORAGE_URL_ALPHA" \
+  --build-arg NEXT_PUBLIC_STORAGE_URL_GAMMA="$NEXT_PUBLIC_STORAGE_URL_GAMMA" \
+  --build-arg NEXT_PUBLIC_ADMIN_ACCOUNTS="$NEXT_PUBLIC_ADMIN_ACCOUNTS" \
+  --build-arg NEXT_PUBLIC_NOF_VERSION="$NEXT_PUBLIC_NOF_VERSION" \
+  -t my-nextjs-app ..

src/components/Navbar/Navbar.jsx

@@ -10,6 +10,7 @@ import AccountInfo from './AccountInfo.jsx'
 import NotificationInfo from './NotificationInfo.jsx'
 import LanguageSelection from '../LanguageSelection'
 import { useLayoutContext, useWeb3Context, useNotificationContext } from '../../hooks'
+import { nofVersion } from '../../config.js'
 
 function Navbar() {
   const { t } = useTranslation()
@@ -88,6 +89,7 @@ function Navbar() {
       <Link href='/'>
         <Image src={'/images/navbar/logo-1.png'} alt='nof' height='60' width='120' />
       </Link>
+      <span className='navbar__left__nof__version'>{nofVersion}</span>
     </div>
   )
 

src/config.js

@@ -52,6 +52,7 @@ export const storageUrlGamma =
   process.env.NEXT_PUBLIC_STORAGE_URL_GAMMA || 'https://storage.googleapis.com/nof-gamma'
 export const adminAccounts =
   process.env.NEXT_PUBLIC_ADMIN_ACCOUNTS || '0x8a8F5e5ae88532c605921f320a92562c9599fB9E'
+export const nofVersion = process.env.NEXT_PUBLIC_NOF_VERSION || 'v0.1.219'
 
 // ------------------------------------------------------------------
 // calculated variables

src/styles/_navbar.scss

@@ -354,3 +354,20 @@ header {
     margin-right: 10px;
   }
 }
+
+.navbar__left__nof {
+  position: relative;
+}
+
+.navbar__left__nof__version {
+  position: absolute;
+  bottom: -22px; /* Ajusta según sea necesario */
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 8px; /* Ajusta el tamaño de la fuente según prefieras */
+  color: #343131; /* Cambia el color si es necesario */
+  background: #ede8e8; /* Puedes cambiar el fondo si quieres */
+  padding: 2px 5px;
+  border-radius: 4px;
+  text-align: center;
+}