Merge branch 'dev' into 'master'

Version 3.2.0

See merge request TheGamecraft/c-cms!44
This commit is contained in:
Mathieu Lagace
2019-08-26 19:00:52 +00:00
27 changed files with 694 additions and 388 deletions

View File

@@ -1,3 +1,22 @@
/** Version 3.2.0 **/
Nouveauté
Modernisation de l'affichage de l'horaire avec fullcalendar
Modernisation de la structure de la base de donnée de l'horaire
Modernisation de l'interface avec Material UI / Dashboard
Ajout d'une bibliothèque d'image
Ajout de nouvelle configuration
Le nombre de période dans l'horaire est maintenant dynamique
Le nombre de niveau dans l'horaire est maintenant dynamique
Les activitées sont maintenant dynamique
L'horaire est maintenant disponible sur le site publique
Les photos du calendrier sont disponible au publique depuis la page d'accueil
Bug
Correction de 22 bugs
/** ALPHA 3.0.5 **/
Front-End

View File

@@ -72,6 +72,19 @@ class ConfigController extends Controller
$configs = [
'is_schedule_public',
'is_schedule_build',
'escadron_name_full',
'escadron_name_short',
'escadron_number',
'escadron_phone',
'escadron_element',
'element_title',
'escadron_address',
'escadron_direct_googlemap_link',
'media_facebook',
'media_twitter',
'media_instagram',
'media_email',
];
foreach ($configs as $config) {

View File

@@ -17,6 +17,10 @@ class PictureController extends Controller
return view('public.allpicture',['pictures' => \App\Picture::paginate(\App\Config::getData('text_public_picture_nb'))]);
}
public function indexAdmin()
{
return view('admin.picture.index',['pictures' => \App\Picture::paginate(\App\Config::getData('text_public_picture_nb'))]);
}
/**
* Show the form for creating a new resource.
*
@@ -24,7 +28,7 @@ class PictureController extends Controller
*/
public function create()
{
//
return view('admin.picture.add');
}
/**
@@ -33,9 +37,20 @@ class PictureController extends Controller
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
public function store()
{
//
$pic = new Picture();
$pic->title = request('title');
$pic->url = request('url');
$pic->desc = request('desc');
$pic->pictureable_id = 0;
$pic->pictureable_type = "";
$pic->save();
return redirect('/admin/picture')->with('success','Image ajoutée avec succès');
}
/**
@@ -55,9 +70,9 @@ class PictureController extends Controller
* @param \App\Picture $picture
* @return \Illuminate\Http\Response
*/
public function edit(Picture $picture)
public function edit($id)
{
//
return view('admin.picture.edit',['picture' => Picture::find($id)]);
}
/**
@@ -67,9 +82,17 @@ class PictureController extends Controller
* @param \App\Picture $picture
* @return \Illuminate\Http\Response
*/
public function update(Request $request, Picture $picture)
public function update($id)
{
//
$pic = Picture::find($id);
$pic->title = request('title');
$pic->url = request('url');
$pic->desc = request('desc');
$pic->save();
return redirect('/admin/picture')->with('success','Image sauvegarder avec succès');
}
/**
@@ -78,8 +101,10 @@ class PictureController extends Controller
* @param \App\Picture $picture
* @return \Illuminate\Http\Response
*/
public function destroy(Picture $picture)
public function destroy($id)
{
//
$pic = Picture::find($id);
$pic->delete();
}
}

View File

@@ -216,6 +216,11 @@ class ConfigsTableSeeder extends Seeder
'name' => 'admin_level_in_schedule_nb',
'state' => 0,
'data' => '["3"]'
],
[
'name' => 'public_index_img_url',
'state' => 0,
'data' => '["./assets/img/bg2.jpg"]'
]
];

15
public/css/custom.css vendored
View File

@@ -2,6 +2,21 @@
margin-top: 50px;
}
.news-body-small {
height: 15rem;
overflow: hidden;
}
.picture-desc-small {
height: 5rem;
overflow: hidden;
}
.a-without-effect {
text-decoration: none;
color: inherit;
}
.calendar-body-column {
display: flex;
}

View File

BIN
public/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

15
resources/custom.css vendored
View File

@@ -2,6 +2,21 @@
margin-top: 50px;
}
.news-body-small {
height: 15rem;
overflow: hidden;
}
.picture-desc-small {
height: 5rem;
overflow: hidden;
}
.a-without-effect {
text-decoration: none;
color: inherit;
}
.calendar-body-column {
display: flex;
}

