From 6fe273e238eb42391384fc7ba290d26a4156be27 Mon Sep 17 00:00:00 2001
From: Alexander Davis <alexander@davisonline.uk>
Date: Thu, 6 Aug 2020 20:05:59 +0100
Subject: [PATCH 1/5] Fixed the uglies

---
 app/public/css/custom.css | 4 ----
 app/public/existing.php   | 2 +-
 app/public/new.php        | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/public/css/custom.css b/app/public/css/custom.css
index 171acc9..30e38a9 100644
--- a/app/public/css/custom.css
+++ b/app/public/css/custom.css
@@ -63,7 +63,3 @@ code {
   footer p {
     margin-bottom: .25rem;
   }
-
-  .card .mx-auto {
-    margin-bottom: 50px;
-  }
diff --git a/app/public/existing.php b/app/public/existing.php
index 9cbec7d..39cbdf0 100644
--- a/app/public/existing.php
+++ b/app/public/existing.php
@@ -47,7 +47,7 @@
 
   <?php if (is_signed_in()) { ?>
     <section>
-      <div class="card mx-auto" style="width: 80%;">
+      <div class="card mx-auto" style="width: 80%;margin-bottom: 50px;">
         <div class="card-header">
           <span class="mdi mdi-ticket-outline"></span> My Open Requests
         </div>
diff --git a/app/public/new.php b/app/public/new.php
index ffba1dc..dceb64b 100644
--- a/app/public/new.php
+++ b/app/public/new.php
@@ -82,7 +82,7 @@
     </section>
 
     <section>
-      <div class="card mx-auto" style="width: 50%;">
+      <div class="card mx-auto" style="width: 50%;margin-bottom: 50px;">
         <form style="padding: 2%" action="/new" method="post" enctype="multipart/form-data">
           <div class="form-group">
             <label for="title">Title: </label>

From 9d9d849bc194580fbde2fced7525877fcecd0711 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 8 Aug 2020 11:17:49 +0100
Subject: [PATCH 2/5] Improve GitHub Actions deploy workflow (#35)

* Update deploy.yml

* Update deploy.yml
---
 .github/workflows/deploy.yml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 33fab56..f8750a5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -4,16 +4,34 @@ on:
     branches: main
 
 jobs:
-  deploy:
+  docker-dh:
+    name: Push to Docker Hub
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Login to DockerHub Registry
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-    - name: Build image
+    - name: Build image for Docker Hub
       run: docker build . --file Dockerfile --tag luketainton/fhed:latest
-    - name: Push image
+    - name: Push image to Docker Hub
       run: docker push luketainton/fhed:latest
+      
+  docker-ghr:
+    name: Push to GitHub Package Registry
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Login to DockerHub Registry
+      run: echo ${{ secrets.GITHUB_TOKEN }} | https://docker.pkg.github.com -u luketainton --password-stdin
+    - name: Build image for GitHub Package Registry
+      run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/FHeD/fhed:latest
+    - name: Push image to GitHub Package Registry
+      run: docker push docker.pkg.github.com/luketainton/FHeD/fhed:latest
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: [docker-dh]
+    steps:
     - name: Update image on server
       uses: garygrossgarten/github-action-ssh@release
       with:

From b2b722e4b600d54bcc4a81c1d334a4079a42edc5 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 8 Aug 2020 11:20:05 +0100
Subject: [PATCH 3/5] Fix GHA deploy regressions

---
 .github/workflows/deploy.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f8750a5..2906458 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,13 +22,14 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Login to DockerHub Registry
-      run: echo ${{ secrets.GITHUB_TOKEN }} | https://docker.pkg.github.com -u luketainton --password-stdin
+      run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
     - name: Build image for GitHub Package Registry
       run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/FHeD/fhed:latest
     - name: Push image to GitHub Package Registry
       run: docker push docker.pkg.github.com/luketainton/FHeD/fhed:latest
 
   deploy:
+    name: Update Docker image on server
     runs-on: ubuntu-latest
     needs: [docker-dh]
     steps:

From a887ecf71a714806705c553a1f83f37140b5c792 Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 8 Aug 2020 11:21:42 +0100
Subject: [PATCH 4/5] Fix GHA deploy regression

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2906458..6bbb335 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Login to DockerHub Registry
       run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
     - name: Build image for GitHub Package Registry
-      run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/FHeD/fhed:latest
+      run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/fhed/fhed:latest
     - name: Push image to GitHub Package Registry
       run: docker push docker.pkg.github.com/luketainton/FHeD/fhed:latest
 

From b0ef2a4a5ee4c9f3ec9c9ba3aa3b75d16d8600ee Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sat, 8 Aug 2020 11:23:51 +0100
Subject: [PATCH 5/5] Fix GHA deploy regression

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6bbb335..eae7038 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Build image for GitHub Package Registry
       run: docker build . --file Dockerfile --tag docker.pkg.github.com/luketainton/fhed/fhed:latest
     - name: Push image to GitHub Package Registry
-      run: docker push docker.pkg.github.com/luketainton/FHeD/fhed:latest
+      run: docker push docker.pkg.github.com/luketainton/fhed/fhed:latest
 
   deploy:
     name: Update Docker image on server