diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php new file mode 100644 index 00000000..66fe37fa --- /dev/null +++ b/app/Http/Controllers/ArticleController.php @@ -0,0 +1,133 @@ + \App\ComplementaryActivity::all()]); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + // + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show($id) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function editActivity($id) + { + return view('admin.article.editActivity',['article' => \App\ComplementaryActivity::find($id)]); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + public function updateActivity(Request $request, $id) + { + $a = \App\ComplementaryActivity::find($id); + + $a->public_slogan = $request->public_slogan; + $a->public_body = $request->public_body; + $a->public_header_picture = $request->public_header_picture; + + $a->save(); + return redirect('/admin/article')->with('success','Article modifié avec succès'); + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } + + public function pictureActivity($id) + { + return view('admin.article.pictureActivity',['article' => \App\ComplementaryActivity::find($id)]); + } + + public function pictureActivityCreate($id) + { + return view('admin.article.picture.add',['article' => \App\ComplementaryActivity::find($id)]); + } + + public function pictureActivityStore(Request $request, $id) + { + $p = new \App\Picture(); + + $p->url = $request->url; + $p->title = $request->title; + $p->desc = $request->desc; + $p->pictureable_id = $id; + $p->pictureable_type = "App\ComplementaryActivity"; + + $p->save(); + + return redirect('/admin/article/activity/picture/'.$id)->with('success','Photo ajoutéé avec succès'); + } +} diff --git a/app/Http/Controllers/InventoryController.php b/app/Http/Controllers/InventoryController.php index 589c79c0..6d8f348a 100644 --- a/app/Http/Controllers/InventoryController.php +++ b/app/Http/Controllers/InventoryController.php @@ -29,6 +29,11 @@ class InventoryController extends Controller { // } + + public function management() + { + return view('admin.inventory.management'); + } public function booking() { diff --git a/app/Http/Controllers/ItemCategoryController.php b/app/Http/Controllers/ItemCategoryController.php index 72cd6ae8..29d7daaa 100644 --- a/app/Http/Controllers/ItemCategoryController.php +++ b/app/Http/Controllers/ItemCategoryController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Item; use App\ItemCategory; use Illuminate\Http\Request; @@ -14,7 +15,7 @@ class ItemCategoryController extends Controller */ public function index() { - // + return view('admin.itemcategory.index',['categories' => ItemCategory::all()]); } /** @@ -24,7 +25,7 @@ class ItemCategoryController extends Controller */ public function create() { - // + return view('admin.itemcategory.add'); } /** @@ -33,9 +34,32 @@ class ItemCategoryController extends Controller * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ - public function store(Request $request) + public function store() { - // + $c = new ItemCategory(); + + $c->name = \request('name'); + $c->desc = \request('desc'); + if (\request('is_training') == 1) + { + $c->is_training = 1; + } + else + { + $c->is_training = 0; + } + if (\request('is_op_appro') == 1) + { + $c->is_op_appro = 1; + } + else + { + $c->is_op_appro = 0; + } + + $c->save(); + + return redirect('/admin/inventory/management/category/')->with('success','Catégorie ajouté avec succès'); } /** @@ -55,9 +79,9 @@ class ItemCategoryController extends Controller * @param \App\ItemCategory $itemCategory * @return \Illuminate\Http\Response */ - public function edit(ItemCategory $itemCategory) + public function edit($id) { - // + return view('admin.itemcategory.edit',['category' => ItemCategory::find($id)]); } /** @@ -67,9 +91,32 @@ class ItemCategoryController extends Controller * @param \App\ItemCategory $itemCategory * @return \Illuminate\Http\Response */ - public function update(Request $request, ItemCategory $itemCategory) + public function update($id) { - // + $c = ItemCategory::find($id); + + $c->name = \request('name'); + $c->desc = \request('desc'); + if (\request('is_training') == 1) + { + $c->is_training = 1; + } + else + { + $c->is_training = 0; + } + if (\request('is_op_appro') == 1) + { + $c->is_op_appro = 1; + } + else + { + $c->is_op_appro = 0; + } + + $c->save(); + + return redirect('/admin/inventory/management/category/')->with('success','Catégorie modifié avec succès'); } /** @@ -78,8 +125,10 @@ class ItemCategoryController extends Controller * @param \App\ItemCategory $itemCategory * @return \Illuminate\Http\Response */ - public function destroy(ItemCategory $itemCategory) + public function destroy($id) { - // + $c = ItemCategory::find($id); + + $c->delete(); } } diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index af23d5c5..df3623cd 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -14,7 +14,12 @@ class NewsController extends Controller */ public function index() { - return view('public.allnews',['news' => \App\News::paginate(9)]); + return view('public.allnews',['news' => News::where('publish','=','1')->paginate(9)]); + } + + public function indexAdmin() + { + return view('admin.news.index',['news' => \App\News::paginate(9)]); } /** @@ -24,7 +29,7 @@ class NewsController extends Controller */ public function create() { - // + return view('admin.news.create'); } /** @@ -35,7 +40,24 @@ class NewsController extends Controller */ public function store(Request $request) { - // + $n = new News(); + + $n->title = $request->title; + $n->body = $request->body; + if ($request->publish == "1") + { + $n->publish = 1; + } + else + { + $n->publish = 0; + } + $n->user_id = \Auth::user()->id; + + $n->save(); + + return redirect('/admin/news')->with('success','Nouvelle ajouté avec succès'); + } /** @@ -55,9 +77,9 @@ class NewsController extends Controller * @param \App\News $news * @return \Illuminate\Http\Response */ - public function edit(News $news) + public function edit($id) { - // + return view('admin.news.update',['news' => News::find($id)]); } /** @@ -67,9 +89,25 @@ class NewsController extends Controller * @param \App\News $news * @return \Illuminate\Http\Response */ - public function update(Request $request, News $news) + public function update(Request $request, $id) { - // + $n = News::find($id); + + $n->title = $request->title; + $n->body = $request->body; + if ($request->publish == "1") + { + $n->publish = 1; + } + else + { + $n->publish = 0; + } + $n->user_id = \Auth::user()->id; + + $n->save(); + + return redirect('/admin/news')->with('success','Nouvelle modifié avec succès'); } /** @@ -78,8 +116,10 @@ class NewsController extends Controller * @param \App\News $news * @return \Illuminate\Http\Response */ - public function destroy(News $news) + public function destroy() { - // + $news = News::find(request('id')); + + $news->delete(); } } diff --git a/app/Http/Controllers/PictureController.php b/app/Http/Controllers/PictureController.php index 44dfb889..c560d7fa 100644 --- a/app/Http/Controllers/PictureController.php +++ b/app/Http/Controllers/PictureController.php @@ -92,7 +92,14 @@ class PictureController extends Controller $pic->save(); - return redirect('/admin/picture')->with('success','Image sauvegarder avec succès'); + if ($pic->pictureable_type == "App\ComplementaryActivity") + { + return redirect('admin/article/activity/picture/'.$pic->pictureable->id)->with('success','Image sauvegarder avec succès'); + } + else + { + return redirect('/admin/picture')->with('success','Image sauvegarder avec succès'); + } } /** diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index 0d2f6332..7dca49f0 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -14,7 +14,7 @@ class PublicController extends Controller public function index() { return view('public.index',[ - 'news' => \App\News::all()->sortByDesc('created_at')->take(3), + 'news' => \App\News::all()->where('publish','1')->sortByDesc('created_at')->take(3), 'activities' => \App\ComplementaryActivity::all()->where('is_promoted','1'), 'pictures' => \App\Picture::all()->sortByDesc('created_at')->take(\App\Config::getData('nb_activity_public')) ]); diff --git a/app/Item.php b/app/Item.php index 8637119e..e1ed7d79 100644 --- a/app/Item.php +++ b/app/Item.php @@ -3,6 +3,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; +use mysql_xdevapi\Collection; class Item extends Model { @@ -29,6 +30,35 @@ class Item extends Model public function category() { + if (\App\ItemCategory::find($this->category_id) == null) + { + $this->category_id = -1; + $this->save(); + $c = new \App\ItemCategory(); + $c->name = "[Categorie Supprimé]"; + $c->is_training = 0; + $c->is_op_appro = 0; + + return $c; + } return \App\ItemCategory::find($this->category_id); } + + public function available() + { + + return $this->quantity - $this->booked(); + } + + public function booked() + { + $nbBooked = 0; + + foreach ($this->bookings() as $b) + { + $nbBooked = $nbBooked + $b->amount; + } + + return $nbBooked; + } } diff --git a/database/migrations/2019_07_19_183610_create_complementary_activities_table.php b/database/migrations/2019_07_19_183610_create_complementary_activities_table.php index 239cac4d..24b0d46e 100644 --- a/database/migrations/2019_07_19_183610_create_complementary_activities_table.php +++ b/database/migrations/2019_07_19_183610_create_complementary_activities_table.php @@ -18,7 +18,7 @@ class CreateComplementaryActivitiesTable extends Migration $table->string('name'); $table->text('public_body'); $table->text('public_slogan'); - $table->string('public_header_picture'); + $table->text('public_header_picture'); $table->text('admin_desc'); $table->string('calendar_color')->default('blue'); $table->string('calendar_icon')->default(''); diff --git a/resources/views/admin/article/edit.blade.php b/resources/views/admin/article/edit.blade.php new file mode 100644 index 00000000..7bb13b6a --- /dev/null +++ b/resources/views/admin/article/edit.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Ajouter une nouvelle + +
+
+
+ @csrf + +
+
+
+ + + Titre de la nouvelle à publier +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/article/editActivity.blade.php b/resources/views/admin/article/editActivity.blade.php new file mode 100644 index 00000000..674b25d7 --- /dev/null +++ b/resources/views/admin/article/editActivity.blade.php @@ -0,0 +1,51 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Modification de l'article {{$article->name}} + +
+
+
+ @csrf + +
+
+
+ + + Slogan de l'activité +
+
+
+
+ + + Url de l'image d'en tête +
+
+
+
+ + +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php new file mode 100644 index 00000000..cc771dab --- /dev/null +++ b/resources/views/admin/article/index.blade.php @@ -0,0 +1,47 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Articles + +
+
+
+ @foreach($activity as $a) +
+
+
+

