diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02ac79ad..7d77ac8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,18 +24,6 @@ deploy_stage: - chmod -R 777 bootstrap - composer update - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 + - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C736 - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" - -deploy_production: - stage: deploy - environment: Production - only: - - tags - script: - - sshpass -V - - export SSHPASS=$USER_PASS - - chmod -R 777 storage - - chmod -R 777 bootstrap - - composer update - - sshpass -e scp -o stricthostkeychecking=no -r . admin@54.39.97.124:/var/www/website/C697 - - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C697 && php artisan migrate" + - sshpass -e ssh -t admin@54.39.97.124 "cd /var/www/website/C736 && php artisan migrate" \ No newline at end of file diff --git a/resources/views/default.blade.php b/resources/views/default.blade.php deleted file mode 100644 index 2b3feebb..00000000 --- a/resources/views/default.blade.php +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - Escadron {{config('squadron.number')}} - - - - - - - - - - -
- @if (Route::has('login')) -
- @auth - Espace Administration - @else - Connexion - @endauth -
- @endif - -
-
- {{config('squadron.fullname')}} -
-
- © C-CMS 2018 - Version {{config('app.version')}} -
-
-
- - diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php index 38cf5c99..2b3feebb 100644 --- a/resources/views/public.blade.php +++ b/resources/views/public.blade.php @@ -1,169 +1,91 @@ - - - - - Escadron 697 - - - - - - + + + + + + - -
+ Escadron {{config('squadron.number')}} - - + + + + + + + + + +
+ @if (Route::has('login')) +
+ @auth + Espace Administration + @else + Connexion + @endauth +
+ @endif - - \ No newline at end of file +
+
+ {{config('squadron.fullname')}} +
+
+ © C-CMS 2018 - Version {{config('app.version')}} +
+
+
+ +