View File

@@ -8,11 +8,99 @@
</div>
<div class="card-body mt-5">
<form action="/admin/config/general/edit" method="POST">
@csrf
<div class="row ml-2">
<div class="col-md-6">
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Nom complet du CC</label>
<input type="text" class="form-control" id="escadron_name_full" name="escadron_name_full" aria-describedby="emailHelp" value="{{\App\Config::getData('escadron_name_full')}}">
<small id="emailHelp" class="form-text text-muted">Nom complet du CC.</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Nom court du CC</label>
<input type="text" class="form-control" name="escadron_name_short" aria-describedby="emailHelp" value="{{\App\Config::getData('escadron_name_short')}}">
<small id="emailHelp" class="form-text text-muted">Nom court du CC.</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Numéro du CC</label>
<input type="text" class="form-control" name="escadron_number" aria-describedby="emailHelp" value="{{\App\Config::getData('escadron_number')}}">
<small id="emailHelp" class="form-text text-muted">Numéro du CC.</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Numéro de téléphone du CC</label>
<input type="text" class="form-control" name="escadron_phone" aria-describedby="emailHelp" value="{{\App\Config::getData('escadron_phone')}}">
<small id="emailHelp" class="form-text text-muted">Numéro de téléphone du CC.</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Élement du CC</label>
<select class="form-control selectpicker" data-style="btn btn-link" name="escadron_element">
<option value="Aviation" @if(\App\Config::getData('escadron_element') == 'Aviation') selected @endif>Aviation</option>
<option value="Armé" @if(\App\Config::getData('escadron_element') == 'Armé') selected @endif>Armé</option>
<option value="Marine" @if(\App\Config::getData('escadron_element') == 'Marine') selected @endif>Marine</option>
</select>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Titre Officiel du CC</label>
<select class="form-control selectpicker" data-style="btn btn-link" name="element_title">
<option value="Cadet de l'aviation royale du Canada" @if(\App\Config::getData('element_title') == "Cadet de l'aviation royale du Canada") selected @endif>Cadet de l'aviation royale du Canada</option>
<option value="Cadets royaux de lArmée canadienne" @if(\App\Config::getData('element_title') == "Cadets royaux de lArmée canadienne") selected @endif>Cadets royaux de lArmée canadienne</option>
<option value="Cadets de la Marine royale canadienne" @if(\App\Config::getData('element_title') == "Cadets de la Marine royale canadienne") selected @endif>Cadets de la Marine royale canadienne</option>
</select>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label>Adresse du CC</label>
<input type="text" class="form-control" name="escadron_address" aria-describedby="emailHelp" value="{{\App\Config::getData('escadron_address')}}">
<small id="emailHelp" class="form-text text-muted">Adresse du CC.</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Lien Google Map du CC</label>
<input type="text" class="form-control" name="escadron_direct_googlemap_link" aria-describedby="emailHelp" value="{{\App\Config::getData('escadron_direct_googlemap_link')}}">
<small id="emailHelp" class="form-text text-muted">Lien Google Map du CC.</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label>Lien vers la page Facebook du CC</label>
<input type="text" class="form-control" name="media_facebook" aria-describedby="emailHelp" value="{{\App\Config::getData('media_facebook')}}">
<small id="emailHelp" class="form-text text-muted">Lien vers la page Facebook du CC. Laisser vide si aucun</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Lien vers le compte twitter du CC</label>
<input type="text" class="form-control" name="media_twitter" aria-describedby="emailHelp" value="{{\App\Config::getData('media_twitter')}}">
<small id="emailHelp" class="form-text text-muted">Lien vers le compte twitter du CC. Laisser vide si aucun</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label>Lien vers le compte instagram du CC</label>
<input type="text" class="form-control" name="media_instagram" aria-describedby="emailHelp" value="{{\App\Config::getData('media_instagram')}}">
<small id="emailHelp" class="form-text text-muted">Lien vers le compte instagram du CC. Laisser vide si aucun</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-group">
<label for="exampleInputEmail1">Email du CC</label>
<input type="text" class="form-control" name="media_email" aria-describedby="emailHelp" value="{{\App\Config::getData('media_email')}}">
<small id="emailHelp" class="form-text text-muted">Email du CC. Laisser vide si aucun</small>
</div>
</div>
<div class="col-md-6 p-2">
<div class="form-check">
<label class="form-check-label">
<input class="form-check-input" name="is_schedule_public" type="checkbox" value="true" @if(\App\Config::getData('is_schedule_public') === "true") checked @endif>
@@ -23,7 +111,7 @@
</label>
</div>
</div>
<div class="col-md-6">
<div class="col-md-6 p-2">
<div class="form-check">
<label class="form-check-label">
<input class="form-check-input" name="is_schedule_build" type="checkbox" value="true" @if(\App\Config::getData('is_schedule_build') === "true") checked @endif>
@@ -34,7 +122,7 @@
</label>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12 p-2">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
</div>
</div>