{{$a->name}}

+

{{$a->updated_at}} + @if($a->is_promoted == 1) Promu sur la page d'accueil @endif

+
+
+ {!! $a->public_body !!} +
+
+
+
+
+   Modifier l'article +   Gérer les photos +
+
+
+   Voir l'article +
+
+
+
+
+ @endforeach +
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/article/picture/add.blade.php b/resources/views/admin/article/picture/add.blade.php new file mode 100644 index 00000000..ee23d704 --- /dev/null +++ b/resources/views/admin/article/picture/add.blade.php @@ -0,0 +1,63 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+

Ajouter une images

+
+
+
+ + @csrf + +
+
+ + +
+
+
+
+ + +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+@endsection + + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/article/pictureActivity.blade.php b/resources/views/admin/article/pictureActivity.blade.php new file mode 100644 index 00000000..27ca5ad1 --- /dev/null +++ b/resources/views/admin/article/pictureActivity.blade.php @@ -0,0 +1,84 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+

Images de l'article {{$article->name}}

+
+
+
+
+

+ Toutes ces images seront disponible dans l'article +

+
+ @if(isset($article->pictures)) + @if($article->pictures->isEmpty()) +
Aucune photo
+ @endif + @endif + @foreach($article->pictures as $picture) +
+
+
+ +
+
+

