diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..07c3e97 --- /dev/null +++ b/.github/workflows/main.yml @@ -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' diff --git a/server_deploy.sh b/server_deploy.sh new file mode 100644 index 0000000..7eaf290 --- /dev/null +++ b/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!" diff --git a/skolehjem/database/seeds/ContactSeeder.php b/skolehjem/database/seeds/ContactSeeder.php index 149c036..2b289be 100644 --- a/skolehjem/database/seeds/ContactSeeder.php +++ b/skolehjem/database/seeds/ContactSeeder.php @@ -22,7 +22,7 @@ class ContactSeeder extends Seeder [ 'contactname' => "Birgitte True", 'email' => "bit@sde.dk", - 'title' => "", + 'title' => "Erhverskollegie Sekretær", 'phone' => "63126715", 'phonetimes' => "

Mandag-Torsdag: 8.00-15.00
Fredag: 8.00-12.00

", ], diff --git a/skolehjem/public/images/icons/Instagram.png b/skolehjem/public/images/icons/Instagram.png new file mode 100644 index 0000000..88c53af Binary files /dev/null and b/skolehjem/public/images/icons/Instagram.png differ diff --git a/skolehjem/public/images/icons/facebook-icon.png b/skolehjem/public/images/icons/facebook-icon.png index d25dd32..1a9e2d8 100644 Binary files a/skolehjem/public/images/icons/facebook-icon.png and b/skolehjem/public/images/icons/facebook-icon.png differ diff --git a/skolehjem/public/images/icons/instagram.png b/skolehjem/public/images/icons/instagram.png deleted file mode 100644 index 893aab6..0000000 Binary files a/skolehjem/public/images/icons/instagram.png and /dev/null differ diff --git a/skolehjem/public/images/icons/yt.png b/skolehjem/public/images/icons/yt.png index 71ef8fd..9b6935d 100644 Binary files a/skolehjem/public/images/icons/yt.png and b/skolehjem/public/images/icons/yt.png differ diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 46965f2..7d29a33 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -6,7 +6,7 @@ -
+