Deployement 117

.gitlab-ci.yml

@@ -69,6 +69,22 @@ deploy_227:
   only:
     - master
 
+deploy_117:
+  stage: deploy
+  script:
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+    - eval $(ssh-agent -s)
+    - ssh-add <(echo "$SSH_PRIVATE_KEY")
+    - mkdir -p ~/.ssh
+    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
+    - ~/.composer/vendor/bin/envoy run deploy_117 --commit="$CI_COMMIT_SHA"
+  environment:
+    name: CCMRC117
+    url: http://117.exvps.ca
+  only:
+    - master
+
 deploy_dev:
   stage: deploy
   script:

Envoy.blade.php

@@ -19,6 +19,10 @@
     $releases_dir_227 = '/var/www/c-cms/ccmrc227/releases';
     $app_dir_227 = '/var/www/c-cms/ccmrc227';
     $new_release_dir_227 = $releases_dir_227 .'/'. $release;
+
+    $releases_dir_117 = '/var/www/c-cms/ccmrc117/releases';
+    $app_dir_117 = '/var/www/c-cms/ccmrc117';
+    $new_release_dir_117 = $releases_dir_117 .'/'. $release;
 @endsetup
 
 @story('deploy_697')
@@ -45,6 +49,12 @@
     update_symlinks_227
 @endstory
 
+@story('deploy_177')
+    clone_repository_117
+    run_composer_117
+    update_symlinks_117
+@endstory
+
 @task('clone_repository_697')
     echo 'Cloning repository'
     [ -d {{ $releases_dir_697 }} ] || mkdir {{ $releases_dir_697 }}
@@ -183,4 +193,39 @@ cd {{ $app_dir_227 }}/current/
 php artisan migrate
 php artisan db:seed --class=ConfigsTableSeeder
 
+@endtask
+
+@task('clone_repository_117')
+echo 'Cloning repository'
+[ -d {{ $releases_dir_117 }} ] || mkdir {{ $releases_dir_117 }}
+git clone --depth 1 --single-branch -b dev {{ $repository }} {{ $new_release_dir_117 }}
+cd {{ $new_release_dir_117 }}
+git reset --hard {{ $commit }}
+@endtask
+
+@task('run_composer_117')
+echo "Starting deployment ({{ $release }})"
+cd {{ $new_release_dir_117 }}
+composer install --prefer-dist --no-scripts -q -o
+@endtask
+
+@task('update_symlinks_117')
+echo "Linking storage directory"
+rm -rf {{ $new_release_dir_117 }}/storage
+ln -nfs {{ $app_dir_117 }}/storage {{ $new_release_dir_117 }}/storage
+
+echo 'Linking .env file'
+ln -nfs {{ $app_dir_117 }}/.env {{ $new_release_dir_117 }}/.env
+
+echo 'Linking current release'
+ln -nfs {{ $new_release_dir_117 }} {{ $app_dir_117 }}/current
+
+echo 'Setting permission'
+chmod -R 777 {{ $app_dir_117 }}/current/bootstrap/
+
+echo 'Migrate DB'
+cd {{ $app_dir_117 }}/current/
+php artisan migrate
+php artisan db:seed --class=ConfigsTableSeeder
+
 @endtask

app/Http/Controllers/ConfigController.php

@@ -17,6 +17,28 @@ class ConfigController extends Controller
         return view ('admin.configs.general',['configs' => Config::all()]);
     }
 