{{$picture->title}}

+

{!!$picture->desc!!}

+
+ + +
+
+
+
+ @endforeach +
+ Ajouter une images +
+
+
+
+
+@endsection + + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/inventory/index.blade.php b/resources/views/admin/inventory/index.blade.php index d0a74f31..0671ecb1 100644 --- a/resources/views/admin/inventory/index.blade.php +++ b/resources/views/admin/inventory/index.blade.php @@ -8,7 +8,10 @@
- Ajouter un item a l'inventaire +
+ Ajouter un item + +
@@ -16,6 +19,8 @@ + + @@ -26,6 +31,8 @@ + +
# Nom CategorieQuantité TotalQuantité Disponible Description Action
{{$item->official_number}} {{$item->name}} {{$item->category()->name}}{{$item->quantity}}{{$item->available()}} {!! $item->desc !!}
diff --git a/resources/views/admin/inventory/management.blade.php b/resources/views/admin/inventory/management.blade.php new file mode 100644 index 00000000..2c60fa9b --- /dev/null +++ b/resources/views/admin/inventory/management.blade.php @@ -0,0 +1,42 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Gestion de l'inventaire + +
+
+
+
+
+
+

Catégorie

+

Gestion des catégories de l'inventaire

+
+
+
+
+

+ Les catégories permettent de diviser l'inventaire et de définir les permissions d'accès aux items +

