diff --git a/.github/workflows/backend-latest.yml b/.github/workflows/backend-latest.yml index 7a8d427..66faa70 100644 --- a/.github/workflows/backend-latest.yml +++ b/.github/workflows/backend-latest.yml @@ -1,4 +1,4 @@ -name: Upload latest backend image to GHCR +name: Upload latest backend image to GHCR and Docker Hub on: push: @@ -24,11 +24,23 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.ACCESS_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build Docker image run: docker build -t $IMAGE_NAME:latest ./backend - - name: Tag Docker image + - name: Tag Docker image for GHCR run: docker tag $IMAGE_NAME:latest ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:latest + - name: Tag Docker image for Docker Hub + run: docker tag $IMAGE_NAME:latest ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:latest + - name: Push Docker image to GHCR run: docker push ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:latest + + - name: Push Docker image to Docker Hub + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:latest diff --git a/.github/workflows/backend-release.yml b/.github/workflows/backend-release.yml index cfe6012..c79b7a6 100644 --- a/.github/workflows/backend-release.yml +++ b/.github/workflows/backend-release.yml @@ -21,11 +21,23 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.ACCESS_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build Docker image run: docker build -t $IMAGE_NAME:${{ github.event.release.tag_name }} ./backend - - name: Tag Docker image + - name: Tag Docker image for GHCR run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }} + - name: Tag Docker image for Docker Hub + run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:${{ github.event.release.tag_name }} + - name: Push Docker image to GHCR run: docker push ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }} + + - name: Push Docker image to Docker Hub + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:${{ github.event.release.tag_name }} diff --git a/.github/workflows/frontend-latest.yml b/.github/workflows/frontend-latest.yml index ef61048..3582806 100644 --- a/.github/workflows/frontend-latest.yml +++ b/.github/workflows/frontend-latest.yml @@ -1,4 +1,4 @@ -name: Upload latest frontend image to GHCR +name: Upload latest frontend image to GHCR and Docker Hub on: push: @@ -24,11 +24,23 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.ACCESS_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build Docker image run: docker build -t $IMAGE_NAME:latest ./frontend - - name: Tag Docker image + - name: Tag Docker image for GHCR run: docker tag $IMAGE_NAME:latest ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:latest + - name: Tag Docker image for Docker Hub + run: docker tag $IMAGE_NAME:latest ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:latest + - name: Push Docker image to GHCR run: docker push ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:latest + + - name: Push Docker image to Docker Hub + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:latest diff --git a/.github/workflows/frontend-release.yml b/.github/workflows/frontend-release.yml index 7962e25..b885bd3 100644 --- a/.github/workflows/frontend-release.yml +++ b/.github/workflows/frontend-release.yml @@ -21,11 +21,23 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.ACCESS_TOKEN }} + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build Docker image run: docker build -t $IMAGE_NAME:${{ github.event.release.tag_name }} ./frontend - - name: Tag Docker image + - name: Tag Docker image for GHCR run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }} + - name: Tag Docker image for Docker Hub + run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:${{ github.event.release.tag_name }} + - name: Push Docker image to GHCR run: docker push ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME:${{ github.event.release.tag_name }} + + - name: Push Docker image to Docker Hub + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/$IMAGE_NAME:${{ github.event.release.tag_name }} diff --git a/backend/server/users/serializers.py b/backend/server/users/serializers.py index ad6f8d1..6be95d6 100644 --- a/backend/server/users/serializers.py +++ b/backend/server/users/serializers.py @@ -12,6 +12,7 @@ from django.core.exceptions import ValidationError as DjangoValidationError from django.utils.translation import gettext_lazy as _ from rest_framework import serializers + try: from allauth.account import app_settings as allauth_account_settings from allauth.account.adapter import get_adapter diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts index a2968e9..74ab654 100644 --- a/frontend/src/lib/config.ts +++ b/frontend/src/lib/config.ts @@ -2,3 +2,4 @@ export let appVersion = 'Web v0.5.1'; export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.5.1'; export let appTitle = 'AdventureLog'; export let copyrightYear = '2024'; +// config for about modal