+    public function customisation()
+    {
+        return view ('admin.configs.perso',['configs' => Config::all()]);
+    }
+
+    public function customisationUpdate()
+    {
+        $configs = [
+            'public_index_img_url'
+        ];
+
+        foreach ($configs as $config) {
+            $c = \App\Config::all()->where('name',$config)->first();
+            $c->data = [request($config)];
+            $c->save();
+        }
+
+        \App\Log::saveLog('Modification de la configuration du site');
+
+        return redirect('/admin/config/customisation')->with('success','Modification sauvegarder avec succès !');
+    }
+
     /**
      * Show the form for creating a new resource.
      *

app/Http/Controllers/EventController.php

@@ -139,6 +139,17 @@ class EventController extends Controller
 
                     $course = new \App\Course();
 
+                    foreach ($event->courses as $c)
+                    {
+                        if ($c->periode == $p)
+                        {
+                            if ($c->level == $l)
+                            {
+                                $course = $c;
+                            }
+                        }
+                    }
+
                     $users = \App\User::all();
                     $instructor = 1;
 

resources/views/admin/configs/general.blade.php

@@ -100,6 +100,8 @@
                             <small id="emailHelp" class="form-text text-muted">Email du CC. Laisser vide si aucun</small>
                         </div>
                     </div>
+                </div>
+                <div class="ml-2 row">
                     <div class="col-md-6 p-2">
                         <div class="form-check">
                             <label class="form-check-label">

resources/views/admin/configs/perso.blade.php

@@ -0,0 +1,69 @@
+@extends('layouts.admin.main')
+
+@section('content')
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header card-header-primary">
+                <h4>Configuration Générale</h4>
+            </div>
+            <div class="card-body mt-5">
+                <form action="/admin/config/customisation" method="POST">
+                    @csrf
+                    <div class="row ml-2">
+                        <div class="col-md-6 p-2">
+                            <div class="form-group">
+                                <label for="exampleInputEmail1">Photo page publique</label>
+                                <input type="text" class="form-control" id="escadron_name_full" name="public_index_img_url" aria-describedby="emailHelp" value="{{\App\Config::getData('public_index_img_url')}}">
+                                <small id="emailHelp" class="form-text text-muted">URL vers la photo a afficher dans l'en tête de la page publique.</small>
+                            </div>
+                        </div>
+                        <div class="col-md-12 p-2">
+                            <button type="submit" class="btn btn-primary">Sauvegarder</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('breadcrumb')
+    <div class="breadcrumbs">
+        <div class="col-sm-4">
+            <div class="page-header float-left">
+                <div class="page-title">
+                    <h1>Configuration Générale</h1>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-8">
+            <div class="page-header float-right">
+                <div class="page-title">
+                    <ol class="breadcrumb text-right">
+                        <li class="active">Configuration/Générale</li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+    <script>
+        function saveChange(pPerm) {
+            (function($) {
+                var myswitch = document.getElementById(pPerm);
+                $.post('/api/config/general/save?api_token='+api_token, { value: myswitch.checked,perm: pPerm } , function(data) {
+                    swal({
+                        title: 'Modification enregistré !',
+                        type: 'success',
+                    }).then((result) => {
+                        if (result.value) {
+                            location.reload();
+                        }
+                    })
+                });
+            })(jQuery);
+        }
+    </script>
+@endsection

resources/views/layouts/admin/sidebar.blade.php

@@ -192,6 +192,12 @@
                             <span class="sidebar-normal"> Activités </span>
                         </a>
                     </li>
+                    <li class="nav-item ">
+                        <a class="nav-link" href="/admin/config/customisation">
+                            <span class="sidebar-mini"> <i class="fas fa-palette"></i> </span>
+                            <span class="sidebar-normal"> Apparence </span>
+                        </a>
+                    </li>
                 </ul>
             </div>
         </li>

routes/web.php

@@ -80,6 +80,8 @@ Route::middleware(['auth','admin'])->group(function () {
         Route::post('/admin/config/activity/edit/{id}' , 'ComplementaryActivityController@update');
         Route::post('/admin/config/general/edit','ConfigController@update');
         Route::get('/admin/config/' , 'ConfigController@index');
+        Route::get('/admin/config/customisation','ConfigController@customisation');
+        Route::post('/admin/config/customisation','ConfigController@customisationUpdate');
 
         /** Public page */
         Route::get('/admin/public/edit/{config}', 'PublicController@edit');