From fdc2772ee2ad43f1659bac08039cb5b66025d084 Mon Sep 17 00:00:00 2001 From: Dev Distant Date: Sun, 4 Aug 2019 09:56:40 -0400 Subject: [PATCH] workflow change --- .env.example | 2 +- app/ComplementaryActivity.php | 13 +++ app/Config.php | 14 ++- .../ComplementaryActivityController.php | 85 +++++++++++++++ app/Http/Controllers/ECCController.php | 20 ++++ app/Http/Controllers/FilesController.php | 5 + app/Http/Controllers/NewsController.php | 85 +++++++++++++++ app/Http/Controllers/PictureController.php | 85 +++++++++++++++ app/Http/Controllers/PublicController.php | 90 +++++++++++++++ app/Http/Controllers/UserController.php | 34 +++++- app/News.php | 13 +++ app/Picture.php | 13 +++ app/User.php | 5 + .../2019_07_19_171303_create_news_table.php | 35 ++++++ ..._create_complementary_activities_table.php | 39 +++++++ ...019_07_20_095729_create_pictures_table.php | 36 ++++++ database/seeds/ConfigsTableSeeder.php | 100 +++++++++++++++++ database/seeds/DatabaseSeeder.php | 3 +- database/seeds/UsersTableSeeder.php | 13 ++- resources/views/admin/dashboard.blade.php | 16 +-- resources/views/admin/files/guide.blade.php | 103 ++++++++++++++++++ resources/views/admin/public/edit.blade.php | 66 +++++++++++ resources/views/admin/user/profil.blade.php | 9 ++ .../views/admin/user/profil/adress.blade.php | 56 ++++++++++ .../admin/user/profil/password.blade.php | 63 +++++++++++ resources/views/ecc/settings.blade.php | 50 +++++++++ resources/views/ecc/settings/adress.blade.php | 50 +++++++++ resources/views/ecc/settings/avatar.blade.php | 55 ++++++++++ .../views/ecc/settings/password.blade.php | 57 ++++++++++ resources/views/home.blade.php | 22 ---- .../views/layouts/admin/header.blade.php | 4 +- .../views/layouts/admin/sidebar.blade.php | 3 +- .../views/layouts/public/activity.blade.php | 24 ++++ .../views/layouts/public/banner.blade.php | 13 +++ .../views/layouts/public/footer.blade.php | 10 ++ resources/views/layouts/public/head.blade.php | 6 + .../views/layouts/public/header.blade.php | 26 +++++ .../layouts/public/introduction.blade.php | 8 ++ resources/views/layouts/public/main.blade.php | 61 +++++++++++ resources/views/layouts/public/news.blade.php | 20 ++++ .../views/layouts/public/picture.blade.php | 12 ++ resources/views/public/activity.blade.php | 33 ++++++ resources/views/public/allnews.blade.php | 24 ++++ resources/views/public/index.blade.php | 51 +++++++++ resources/views/public/news.blade.php | 0 resources/views/public/picture.blade.php | 0 resources/views/william.blade.php | 76 ------------- routes/web.php | 44 ++++---- vendor/composer/autoload_classmap.php | 12 +- vendor/composer/autoload_static.php | 12 +- 50 files changed, 1537 insertions(+), 139 deletions(-) create mode 100644 app/ComplementaryActivity.php create mode 100644 app/Http/Controllers/ComplementaryActivityController.php create mode 100644 app/Http/Controllers/NewsController.php create mode 100644 app/Http/Controllers/PictureController.php create mode 100644 app/Http/Controllers/PublicController.php create mode 100644 app/News.php create mode 100644 app/Picture.php create mode 100644 database/migrations/2019_07_19_171303_create_news_table.php create mode 100644 database/migrations/2019_07_19_183610_create_complementary_activities_table.php create mode 100644 database/migrations/2019_07_20_095729_create_pictures_table.php create mode 100644 resources/views/admin/files/guide.blade.php create mode 100644 resources/views/admin/public/edit.blade.php create mode 100644 resources/views/admin/user/profil/adress.blade.php create mode 100644 resources/views/admin/user/profil/password.blade.php create mode 100644 resources/views/ecc/settings.blade.php create mode 100644 resources/views/ecc/settings/adress.blade.php create mode 100644 resources/views/ecc/settings/avatar.blade.php create mode 100644 resources/views/ecc/settings/password.blade.php delete mode 100644 resources/views/home.blade.php create mode 100644 resources/views/layouts/public/activity.blade.php create mode 100644 resources/views/layouts/public/banner.blade.php create mode 100644 resources/views/layouts/public/footer.blade.php create mode 100644 resources/views/layouts/public/head.blade.php create mode 100644 resources/views/layouts/public/header.blade.php create mode 100644 resources/views/layouts/public/introduction.blade.php create mode 100644 resources/views/layouts/public/main.blade.php create mode 100644 resources/views/layouts/public/news.blade.php create mode 100644 resources/views/layouts/public/picture.blade.php create mode 100644 resources/views/public/activity.blade.php create mode 100644 resources/views/public/allnews.blade.php create mode 100644 resources/views/public/index.blade.php create mode 100644 resources/views/public/news.blade.php create mode 100644 resources/views/public/picture.blade.php delete mode 100644 resources/views/william.blade.php diff --git a/.env.example b/.env.example index 0710ce52..aaf8f7e5 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,7 @@ APP_NAME=C-CMS APP_ENV=local APP_KEY= -APP_DEBUG=true +APP_DEBUG=false APP_URL=https://dev.c-cms.cf/ # Adresse de votre site web SQN_NUMBER=000 # Numéro de votre escadron diff --git a/app/ComplementaryActivity.php b/app/ComplementaryActivity.php new file mode 100644 index 00000000..bc0597e4 --- /dev/null +++ b/app/ComplementaryActivity.php @@ -0,0 +1,13 @@ +morphMany('App\Picture', 'pictureable'); + } +} diff --git a/app/Config.php b/app/Config.php index 161d2b8d..b4dce0e5 100644 --- a/app/Config.php +++ b/app/Config.php @@ -6,5 +6,17 @@ use Illuminate\Database\Eloquent\Model; class Config extends Model { - // + protected $casts = [ + 'data' => 'array', + ]; + + public function data() + { + return $this->data[0]; + } + + public static function getData($configName) + { + return Config::where('name',$configName)->first()->data(); + } } diff --git a/app/Http/Controllers/ComplementaryActivityController.php b/app/Http/Controllers/ComplementaryActivityController.php new file mode 100644 index 00000000..2f2679df --- /dev/null +++ b/app/Http/Controllers/ComplementaryActivityController.php @@ -0,0 +1,85 @@ + \App\News::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 \App\News $news + * @return \Illuminate\Http\Response + */ + public function show($id) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\News $news + * @return \Illuminate\Http\Response + */ + public function edit(News $news) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\News $news + * @return \Illuminate\Http\Response + */ + public function update(Request $request, News $news) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param \App\News $news + * @return \Illuminate\Http\Response + */ + public function destroy(News $news) + { + // + } +} diff --git a/app/Http/Controllers/PictureController.php b/app/Http/Controllers/PictureController.php new file mode 100644 index 00000000..f55ed74c --- /dev/null +++ b/app/Http/Controllers/PictureController.php @@ -0,0 +1,85 @@ + \App\News::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($config) + { + return view('admin.public.edit',['config' => \App\Config::where('name',$config)->first()]); + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $config) + { + $config = \App\Config::where('name',$config)->first(); + + $config->data = [request('data')]; + + $config->save(); + + return redirect('/');; + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 9a398a34..fac4d2f9 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -208,11 +208,43 @@ class UserController extends Controller $user->save(); - return redirect('/admin/profil/avatar')->with('status', 'Modification enregistré'); + return back()->with('status', 'Votre avatar a été mis à jour !'); } public function UserAvatar() { return view('admin.user.profil.avatar'); } + + public function UserPassword() + { + return view('admin.user.profil.password'); + } + + public function editUserPassword() + { + $user = \Auth::User(); + + $user->password = bcrypt(request('psw')); + + $user->save(); + + return back()->with('status', 'Modification enregistré'); + } + + public function UserAdress() + { + return view('admin.user.profil.adress'); + } + + public function editUserAdress() + { + $user = \Auth::user(); + + $user->adress = request('adress'); + + $user->save(); + + return back()->with('status', 'Modification enregistré'); + } } diff --git a/app/News.php b/app/News.php new file mode 100644 index 00000000..f1b5fbeb --- /dev/null +++ b/app/News.php @@ -0,0 +1,13 @@ +belongsTo('App\User'); + } +} diff --git a/app/Picture.php b/app/Picture.php new file mode 100644 index 00000000..bafe295c --- /dev/null +++ b/app/Picture.php @@ -0,0 +1,13 @@ +morphTo(); + } +} diff --git a/app/User.php b/app/User.php index 6b451982..69657d4c 100644 --- a/app/User.php +++ b/app/User.php @@ -259,4 +259,9 @@ class User extends Authenticatable $this_msg->save(); } } + + public function news() + { + return $this->hasMany('App\News'); + } } diff --git a/database/migrations/2019_07_19_171303_create_news_table.php b/database/migrations/2019_07_19_171303_create_news_table.php new file mode 100644 index 00000000..27907a05 --- /dev/null +++ b/database/migrations/2019_07_19_171303_create_news_table.php @@ -0,0 +1,35 @@ +increments('id'); + $table->string('title'); + $table->text('body'); + $table->integer('user_id'); + $table->boolean('publish'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('news'); + } +} 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 new file mode 100644 index 00000000..ddff3157 --- /dev/null +++ b/database/migrations/2019_07_19_183610_create_complementary_activities_table.php @@ -0,0 +1,39 @@ +increments('id'); + $table->string('name'); + $table->text('public_body'); + $table->text('admin_desc'); + $table->string('begin_time')->default('12:00'); + $table->string('end_time')->default('13:00'); + $table->string('location')->default('Escadron'); + $table->boolean('is_mandatory')->default(false); + $table->boolean('is_promoted')->default(false); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('complementary_activities'); + } +} diff --git a/database/migrations/2019_07_20_095729_create_pictures_table.php b/database/migrations/2019_07_20_095729_create_pictures_table.php new file mode 100644 index 00000000..7fc25b13 --- /dev/null +++ b/database/migrations/2019_07_20_095729_create_pictures_table.php @@ -0,0 +1,36 @@ +increments('id'); + $table->string('url'); + $table->string('title'); + $table->text('desc'); + $table->integer('pictureable_id'); + $table->string('pictureable_type'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('pictures'); + } +} diff --git a/database/seeds/ConfigsTableSeeder.php b/database/seeds/ConfigsTableSeeder.php index cefb3ea9..d096ab56 100644 --- a/database/seeds/ConfigsTableSeeder.php +++ b/database/seeds/ConfigsTableSeeder.php @@ -21,6 +21,106 @@ class ConfigsTableSeeder extends Seeder 'name' => 'is_schedule_build', 'state' => 0, 'data' => 'null' + ], + [ + 'name' => 'text_public_banner_cadet_desc', + 'state' => 0, + 'data' => '["Les cadets de l\'air s\'adressent aux jeunes de 12 à 18 ans qui désirent vivre des expériences enrichissantes et relever de nouveaux défis, en participant à des activités stimulantes dans un cadre dynamique et chaleureux."]' + ], + [ + 'name' => 'text_public_banner_apprendre_plus', + 'state' => 0, + 'data' => '["En apprendre plus!"]' + ], + [ + 'name' => 'text_public_intro_title', + 'state' => 0, + 'data' => '["L\'escadron c\'est ..."]' + ], + [ + 'name' => 'text_public_intro_desc', + 'state' => 0, + 'data' => '["De nombreuses activités hebdomadaires dont : les soirées du vendredi, les soirées de musique (fanfare), l\'entrainement au tir, une équipe de biathlon, des cours de pilotage et plus encore !"]' + ], + [ + 'name' => 'text_public_picture_title', + 'state' => 0, + 'data' => '["Photos"]' + ], + [ + 'name' => 'text_public_picture_desc', + 'state' => 0, + 'data' => '["Voici quelques photos de nos activités, même s\'il est mieux d\'y participer réellement!"]' + ], + [ + 'name' => 'text_public_picture_nb', + 'state' => 0, + 'data' => '["6"]' + ], + [ + 'name' => 'text_public_cta', + 'state' => 0, + 'data' => '["Êtes-vous prêt à en faire partie ?"]' + ], + [ + 'name' => 'media_facebook', + 'state' => 0, + 'data' => '["https://www.facebook.com/"]' + ], + [ + 'name' => 'media_twitter', + 'state' => 0, + 'data' => '["https://twitter.com"]' + ], + [ + 'name' => 'media_instagram', + 'state' => 0, + 'data' => '["https://www.instagram.com"]' + ], + [ + 'name' => 'media_email', + 'state' => 0, + 'data' => '["exemple@email.com"]' + ], + [ + 'name' => 'escadron_address', + 'state' => 0, + 'data' => '["000 Rue Exemple, Québec, Canada"]' + ], + [ + 'name' => 'escadron_name_full', + 'state' => 0, + 'data' => '["Escadron 000 Exemple"]' + ], + [ + 'name' => 'escadron_name_short', + 'state' => 0, + 'data' => '["Escadron 000"]' + ], + [ + 'name' => 'escadron_number', + 'state' => 0, + 'data' => '["000"]' + ], + [ + 'name' => 'escadron_element', + 'state' => 0, + 'data' => '["Aviation"]' + ], + [ + 'name' => 'element_title', + 'state' => 0, + 'data' => '["Cadet de l\'aviation royale du Canada"]' + ], + [ + 'name' => 'escadron_direct_googlemap_link', + 'state' => 0, + 'data' => '["https://goo.gl/maps/iLwGZLwWXujwoAg59"]' + ], + [ + 'name' => 'escadron_phone', + 'state' => 0, + 'data' => '["(418) 722-7712"]' ] ]); } diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index ca430b50..9ef2b2df 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -14,7 +14,8 @@ class DatabaseSeeder extends Seeder $this->call([ JobsTableSeeder::class, RanksTableSeeder::class, - ConfigsTableSeeder::class + ConfigsTableSeeder::class, + UsersTableSeeder::class ]); } } diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php index 362668fb..d21eb8e7 100644 --- a/database/seeds/UsersTableSeeder.php +++ b/database/seeds/UsersTableSeeder.php @@ -11,6 +11,17 @@ class UsersTableSeeder extends Seeder */ public function run() { - // + DB::table('users')->insert([ + 'firstname' => 'Administrateur', + 'lastname' => 'Administrateur', + 'email' => 'admin@exvps.ca', + 'password' => bcrypt('SuperAdmin'), + 'rank' => '1', + 'adress' => 'Inconnu', + 'age' => '99', + 'avatar' => '3', + 'sexe' => 'm', + 'job' => '1', + ]); } } diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php index 5663ca4c..b2267d52 100644 --- a/resources/views/admin/dashboard.blade.php +++ b/resources/views/admin/dashboard.blade.php @@ -105,14 +105,16 @@
@foreach (\App\Message::all()->forPage(1,4); as $msg) -
-
{{$msg->title}}
-
-
- {!!$msg->body!!} +
+ +
{{$msg->title}}
+
+
+ {!!$msg->body!!} +
+
+
-
-
@endforeach

