1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-24 23:39:37 +02:00

Merge pull request #168 from seanmorley15/development

Development
This commit is contained in:
Sean Morley 2024-08-06 09:04:25 -04:00 committed by GitHub
commit 82e69ca56a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 69 additions and 8 deletions

View file

@ -1,4 +1,4 @@
name: Upload Docker image to GHCR
name: Upload latest backend image to GHCR
on:
push:

31
.github/workflows/backend-release.yml vendored Normal file
View file

@ -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 }}

View file

@ -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"

31
.github/workflows/frontend-release.yml vendored Normal file
View file

@ -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 }}

View file

@ -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",

View file

@ -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';

View file

@ -151,7 +151,7 @@
<Marker
{lngLat}
on:click={() => (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"
>
<svg
width="24"