View File

@@ -0,0 +1,63 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">
<h4>Ajouter une images</h4>
</div>
<div class="card-body mt-5">
<form action="/admin/picture/add" method="post">
@csrf
<div class="col-lg-12">
<div class="form-group">
<label>Nom de l'image</label>
<input name="title" type="text" class="form-control">
</div>
</div>
<div class="col-lg-12">
<div class="form-group">
<label>URL de l'image</label>
<input name="url" type="text" class="form-control">
</div>
</div>
<div class="col-lg-12">
<label for="desc">Description de l'image</label>
<div class="form-group">
<textarea name="desc" id="desc" class="form-control"></textarea>
</div>
</div>
<div class="col-lg-12">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
</div>
</form>
</div>
</div>
</div>
@endsection
@section('custom_scripts')
<script>
$('#desc').trumbowyg({
lang: 'fr'
});
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

View File

@@ -0,0 +1,63 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">
<h4>Ajouter une images</h4>
</div>
<div class="card-body mt-5">
<form action="/admin/picture/edit/{{$picture->id}}" method="post">
@csrf
<div class="col-lg-12">
<div class="form-group">
<label>Nom de l'image</label>
<input name="title" type="text" class="form-control" value="{{$picture->title}}">
</div>
</div>
<div class="col-lg-12">
<div class="form-group">
<label>URL de l'image</label>
<input name="url" type="text" class="form-control" value="{{$picture->url}}">
</div>
</div>
<div class="col-lg-12">
<label for="desc">Description de l'image</label>
<div class="form-group">
<textarea name="desc" id="desc" class="form-control">{!!$picture->desc!!}</textarea>
</div>
</div>
<div class="col-lg-12">
<button type="submit" class="btn btn-primary">Sauvegarder</button>
</div>
</form>
</div>
</div>
</div>
@endsection
@section('custom_scripts')
<script>
$('#desc').trumbowyg({
lang: 'fr'
});
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

View File

@@ -0,0 +1,79 @@
@extends('layouts.admin.main')
@section('content')
<div class="col-md-12">
<div class="card">
<div class="card-header card-header-primary">
<h4>Images</h4>
</div>
<div class="card-body mt-5">
<div class="row">
<div class="col-md-12">
<p>
Toutes les images serons affiché dans la section publique du site.
</p>
</div>
@foreach($pictures as $picture)
<div class="col-md-4">
<div class="card">
<div class="card-img-top">
<img class="img-responsive w-100" src="{{$picture->url}}">
</div>
<div class="card-body">
<h4 class="card-title">{{$picture->title}}</h4>
<p>{!!$picture->desc!!}</p>
<div class="btn-group">
<a class="btn btn-primary" href="/admin/picture/edit/{{$picture->id}}"><i class="fas fa-edit"></i></a>
<button class="btn btn-danger" onclick="Delete({{$picture->id}})"><i class="fas fa-times"></i></button>
</div>
</div>
</div>
</div>
@endforeach
<div class="col-12">
<a class="btn btn-primary btn-block" href="/admin/picture/add">Ajouter une images</a>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('custom_scripts')
<script>
function Delete(pID) {
swal({
title: 'Êtes vous certain de vouloir supprimer l\'image?',
text: "Vous ne pourrez pas annuler cette action",
type: 'warning',
showCancelButton: true,
confirmButtonColor: '#3085d6',
cancelButtonColor: '#d33',
confirmButtonText: 'Oui',
cancelButtonText: 'Non'
}).then((result) => {
if (result.value) {
(function($) {
$.post('/api/picture/delete/'+pID+'?api_token='+api_token, function(data) {
console.log('Delete');
});
})(jQuery);
swal(
'Supprimé!',
"L'image a été supprimé",
'success'
).then((result) => {
if (result.value) {
location.reload();
}
})
}
})
}
</script>
@endsection

View File

@@ -1,311 +1,154 @@
@extends('layouts.admin.main')
@section('content')
<!--/* ALPHA 3.0.5 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.6<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p>
Front-End
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'un bouton pour supprimer toute les notifications</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'affichage des activités a venir</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'affichage des cours a venir</li>
</ul>
</p>
<hr>
<p>
Back End & API
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout des notifications par Email.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout des notifications pas SMS</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout de la suppression massive de notifications</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Multiples autres ajouts</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/26"> - Largeur colonne profil utilisateur - #26</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/25"> - Bug dans la création d'horaire - Message automatique qui reste lors de changement d'act. - #25</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/24"> - Email page d'accueil - #24</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/32"> - Notification Lu - #32</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/23"> - Message qui gosse dans l'horaire - #23</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de multiple bug</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-11-08 12:30</span></small>
</div>
<!--/* ALPHA 3.0.5 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.5<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p>
Front-End
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'un quantité d'item dans l'inventaire.</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Modification de l'interface de la gestion d'inventaire pour accomoder l'ajout de quantité.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'un indicateur de status sur la page de connexion..</li>
<li><i class="fa fa-exclamation" aria-hidden="true" style="color: orange;width:1.2rem;"></i> Le rapport de bug est maintenant publique.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout du dashboard administrateur.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green;width:1.2rem;"></i> Ajout d'option de configuration générale.'</li>
</ul>
</p>
<hr>
<p>
Back End & API
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Modification du model de réservation pour accomoder l'ajout de quantité.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'une quantité d'item a l'inventaire.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'un « Helper » pour connaitre le status des services.</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF;width:1.2rem;"></i> Ajout d'une section « Alerte » dans le modele de page Admin.</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/22"> - Bug avec les heures quand il s'agit d'une activité "Autre" - #22</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de <a href="https://gitlab.com/TheGamecraft/c-cms/issues/21"> - Bug ECC" - #21</a></li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green;width:1.2rem;"></i> Correction de multiple bug</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-09-21 18:30</span></small>
</div>
<!--/* ALPHA 3.0.4 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.4<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Création de l'espace cadet cadre.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de nouveau type d'icones.</li>
</ul>
</p>
<hr>
<p>
Back End & API
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout de CSS spécifique au calendrier</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'un controller pour l'ECC</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction de multiple bug</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-09-14 18:30</span></small>
</div>
<!--/* ALPHA 3.0.3 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.3<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Mise à jour de la section notification.</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout d'une option pour bloquer les notifications de l'horaire lors de ça construction initiale.</li>
</ul>
</p>
<hr>
<p>
Back End & API
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Mise à jours du nom de l'adresse d'envois de Email</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Mise à jours de l'adresse d'envois de Email</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout de la suppression de notification</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout de notification Email et Alert lors de l'ajout d'evenement a l'horaire</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction de multiple bug</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-09-11 14:30</span></small>
</div>
<!--/* ALPHA 3.0.2 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.2<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Amélioration générale de l'horaire</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de la section message</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de la section statistique</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de la section utilisateur</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de la section configuration</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de modèle de poste</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de modèle de grade</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de notification par Email</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de notification par SMS</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de notification interne</li>
</ul>
</p>
<hr>
<p>
Back End & API
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'une liste de locaux dynamique</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'une liste de poste dynamique</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'une liste de grade dynamique</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'une authentification par token pour les requetes API</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'un "Middleware" pour les staffs</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout d'un "Middleware" pour les admins</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout du plugin DataTable</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Modification de la table de données des permissions de "Boolean" a "String"</li>
<li><i class="fa fa-plug" aria-hidden="true" style="color: #0174DF"></i> Ajout de page d'erreur personnalisé</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction de multiple bug</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-05-09 13:20</span></small>
</div>
<!--/* ALPHA 3.0.1e */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.1e<small><span class="badge badge-danger float-right mt-1">UNSTABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Amélioration générale de l'horaire</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout du model d'activité</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de la migration d'activité</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout du CSS du calendrier</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout d'un préloader</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout de photos sur la page publique</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction de multiple bug mineur</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-07-18 21:23</span></small>
</div>
<!--/* ALPHA 3.0.1d */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.1d<small><span class="badge badge-danger float-right mt-1">UNSTABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout du prototype de l'horaire</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction d'un bug dans le header</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-07-17 21:58</span></small>
</div>
<!--/* ALPHA 3.0.1c */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.1c<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout du systeme de logs</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction d'un bug lors de la connexion</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-07-17 08:55</span></small>
</div>
<!--/* ALPHA 3.0.1b */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.1b<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Traduction complète des fichiers de langues</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-07-13 18:06</span></small>
</div>
<!--/* ALPHA 3.0.1a */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.1a<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Traduction des fichiers de langues</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-07-13 06:29</span></small>
</div>
<!--/* ALPHA 3.0.1 */-->
<div class="card-header">
<strong class="card-title"><i class="fa fa-star" aria-hidden="true" style="color: gold"></i> ALPHA 3.0.1<small><span class="badge badge-success float-right mt-1">STABLE</span> <span class="badge badge-warning float-right mt-1">ALPHA</span></small></strong>
</div>
<div class="card-body">
<p class="card-text">
Nouveauté
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-power-off" aria-hidden="true" style="color: green"></i> Création du C-CMS sous laravel 5.5</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Création de la page publique</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Création de l'espace administration</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout d'un syteme d'authentification</li>
<li><i class="fa fa-plus" aria-hidden="true" style="color: green"></i> Ajout d'un syteme de notification</li>
</ul>
</p>
<hr>
<p>
Correction de bug
<ul style="margin-left: 28px;list-style-type: none;">
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction d'un bug lors de la connexion (ISSUE #13)</li>
<li><i class="fa fa-bug" aria-hidden="true" style="color: green"></i> Correction d'un bug dans la barre de navigation (ISSUE #12)</li>
</ul>
</p>
<small><span class="badge badge-primary float-right mt-1">2018-07-12 20:44</span></small>
</div>
<div class="row">
<div class="col-md-12">
<div class="card">
<div class="card-header">
<div class="row">
<div class="col-sm-6">
<h3 class="card-title">3.2.0</h3>
<p class="category">2019-08-26</p>
</div>
<div class="col-sm-6 text-right">
<span class="badge badge-pill badge-success">STABLE</span>
</div>
</div>
</div>
<div class="card-body">
<div class="alert alert-danger" role="alert">
<i class="fas fa-exclamation-triangle text-white fa-2x mr-3"></i>L'inventaire et les réservations sont <strong>DÉSACTIVÉ</strong> le temps de moderniser la base de donnée
</div>
<div class="row">
<div class="col-md-6">
<p>
Nouveauté
<ul class="list-group list-group-flush ml-3">
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-coffee"></i>
</div>
<div class="col m-auto text-left">
Modernisation de l'affichage de l'horaire avec <a href="https://fullcalendar.io/">fullcalendar</a>
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-coffee"></i>
</div>
<div class="col m-auto text-left">
Modernisation de la structure de la base de donnée de l'horaire
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-coffee"></i>
</div>
<div class="col m-auto text-left">
Modernisation de l'interface avec Material UI / Dashboard
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-plus"></i>
</div>
<div class="col m-auto text-left">
Ajout d'une bibliothèque d'image
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-plus"></i>
</div>
<div class="col m-auto text-left">
Ajout de nouvelle configuration
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-plus"></i>
</div>
<div class="col m-auto text-left">
Le nombre de période dans l'horaire est maintenant dynamique
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-plus"></i>
</div>
<div class="col m-auto text-left">
Le nombre de niveau dans l'horaire est maintenant dynamique
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-plus"></i>
</div>
<div class="col m-auto text-left">
Les activitées sont maintenant dynamique
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-plus"></i>
</div>
<div class="col m-auto text-left">
L'horaire est maintenant disponible sur le site publique
</div>
</div>
</li>
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-plus"></i>
</div>
<div class="col m-auto text-left">
Les photos du calendrier sont disponible au publique depuis la page d'accueil
</div>
</div>
</li>
</ul>
</p>
</div>
<div class="col-md-6">
<p>
Bug
<ul class="list-group list-group-flush ml-3">
<li class="list-group-item">
<div class="row">
<div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
<i class="fas fa-bug"></i>
</div>
<div class="col m-auto text-left">
Correction de <a href="https://op.exvps.ca/projects/c-cms/work_packages?query_props=%7B%22c%22%3A%5B%22id%22%2C%22subject%22%2C%22type%22%2C%22status%22%2C%22assignee%22%5D%2C%22hl%22%3A%22none%22%2C%22hi%22%3Afalse%2C%22g%22%3A%22type%22%2C%22t%22%3A%22id%3Aasc%22%2C%22f%22%3A%5B%7B%22n%22%3A%22status%22%2C%22o%22%3A%22c%22%2C%22v%22%3A%5B%5D%7D%2C%7B%22n%22%3A%22version%22%2C%22o%22%3A%22%3D%22%2C%22v%22%3A%5B%227%22%5D%7D%5D%2C%22pa%22%3A1%2C%22pp%22%3A20%7D">22 bugs</a>
</div>
</div>
</li>
</ul>
</p>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
@section('breadcrumb')

View File

@@ -18,11 +18,10 @@
<head>
<meta charset="utf-8"/>
<link rel="apple-touch-icon" sizes="76x76" href="../../assets/img/apple-icon.png">
<link rel="icon" type="image/png" href="../../assets/img/favicon.png">
<link rel="icon" type="image/png" href="/favicon.png">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
<title>
Material Dashboard PRO by Creative Tim
Connexion - C-CMS
</title>
<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
name='viewport'/>
@@ -62,7 +61,7 @@
<!-- End Navbar -->
<div class="wrapper wrapper-full-page">
<div class="page-header login-page header-filter" filter-color="black"
style="background-image: url('/assets/public/images/banner.jpg'); background-size: cover; background-position: top center;">
style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}}); background-size: cover; background-position: top center;">
<!-- you can change the color of the filter page using: data-color="blue | purple | green | orange | red | rose " -->
<div class="container">
<div class="row">

View File

@@ -7,6 +7,7 @@
<title>C-CMS - Espace Administration</title>
<meta charset="utf-8">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
<link rel="icon" type="image/png" href="/favicon.png">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<!-- CSRF Token -->

View File

@@ -100,6 +100,30 @@
</ul>
</div>
</li>-->
<li class="nav-item ">
<a class="nav-link" data-toggle="collapse" href="#inventory">
<i class="material-icons">image</i>
<p> Image
<b class="caret"></b>
</p>
</a>
<div class="collapse" id="inventory">
<ul class="nav">
<li class="nav-item ">
<a class="nav-link" href="/admin/picture">
<span class="sidebar-mini"> <i class="fas fa-list"></i> </span>
<span class="sidebar-normal"> Afficher toutes les images </span>
</a>
</li>
<li class="nav-item ">
<a class="nav-link" href="/admin/picture/add">
<span class="sidebar-mini"> <i class="fas fa-plus"></i> </span>
<span class="sidebar-normal"> Ajouter une image </span>
</a>
</li>
</ul>
</div>
</li>
<li class="nav-item ">
<a class="nav-link" data-toggle="collapse" href="#stats">
<i class="material-icons">timeline</i>