diff --git a/resources/views/admin/files/guide.blade.php b/resources/views/admin/files/guide.blade.php new file mode 100644 index 00000000..861ba307 --- /dev/null +++ b/resources/views/admin/files/guide.blade.php @@ -0,0 +1,103 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Fichiers + +
+
+
+

Les fichiers si dessous sont disponible autant dans l'espace administration que dans l'espace cadet cadre. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Nom
Niveau 1
Guide PédagogiqueTélécharger
Guide de QualificationTélécharger
Niveau 2
Guide PédagogiqueTélécharger
Guide de QualificationTélécharger
Niveau 3
Guide PédagogiqueTélécharger
Guide de QualificationTélécharger
Niveau 4
Guide PédagogiqueTélécharger
Guide de QualificationTélécharger
+

+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

Fichiers

+
+
+
+
+
+
+
    +
  1. Fichiers/Guide Pédagogique
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + + + + + + + + + + + + +@endsection diff --git a/resources/views/admin/public/edit.blade.php b/resources/views/admin/public/edit.blade.php new file mode 100644 index 00000000..8356b7c6 --- /dev/null +++ b/resources/views/admin/public/edit.blade.php @@ -0,0 +1,66 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Modifier la page d'accueil +
+
+
+ @csrf +
+
+
+ + + Texte à afficher sur la page d'accueil +
+
+
+
+
+ +
+
+
+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

Inventaire

+
+
+
+
+
+
+
    +
  1. Inventaire
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + + + + + + + + + + + + +@endsection diff --git a/resources/views/admin/user/profil.blade.php b/resources/views/admin/user/profil.blade.php index 288e280c..52fa2bea 100644 --- a/resources/views/admin/user/profil.blade.php +++ b/resources/views/admin/user/profil.blade.php @@ -4,6 +4,15 @@
id == \Auth::User()->id) class="col-md-12 col-lg-9" @else class="col-sm-12" @endif>
+ @if (session('status')) +
+ Félicitation + {{session('status')}} + +
+ @endif
Card image cap diff --git a/resources/views/admin/user/profil/adress.blade.php b/resources/views/admin/user/profil/adress.blade.php new file mode 100644 index 00000000..34bfe01a --- /dev/null +++ b/resources/views/admin/user/profil/adress.blade.php @@ -0,0 +1,56 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Modification de mon adresse + +
+
+ @if (session('status')) +
+ Félicitation + {{session('status')}} + +
+ @endif +
+ @csrf +
+ + +
+ +
+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

Profil d'utilisateur

+
+
+
+
+
+
+
    +
  1. Utilisateur/Profil/Adresse
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/admin/user/profil/password.blade.php b/resources/views/admin/user/profil/password.blade.php new file mode 100644 index 00000000..6549efb7 --- /dev/null +++ b/resources/views/admin/user/profil/password.blade.php @@ -0,0 +1,63 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Modification du mot de passe + +
+
+ @if (session('status')) +
+ Félicitation + Votre avatar a été mis a jour ! + +
+ @endif +
+ @csrf + +
+ + +
+
+ + +
+ +
+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

Profil d'utilisateur

+
+
+
+
+
+
+
    +
  1. Utilisateur/Profil/Mot de passe
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/resources/views/ecc/settings.blade.php b/resources/views/ecc/settings.blade.php new file mode 100644 index 00000000..4808feb2 --- /dev/null +++ b/resources/views/ecc/settings.blade.php @@ -0,0 +1,50 @@ +@extends('layouts.ecc.main') + +@section('content') +
+
+
+
+
+
+
+ +
+
+
+
+

Options

+
+
+
+
+
Mes options
+
+
+
+
+ Modifier mon mot de passe + Modifier ma photo de profil +
+
+
+
+
+
+ Modifier mon adresse + Modifier mon numéro de téléphone +
+
+
+
+
+
+
+
+
+
+@endsection + +@section('active_page') + +@endsection \ No newline at end of file diff --git a/resources/views/ecc/settings/adress.blade.php b/resources/views/ecc/settings/adress.blade.php new file mode 100644 index 00000000..d4210cb8 --- /dev/null +++ b/resources/views/ecc/settings/adress.blade.php @@ -0,0 +1,50 @@ +@extends('layouts.ecc.main') + +@section('content') +
+
+
+
+
+
+
+ +
+
+
+
+

Options

+
+
+
+
+
Modifier mon adresse
+ @if (session('status')) +
+ + {{session('status')}} +
+ @endif +
+ @csrf +
+ + +
+ +
+
+
+
+
+
+
+@endsection + +@section('active_page') + +@endsection + +@section('custom_scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/ecc/settings/avatar.blade.php b/resources/views/ecc/settings/avatar.blade.php new file mode 100644 index 00000000..198d4311 --- /dev/null +++ b/resources/views/ecc/settings/avatar.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.ecc.main') + +@section('content') +
+
+
+
+
+
+
+ +
+
+
+
+

Options