+
+
+
+ Gérer les catégories +
+
+
+
+
+
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/item/add.blade.php b/resources/views/admin/item/add.blade.php index 95e09843..a4b045d2 100644 --- a/resources/views/admin/item/add.blade.php +++ b/resources/views/admin/item/add.blade.php @@ -9,52 +9,52 @@
- @csrf -
-
-
- - + @csrf +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+ +
+
+
+
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- - -
-
-
- -
- -
-
-
- -
-
diff --git a/resources/views/admin/itemcategory/add.blade.php b/resources/views/admin/itemcategory/add.blade.php new file mode 100644 index 00000000..e4aba9cc --- /dev/null +++ b/resources/views/admin/itemcategory/add.blade.php @@ -0,0 +1,64 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Ajouter une catégorie + +
+
+
+ @csrf +
+
+
+ + +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/itemcategory/edit.blade.php b/resources/views/admin/itemcategory/edit.blade.php new file mode 100644 index 00000000..a73e7513 --- /dev/null +++ b/resources/views/admin/itemcategory/edit.blade.php @@ -0,0 +1,64 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Modifier une catégorie + +
+
+
+ @csrf +
+
+
+ + +
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/itemcategory/index.blade.php b/resources/views/admin/itemcategory/index.blade.php new file mode 100644 index 00000000..cb6f1f4d --- /dev/null +++ b/resources/views/admin/itemcategory/index.blade.php @@ -0,0 +1,113 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Gestion de l'inventaire + +
+
+
+
+
+ Ajouter une catégorie +
+
+
+ + + + + + + + + + + + + @foreach ($categories as $category) + + + + + + + + + @endforeach + + +
IDNomDescriptionDisponible pour l'instructionRéservé a l'officer d'approvisionnementAction
{{$category->id}}{{$category->name}}{!! $category->desc !!} + @if($category->is_training == 1) + + @else + + @endif + + @if($category->is_op_appro == 1) + + @else + + @endif + +
+   Modifier + +
+
+
+
+
+
+
+@endsection + +@section('custom_scripts') + + +@endsection diff --git a/resources/views/admin/news/create.blade.php b/resources/views/admin/news/create.blade.php new file mode 100644 index 00000000..ce4bcb68 --- /dev/null +++ b/resources/views/admin/news/create.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Ajouter une nouvelle + +
+
+
+ @csrf + +
+
+
+ + + Titre de la nouvelle à publier +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php new file mode 100644 index 00000000..636dcef2 --- /dev/null +++ b/resources/views/admin/news/index.blade.php @@ -0,0 +1,112 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Nouvelles + +
+
+
+ Ajouter un nouvelle +
+
+
+ @foreach($news as $n) +
+
+
+

{{$n->title}}

+

{{$n->user->fullname()}} - {{$n->created_at}} + @if($n->publish == 0) Brouillon @endif

+
+
+ {!! $n->body !!} +
+
+
+   Modifier + +
+
+
+
+ @endforeach +
+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

Inventaire

+
+
+
+
+
+
+
    +
  1. Inventaire
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + + +@endsection diff --git a/resources/views/admin/news/update.blade.php b/resources/views/admin/news/update.blade.php new file mode 100644 index 00000000..7bb13b6a --- /dev/null +++ b/resources/views/admin/news/update.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Ajouter une nouvelle + +
+
+
+ @csrf + +
+
+
+ + + Titre de la nouvelle à publier +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+ +
+
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/picture/index.blade.php b/resources/views/admin/picture/index.blade.php index 34767d4e..c309d2fe 100644 --- a/resources/views/admin/picture/index.blade.php +++ b/resources/views/admin/picture/index.blade.php @@ -14,21 +14,34 @@