View File

@@ -1,4 +1,4 @@
<div id="header" class="page-header pricing-page header-filter" style="background-image: url('/assets/public/images/banner.jpg')">
<div id="header" class="page-header pricing-page header-filter" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}})">
<div class="container mt-lg-5 pt-md-5">
<div class="row mt-sm-5 pt-md-5">
<div class="col-md-6 ml-auto mr-auto text-center">

View File

@@ -1,10 +1,18 @@
<nav class="float-left">
<ul>
<li>
<li><a href="{{ App\Config::getData('media_twitter')}}" class="icon"><i class="fab fa-twitter mr-2"></i><span class="label">Twitter</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_twitter"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
<li><a href="{{ App\Config::getData('media_facebook')}}" class="icon"><i class="fab fa-facebook mr-2"></i><span class="label">Facebook</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_facebook"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
<li><a href="{{ App\Config::getData('media_instagram')}}" class="icon"><i class="fab fa-instagram mr-2"></i><span class="label">Instagram</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_instagram"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
<li><a href="mailto:{{ App\Config::getData('media_email')}}" class="icon"><i class="fas fa-envelope mr-2"></i><span class="label">Email</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_email"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
@if(App\Config::getData('media_twitter'))
<li><a href="{{ App\Config::getData('media_twitter')}}" class="icon"><i class="fab fa-twitter mr-2"></i><span class="label">Twitter</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_twitter"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
@endif
@if(App\Config::getData('media_facebook'))
<li><a href="{{ App\Config::getData('media_facebook')}}" class="icon"><i class="fab fa-facebook mr-2"></i><span class="label">Facebook</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_facebook"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
@endif
@if(App\Config::getData('media_instagram'))
<li><a href="{{ App\Config::getData('media_instagram')}}" class="icon"><i class="fab fa-instagram mr-2"></i><span class="label">Instagram</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_instagram"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
@endif
@if(App\Config::getData('media_email'))
<li><a href="mailto:{{ App\Config::getData('media_email')}}" class="icon"><i class="fas fa-envelope mr-2"></i><span class="label">Email</span></a>@if(request()->has('editMode'))<a class="badge badge-primary edit-btn" href="/admin/public/edit/media_email"><i class="fa fa-pencil" aria-hidden="true"></i></a>@endif</li>
@endif
</li>
</ul>
</nav>

