diff --git a/.github/workflows/docker-image.yml b/.github/workflows/backend-latest.yml similarity index 95% rename from .github/workflows/docker-image.yml rename to .github/workflows/backend-latest.yml index e890bfc..7a8d427 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/backend-latest.yml @@ -1,4 +1,4 @@ -name: Upload Docker image to GHCR +name: Upload latest backend image to GHCR on: push: diff --git a/.github/workflows/backend-release.yml b/.github/workflows/backend-release.yml new file mode 100644 index 0000000..d81b2e8 --- /dev/null +++ b/.github/workflows/backend-release.yml @@ -0,0 +1,31 @@ +name: Publish backend release + +on: + release: + types: [published] + +env: + IMAGE_NAME: "adventurelog-backend" + +jobs: + upload: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.ACESS_TOKEN }} + + - name: Build Docker image + run: docker build -t $IMAGE_NAME:${{ github.event.release.tag_name }} ./backend + + - name: Tag Docker image + run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/$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 }} diff --git a/.github/workflows/frontend-latest.yml b/.github/workflows/frontend-latest.yml index a0a7602..ef61048 100644 --- a/.github/workflows/frontend-latest.yml +++ b/.github/workflows/frontend-latest.yml @@ -1,11 +1,11 @@ -name: Upload Docker image to GHCR +name: Upload latest frontend image to GHCR on: push: branches: - main paths: - - 'frontend/**' + - "frontend/**" env: IMAGE_NAME: "adventurelog-frontend" diff --git a/.github/workflows/frontend-release.yml b/.github/workflows/frontend-release.yml new file mode 100644 index 0000000..c0319dc --- /dev/null +++ b/.github/workflows/frontend-release.yml @@ -0,0 +1,31 @@ +name: Publish frontend release + +on: + release: + types: [published] + +env: + IMAGE_NAME: "adventurelog-frontend" + +jobs: + upload: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.ACESS_TOKEN }} + + - name: Build Docker image + run: docker build -t $IMAGE_NAME:${{ github.event.release.tag_name }} ./frontend + + - name: Tag Docker image + run: docker tag $IMAGE_NAME:${{ github.event.release.tag_name }} ghcr.io/${{ github.repository_owner }}/$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 }} diff --git a/frontend/package.json b/frontend/package.json index 521f1d5..fc174dd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,7 +1,6 @@ { "name": "adventurelog-frontend", - "version": "0.0.1", - "private": true, + "version": "0.5.0", "scripts": { "dev": "vite dev", "django": "cd .. && cd backend/server && python3 manage.py runserver", diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts index 978f5b9..eb32388 100644 --- a/frontend/src/lib/config.ts +++ b/frontend/src/lib/config.ts @@ -1,4 +1,4 @@ -export let appVersion = 'Web v0.4.1'; -export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.4.1'; +export let appVersion = 'Web v0.5.0'; +export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.5.0'; export let appTitle = 'AdventureLog'; export let copyrightYear = '2024'; diff --git a/frontend/src/routes/map/+page.svelte b/frontend/src/routes/map/+page.svelte index 094e987..99dd7ed 100644 --- a/frontend/src/routes/map/+page.svelte +++ b/frontend/src/routes/map/+page.svelte @@ -151,7 +151,7 @@ (clickedName = name)} - class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-red-300 text-black shadow-2xl focus:outline-2 focus:outline-black" + class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-red-300 text-black shadow-md" >