@foreach($pictures as $picture) -
-
-
- -
-
-

{{$picture->title}}

-

{!!$picture->desc!!}

-
- - +
+
+
+ +
+
+

{{$picture->title}}

+

{!!$picture->desc!!}

+
+
+
+
+
+ + +
+
+ @if($picture->pictureable) +
+ + {{$picture->pictureable->name}} + +
+ @endif +
-
@endforeach
Ajouter une images diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php index 11d47852..0b8874e0 100644 --- a/resources/views/admin/update.blade.php +++ b/resources/views/admin/update.blade.php @@ -2,6 +2,102 @@ @section('content')
+
+
+
+
+
+

3.2.1

+

2019-09-03

+
+
+ STABLE +
+
+
+
+ +
+
+

+ Nouveauté +

    +
  • +
    +
    + +
    +
    + Modernisation de l'inventaire +
    +
    +
    • +
  • +
    +
    + +
    +
    + Modernisation de la structure de la base de donnée de l'inventaire +
    +
    +
    • +
  • +
    +
    + +
    +
    + Ajout de catégorie dynamique dans l'inventaire +
    +
    +
    • +
  • +
    +
    + +
    +
    + Ajout d'un système de nouvelles +
    +
    +
    • +
  • +
    +
    + +
    +
    + Ajout d'un système d'article pour chaque activité complémentaire +
    +
    +
    • +
+

+
+
+

+ Bug +

    +
  • +
    +
    + +
    +
    + Correction de 4 bugs +
    +
    +
    • +
+

+
+
+
+
+
@@ -148,7 +244,7 @@
-
+
@endsection @section('breadcrumb') diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index b9461abe..cde959a2 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -1,221 +1,257 @@
- +
\ No newline at end of file diff --git a/resources/views/layouts/public/activity.blade.php b/resources/views/layouts/public/activity.blade.php index 50b02097..2259a34a 100644 --- a/resources/views/layouts/public/activity.blade.php +++ b/resources/views/layouts/public/activity.blade.php @@ -2,12 +2,12 @@ @foreach ($activities as $activity)
-
- +
+

{{$activity->name}}

-

{{$activity->public_body}}

+

{!! $activity->public_body !!}

Plus d'information
diff --git a/resources/views/layouts/public/news.blade.php b/resources/views/layouts/public/news.blade.php index ef5a56dc..0668188f 100644 --- a/resources/views/layouts/public/news.blade.php +++ b/resources/views/layouts/public/news.blade.php @@ -10,7 +10,7 @@ @foreach ($news as $new)

{{ $new->title }}

-

{{ $new->body }}

+
{!! $new->body !!}
{{ \App\User::find($new->user_id)->fullname()}}, {{$new->created_at}} Voir plus!
diff --git a/resources/views/public/activity.blade.php b/resources/views/public/activity.blade.php index 7c29d148..2d1f3a42 100644 --- a/resources/views/public/activity.blade.php +++ b/resources/views/public/activity.blade.php @@ -1,7 +1,7 @@ @extends('layouts.public.main') @section('content') -
public_header_picture.'"'}});"> +
public_header_picture.'"'}});">
@@ -16,10 +16,10 @@
- {{$activity->public_body}} + {!! $activity->public_body !!}
@if(!$activity->pictures->isEmpty()) -
+
diff --git a/resources/views/public/allnews.blade.php b/resources/views/public/allnews.blade.php index eea2e97a..265d1632 100644 --- a/resources/views/public/allnews.blade.php +++ b/resources/views/public/allnews.blade.php @@ -23,9 +23,9 @@ @foreach ($news as $new)

{{ $new->title }}

-

- {{ $new->body }} -

+
+ {!! $new->body !!} +
{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }} Voir plus!
diff --git a/resources/views/public/news.blade.php b/resources/views/public/news.blade.php index 95ee2560..4701a2a4 100644 --- a/resources/views/public/news.blade.php +++ b/resources/views/public/news.blade.php @@ -27,7 +27,7 @@ @endforeach