View File

@@ -3,6 +3,7 @@
<meta charset="utf-8">
<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<link rel="icon" type="image/png" href="/favicon.png">
<!-- Fonts and icons -->
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons" />

View File

@@ -8,15 +8,15 @@
@endif
<div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
<ol class="carousel-indicators">
@foreach ($pictures as $picture)
<li data-target="#carouselExampleIndicators" data-slide-to="0"></li>
@endforeach
<li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
<li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
<li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
</ol>
<div class="carousel-inner">
@foreach ($pictures as $picture)
<div class="carousel-item">
<img class="d-block w-100" src="{{$picture->url}}" alt="{{$picture->title}}">
</div>
@foreach($pictures as $picture)
<div class="carousel-item @if($loop->first) active @endif">
<img class="d-block w-100" src="{{$picture->url}}" alt="First slide">
</div>
@endforeach
</div>
<a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">

View File

@@ -1,7 +1,7 @@
@extends('layouts.public.main')
@section('content')
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{$activity->public_header_picture}});">
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{'"'.$activity->public_header_picture.'"'}});">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto">

View File

@@ -1,11 +1,21 @@
@extends('layouts.public.main')
@section('content')
<article id="main">
<section class="wrapper style5">
<div class="inner">
<h2>Nouvelles</h2>
<p>Aliquam ut ex ut interdum donec amet imperdiet eleifend</p>
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto">
<div class="brand">
<h2>{{ App\Config::getData('text_public_news_title')}}</h2>
<p>{{ App\Config::getData('text_public_news_desc')}}</p>
</div>
</div>
</div>
</div>
</div>
<div class="main main-raised">
<div class="container">
<div class="section">
@if ($news->isEmpty())
<h4 class="text-center">Aucune nouvelles</h4>
@endif
@@ -13,7 +23,7 @@
@foreach ($news as $new)
<div class="col-md-4">
<h3>{{ $new->title }}</h3>
<p class="news-body-full">
<p class="news-body-small">
{{ $new->body }}
</p>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}</span>
@@ -25,7 +35,6 @@
{{ $news->links() }}
</div>
<a href="/" class="btn button primary">Retour</a>
</div>
</section>
</article>
</div>
</div>
@endsection

View File

@@ -1,32 +1,39 @@
@extends('layouts.public.main')
@section('content')
<article id="main">
<section class="wrapper style5">
<div class="inner">
<header class="major">
<h2>{{ App\Config::getData('text_public_picture_title')}}</h2>
<p>{{ App\Config::getData('text_public_picture_desc')}}</p>
</header>
<ul class="features">
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto">
<div class="brand">
<h2>{{ App\Config::getData('text_public_picture_title')}}</h2>
<p>{{ App\Config::getData('text_public_picture_desc')}}</p>
</div>
</div>
</div>
</div>
</div>
<div class="main main-raised">
<div class="container">
<div class="section">
<div class="row">
@if ($pictures->isEmpty())
<h4 class="text-center">Aucune Photo</h4>
@endif
@foreach ($pictures as $picture)
<li>
<div class="col-md-4">
<a class="a-without-effect" href="/picture/{{$picture->id}}">
<h3><img src="{{$picture->url}}" alt="{{$picture->title}}" width="100%"></h3>
<p>{{$picture->desc}}</p>
<p class="picture-desc-small">{!!$picture->desc!!}</p>
<span class="news-small">{{ $picture->created_at }}</span>
</a>
</li>
</div>
@endforeach
</ul>
</div>
<div class="m-3" role="group">
{{ $pictures->links() }}
</div>
<a href="/" class="btn button primary">Retour</a>
</div>
</section>
</article>
</div>
@endsection

