Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
This commit is contained in:
commit
7ea2208b4a
|
|
@ -0,0 +1,35 @@
|
|||
name: CD
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ production ]
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
token: a0a2dd521e6af856629d95da2a32f196957a78b0
|
||||
- name: Set up Node
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: '12.x'
|
||||
- run: cd skolehjem
|
||||
- run: npm install
|
||||
- run: npm run production
|
||||
- name: Commit built assets
|
||||
run: |
|
||||
git config --local user.email "action@github.com"
|
||||
git config --local user.name "GitHub Action"
|
||||
git checkout -B deploy
|
||||
git add -f public/
|
||||
git commit -m "Build front-end assets"
|
||||
git push -f origin deploy
|
||||
- name: Deploy to production
|
||||
uses: appleboy/ssh-action@master
|
||||
with:
|
||||
username: ekapp
|
||||
host: sebathefox.dk
|
||||
password: Aa123456&
|
||||
script: 'cd /home/ekapp/public_html/skolehjem && ./server_deploy.sh'
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
echo "Deploying application ..."
|
||||
|
||||
# Enter maintenance mode
|
||||
(php artisan down --message 'The app is being (quickly!) updated. Please try again in a minute.') || true
|
||||
# Update codebase
|
||||
git fetch origin deploy
|
||||
git reset --hard origin/deploy
|
||||
|
||||
# Install dependencies based on lock file
|
||||
composer install --no-interaction --prefer-dist --optimize-autoloader
|
||||
|
||||
# Migrate database
|
||||
php artisan migrate --force
|
||||
|
||||
# Note: If you're using queue workers, this is the place to restart them.
|
||||
# ...
|
||||
|
||||
# Clear cache
|
||||
php artisan optimize
|
||||
|
||||
# Reload PHP to update opcache
|
||||
echo "" | sudo -S service php7.4-fpm reload
|
||||
# Exit maintenance mode
|
||||
php artisan up
|
||||
|
||||
echo "Application deployed!"
|
||||
|
|
@ -22,7 +22,7 @@ class ContactSeeder extends Seeder
|
|||
[
|
||||
'contactname' => "Birgitte True",
|
||||
'email' => "bit@sde.dk",
|
||||
'title' => "",
|
||||
'title' => "Erhverskollegie Sekretær",
|
||||
'phone' => "63126715",
|
||||
'phonetimes' => "<p><strong>Mandag-Torsdag:</strong> 8.00-15.00<br><strong>Fredag:</strong> 8.00-12.00</p>",
|
||||
],
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 475 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 2.3 KiB |
|
|
@ -6,7 +6,7 @@
|
|||
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
|
||||
</head>
|
||||
<body>
|
||||
<header class="row align-items-center">
|
||||
<header class="row align-items-center" id="header">
|
||||
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" onclick="location.href = '{{ route("root.index") }}';" alt="Syddansk Erhvervsskole">
|
||||
<button class="ml-auto" id="toggle">
|
||||
<i id="icon" class="fas fa-bars"></i>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@
|
|||
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
|
||||
<a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
|
||||
</div>
|
||||
<!--
|
||||
<div class="row" style="align-self: center; margin: 8px 0 8px 0;">
|
||||
<a href="https://www.facebook.com" target="_blank" class="link">
|
||||
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
|
||||
|
|
@ -21,7 +20,7 @@
|
|||
<a href="https://www.instagram.com" target="_blank" class="link">
|
||||
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
|
||||
</a>
|
||||
</div>-->
|
||||
</div>
|
||||
</main>
|
||||
@endsection
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue