{{ $new->title }}
-- {{ $new->body }} -
+- {{ $new->body }} + {!! $new->body !!}
{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}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/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/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') +
{{$a->updated_at}} + @if($a->is_promoted == 1) Promu sur la page d'accueil @endif
++ Toutes ces images seront disponible dans l'article +
+