View File

@@ -1,29 +1,39 @@
@extends('layouts.public.main')
@section('content')
<article id="main">
<section class="wrapper style5">
<div class="inner">
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto">
<div class="brand">
<h2>{{ $new->title }}</h2>
</div>
</div>
</div>
</div>
</div>
<div class="main main-raised">
<div class="container">
<div class="section">
<div class="row">
<div class="col-md-12">
<h2>{{ $new->title }}</h2>
<div class="row gtr-50 gtr-uniform">
@foreach ($new->pictures as $picture)
<div @if ($loop->first)
class="col-12"
@else
class="col-4"
@endif><span class="image fit"><a href="/picture/{{$picture->id}}"><img src="{{ $picture->url }}" alt="{{ $picture->title }}"></a></span></div>
@endforeach
@foreach ($new->pictures as $picture)
<div @if ($loop->first)
class="col-12"
@else
class="col-4"
@endif><span class="image fit"><a href="/picture/{{$picture->id}}"><img src="{{ $picture->url }}" alt="{{ $picture->title }}"></a></span></div>
@endforeach
</div>
<p>
{{ $new->body }}
</p>
<span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}</span>
<a href="{{ url()->previous() }}" class="btn button primary">Retour</a>
</div>
</div>
<a href="{{ url()->previous() }}" class="btn button primary">Retour</a>
</div>
</section>
</article>
</div>
@endsection

View File

@@ -1,21 +1,30 @@
@extends('layouts.public.main')
@section('content')
<article id="main">
<section class="wrapper style5">
<div class="inner">
<div class="row">
<div class="col-md-12">
<h2>{{ $picture->title }}</h2>
<div><span class="image fit"><img src="{{ $picture->url }}" alt="{{ $picture->title }}"></span></div>
<div class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{'"'.\App\Config::getData('public_index_img_url').'"'}});">
<div class="container">
<div class="row">
<div class="col-md-8 ml-auto mr-auto">
<div class="brand">
<h2>{{ App\Config::getData('text_public_picture_title')}}</h2>
<p>{{ App\Config::getData('text_public_picture_desc')}}</p>
</div>
</div>
</div>
</div>
</div>
<div class="main main-raised">
<div class="container">
<div class="section">
<div>
<h2 class="title">{{ $picture->title }}</h2>
<div><img class="img-responsive w-100" src="{{ $picture->url }}" alt="{{ $picture->title }}"></div>
<p>
{{ $picture->desc }}
{!! $picture->desc !!}
</p>
<span class="news-small">{{ $picture->created_at }}</span>
<a href="{{ url()->previous() }}" class="btn button primary">Retour</a>
</div>
</div>
</div>
</section>
</article>
</div>
@endsection

View File

@@ -20,7 +20,7 @@ Route::middleware('auth:api')->group(function () {
return $request->user();
});
/* Calendar Route */
/** Calendar Route */
Route::post('/calendar/generate', 'CalendarController@generate');
Route::post('/calendar_ecc/generate', 'ECCController@generateCalendar');
Route::post('/calendar/loadDay', 'CalendarController@show');
@@ -30,6 +30,9 @@ Route::middleware('auth:api')->group(function () {
Route::get('/schedule/events/add/modal/{type}/{date}','ScheduleController@loadModalDefautType');
Route::post('/schedule/event/delete/{id}','ScheduleController@delete');
/** Picture */
Route::post('/picture/delete/{id}','PictureController@destroy');
/** Message Route */
Route::post('/message/delete', 'MessageController@destroy');

View File

@@ -85,6 +85,13 @@ Route::middleware(['auth','admin'])->group(function () {
Route::get('/admin/public/edit/{config}', 'PublicController@edit');
Route::post('/admin/public/edit/{config}', 'PublicController@update');
/** Picture */
Route::get('/admin/picture','PictureController@indexAdmin');
Route::get('/admin/picture/add','PictureController@create');
Route::post('/admin/picture/add','PictureController@store');
Route::get('/admin/picture/edit/{id}','PictureController@edit');
Route::post('/admin/picture/edit/{id}','PictureController@update');
/** Inventory */
Route::get('/admin/inventory' , 'InventoryController@index');
Route::get('/admin/inventory/booking' , 'InventoryController@booking');