- {{ $new->body }} + {!! $new->body !!}

{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}
diff --git a/routes/api.php b/routes/api.php index d4c53291..dd215a61 100644 --- a/routes/api.php +++ b/routes/api.php @@ -36,6 +36,9 @@ Route::middleware('auth:api')->group(function () { /** Message Route */ Route::post('/message/delete', 'MessageController@destroy'); + /** News Route */ + Route::post('/news/delete','NewsController@destroy'); + /** User Route */ Route::post('/user/delete', 'UserController@destroy'); Route::get('/user/list', 'UserController@apiList'); @@ -43,6 +46,9 @@ Route::middleware('auth:api')->group(function () { /** Inventory Route */ Route::post('/item/delete', 'ItemController@destroy'); + /** Item Category */ + Route::post('/itemcategory/delete/{id}','ItemCategoryController@destroy'); + /** Config Route */ Route::post('/config/general/save', 'ConfigController@update'); Route::post('/config/activity/delete', 'ComplementaryActivityController@destroy'); diff --git a/routes/web.php b/routes/web.php index a3da046e..6a0cb44b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -49,7 +49,6 @@ Route::middleware(['auth','admin'])->group(function () { Route::post('/admin/schedule/event/add','EventController@Store'); Route::post('/admin/schedule/event/edit/{id}','EventController@update'); - /** Statistique */ Route::get('/admin/stats/log' , 'LogController@index'); @@ -96,21 +95,44 @@ Route::middleware(['auth','admin'])->group(function () { /** Inventory */ Route::get('/admin/inventory' , 'InventoryController@index'); - Route::get('/admin/inventory/booking' , 'InventoryController@booking'); - Route::get('/admin/inventory/{id}/{periode}/{niveau}' , 'InventoryController@show'); - Route::post('/admin/inventory/add/{id}/{periode}/{niveau}' , 'InventoryController@store'); - Route::post('/admin/inventory/remove/{id}/{periode}/{niveau}' , 'InventoryController@destroy'); + Route::get('/admin/inventory/management','InventoryController@management'); + + /** Item Category */ + Route::get('/admin/inventory/management/category','ItemCategoryController@index'); + Route::get('/admin/inventory/management/category/add','ItemCategoryController@create'); + Route::post('/admin/inventory/management/category/add','ItemCategoryController@store'); + Route::get('/admin/inventory/management/category/edit/{id}','ItemCategoryController@edit'); + Route::post('/admin/inventory/management/category/edit/{id}','ItemCategoryController@update'); + + /** News */ + Route::get('/admin/news','NewsController@indexAdmin'); + Route::get('/admin/news/add','NewsController@create'); + Route::post('/admin/news/add','NewsController@store'); + Route::get('/admin/news/edit/{id}','NewsController@edit'); + Route::post('/admin/news/edit/{id}','NewsController@update'); + + /** Articles */ + Route::get('/admin/article','ArticleController@index'); + Route::get('/admin/article/activity/edit/{id}','ArticleController@editActivity'); + Route::post('/admin/article/activity/edit/{id}','ArticleController@updateActivity'); + Route::get('/admin/article/activity/picture/{id}','ArticleController@pictureActivity'); + Route::get('/admin/article/activity/picture/{id}/add','ArticleController@pictureActivityCreate'); + Route::post('/admin/article/activity/picture/{id}/add','ArticleController@pictureActivityStore'); /** Booking */ + Route::get('/admin/booking','BookingController@index'); + Route::get('/admin/booking/{id}','BookingController@show'); Route::get('/admin/booking/{type}/{id}',function() { return 'A faire'; }); + Route::get('/admin/inventory/booking' , 'InventoryController@booking'); /** Item */ Route::get('/admin/item/add' , 'ItemController@create'); Route::get('/admin/item/edit/{id}' , 'ItemController@edit'); Route::post('/admin/item/add' , 'ItemController@store'); Route::post('/admin/item/edit/{id}' , 'ItemController@update'); + /** Local */ Route::get('/admin/config/local' , 'LocalController@index');