Merge main into new-logo #29

Merged
luketainton merged 2 commits from main into new-logo 2020-08-06 18:26:38 +00:00
2 changed files with 24 additions and 43 deletions

24
.github/workflows/deploy.yml vendored Normal file
View File

@@ -0,0 +1,24 @@
name: Deploy
on:
push:
branches: main
jobs:
deploy:
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
run: docker build . --file Dockerfile --tag luketainton/fhed:latest
- name: Push image
run: docker push luketainton/fhed:latest
- name: Update image on server
uses: garygrossgarten/github-action-ssh@release
with:
command: cd /docker/active/fhed && docker-compose pull && docker-compose up -d
host: ${{ secrets.SSH_HOST }}
port: ${{ secrets.SSH_PORT }}
username: ${{ secrets.SSH_USERNAME }}
privateKey: ${{ secrets.SSH_SSHKEY }}

View File

@@ -33,49 +33,6 @@
<!-- Begin page content -->
<main role="main" class="flex-shrink-0">
<?php if (is_signed_in()) { ?>
<section class="jumbotron text-center">
<div class="container">
<h1>Open requests</h1>
<p class="lead text-muted">
Here you can find all of your requests, and other requests that you are subscribed to.
</p>
</div>
</section>
<section>
<p>This page is currently under construction.</p>
</section>
<?php } else { ?>
<section>
<div class='alert alert-danger alert-dismissible fade show' role='alert'>
You need to log in to access this page.
<button type='button' class='close' data-dismiss='alert' aria-label='Close'>
<span aria-hidden='true'>&times;</span>
</button>
</div>
</section>
<?php } ?>
</main>
<?php
require_once __DIR__ . "/../includes/footer.php";
?>
<!-- Begin page content -->
<main role="main" class="flex-shrink-0">