+
+
+
+
+
Modifier mon mot de passe
+ @if (session('status')) +
+ + {{session('status')}} +
+ @endif + Votre Avatar +
+ Card image cap +
+
+ Cliquer sur un avatar pour mettre a jour votre avatar +
+ @for ($i = 1; $i < 16; $i++) +
+ Card image cap +
+ @endfor +
+
+
+
+
+
+
+@endsection + +@section('active_page') + +@endsection + +@section('custom_scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/ecc/settings/password.blade.php b/resources/views/ecc/settings/password.blade.php new file mode 100644 index 00000000..65a1dedc --- /dev/null +++ b/resources/views/ecc/settings/password.blade.php @@ -0,0 +1,57 @@ +@extends('layouts.ecc.main') + +@section('content') +
+
+
+
+
+
+
+ +
+
+
+
+

Options

+
+
+
+
+
Modifier mon mot de passe
+ @if (session('status')) +
+ + Votre mot de passe a été mis a jour ! +
+ @endif +
+ @csrf + +
+ + +
+
+ + +
+ +
+
+
+
+
+
+
+@endsection + +@section('active_page') + +@endsection + +@section('custom_scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php deleted file mode 100644 index 45d047b9..00000000 --- a/resources/views/home.blade.php +++ /dev/null @@ -1,22 +0,0 @@ -@extends('layouts.admin') - -@section('content') -
-
-
-
-
Dashboard
- -
- @if (session('status')) - - @endif - You are logged in! -
-
-
-
-
-@endsection diff --git a/resources/views/layouts/admin/header.blade.php b/resources/views/layouts/admin/header.blade.php index 83b6ba23..4e8a4e1a 100644 --- a/resources/views/layouts/admin/header.blade.php +++ b/resources/views/layouts/admin/header.blade.php @@ -57,8 +57,8 @@ foreach (Auth::user()->unreadNotifications as $notification) {
- + {{ trans('admin/header.profil')}} + {{ trans('admin/header.logout')}}
diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index fcee491e..054e50a4 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -18,13 +18,14 @@
  • Fichiers + Guide pédagogique
    • + + + + + + @include('layouts.public.head') + + + + + + +
    + + + + @yield('content') + + +
    + + + @include('layouts.public.footer') + +
    + +
    + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/layouts/public/news.blade.php b/resources/views/layouts/public/news.blade.php new file mode 100644 index 00000000..e6ba4990 --- /dev/null +++ b/resources/views/layouts/public/news.blade.php @@ -0,0 +1,20 @@ +
    +
    +

    Nouvelles

    + Lorem ipsum dolor sit amet, consectetur adipisicing elit. Corrupti perferendis +
    +
    +
    + @foreach ($news as $new) +
    +

    {{ new.title }}

    +

    {{ new.body }}

    + {{ \App\User::find()}}, 19/07/2019 - 18:25 + Voir plus! +
    + @endforeach +
    +
    + Voir toutes les nouvelles! +
    +
    \ No newline at end of file diff --git a/resources/views/layouts/public/picture.blade.php b/resources/views/layouts/public/picture.blade.php new file mode 100644 index 00000000..1f37316c --- /dev/null +++ b/resources/views/layouts/public/picture.blade.php @@ -0,0 +1,12 @@ +
    +
    +

    {{ App\Config::getData('text_public_picture_title')}}

    +

    {{ App\Config::getData('text_public_picture_desc')}}

    +
    +
      +
    • +

      Picture

      +

      Lorem ipsum dolor sit amet consectetur adipisicing elit. Quibusdam iusto ex corrupti accusantium harum iure aut obcaecati doloremque omnis commodi officiis ut rem cumque sequi tenetur, debitis asperiores esse! Esse.

      +
      • +
    +
    \ No newline at end of file diff --git a/resources/views/public/activity.blade.php b/resources/views/public/activity.blade.php new file mode 100644 index 00000000..dea53056 --- /dev/null +++ b/resources/views/public/activity.blade.php @@ -0,0 +1,33 @@ +@extends('layouts.public.main') + +@section('content') +
    +
    +
    + +

    Activité complémentaire

    +

    Aliquam ut ex ut interdum donec amet imperdiet eleifend

    + +
    +
    +
    +
    +
    +
    + +

    Lorem ipsum dolor

    +

    Morbi mattis mi consectetur tortor elementum, varius pellentesque velit convallis. Aenean tincidunt lectus auctor mauris maximus, ac scelerisque ipsum tempor. Duis vulputate ex et ex tincidunt, quis lacinia velit aliquet. Duis non efficitur nisi, id malesuada justo. Maecenas sagittis felis ac sagittis semper. Curabitur purus leo, tempus sed finibus eget, fringilla quis risus. Maecenas et lorem quis sem varius sagittis et a est. Maecenas iaculis iaculis sem. Donec vel dolor at arcu tincidunt bibendum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Fusce ut aliquet justo. Donec id neque ipsum. Integer eget ultricies odio. Nam vel ex a orci fringilla tincidunt. Aliquam eleifend ligula non velit accumsan cursus. Etiam ut gravida sapien.

    + +

    Vestibulum ultrices risus velit, sit amet blandit massa auctor sit amet. Sed eu lectus sem. Phasellus in odio at ipsum porttitor mollis id vel diam. Praesent sit amet posuere risus, eu faucibus lectus. Vivamus ex ligula, tempus pulvinar ipsum in, auctor porta quam. Proin nec dui cursus, posuere dui eget interdum. Fusce lectus magna, sagittis at facilisis vitae, pellentesque at etiam. Quisque posuere leo quis sem commodo, vel scelerisque nisi scelerisque. Suspendisse id quam vel tortor tincidunt suscipit. Nullam auctor orci eu dolor consectetur, interdum ullamcorper ante tincidunt. Mauris felis nec felis elementum varius.

    + +
    + +

    Feugiat aliquam

    +

    Nam sapien ante, varius in pulvinar vitae, rhoncus id massa. Donec varius ex in mauris ornare, eget euismod urna egestas. Etiam lacinia tempor ipsum, sodales porttitor justo. Aliquam dolor quam, semper in tortor eu, volutpat efficitur quam. Fusce nec fermentum nisl. Aenean erat diam, tempus aliquet erat.

    + +

    Etiam iaculis nulla ipsum, et pharetra libero rhoncus ut. Phasellus rutrum cursus velit, eget condimentum nunc blandit vel. In at pulvinar lectus. Morbi diam ante, vulputate et imperdiet eget, fermentum non dolor. Ut eleifend sagittis tincidunt. Sed viverra commodo mi, ac rhoncus justo. Duis neque ligula, elementum ut enim vel, posuere finibus justo. Vivamus facilisis maximus nibh quis pulvinar. Quisque hendrerit in ipsum id tellus facilisis fermentum. Proin mauris dui, at vestibulum sit amet, auctor bibendum neque.

    + +
    +
    +
    +@endsection \ No newline at end of file diff --git a/resources/views/public/allnews.blade.php b/resources/views/public/allnews.blade.php new file mode 100644 index 00000000..8a993604 --- /dev/null +++ b/resources/views/public/allnews.blade.php @@ -0,0 +1,24 @@ +@extends('layouts.public.main') + +@section('content') +
    +
    +
    +

    Nouvelles

    +

    Aliquam ut ex ut interdum donec amet imperdiet eleifend

    +
    + @foreach ($news as $new) +
    +

    {{ $new->title }}

    +

    + {{ $new->body }} +

    + {{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }} + Voir plus! +
    + @endforeach +
    +
    +
    +
    +@endsection \ No newline at end of file diff --git a/resources/views/public/index.blade.php b/resources/views/public/index.blade.php new file mode 100644 index 00000000..12d74d78 --- /dev/null +++ b/resources/views/public/index.blade.php @@ -0,0 +1,51 @@ +@extends('layouts.public.main') + +@section('content') + + + + + + +
    + @include('layouts.public.news') +
    + + +
    + + + @include('layouts.public.introduction') + +
    + + +
    + + + @include('layouts.public.activity') + +
    + + +
    + + + @include('layouts.public.picture') + +
    + + +
    +
    +

    {{ App\Config::getData('text_public_cta')}}

    + {{ App\Config::getData('escadron_address')}} - {{ App\Config::getData('escadron_phone')}} +
    +
    + +@endsection \ No newline at end of file diff --git a/resources/views/public/news.blade.php b/resources/views/public/news.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/resources/views/public/picture.blade.php b/resources/views/public/picture.blade.php new file mode 100644 index 00000000..e69de29b diff --git a/resources/views/william.blade.php b/resources/views/william.blade.php deleted file mode 100644 index 66cd407d..00000000 --- a/resources/views/william.blade.php +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - C-CMS - - - - - - - - - - - - - -
    - - -
    -
    -
    -
    -
    -
    Escadron 697
    - -
    -
    -
    - logo -
    -
    - Connexion ... -
    -
    -
    -
    -
    -
    -
    -
    Escadron 736
    - -
    -
    -
    - logo -
    -
    - Connexion ... -
    -
    -
    -
    -
    -
    -
    -
    -
    - - diff --git a/routes/web.php b/routes/web.php index fbb65bc0..25878984 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,16 +16,13 @@ use Illuminate\Support\Facades\Storage; Auth::routes(); Route::get('logout', 'Auth\LoginController@logout')->name('logout'); -/* Index Route */ -if (env('APP_DEBUG')) { - Route::get('/', function () { - return view('default'); - }); -} else { - Route::get('/', function () { - return view('public'); - }); -} + + +/** Public Route */ +Route::get('/', 'PublicController@index'); +Route::get('/news', 'NewsController@index'); +Route::get('/news/{id}', 'NewsController@show'); +Route::get('/activity', 'ComplementaryActivityController@index'); Route::middleware(['auth','admin'])->group(function () { @@ -65,6 +62,9 @@ Route::middleware(['auth','admin'])->group(function () { Route::get('/admin/config/job/edit/{id}' , 'JobController@edit'); Route::get('/admin/config' , 'ConfigController@index'); + /** Public page */ + Route::get('/admin/public/edit/{config}', 'PublicController@edit'); + Route::post('/admin/public/edit/{config}', 'PublicController@update'); /** Inventory */ Route::get('/admin/inventory' , 'InventoryController@index'); @@ -89,11 +89,16 @@ Route::middleware(['auth','admin'])->group(function () { /** Profil */ Route::get('/admin/profil/avatar' , 'UserController@UserAvatar'); + Route::get('/admin/profil/password' , 'UserController@UserPassword'); + Route::get('/admin/profil/adress' , 'UserController@UserAdress'); + Route::post('/admin/profil/edit/adress' , 'UserController@editUserAdress'); + Route::post('/admin/profil/edit/password' , 'UserController@editUserPassword'); Route::get('/admin/profil/edit/avatar/{id}' , 'UserController@editUserAvatar'); Route::get('/admin/profil/{id?}' , 'UserController@showUserProfil'); /** Files */ Route::get('/admin/files','FilesController@index'); + Route::get('/admin/guide','FilesController@guide'); }); Route::middleware(['auth','staff'])->group(function () { @@ -112,20 +117,15 @@ Route::middleware(['auth','staff'])->group(function () { Route::post('/ecc/inventory/remove/{id}/{periode}/{niveau}' , 'ECCController@booking_remove'); Route::get('/ecc/list','ECCController@list'); Route::get('/ecc/files','ECCController@files'); + Route::get('/ecc/settings','ECCController@settings'); + Route::get('/ecc/settings/password' , 'ECCController@UserPassword'); + Route::post('/ecc/settings/edit/password' , 'UserController@editUserPassword'); + Route::get('/ecc/settings/avatar', 'ECCController@UserAvatar'); + Route::get('/ecc/settings/edit/avatar/{id}' , 'UserController@editUserAvatar'); + Route::get('/ecc/settings/adress', 'ECCController@UserAdress'); + Route::post('/ecc/settings/edit/adress', 'UserController@editUserAdress'); -}); -/* Other Route */ -Route::get('/test', function () { - - $fileContents = "1234"; - - Storage::put('avatars/1', $fileContents); - return view('test'); }); -Route::get('/william', function() { - return view('william'); -}); - diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index d37260f7..3038cc4f 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'App\\ComplementaryActivity' => $baseDir . '/app/ComplementaryActivity.php', 'App\\Config' => $baseDir . '/app/Config.php', 'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php', 'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php', @@ -16,15 +17,19 @@ return array( 'App\\Http\\Controllers\\Auth\\RegisterController' => $baseDir . '/app/Http/Controllers/Auth/RegisterController.php', 'App\\Http\\Controllers\\Auth\\ResetPasswordController' => $baseDir . '/app/Http/Controllers/Auth/ResetPasswordController.php', 'App\\Http\\Controllers\\CalendarController' => $baseDir . '/app/Http/Controllers/CalendarController.php', + 'App\\Http\\Controllers\\ComplementaryActivityController' => $baseDir . '/app/Http/Controllers/ComplementaryActivityController.php', 'App\\Http\\Controllers\\ConfigController' => $baseDir . '/app/Http/Controllers/ConfigController.php', 'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php', 'App\\Http\\Controllers\\ECCController' => $baseDir . '/app/Http/Controllers/ECCController.php', + 'App\\Http\\Controllers\\FilesController' => $baseDir . '/app/Http/Controllers/FilesController.php', 'App\\Http\\Controllers\\InventoryController' => $baseDir . '/app/Http/Controllers/InventoryController.php', 'App\\Http\\Controllers\\ItemController' => $baseDir . '/app/Http/Controllers/ItemController.php', 'App\\Http\\Controllers\\JobController' => $baseDir . '/app/Http/Controllers/JobController.php', 'App\\Http\\Controllers\\LocalController' => $baseDir . '/app/Http/Controllers/LocalController.php', 'App\\Http\\Controllers\\LogController' => $baseDir . '/app/Http/Controllers/LogController.php', 'App\\Http\\Controllers\\MessageController' => $baseDir . '/app/Http/Controllers/MessageController.php', + 'App\\Http\\Controllers\\NewsController' => $baseDir . '/app/Http/Controllers/NewsController.php', + 'App\\Http\\Controllers\\PublicController' => $baseDir . '/app/Http/Controllers/PublicController.php', 'App\\Http\\Controllers\\RankController' => $baseDir . '/app/Http/Controllers/RankController.php', 'App\\Http\\Controllers\\ScheduleController' => $baseDir . '/app/Http/Controllers/ScheduleController.php', 'App\\Http\\Controllers\\TaskController' => $baseDir . '/app/Http/Controllers/TaskController.php', @@ -42,9 +47,11 @@ return array( 'App\\Local' => $baseDir . '/app/Local.php', 'App\\Log' => $baseDir . '/app/Log.php', 'App\\Message' => $baseDir . '/app/Message.php', + 'App\\News' => $baseDir . '/app/News.php', 'App\\Notifications\\Alert' => $baseDir . '/app/Notifications/Alert.php', 'App\\Notifications\\mail' => $baseDir . '/app/Notifications/mail.php', 'App\\Notifications\\sms' => $baseDir . '/app/Notifications/sms.php', + 'App\\Picture' => $baseDir . '/app/Picture.php', 'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php', 'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php', 'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php', @@ -3548,9 +3555,10 @@ return array( 'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php', 'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php', 'Tests\\CreatesApplication' => $baseDir . '/tests/CreatesApplication.php', - 'Tests\\Feature\\ExampleTest' => $baseDir . '/tests/Feature/ExampleTest.php', + 'Tests\\Feature\\AdminTest' => $baseDir . '/tests/Feature/AdminTest.php', + 'Tests\\Feature\\ECCTest' => $baseDir . '/tests/Feature/ECCTest.php', + 'Tests\\Feature\\PublicTest' => $baseDir . '/tests/Feature/PublicTest.php', 'Tests\\TestCase' => $baseDir . '/tests/TestCase.php', - 'Tests\\Unit\\ExampleTest' => $baseDir . '/tests/Unit/ExampleTest.php', 'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php', 'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php', 'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index e826fde6..382743b6 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -390,6 +390,7 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15 ); public static $classMap = array ( + 'App\\ComplementaryActivity' => __DIR__ . '/../..' . '/app/ComplementaryActivity.php', 'App\\Config' => __DIR__ . '/../..' . '/app/Config.php', 'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php', 'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php', @@ -400,15 +401,19 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15 'App\\Http\\Controllers\\Auth\\RegisterController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/RegisterController.php', 'App\\Http\\Controllers\\Auth\\ResetPasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/ResetPasswordController.php', 'App\\Http\\Controllers\\CalendarController' => __DIR__ . '/../..' . '/app/Http/Controllers/CalendarController.php', + 'App\\Http\\Controllers\\ComplementaryActivityController' => __DIR__ . '/../..' . '/app/Http/Controllers/ComplementaryActivityController.php', 'App\\Http\\Controllers\\ConfigController' => __DIR__ . '/../..' . '/app/Http/Controllers/ConfigController.php', 'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php', 'App\\Http\\Controllers\\ECCController' => __DIR__ . '/../..' . '/app/Http/Controllers/ECCController.php', + 'App\\Http\\Controllers\\FilesController' => __DIR__ . '/../..' . '/app/Http/Controllers/FilesController.php', 'App\\Http\\Controllers\\InventoryController' => __DIR__ . '/../..' . '/app/Http/Controllers/InventoryController.php', 'App\\Http\\Controllers\\ItemController' => __DIR__ . '/../..' . '/app/Http/Controllers/ItemController.php', 'App\\Http\\Controllers\\JobController' => __DIR__ . '/../..' . '/app/Http/Controllers/JobController.php', 'App\\Http\\Controllers\\LocalController' => __DIR__ . '/../..' . '/app/Http/Controllers/LocalController.php', 'App\\Http\\Controllers\\LogController' => __DIR__ . '/../..' . '/app/Http/Controllers/LogController.php', 'App\\Http\\Controllers\\MessageController' => __DIR__ . '/../..' . '/app/Http/Controllers/MessageController.php', + 'App\\Http\\Controllers\\NewsController' => __DIR__ . '/../..' . '/app/Http/Controllers/NewsController.php', + 'App\\Http\\Controllers\\PublicController' => __DIR__ . '/../..' . '/app/Http/Controllers/PublicController.php', 'App\\Http\\Controllers\\RankController' => __DIR__ . '/../..' . '/app/Http/Controllers/RankController.php', 'App\\Http\\Controllers\\ScheduleController' => __DIR__ . '/../..' . '/app/Http/Controllers/ScheduleController.php', 'App\\Http\\Controllers\\TaskController' => __DIR__ . '/../..' . '/app/Http/Controllers/TaskController.php', @@ -426,9 +431,11 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15 'App\\Local' => __DIR__ . '/../..' . '/app/Local.php', 'App\\Log' => __DIR__ . '/../..' . '/app/Log.php', 'App\\Message' => __DIR__ . '/../..' . '/app/Message.php', + 'App\\News' => __DIR__ . '/../..' . '/app/News.php', 'App\\Notifications\\Alert' => __DIR__ . '/../..' . '/app/Notifications/Alert.php', 'App\\Notifications\\mail' => __DIR__ . '/../..' . '/app/Notifications/mail.php', 'App\\Notifications\\sms' => __DIR__ . '/../..' . '/app/Notifications/sms.php', + 'App\\Picture' => __DIR__ . '/../..' . '/app/Picture.php', 'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php', 'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php', 'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php', @@ -3932,9 +3939,10 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15 'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php', 'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php', 'Tests\\CreatesApplication' => __DIR__ . '/../..' . '/tests/CreatesApplication.php', - 'Tests\\Feature\\ExampleTest' => __DIR__ . '/../..' . '/tests/Feature/ExampleTest.php', + 'Tests\\Feature\\AdminTest' => __DIR__ . '/../..' . '/tests/Feature/AdminTest.php', + 'Tests\\Feature\\ECCTest' => __DIR__ . '/../..' . '/tests/Feature/ECCTest.php', + 'Tests\\Feature\\PublicTest' => __DIR__ . '/../..' . '/tests/Feature/PublicTest.php', 'Tests\\TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php', - 'Tests\\Unit\\ExampleTest' => __DIR__ . '/../..' . '/tests/Unit/ExampleTest.php', 'Text_Template' => __DIR__ . '/..' . '/phpunit/php-text-template/src/Template.php', 'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php', 'TheSeer\\Tokenizer\\NamespaceUri' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUri.php',