Feature/issue-1408-1423/deposit-withdraw-profile (#1473) (#1474)

Betarena · Jul 24, 2023 · 1d9745c · 1d9745c
1 parent 78c5bc8
commit 1d9745c
Show file tree

Hide file tree

Showing 363 changed files with 16,809 additions and 6,083 deletions.
diff --git a/.github/workflows/pr-main-check.yml b/.github/workflows/pr-main-check.yml
@@ -48,4 +48,4 @@ jobs:
       - uses: actions/checkout@v3
       - name: Build docker image
         run: |
-          docker build . --file Dockerfile --tag ${{ env.DOCKER_IMAGE }}:$(date +%s)
+          docker build . --file ./docker/prod.Dockerfile --tag ${{ env.DOCKER_IMAGE }}:$(date +%s)
diff --git a/Makefile b/Makefile
@@ -5,10 +5,12 @@
 start:
 	echo 'Starting PROD container'
 	docker-compose -f docker-compose.yml up -d
+#
 
 log-listen:
 	echo 'Starting PROD container'
 	docker-compose -f docker-compose.yml up
+#
 
 update-scores-web:
 	echo 'Updating PROD Scores Web container...'
@@ -18,6 +20,7 @@ update-scores-web:
 	# -docker rmi $$(docker images --filter "dangling=true" -q --no-trunc)
 	# docker-compose -f docker-compose.yml up -d
 	docker-compose -f docker-compose.yml up -d --build
+#
 
 # ===========
 # DEVELOPMENT
@@ -29,17 +32,20 @@ dev-start:
 	echo 'Removing Old DEV Logs'
 	-rm -r ./datalog/*
 	echo 'DEV Ready!'
+#
 
 dev-docker-start:
 	echo 'Starting DEV - Docker Environment'
 	echo 'Removing Old DEV Logs'
 	-rm -r ./datalog/*
 	docker-compose -f docker-compose.dev.yml up
 	echo 'DEV Ready!'
+#
 
 dev-clean:
 	echo 'Removing Old DEV Logs'
 	rm -r ./datalog/
+#
 
 git-post-main-pr:
 	# After PR -> (main) - run (this) to get local/dev in pair with (main)
@@ -51,9 +57,11 @@ git-post-main-pr:
 	git checkout dev
 	echo 'Resetting to MAIN'
 	git reset --hard main
-
+#
+
 git-del-branches-w-origin:
 	echo 'Deleting branches not present in origin + /dev'
 	# Original command (below) is without \(...\) syntax
 	# git fetch -p ; git branch -r | awk '{print $$1}' | egrep -v -f /dev/fd/0 <\(git branch -vv | grep origin\) | awk '{print $$1}' | xargs git branch -D
-	# git branch --merged | grep -v "*" | grep -v "main" | xargs git branch -d
+	# git branch --merged | grep -v "*" | grep -v "main" | xargs git branch -d
+#
diff --git a/Dockerfile.dev → docker/dev.Dockerfile b/Dockerfile.dev → docker/dev.Dockerfile
diff --git a/docker-compose.dev.yml → docker/dev.docker-compose.yml b/docker-compose.dev.yml → docker/dev.docker-compose.yml
diff --git a/Dockerfile → docker/prod.Dockerfile b/Dockerfile → docker/prod.Dockerfile
@@ -22,11 +22,18 @@ RUN apk add --no-cache \
 COPY . .
 RUN npm run build
 
-# ==== Final Image
+# ********************************************************************
+# STEP 2 | Build And Publish                                         *
+# ********************************************************************
+
 FROM node:16.17.0-alpine as final
 USER node:node
 WORKDIR /app
 
+# ********************************************************************
+# STEP 3 | TARGET Code Deployment                                    *
+# ********************************************************************
+
 COPY --from=build /app .
 COPY . .
 

diff --git a/docker-compose.yml → docker/prod.docker-compose.yml b/docker-compose.yml → docker/prod.docker-compose.yml
@@ -26,10 +26,10 @@ services:
       VITE_REDIS_CACHE_DB: ${VITE_REDIS_CACHE_DB}
       VITE_REDIS_BULL_DB: ${VITE_REDIS_BULL_DB}
     build:
-      context: .
-      dockerfile: ./Dockerfile
+      context: ../
+      dockerfile: ./docker/prod.Dockerfile
     volumes:
-      - ./certs:/certs # IMPORTANT
+      - ../certs:/app/certs # IMPORTANT
     ports:
       - 5055:5055
       - 443:443 # IMPORTANT

diff --git a/openapi.yaml b/openapi.yaml
@@ -983,7 +983,7 @@ paths:
             Target fixture H2H widget data
 
   # ===================
-  # PLAYER PAGE
+  # 🤾 PLAYER PAGE
   # ===================
 
   # [PP] - FIXTURES Widget
@@ -1131,6 +1131,49 @@ paths:
         Optional extended description in CommonMark or HTML.
       tags:
         - Player Page
+      responses:
+        200:
+          description:
+            Target player SEO widget data
+
+  # ===================
+  # 🤾 USER / PROFILE PAGE
+  # ===================
+
+  # [UP] - User Profile
+  /api/data/profile:
+    get:
+      parameters:
+        - name: filter
+          in: query
+          description:
+            Target player (main) SEO widget data parameters
+          required: true
+          style: form
+          explode: true
+          schema:
+            type: object
+            properties:
+              # ?uid=[...]
+              uid:
+                type: string
+                example: n65vqAoIH3b7lsU4zroxjHk0SSp2
+              # ?lang=[...]
+              lang:
+                type: string
+                example: es
+            additionalProperties: false
+            oneOf:
+              # translation
+              - required: [lang]
+              # data (main)
+              - required: [uid]
+      summary:
+        Returns a targets' player main SEO widget (data).
+      description:
+        Optional extended description in CommonMark or HTML.
+      tags:
+        - Player Page
       responses:
         200:
           description: