Merge pull request #18 from joaovitoriasilva/OAuth2_scopes

merge auth2 scopes branch to master
joaovitoriasilva · Jul 26, 2024 · 4b0d546 · 4b0d546
2 parents 488cfae + 3a97abe
commit 4b0d546
Show file tree

Hide file tree

Showing 210 changed files with 15,762 additions and 8,612 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: joaovitoriasilva # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: 84745218 # Replace with a single Patreon username
+#patreon: # Replace with a single Patreon username
 #open_collective: # Replace with a single Open Collective username
 #ko_fi: # Replace with a single Ko-fi username
 #tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

diff --git a/.github/workflows/docker-image_backend_latest_manual.yml b/.github/workflows/docker-image_backend_latest_manual.yml
@@ -13,18 +13,25 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
-    - name: Build the backend Docker image
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: linux/amd64,linux/arm64
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Create a builder
       run: |
-        ls -al
-        IMAGE_TAG="latest"
-        docker build . --file Dockerfile_backend --tag ${{ github.repository }}/backend:$IMAGE_TAG
-        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
-      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+        docker buildx create --use
 
-    - name: Push the backend Docker image to GHCR
-      if: success() && (github.event_name == 'release' || github.event_name == 'workflow_dispatch')
+    - name: Build and push the backend Docker image
       run: |
-        echo ${{ secrets.TOKEN_FOR_ACTIONS }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
+        IMAGE_TAG="latest"
         IMAGE_NAME="ghcr.io/${{ github.repository }}/backend"
-        docker tag ${{ github.repository }}/backend:$IMAGE_TAG $IMAGE_NAME:$IMAGE_TAG
-        docker push $IMAGE_NAME:$IMAGE_TAG
+
+        echo ${{ secrets.TOKEN_FOR_ACTIONS }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
+        
+        docker buildx build --platform linux/amd64,linux/arm64 --file backend/Dockerfile --tag $IMAGE_NAME:$IMAGE_TAG --push ./backend
+        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
+      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
diff --git a/.github/workflows/docker-image_backend_manualORnewrelease.yml b/.github/workflows/docker-image_backend_manualORnewrelease.yml
@@ -1,10 +1,6 @@
 name: Create backend Docker image on new release or using manual trigger
 
 on:
-  #push:
-  #  branches: [ "master" ]
-  #pull_request:
-  #  branches: [ "master" ]
   workflow_dispatch:
   release:
     types:
@@ -20,22 +16,29 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
-    - name: Build the backend Docker image
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: linux/amd64,linux/arm64
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Create a builder
+      run: |
+        docker buildx create --use
+
+    - name: Build and push the backend Docker image
       run: |
-        ls -al
         if [ "${{ github.event_name }}" == 'workflow_dispatch' ]; then
           IMAGE_TAG="dev_$(date +"%d%m%Y")"
         else
           IMAGE_TAG="${{ github.event.release.tag_name }}"
         fi
-        docker build . --file Dockerfile_backend --tag ${{ github.repository }}/backend:$IMAGE_TAG
-        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
-      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+        IMAGE_NAME="ghcr.io/${{ github.repository }}/backend"
 
-    - name: Push the backend Docker image to GHCR
-      if: success() && (github.event_name == 'release' || github.event_name == 'workflow_dispatch')
-      run: |
         echo ${{ secrets.TOKEN_FOR_ACTIONS }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-        IMAGE_NAME="ghcr.io/${{ github.repository }}/backend"
-        docker tag ${{ github.repository }}/backend:$IMAGE_TAG $IMAGE_NAME:$IMAGE_TAG
-        docker push $IMAGE_NAME:$IMAGE_TAG
+        
+        docker buildx build --platform linux/amd64,linux/arm64 --file backend/Dockerfile --tag $IMAGE_NAME:$IMAGE_TAG --push ./backend
+        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
+      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
diff --git a/.github/workflows/docker-image_frontend_latest_manual.yml b/.github/workflows/docker-image_frontend_latest_manual.yml
@@ -13,17 +13,25 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
-    - name: Build the frontend Docker image
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: linux/amd64,linux/arm64
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Create a builder
       run: |
-        IMAGE_TAG="latest"
-        docker build . --file Dockerfile_frontend --tag ${{ github.repository }}/frontend:$IMAGE_TAG
-        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
-      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+        docker buildx create --use
 
-    - name: Push the frontend Docker image to GHCR
-      if: success() && (github.event_name == 'release' || github.event_name == 'workflow_dispatch')
+    - name: Build and push the frontend Docker image
       run: |
-        echo ${{ secrets.TOKEN_FOR_ACTIONS }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
+        IMAGE_TAG="latest"
         IMAGE_NAME="ghcr.io/${{ github.repository }}/frontend"
-        docker tag ${{ github.repository }}/frontend:$IMAGE_TAG $IMAGE_NAME:$IMAGE_TAG
-        docker push $IMAGE_NAME:$IMAGE_TAG
+
+        echo ${{ secrets.TOKEN_FOR_ACTIONS }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
+        
+        docker buildx build --platform linux/amd64,linux/arm64 --file frontend/Dockerfile --tag $IMAGE_NAME:$IMAGE_TAG --push ./frontend
+        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
+      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
diff --git a/.github/workflows/docker-image_frontend_manualORnewrelease.yml b/.github/workflows/docker-image_frontend_manualORnewrelease.yml
@@ -1,10 +1,6 @@
 name: Create frontend Docker image on new release or using manual trigger
 
 on:
-  #push:
-  #  branches: [ "master" ]
-  #pull_request:
-  #  branches: [ "master" ]
   workflow_dispatch:
   release:
     types:
@@ -20,21 +16,29 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
-    - name: Build the frontend Docker image
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+      with:
+        platforms: linux/amd64,linux/arm64
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Create a builder
+      run: |
+        docker buildx create --use
+
+    - name: Build and push the frontend Docker image
       run: |
         if [ "${{ github.event_name }}" == 'workflow_dispatch' ]; then
           IMAGE_TAG="dev_$(date +"%d%m%Y")"
         else
           IMAGE_TAG="${{ github.event.release.tag_name }}"
         fi
-        docker build . --file Dockerfile_frontend --tag ${{ github.repository }}/frontend:$IMAGE_TAG
-        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
-      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
+        IMAGE_NAME="ghcr.io/${{ github.repository }}/frontend"
 
-    - name: Push the frontend Docker image to GHCR
-      if: success() && (github.event_name == 'release' || github.event_name == 'workflow_dispatch')
-      run: |
         echo ${{ secrets.TOKEN_FOR_ACTIONS }} | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-        IMAGE_NAME="ghcr.io/${{ github.repository }}/frontend"
-        docker tag ${{ github.repository }}/frontend:$IMAGE_TAG $IMAGE_NAME:$IMAGE_TAG
-        docker push $IMAGE_NAME:$IMAGE_TAG
+        
+        docker buildx build --platform linux/amd64,linux/arm64 --file frontend/Dockerfile --tag $IMAGE_NAME:$IMAGE_TAG --push ./frontend
+        echo "IMAGE_TAG=${IMAGE_TAG}" >> $GITHUB_ENV
+      if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
diff --git a/.gitignore b/.gitignore
@@ -1,49 +1,52 @@
+# General
+docker-compose.yml
+
 # Python
-backend/__pycache__/
-backend/*/__pycache__/
-backend/*/*/__pycache__/
-backend/*.pyc
+backend/app/__pycache__/
+backend/app/*/__pycache__/
+backend/app/*/*/__pycache__/
+backend/app/*.pyc
 
 # Logs
-backend/logs/*.log
-backend/*.log
+backend/app/logs/*.log
+backend/app/*.log
 
 # user image folder images
-backend/user_images/*.jpeg
-backend/user_images/*.png
-backend/user_images/*.jpg
+backend/app/user_images/*.jpeg
+backend/app/user_images/*.png
+backend/app/user_images/*.jpg
 
 # Frontend
-frontend/img/users_img/*.*
+frontend/app/img/users_img/*.*
 # Logs
-frontend/.gitignore
-frontend/logs
-frontend/*.log
-frontend/npm-debug.log*
-frontend/yarn-debug.log*
-frontend/yarn-error.log*
-frontend/pnpm-debug.log*
-frontend/lerna-debug.log*
-
-frontend/node_modules
-frontend/.DS_Store
-frontend/dist
-frontend/dist-ssr
-frontend/coverage
-frontend/*.local
-frontend/README.md
-
-frontend/cypress/videos/
-frontend/cypress/screenshots/
+frontend/app/.gitignore
+frontend/app/logs
+frontend/app/*.log
+frontend/app/npm-debug.log*
+frontend/app/yarn-debug.log*
+frontend/app/yarn-error.log*
+frontend/app/pnpm-debug.log*
+frontend/app/lerna-debug.log*
+
+frontend/app/node_modules
+frontend/app/.DS_Store
+frontend/app/dist
+frontend/app/dist-ssr
+frontend/app/coverage
+frontend/app/*.local
+frontend/app/README.md
+
+frontend/app/cypress/videos/
+frontend/app/cypress/screenshots/
 
 # Editor directories and files
-frontend/.vscode/*
-frontend/!.vscode/extensions.json
-frontend/.idea
-frontend/*.suo
-frontend/*.ntvs*
-frontend/*.njsproj
-frontend/*.sln
-frontend/*.sw?
-
-frontend/*.tsbuildinfo
+frontend/app/.vscode/*
+frontend/app/!.vscode/extensions.json
+frontend/app/.idea
+frontend/app/*.suo
+frontend/app/*.ntvs*
+frontend/app/*.njsproj
+frontend/app/*.sln
+frontend/app/*.sw?
+
+frontend/app/*.tsbuildinfo