From c77d35bd14bb218bc677217793825a18a616c54c Mon Sep 17 00:00:00 2001 From: TheGamecraft Date: Mon, 20 Aug 2018 15:30:08 -0400 Subject: [PATCH 1/4] ALPHA 3.0.1i --- app/Http/Controllers/CalendarController.php | 36 +++++--- app/Http/Controllers/LogController.php | 87 +++++++++++++++++++ bootstrap/app.php | 0 .../admin/calendar/calendar_display.blade.php | 28 ++++-- resources/views/admin/log/display.blade.php | 81 +++++++++++++++++ resources/views/layouts/admin/head.blade.php | 1 + .../views/layouts/admin/sidebar.blade.php | 4 +- routes/api.php | 1 + routes/web.php | 2 + .../Foundation/Auth/AuthenticatesUsers.php | 4 +- 10 files changed, 220 insertions(+), 24 deletions(-) create mode 100644 app/Http/Controllers/LogController.php mode change 100644 => 100755 bootstrap/app.php create mode 100644 resources/views/admin/log/display.blade.php diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index 1e482c47..7d9e4b5c 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -19,7 +19,7 @@ class CalendarController extends Controller */ public function __construct() { - $this->middleware('auth', ['except' => ['generate','load']]); + $this->middleware('auth', ['except' => ['generate','load','delete']]); } /** @@ -217,11 +217,11 @@ class CalendarController extends Controller - + - + @@ -231,11 +231,11 @@ class CalendarController extends Controller
'.User::find($date->data['n1_p1_instructor'])->fullname().''.User::find($date->data['n1_p1_instructor'])->fullname().' '.$isdone_n1_p1.'
'.$date->data['n1_p1_ocom'].' - '.$date->data['n1_p1_name'].''.$date->data['n1_p1_ocom'].' - '.$date->data['n1_p1_name'].' '.Local::find($date->data['n1_p1_local'])->name.'
- + - + @@ -248,11 +248,11 @@ class CalendarController extends Controller
'.User::find($date->data['n1_p2_instructor'])->fullname().''.User::find($date->data['n1_p2_instructor'])->fullname().' '.$isdone_n1_p2.'
'.$date->data['n1_p2_ocom'].' - '.$date->data['n1_p2_name'].''.$date->data['n1_p2_ocom'].' - '.$date->data['n1_p2_name'].' '.Local::find($date->data['n1_p2_local'])->name.'
- + - + @@ -262,11 +262,11 @@ class CalendarController extends Controller
'.User::find($date->data['n2_p1_instructor'])->fullname().''.User::find($date->data['n2_p1_instructor'])->fullname().' '.$isdone_n2_p1.'
'.$date->data['n2_p1_ocom'].' - '.$date->data['n2_p1_name'].''.$date->data['n2_p1_ocom'].' - '.$date->data['n2_p1_name'].' '.Local::find($date->data['n2_p1_local'])->name.'
- + - + @@ -279,11 +279,11 @@ class CalendarController extends Controller
'.User::find($date->data['n2_p2_instructor'])->fullname().''.User::find($date->data['n2_p2_instructor'])->fullname().' '.$isdone_n2_p2.'
'.$date->data['n2_p2_ocom'].' - '.$date->data['n2_p2_name'].''.$date->data['n2_p2_ocom'].' - '.$date->data['n2_p2_name'].' '.Local::find($date->data['n2_p2_local'])->name.'
- + - + @@ -293,11 +293,11 @@ class CalendarController extends Controller
'.User::find($date->data['n3_p1_instructor'])->fullname().''.User::find($date->data['n3_p1_instructor'])->fullname().' '.$isdone_n3_p1.'
'.$date->data['n3_p1_ocom'].' - '.$date->data['n3_p1_name'].''.$date->data['n3_p1_ocom'].' - '.$date->data['n3_p1_name'].' '.Local::find($date->data['n3_p1_local'])->name.'
- + - + @@ -307,6 +307,7 @@ class CalendarController extends Controller
'.User::find($date->data['n3_p2_instructor'])->fullname().''.User::find($date->data['n3_p2_instructor'])->fullname().' '.$isdone_n3_p2.'
'.$date->data['n3_p2_ocom'].' - '.$date->data['n3_p2_name'].''.$date->data['n3_p2_ocom'].' - '.$date->data['n3_p2_name'].' '.Local::find($date->data['n3_p2_local'])->name.'
'; } + echo '

'; } echo ''.trans('calendar.add_to_schedule').'
'; @@ -468,4 +469,13 @@ class CalendarController extends Controller dd($check); } + public function delete() + { + $id = request('id'); + + $schedule = Schedule::find($id); + + $schedule->delete(); + } + } diff --git a/app/Http/Controllers/LogController.php b/app/Http/Controllers/LogController.php new file mode 100644 index 00000000..1acafa5e --- /dev/null +++ b/app/Http/Controllers/LogController.php @@ -0,0 +1,87 @@ +sortByDesc('created_at')->take(500); + + return view('admin.log.display' ,['log' => $logs]); + } + + /** + * 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) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/bootstrap/app.php b/bootstrap/app.php old mode 100644 new mode 100755 diff --git a/resources/views/admin/calendar/calendar_display.blade.php b/resources/views/admin/calendar/calendar_display.blade.php index 2ce50c3d..15762e83 100644 --- a/resources/views/admin/calendar/calendar_display.blade.php +++ b/resources/views/admin/calendar/calendar_display.blade.php @@ -70,24 +70,38 @@
@endsection \ No newline at end of file diff --git a/resources/views/admin/log/display.blade.php b/resources/views/admin/log/display.blade.php new file mode 100644 index 00000000..19808e8f --- /dev/null +++ b/resources/views/admin/log/display.blade.php @@ -0,0 +1,81 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Activitées des utilisateurs + +
+
+ +
+ + + + + + + + + + @foreach ($log as $item) + + + + + + @endforeach + + +
Horodatage UtilisateurAction
{{$item->created_at}}{{\App\User::find($item->user_id)->fullname()}}{{$item->action}}
+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

{{ trans('admin/dashboard.page_title')}}

+
+
+
+
+
+
+
    +
  1. {{ trans('admin/dashboard.breadcrumb')}}
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + + + + + + + + + + + + + +@endsection diff --git a/resources/views/layouts/admin/head.blade.php b/resources/views/layouts/admin/head.blade.php index f9a79265..f5b19579 100644 --- a/resources/views/layouts/admin/head.blade.php +++ b/resources/views/layouts/admin/head.blade.php @@ -21,6 +21,7 @@ + diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index 2766c4b1..528c72b3 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -55,14 +55,14 @@
    • diff --git a/routes/api.php b/routes/api.php index 76283cc2..e8bda374 100644 --- a/routes/api.php +++ b/routes/api.php @@ -20,3 +20,4 @@ Route::middleware('auth:api')->get('/user', function (Request $request) { /* Calendar Route */ Route::post('/calendar/generate', 'CalendarController@generate'); Route::post('/calendar/loadDay', 'CalendarController@load'); +Route::post('/calendar/delete', 'CalendarController@delete'); diff --git a/routes/web.php b/routes/web.php index 57554cf4..561397a3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -31,6 +31,8 @@ Route::get('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@edit']); Route::post('/admin/calendar/add', 'CalendarController@store'); Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']); +Route::get('/admin/log' , 'LogController@index'); + /* Other Route */ Route::get('/test', function () { diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php index a9254b82..9ee0fd00 100644 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php @@ -104,7 +104,7 @@ trait AuthenticatesUsers $this->clearLoginAttempts($request); - Log::saveLog("c'est connecté"); + Log::saveLog('Connexion'); return $this->authenticated($request, $this->guard()->user()) ?: redirect()->intended($this->redirectPath()); @@ -155,7 +155,7 @@ trait AuthenticatesUsers */ public function logout(Request $request) { - Log::saveLog("C'est déconnecté"); + Log::saveLog("Déconnexion"); $this->guard()->logout(); From 4dbdc8fd192992a219ea9288871c1913e5891c2d Mon Sep 17 00:00:00 2001 From: TheGamecraft Date: Wed, 22 Aug 2018 13:30:37 -0400 Subject: [PATCH 2/4] ALPHA 3.0.1j --- app/Http/Controllers/JobController.php | 85 +++++++++++++ app/Http/Controllers/MessageController.php | 85 +++++++++++++ app/Http/Controllers/RankController.php | 85 +++++++++++++ app/Http/Controllers/UserController.php | 87 +++++++++++++ app/Job.php | 12 ++ app/Message.php | 12 ++ app/Rank.php | 12 ++ app/User.php | 5 + config/app.php | 2 +- .../2018_08_21_094628_create_jobs_table.php | 33 +++++ .../2018_08_21_094646_create_ranks_table.php | 33 +++++ ...018_08_21_135453_create_messages_table.php | 37 ++++++ resources/views/admin/message/index.blade.php | 84 +++++++++++++ resources/views/admin/user/index.blade.php | 119 ++++++++++++++++++ .../views/layouts/admin/sidebar.blade.php | 16 ++- routes/web.php | 5 + vendor/composer/autoload_classmap.php | 9 +- vendor/composer/autoload_static.php | 9 +- 18 files changed, 723 insertions(+), 7 deletions(-) create mode 100644 app/Http/Controllers/JobController.php create mode 100644 app/Http/Controllers/MessageController.php create mode 100644 app/Http/Controllers/RankController.php create mode 100644 app/Http/Controllers/UserController.php create mode 100644 app/Job.php create mode 100644 app/Message.php create mode 100644 app/Rank.php create mode 100644 database/migrations/2018_08_21_094628_create_jobs_table.php create mode 100644 database/migrations/2018_08_21_094646_create_ranks_table.php create mode 100644 database/migrations/2018_08_21_135453_create_messages_table.php create mode 100644 resources/views/admin/message/index.blade.php create mode 100644 resources/views/admin/user/index.blade.php diff --git a/app/Http/Controllers/JobController.php b/app/Http/Controllers/JobController.php new file mode 100644 index 00000000..cead64e3 --- /dev/null +++ b/app/Http/Controllers/JobController.php @@ -0,0 +1,85 @@ + \App\Message::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\Message $message + * @return \Illuminate\Http\Response + */ + public function show(Message $message) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param \App\Message $message + * @return \Illuminate\Http\Response + */ + public function edit(Message $message) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param \App\Message $message + * @return \Illuminate\Http\Response + */ + public function update(Request $request, Message $message) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param \App\Message $message + * @return \Illuminate\Http\Response + */ + public function destroy(Message $message) + { + // + } +} diff --git a/app/Http/Controllers/RankController.php b/app/Http/Controllers/RankController.php new file mode 100644 index 00000000..db5b967b --- /dev/null +++ b/app/Http/Controllers/RankController.php @@ -0,0 +1,85 @@ + $UserList]); + } + + /** + * 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) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/app/Job.php b/app/Job.php new file mode 100644 index 00000000..73a19e40 --- /dev/null +++ b/app/Job.php @@ -0,0 +1,12 @@ + 'array', + ]; +} diff --git a/app/Message.php b/app/Message.php new file mode 100644 index 00000000..a537497e --- /dev/null +++ b/app/Message.php @@ -0,0 +1,12 @@ + 'array', + ]; +} diff --git a/app/Rank.php b/app/Rank.php new file mode 100644 index 00000000..1e74e9cb --- /dev/null +++ b/app/Rank.php @@ -0,0 +1,12 @@ + 'array', + ]; +} diff --git a/app/User.php b/app/User.php index ebed9892..2699edb0 100644 --- a/app/User.php +++ b/app/User.php @@ -37,4 +37,9 @@ class User extends Authenticatable $fullname = $this->lastname.' '.$this->firstname; return $fullname; } + + public function messages() + { + return $this->hasMany(Message::class); + } } diff --git a/config/app.php b/config/app.php index 7657817f..642649e6 100644 --- a/config/app.php +++ b/config/app.php @@ -65,7 +65,7 @@ return [ | */ - 'timezone' => 'UTC', + 'timezone' => 'America/New_York', /* |-------------------------------------------------------------------------- diff --git a/database/migrations/2018_08_21_094628_create_jobs_table.php b/database/migrations/2018_08_21_094628_create_jobs_table.php new file mode 100644 index 00000000..70b8cb56 --- /dev/null +++ b/database/migrations/2018_08_21_094628_create_jobs_table.php @@ -0,0 +1,33 @@ +increments('id'); + $table->string('name'); + $table->text('perm'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('jobs'); + } +} diff --git a/database/migrations/2018_08_21_094646_create_ranks_table.php b/database/migrations/2018_08_21_094646_create_ranks_table.php new file mode 100644 index 00000000..d934edf7 --- /dev/null +++ b/database/migrations/2018_08_21_094646_create_ranks_table.php @@ -0,0 +1,33 @@ +increments('id'); + $table->string('name'); + $table->text('perm'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('ranks'); + } +} diff --git a/database/migrations/2018_08_21_135453_create_messages_table.php b/database/migrations/2018_08_21_135453_create_messages_table.php new file mode 100644 index 00000000..54d4050e --- /dev/null +++ b/database/migrations/2018_08_21_135453_create_messages_table.php @@ -0,0 +1,37 @@ +increments('id'); + $table->string('title'); + $table->text('body'); + $table->boolean('publish'); + $table->boolean('private'); + $table->integer('user_id'); + $table->text('data'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('messages'); + } +} diff --git a/resources/views/admin/message/index.blade.php b/resources/views/admin/message/index.blade.php new file mode 100644 index 00000000..d8c9af18 --- /dev/null +++ b/resources/views/admin/message/index.blade.php @@ -0,0 +1,84 @@ +@extends('layouts.admin.main') + +@section('content') +
    +
    +
    + Activitées des utilisateurs + +
    +
    + +
    + + + + + + + + + + + @while ($i < $messages->count()) + + @for ($i = 0; $i < 3; $i++) + + @endfor + + @endwhile + +
    + {{$messages[$i]->title}} +

    {{$messages[$i]->body}}

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

    {{ trans('admin/dashboard.page_title')}}

    +
    +
    +
    +
    +
    +
    +
      +
    1. {{ trans('admin/dashboard.breadcrumb')}}
      2. +
    +
    +
    +
    +
    +@endsection + +@section('custom_scripts') + + + + + + + + + + + + + +@endsection diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php new file mode 100644 index 00000000..37a2004b --- /dev/null +++ b/resources/views/admin/user/index.blade.php @@ -0,0 +1,119 @@ +@extends('layouts.admin.main') + +@section('content') +
    +
    +
    + Liste des utilisateurs + +
    +
    + + + + + + + + + + + + @foreach ($Userslist as $item) + + + + + + + + @endforeach + + +
    IDNomGradePoste
    {{$item->id}}{{$item->fullname()}}{{\App\Rank::find($item->rank)->name}}{{\App\Job::find($item->job)->name}}  Modifier
    +
    + Ajouter un utilisateur +
    +
    +
    +@endsection + +@section('breadcrumb') +
    +
    +
    +
    +

    {{ trans('admin/dashboard.page_title')}}

    +
    +
    +
    +
    +
    +
    +
      +
    1. {{ trans('admin/dashboard.breadcrumb')}}
      2. +
    +
    +
    +
    +
    +@endsection + +@section('custom_scripts') + + + + + + + + + + + + + +@endsection diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index 528c72b3..30bff281 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -55,15 +55,23 @@
  • +
    • +
  • + +

    • {{ trans('admin/sidebar.tools_title') }}

    diff --git a/routes/web.php b/routes/web.php index 561397a3..95ccefd8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,6 +33,11 @@ Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']) Route::get('/admin/log' , 'LogController@index'); +Route::get('/admin/messages' , 'MessageController@index'); + +Route::get('/admin/users' , 'UserController@index'); + + /* Other Route */ Route::get('/test', function () { diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 8c78b7fd..6d1a9b19 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -16,25 +16,32 @@ return array( '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\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php', + 'App\\Http\\Controllers\\JobController' => $baseDir . '/app/Http/Controllers/JobController.php', + 'App\\Http\\Controllers\\LogController' => $baseDir . '/app/Http/Controllers/LogController.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', + 'App\\Http\\Controllers\\UserController' => $baseDir . '/app/Http/Controllers/UserController.php', 'App\\Http\\Kernel' => $baseDir . '/app/Http/Kernel.php', 'App\\Http\\Middleware\\EncryptCookies' => $baseDir . '/app/Http/Middleware/EncryptCookies.php', 'App\\Http\\Middleware\\RedirectIfAuthenticated' => $baseDir . '/app/Http/Middleware/RedirectIfAuthenticated.php', 'App\\Http\\Middleware\\TrimStrings' => $baseDir . '/app/Http/Middleware/TrimStrings.php', 'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php', + 'App\\Job' => $baseDir . '/app/Job.php', + 'App\\Local' => $baseDir . '/app/Local.php', 'App\\Log' => $baseDir . '/app/Log.php', + 'App\\Message' => $baseDir . '/app/Message.php', 'App\\Notifications\\Alert' => $baseDir . '/app/Notifications/Alert.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', 'App\\Providers\\EventServiceProvider' => $baseDir . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => $baseDir . '/app/Providers/RouteServiceProvider.php', + 'App\\Rank' => $baseDir . '/app/Rank.php', 'App\\Schedule' => $baseDir . '/app/Schedule.php', 'App\\Task' => $baseDir . '/app/Task.php', 'App\\User' => $baseDir . '/app/User.php', - 'App\\local' => $baseDir . '/app/local.php', 'Carbon\\Carbon' => $vendorDir . '/nesbot/carbon/src/Carbon/Carbon.php', 'Carbon\\CarbonInterval' => $vendorDir . '/nesbot/carbon/src/Carbon/CarbonInterval.php', 'Carbon\\Exceptions\\InvalidDateException' => $vendorDir . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d14f4f9f..c1c1e5b5 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -330,25 +330,32 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15 '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\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php', + 'App\\Http\\Controllers\\JobController' => __DIR__ . '/../..' . '/app/Http/Controllers/JobController.php', + 'App\\Http\\Controllers\\LogController' => __DIR__ . '/../..' . '/app/Http/Controllers/LogController.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', + 'App\\Http\\Controllers\\UserController' => __DIR__ . '/../..' . '/app/Http/Controllers/UserController.php', 'App\\Http\\Kernel' => __DIR__ . '/../..' . '/app/Http/Kernel.php', 'App\\Http\\Middleware\\EncryptCookies' => __DIR__ . '/../..' . '/app/Http/Middleware/EncryptCookies.php', 'App\\Http\\Middleware\\RedirectIfAuthenticated' => __DIR__ . '/../..' . '/app/Http/Middleware/RedirectIfAuthenticated.php', 'App\\Http\\Middleware\\TrimStrings' => __DIR__ . '/../..' . '/app/Http/Middleware/TrimStrings.php', 'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php', + 'App\\Job' => __DIR__ . '/../..' . '/app/Job.php', + 'App\\Local' => __DIR__ . '/../..' . '/app/Local.php', 'App\\Log' => __DIR__ . '/../..' . '/app/Log.php', + 'App\\Message' => __DIR__ . '/../..' . '/app/Message.php', 'App\\Notifications\\Alert' => __DIR__ . '/../..' . '/app/Notifications/Alert.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', 'App\\Providers\\EventServiceProvider' => __DIR__ . '/../..' . '/app/Providers/EventServiceProvider.php', 'App\\Providers\\RouteServiceProvider' => __DIR__ . '/../..' . '/app/Providers/RouteServiceProvider.php', + 'App\\Rank' => __DIR__ . '/../..' . '/app/Rank.php', 'App\\Schedule' => __DIR__ . '/../..' . '/app/Schedule.php', 'App\\Task' => __DIR__ . '/../..' . '/app/Task.php', 'App\\User' => __DIR__ . '/../..' . '/app/User.php', - 'App\\local' => __DIR__ . '/../..' . '/app/local.php', 'Carbon\\Carbon' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Carbon.php', 'Carbon\\CarbonInterval' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/CarbonInterval.php', 'Carbon\\Exceptions\\InvalidDateException' => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon/Exceptions/InvalidDateException.php', From 8ef8057bfa5b47633c244545a336c3c987cf9cba Mon Sep 17 00:00:00 2001 From: TheGamecraft Date: Wed, 5 Sep 2018 11:35:41 -0400 Subject: [PATCH 3/4] ALPHA 3.0.2 --- app/Config.php | 10 + app/Http/Controllers/AdminController.php | 2 + app/Http/Controllers/CalendarController.php | 83 +- app/Http/Controllers/ConfigController.php | 85 + app/Http/Controllers/JobController.php | 8 +- app/Http/Controllers/MessageController.php | 65 +- app/Http/Controllers/UserController.php | 8 +- app/Notifications/mail.php | 52 + app/Notifications/sms.php | 49 + app/User.php | 56 + composer.json | 4 +- composer.lock | 568 ++++- config/mail.php | 2 +- config/services.php | 9 +- .../2014_10_12_000000_create_users_table.php | 27 +- .../2018_08_21_094628_create_jobs_table.php | 18 +- .../2018_08_21_094646_create_ranks_table.php | 17 +- ...2018_08_29_172124_create_configs_table.php | 34 + database/seeds/ConfigsTableSeeder.php | 22 + database/seeds/DatabaseSeeder.php | 6 +- database/seeds/JobsTableSeeder.php | 97 + database/seeds/RanksTableSeeder.php | 188 ++ database/seeds/UsersTableSeeder.php | 16 + public/assets/admin/assets/scss/style.css | 20 +- public/assets/js/calendar/calendar.js | 8 +- .../admin/calendar/calendar_add.blade.php | 7 + .../admin/calendar/calendar_display.blade.php | 8 +- .../admin/calendar/calendar_edit.blade.php | 7 + resources/views/admin/job/add.blade.php | 227 ++ resources/views/admin/job/index.blade.php | 237 ++ resources/views/admin/message/add.blade.php | 70 + resources/views/admin/message/index.blade.php | 83 +- resources/views/admin/message/show.blade.php | 46 + resources/views/admin/user/index.blade.php | 5 +- resources/views/errors/404.blade.php | 90 + resources/views/errors/500.blade.php | 90 + resources/views/layouts/admin.blade.php | 24 +- .../views/layouts/admin/scripts.blade.php | 4 + .../views/layouts/admin/sidebar.blade.php | 22 +- resources/views/public.blade.php | 4 +- .../vendor/notifications/email.blade.php | 64 + resources/views/william.blade.php | 76 + routes/api.php | 27 +- routes/web.php | 25 +- vendor/bin/phpunit | 54 +- vendor/bin/var-dump-server | 64 +- vendor/composer/autoload_classmap.php | 276 +++ vendor/composer/autoload_files.php | 11 + vendor/composer/autoload_psr4.php | 10 + vendor/composer/autoload_static.php | 346 +++ vendor/composer/installed.json | 800 ++++++- .../src/Illuminate/Auth/Access/Response.php | 2 +- .../src/Illuminate/Auth/AuthManager.php | 0 .../Illuminate/Auth/AuthServiceProvider.php | 0 .../Illuminate/Auth/DatabaseUserProvider.php | 9 +- .../Illuminate/Auth/EloquentUserProvider.php | 9 +- .../src/Illuminate/Auth/GenericUser.php | 0 .../Passwords/DatabaseTokenRepository.php | 0 .../Auth/Passwords/PasswordBroker.php | 0 .../PasswordResetServiceProvider.php | 0 .../Passwords/TokenRepositoryInterface.php | 0 .../Broadcasters/PusherBroadcaster.php | 2 +- .../src/Illuminate/Cache/ApcStore.php | 0 .../src/Illuminate/Cache/ApcWrapper.php | 0 .../src/Illuminate/Cache/CacheManager.php | 0 .../Illuminate/Cache/CacheServiceProvider.php | 0 .../Illuminate/Cache/Console/ClearCommand.php | 0 .../Cache/Console/ForgetCommand.php | 0 .../src/Illuminate/Cache/DatabaseStore.php | 0 .../src/Illuminate/Cache/FileStore.php | 0 .../Illuminate/Cache/MemcachedConnector.php | 0 .../src/Illuminate/Cache/MemcachedStore.php | 0 .../src/Illuminate/Cache/NullStore.php | 0 .../src/Illuminate/Cache/RedisStore.php | 0 .../src/Illuminate/Cache/Repository.php | 0 .../src/Illuminate/Cache/composer.json | 0 .../src/Illuminate/Config/composer.json | 0 .../src/Illuminate/Console/Application.php | 0 .../src/Illuminate/Console/Command.php | 0 .../src/Illuminate/Console/composer.json | 0 .../src/Illuminate/Container/Container.php | 0 .../src/Illuminate/Container/composer.json | 0 .../Contracts/Support/Arrayable.php | 0 .../Illuminate/Contracts/Support/Jsonable.php | 0 .../Contracts/Support/MessageProvider.php | 0 .../Contracts/Support/Renderable.php | 0 .../Contracts/Translation/Loader.php | 0 .../src/Illuminate/Contracts/View/Engine.php | 0 .../src/Illuminate/Cookie/CookieJar.php | 0 .../Cookie/CookieServiceProvider.php | 0 .../src/Illuminate/Cookie/composer.json | 0 .../Illuminate/Database/Capsule/Manager.php | 0 .../src/Illuminate/Database/Connection.php | 2 +- .../Database/ConnectionInterface.php | 0 .../Database/ConnectionResolver.php | 0 .../Database/ConnectionResolverInterface.php | 0 .../Database/Connectors/ConnectionFactory.php | 0 .../Database/Connectors/Connector.php | 0 .../Connectors/ConnectorInterface.php | 0 .../Database/Connectors/MySqlConnector.php | 0 .../Database/Connectors/PostgresConnector.php | 0 .../Database/Connectors/SQLiteConnector.php | 0 .../Connectors/SqlServerConnector.php | 0 .../Console/Migrations/BaseCommand.php | 0 .../Console/Migrations/FreshCommand.php | 27 +- .../Console/Migrations/InstallCommand.php | 0 .../Console/Migrations/MigrateCommand.php | 0 .../Console/Migrations/RefreshCommand.php | 0 .../Console/Migrations/ResetCommand.php | 0 .../Console/Migrations/RollbackCommand.php | 0 .../Illuminate/Database/DatabaseManager.php | 0 .../Database/DatabaseServiceProvider.php | 0 .../Illuminate/Database/Eloquent/Builder.php | 0 .../Database/Eloquent/Collection.php | 0 .../Eloquent/MassAssignmentException.php | 0 .../Illuminate/Database/Eloquent/Model.php | 55 + .../Eloquent/ModelNotFoundException.php | 0 .../Eloquent/RelationNotFoundException.php | 0 .../Database/Eloquent/Relations/BelongsTo.php | 0 .../Eloquent/Relations/BelongsToMany.php | 0 .../Database/Eloquent/Relations/HasMany.php | 0 .../Database/Eloquent/Relations/HasOne.php | 0 .../Eloquent/Relations/HasOneOrMany.php | 0 .../Database/Eloquent/Relations/MorphMany.php | 0 .../Database/Eloquent/Relations/MorphOne.php | 0 .../Eloquent/Relations/MorphOneOrMany.php | 0 .../Database/Eloquent/Relations/Pivot.php | 0 .../Database/Eloquent/Relations/Relation.php | 8 +- .../src/Illuminate/Database/Grammar.php | 0 .../Database/MigrationServiceProvider.php | 0 .../DatabaseMigrationRepository.php | 0 .../Database/Migrations/Migration.php | 0 .../Database/Migrations/MigrationCreator.php | 7 +- .../MigrationRepositoryInterface.php | 0 .../Database/Migrations/Migrator.php | 0 .../Database/Migrations/stubs/blank.stub | 0 .../Database/Migrations/stubs/create.stub | 0 .../Database/Migrations/stubs/update.stub | 0 .../Illuminate/Database/MySqlConnection.php | 0 .../Database/PostgresConnection.php | 0 .../src/Illuminate/Database/Query/Builder.php | 0 .../Illuminate/Database/Query/Expression.php | 0 .../Database/Query/Grammars/Grammar.php | 0 .../Database/Query/Grammars/MySqlGrammar.php | 0 .../Query/Grammars/PostgresGrammar.php | 0 .../Database/Query/Grammars/SQLiteGrammar.php | 0 .../Query/Grammars/SqlServerGrammar.php | 0 .../Illuminate/Database/Query/JoinClause.php | 0 .../Query/Processors/PostgresProcessor.php | 0 .../Database/Query/Processors/Processor.php | 0 .../Query/Processors/SqlServerProcessor.php | 0 .../src/Illuminate/Database/README.md | 0 .../Illuminate/Database/SQLiteConnection.php | 0 .../Illuminate/Database/Schema/Blueprint.php | 0 .../Illuminate/Database/Schema/Builder.php | 12 + .../Database/Schema/Grammars/Grammar.php | 0 .../Database/Schema/Grammars/MySqlGrammar.php | 21 + .../Schema/Grammars/PostgresGrammar.php | 22 + .../Schema/Grammars/SQLiteGrammar.php | 10 + .../Schema/Grammars/SqlServerGrammar.php | 0 .../Database/Schema/MySqlBuilder.php | 36 + .../Database/Schema/PostgresBuilder.php | 36 + .../Database/Schema/SQLiteBuilder.php | 14 + .../src/Illuminate/Database/Seeder.php | 0 .../Database/SqlServerConnection.php | 0 .../src/Illuminate/Encryption/Encrypter.php | 2 +- .../Encryption/EncryptionServiceProvider.php | 0 .../src/Illuminate/Events/Dispatcher.php | 0 .../Events/EventServiceProvider.php | 0 .../src/Illuminate/Events/composer.json | 0 .../src/Illuminate/Foundation/AliasLoader.php | 0 .../src/Illuminate/Foundation/Application.php | 2 +- .../Foundation/Auth/AuthenticatesUsers.php | 7 +- .../Foundation/ProviderRepository.php | 0 .../Providers/ArtisanServiceProvider.php | 0 .../Providers/ComposerServiceProvider.php | 0 .../Providers/FormRequestServiceProvider.php | 1 - .../Testing/Concerns/InteractsWithRedis.php | 3 +- .../Foundation/Testing/RefreshDatabase.php | 15 +- .../Foundation/Testing/TestResponse.php | 28 + .../src/Illuminate/Foundation/helpers.php | 2 +- .../src/Illuminate/Hashing/BcryptHasher.php | 0 .../Hashing/HashServiceProvider.php | 0 .../src/Illuminate/Hashing/composer.json | 0 .../src/Illuminate/Http/JsonResponse.php | 0 .../src/Illuminate/Http/RedirectResponse.php | 0 .../src/Illuminate/Http/Response.php | 0 .../src/Illuminate/Http/composer.json | 0 .../framework/src/Illuminate/Log/Logger.php | 0 .../src/Illuminate/Log/composer.json | 0 .../Illuminate/Mail/MailServiceProvider.php | 0 .../framework/src/Illuminate/Mail/Mailer.php | 0 .../framework/src/Illuminate/Mail/Message.php | 0 .../src/Illuminate/Mail/composer.json | 0 .../Notifications/Channels/MailChannel.php | 6 +- .../Pagination/PaginationServiceProvider.php | 0 .../src/Illuminate/Pagination/composer.json | 0 .../src/Illuminate/Queue/BeanstalkdQueue.php | 0 .../Queue/Connectors/BeanstalkdConnector.php | 0 .../Queue/Connectors/ConnectorInterface.php | 0 .../Queue/Connectors/SqsConnector.php | 0 .../Queue/Connectors/SyncConnector.php | 0 .../Queue/Console/ListenCommand.php | 0 .../Illuminate/Queue/Jobs/BeanstalkdJob.php | 0 .../src/Illuminate/Queue/Jobs/Job.php | 0 .../src/Illuminate/Queue/Jobs/SqsJob.php | 0 .../src/Illuminate/Queue/Jobs/SyncJob.php | 0 .../src/Illuminate/Queue/Listener.php | 0 .../framework/src/Illuminate/Queue/Queue.php | 0 .../src/Illuminate/Queue/QueueManager.php | 0 .../Illuminate/Queue/QueueServiceProvider.php | 0 .../src/Illuminate/Queue/SqsQueue.php | 0 .../src/Illuminate/Queue/SyncQueue.php | 0 .../Redis/Connections/PhpRedisConnection.php | 2 +- .../Illuminate/Redis/RedisServiceProvider.php | 0 .../src/Illuminate/Redis/composer.json | 0 .../Routing/Console/ControllerMakeCommand.php | 0 .../src/Illuminate/Routing/Redirector.php | 0 .../src/Illuminate/Routing/Route.php | 0 .../src/Illuminate/Routing/Router.php | 1 - .../Routing/RoutingServiceProvider.php | 0 .../src/Illuminate/Routing/UrlGenerator.php | 2 + .../Session/CacheBasedSessionHandler.php | 0 .../Session/Console/stubs/database.stub | 0 .../Session/CookieSessionHandler.php | 0 .../src/Illuminate/Session/SessionManager.php | 0 .../Session/SessionServiceProvider.php | 0 .../src/Illuminate/Session/Store.php | 0 .../Session/TokenMismatchException.php | 0 .../src/Illuminate/Session/composer.json | 0 .../framework/src/Illuminate/Support/Arr.php | 0 .../src/Illuminate/Support/Facades/App.php | 0 .../Illuminate/Support/Facades/Artisan.php | 0 .../src/Illuminate/Support/Facades/Auth.php | 0 .../src/Illuminate/Support/Facades/Blade.php | 0 .../src/Illuminate/Support/Facades/Cache.php | 0 .../src/Illuminate/Support/Facades/Config.php | 0 .../src/Illuminate/Support/Facades/Cookie.php | 0 .../src/Illuminate/Support/Facades/Crypt.php | 0 .../src/Illuminate/Support/Facades/DB.php | 0 .../src/Illuminate/Support/Facades/Event.php | 0 .../src/Illuminate/Support/Facades/Facade.php | 0 .../src/Illuminate/Support/Facades/File.php | 0 .../src/Illuminate/Support/Facades/Hash.php | 0 .../src/Illuminate/Support/Facades/Input.php | 0 .../src/Illuminate/Support/Facades/Lang.php | 0 .../src/Illuminate/Support/Facades/Log.php | 0 .../src/Illuminate/Support/Facades/Mail.php | 0 .../Illuminate/Support/Facades/Password.php | 0 .../src/Illuminate/Support/Facades/Queue.php | 0 .../Illuminate/Support/Facades/Redirect.php | 0 .../src/Illuminate/Support/Facades/Redis.php | 0 .../Illuminate/Support/Facades/Request.php | 0 .../Illuminate/Support/Facades/Response.php | 0 .../src/Illuminate/Support/Facades/Route.php | 0 .../src/Illuminate/Support/Facades/Schema.php | 0 .../Illuminate/Support/Facades/Session.php | 0 .../src/Illuminate/Support/Facades/URL.php | 0 .../Illuminate/Support/Facades/Validator.php | 0 .../src/Illuminate/Support/Facades/View.php | 0 .../src/Illuminate/Support/Fluent.php | 0 .../src/Illuminate/Support/Manager.php | 0 .../src/Illuminate/Support/MessageBag.php | 0 .../Support/NamespacedItemResolver.php | 0 .../src/Illuminate/Support/Optional.php | 3 +- .../src/Illuminate/Support/Pluralizer.php | 0 .../Illuminate/Support/ServiceProvider.php | 2 +- .../src/Illuminate/Support/helpers.php | 0 .../src/Illuminate/Translation/FileLoader.php | 0 .../Translation/MessageSelector.php | 0 .../TranslationServiceProvider.php | 0 .../src/Illuminate/Translation/Translator.php | 0 .../src/Illuminate/Translation/composer.json | 0 .../Validation/DatabasePresenceVerifier.php | 0 .../src/Illuminate/Validation/Factory.php | 0 .../Validation/PresenceVerifierInterface.php | 0 .../Validation/ValidationRuleParser.php | 2 +- .../Validation/ValidationServiceProvider.php | 0 .../src/Illuminate/Validation/Validator.php | 0 .../src/Illuminate/Validation/composer.json | 0 .../Illuminate/View/Compilers/Compiler.php | 0 .../View/Compilers/CompilerInterface.php | 0 .../View/Engines/CompilerEngine.php | 0 .../src/Illuminate/View/Engines/Engine.php | 0 .../View/Engines/EngineResolver.php | 0 .../src/Illuminate/View/Engines/PhpEngine.php | 0 .../framework/src/Illuminate/View/Factory.php | 0 .../src/Illuminate/View/FileViewFinder.php | 0 .../framework/src/Illuminate/View/View.php | 0 .../Illuminate/View/ViewFinderInterface.php | 0 .../Illuminate/View/ViewServiceProvider.php | 0 vendor/nunomaduro/collision/LICENSE.md | 0 vendor/nunomaduro/collision/composer.json | 3 +- .../Laravel/CollisionServiceProvider.php | 4 +- .../src/Contracts/ArgumentFormatter.php | 2 +- .../nunomaduro/collision/src/Highlighter.php | 2 +- vendor/nunomaduro/collision/src/Provider.php | 2 +- vendor/nunomaduro/collision/src/Writer.php | 2 +- vendor/paragonie/random_compat/build-phar.sh | 0 .../random_compat/lib/byte_safe_strings.php | 32 +- .../random_compat/lib/cast_to_int.php | 6 +- vendor/paragonie/random_compat/lib/random.php | 5 +- .../lib/random_bytes_com_dotnet.php | 7 +- .../lib/random_bytes_dev_urandom.php | 11 +- .../lib/random_bytes_libsodium.php | 5 +- .../lib/random_bytes_libsodium_legacy.php | 1 + .../random_compat/lib/random_bytes_mcrypt.php | 8 +- .../random_compat/lib/random_int.php | 14 + vendor/paragonie/random_compat/psalm.xml | 13 +- vendor/phpunit/phpunit/.php_cs.dist | 24 +- vendor/phpunit/phpunit/ChangeLog-7.2.md | 15 + vendor/phpunit/phpunit/appveyor.yml | 19 +- vendor/phpunit/phpunit/composer.json | 2 +- vendor/phpunit/phpunit/phive.xml | 2 +- vendor/phpunit/phpunit/phpunit | 0 vendor/phpunit/phpunit/src/Exception.php | 1 - .../phpunit/phpunit/src/Framework/Assert.php | 396 +--- .../src/Framework/Assert/Functions.php | 390 +--- .../src/Framework/AssertionFailedError.php | 1 - .../src/Framework/CodeCoverageException.php | 1 - .../src/Framework/Constraint/ArraySubset.php | 12 +- .../src/Framework/Constraint/Attribute.php | 2 - .../src/Framework/Constraint/Composite.php | 2 - .../src/Framework/Constraint/Constraint.php | 3 - .../src/Framework/Constraint/Count.php | 2 - .../src/Framework/Constraint/IsAnything.php | 2 - .../src/Framework/Constraint/IsEqual.php | 2 - .../src/Framework/Constraint/IsIdentical.php | 5 - .../src/Framework/Constraint/IsType.php | 11 + .../JsonMatchesErrorMessageProvider.php | 13 +- .../src/Framework/Constraint/LogicalAnd.php | 2 - .../src/Framework/Constraint/LogicalNot.php | 2 - .../src/Framework/Constraint/LogicalOr.php | 2 - .../src/Framework/Constraint/LogicalXor.php | 2 - .../StringMatchesFormatDescription.php | 5 +- .../Constraint/TraversableContains.php | 2 - .../Constraint/TraversableContainsOnly.php | 2 - .../CoveredCodeNotExecutedException.php | 1 - .../phpunit/src/Framework/Error/Error.php | 1 - .../src/Framework/ExceptionWrapper.php | 6 - .../phpunit/src/Framework/IncompleteTest.php | 1 - .../MissingCoversAnnotationException.php | 1 - .../MockObject/Builder/InvocationMocker.php | 22 - .../src/Framework/MockObject/Builder/Stub.php | 2 - .../ForwardCompatibility/MockObject.php | 1 - .../src/Framework/MockObject/Generator.php | 37 +- .../Generator/proxied_method_void.tpl.dist | 2 +- .../Invocation/ObjectInvocation.php | 1 - .../Invocation/StaticInvocation.php | 1 - .../Framework/MockObject/InvocationMocker.php | 22 - .../src/Framework/MockObject/Matcher.php | 12 - .../MockObject/Matcher/AnyInvokedCount.php | 3 - .../MockObject/Matcher/AnyParameters.php | 5 - .../Matcher/ConsecutiveParameters.php | 10 +- .../MockObject/Matcher/Invocation.php | 2 - .../MockObject/Matcher/InvokedAtIndex.php | 8 - .../Matcher/InvokedAtLeastCount.php | 3 - .../MockObject/Matcher/InvokedAtLeastOnce.php | 3 - .../MockObject/Matcher/InvokedAtMostCount.php | 3 - .../MockObject/Matcher/InvokedCount.php | 5 - .../MockObject/Matcher/InvokedRecorder.php | 5 - .../MockObject/Matcher/MethodName.php | 6 - .../MockObject/Matcher/Parameters.php | 7 - .../Matcher/StatelessInvocation.php | 4 - .../src/Framework/MockObject/MockBuilder.php | 5 - .../src/Framework/MockObject/MockObject.php | 4 - .../phpunit/src/Framework/MockObject/Stub.php | 2 - .../phpunit/src/Framework/RiskyTest.php | 1 - .../phpunit/src/Framework/SelfDescribing.php | 1 - .../phpunit/src/Framework/SkippedTest.php | 1 - .../src/Framework/SkippedTestError.php | 1 - .../src/Framework/SkippedTestSuiteError.php | 1 - .../phpunit/src/Framework/SyntheticError.php | 1 - vendor/phpunit/phpunit/src/Framework/Test.php | 1 - .../phpunit/src/Framework/TestCase.php | 76 +- .../phpunit/src/Framework/TestFailure.php | 4 +- .../phpunit/src/Framework/TestResult.php | 7 +- .../phpunit/src/Framework/TestSuite.php | 22 +- .../phpunit/src/Runner/BaseTestRunner.php | 10 +- .../phpunit/src/Runner/Filter/Factory.php | 3 - .../src/Runner/Filter/NameFilterIterator.php | 1 + .../Runner/Hook/AfterIncompleteTestHook.php | 1 - .../src/Runner/Hook/AfterLastTestHook.php | 1 - .../src/Runner/Hook/AfterRiskyTestHook.php | 1 - .../src/Runner/Hook/AfterSkippedTestHook.php | 1 - .../Runner/Hook/AfterSuccessfulTestHook.php | 1 - .../src/Runner/Hook/AfterTestErrorHook.php | 1 - .../src/Runner/Hook/AfterTestFailureHook.php | 1 - .../src/Runner/Hook/AfterTestWarningHook.php | 1 - .../src/Runner/Hook/BeforeFirstTestHook.php | 1 - .../src/Runner/Hook/BeforeTestHook.php | 1 - .../phpunit/phpunit/src/Runner/Hook/Hook.php | 1 - .../phpunit/src/Runner/Hook/TestHook.php | 1 - .../src/Runner/Hook/TestListenerAdapter.php | 1 - .../phpunit/src/Runner/PhptTestCase.php | 7 +- .../phpunit/src/Runner/TestSuiteLoader.php | 1 - .../phpunit/src/Runner/TestSuiteSorter.php | 68 +- vendor/phpunit/phpunit/src/Runner/Version.php | 4 +- vendor/phpunit/phpunit/src/TextUI/Command.php | 39 +- .../phpunit/src/TextUI/ResultPrinter.php | 12 +- .../phpunit/phpunit/src/TextUI/TestRunner.php | 8 +- vendor/phpunit/phpunit/src/Util/Blacklist.php | 3 +- .../phpunit/src/Util/Configuration.php | 17 +- .../src/Util/ConfigurationGenerator.php | 1 - .../phpunit/phpunit/src/Util/ErrorHandler.php | 9 +- .../phpunit/phpunit/src/Util/FileLoader.php | 2 +- .../phpunit/phpunit/src/Util/Filesystem.php | 3 +- vendor/phpunit/phpunit/src/Util/Json.php | 3 +- vendor/phpunit/phpunit/src/Util/Log/JUnit.php | 7 +- .../phpunit/phpunit/src/Util/Log/TeamCity.php | 15 - .../src/Util/PHP/AbstractPhpProcess.php | 5 +- vendor/phpunit/phpunit/src/Util/Printer.php | 4 +- vendor/phpunit/phpunit/src/Util/Test.php | 15 +- .../src/Util/TestDox/HtmlResultPrinter.php | 2 - .../src/Util/TestDox/NamePrettifier.php | 1 - .../src/Util/TestDox/ResultPrinter.php | 4 - .../src/Util/TestDox/TextResultPrinter.php | 2 - .../src/Util/TestDox/XmlResultPrinter.php | 2 +- .../phpunit/src/Util/TextTestListRenderer.php | 5 +- vendor/phpunit/phpunit/src/Util/Type.php | 1 - vendor/phpunit/phpunit/src/Util/Xml.php | 8 +- .../phpunit/src/Util/XmlTestListRenderer.php | 1 - .../phpunit/tests/Framework/AssertTest.php | 80 +- .../Framework/Constraint/ArrayHasKeyTest.php | 1 - .../Framework/Constraint/ArraySubsetTest.php | 1 - .../Framework/Constraint/AttributeTest.php | 1 - .../Framework/Constraint/CallbackTest.php | 1 - .../Constraint/ClassHasAttributeTest.php | 1 - .../ClassHasStaticAttributeTest.php | 1 - .../Constraint/ConstraintTestCase.php | 3 - .../tests/Framework/Constraint/CountTest.php | 1 - .../Constraint/DirectoryExistsTest.php | 1 - .../Constraint/ExceptionMessageRegExpTest.php | 1 - .../Constraint/ExceptionMessageTest.php | 1 - .../Framework/Constraint/FileExistsTest.php | 1 - .../Framework/Constraint/GreaterThanTest.php | 1 - .../Framework/Constraint/IsEmptyTest.php | 1 - .../Framework/Constraint/IsEqualTest.php | 5 - .../Framework/Constraint/IsIdenticalTest.php | 1 - .../Framework/Constraint/IsInstanceOfTest.php | 1 - .../tests/Framework/Constraint/IsJsonTest.php | 4 - .../tests/Framework/Constraint/IsNullTest.php | 1 - .../Framework/Constraint/IsReadableTest.php | 1 - .../tests/Framework/Constraint/IsTypeTest.php | 3 - .../Framework/Constraint/IsWritableTest.php | 1 - .../JsonMatchesErrorMessageProviderTest.php | 20 +- .../Framework/Constraint/JsonMatchesTest.php | 8 - .../Framework/Constraint/LessThanTest.php | 1 - .../Framework/Constraint/LogicalAndTest.php | 1 - .../Framework/Constraint/LogicalOrTest.php | 1 - .../Constraint/ObjectHasAttributeTest.php | 1 - .../Constraint/RegularExpressionTest.php | 1 - .../Framework/Constraint/SameSizeTest.php | 1 - .../Constraint/StringContainsTest.php | 1 - .../Constraint/StringEndsWithTest.php | 1 - .../StringMatchesFormatDescriptionTest.php | 1 - .../Constraint/StringStartsWithTest.php | 1 - .../Constraint/TraversableContainsTest.php | 1 - .../tests/Framework/ConstraintTest.php | 5 +- .../tests/Framework/ExceptionWrapperTest.php | 1 - .../Framework/MockObject/GeneratorTest.php | 3 - .../Invocation/ObjectInvocationTest.php | 2 +- .../Invocation/StaticInvocationTest.php | 2 +- .../Framework/MockObject/MockObjectTest.php | 14 +- .../phpunit/tests/Framework/TestCaseTest.php | 18 +- .../tests/Framework/TestFailureTest.php | 1 - .../tests/Framework/TestImplementorTest.php | 1 - .../tests/Framework/TestListenerTest.php | 9 +- .../phpunit/tests/Framework/TestSuiteTest.php | 3 +- .../Regression/GitHub/1337/Issue1337Test.php | 6 +- .../Regression/GitHub/1348/Issue1348Test.php | 4 +- .../Regression/GitHub/2137/Issue2137Test.php | 6 - .../Regression/GitHub/2366/Issue2366Test.php | 2 - .../Regression/GitHub/2380/Issue2380Test.php | 2 - .../Regression/GitHub/2382/Issue2382Test.php | 2 - ...SeparateClassRunMethodInNewProcessTest.php | 3 + .../Regression/GitHub/3156/Issue3156Test.php | 1 - .../Regression/GitHub/498/Issue498Test.php | 4 - .../Regression/GitHub/765/Issue765Test.php | 2 - .../Regression/Trac/1021/Issue1021Test.php | 2 - .../Regression/Trac/578/Issue578Test.php | 8 +- .../phpunit/tests/Runner/PhptTestCaseTest.php | 37 +- .../tests/Runner/TestSuiteSorterTest.php | 1 - .../phpunit/tests/TextUI/_files/Extension.php | 22 +- .../tests/Util/ConfigurationGeneratorTest.php | 1 - .../phpunit/tests/Util/ConfigurationTest.php | 230 +- .../phpunit/phpunit/tests/Util/GetoptTest.php | 1 - .../phpunit/tests/Util/GlobalStateTest.php | 1 - .../phpunit/phpunit/tests/Util/JsonTest.php | 10 - .../tests/Util/PHP/AbstractPhpProcessTest.php | 3 +- .../tests/Util/RegularExpressionTest.php | 22 +- .../tests/Util/TestDox/NamePrettifierTest.php | 1 - .../phpunit/phpunit/tests/Util/TestTest.php | 245 +- vendor/phpunit/phpunit/tests/Util/XmlTest.php | 1 - .../tests/_files/BeforeAndAfterTest.php | 1 + .../_files/BeforeClassAndAfterClassTest.php | 1 + .../BeforeClassWithOnlyDataProviderTest.php | 1 + .../phpunit/tests/_files/Calculator.php | 3 - .../_files/ClassWithNonPublicAttributes.php | 10 + .../tests/_files/ClonedDependencyTest.php | 10 - .../_files/DataProviderDependencyTest.php | 2 - .../tests/_files/DataProviderFilterTest.php | 20 +- .../_files/DataProviderIncompleteTest.php | 16 +- .../DataProviderIssue2833/FirstTest.php | 2 - .../another/TestWithDataProviderTest.php | 2 - .../DataProviderIssue2922/FirstTest.php | 2 - .../tests/_files/DataProviderSkippedTest.php | 16 +- .../phpunit/tests/_files/DataProviderTest.php | 12 +- .../ExceptionInAssertPostConditionsTest.php | 4 + .../ExceptionInAssertPreConditionsTest.php | 4 + .../tests/_files/ExceptionInSetUpTest.php | 4 + .../tests/_files/ExceptionInTearDownTest.php | 4 + .../phpunit/tests/_files/ExceptionInTest.php | 4 + .../phpunit/phpunit/tests/_files/Mockable.php | 1 + .../tests/_files/MultiDependencyTest.php | 3 - .../tests/_files/SampleArrayAccess.php | 2 +- .../phpunit/tests/_files/SampleClass.php | 2 + .../phpunit/tests/_files/SomeClass.php | 2 - .../phpunit/tests/_files/TestIterator.php | 1 + .../phpunit/tests/_files/TestWithTest.php | 12 +- vendor/phpunit/phpunit/tests/bootstrap.php | 2 +- vendor/swiftmailer/swiftmailer/.php_cs.dist | 9 +- vendor/swiftmailer/swiftmailer/.travis.yml | 1 + vendor/swiftmailer/swiftmailer/CHANGES | 21 +- vendor/swiftmailer/swiftmailer/LICENSE | 2 +- vendor/swiftmailer/swiftmailer/composer.json | 8 +- .../swiftmailer/swiftmailer/doc/headers.rst | 14 +- .../swiftmailer/swiftmailer/doc/messages.rst | 52 +- .../swiftmailer/swiftmailer/doc/sending.rst | 15 +- .../swiftmailer/lib/classes/Swift.php | 7 +- .../lib/classes/Swift/Attachment.php | 2 +- .../AbstractFilterableInputStream.php | 15 +- .../Swift/ByteStream/ArrayByteStream.php | 12 +- .../Swift/ByteStream/FileByteStream.php | 8 +- .../ByteStream/TemporaryFileByteStream.php | 4 +- .../Swift/CharacterReader/Utf8Reader.php | 14 +- .../SimpleCharacterReaderFactory.php | 28 +- .../CharacterStream/ArrayCharacterStream.php | 24 +- .../CharacterStream/NgCharacterStream.php | 13 +- .../lib/classes/Swift/DependencyContainer.php | 50 +- .../lib/classes/Swift/EmbeddedFile.php | 2 +- .../lib/classes/Swift/Encoder/QpEncoder.php | 28 +- .../classes/Swift/Encoder/Rfc2231Encoder.php | 4 +- .../lib/classes/Swift/Events/CommandEvent.php | 9 +- .../classes/Swift/Events/EventDispatcher.php | 2 +- .../lib/classes/Swift/Events/EventObject.php | 2 - .../classes/Swift/Events/ResponseEvent.php | 5 +- .../lib/classes/Swift/Events/SendEvent.php | 5 +- .../Swift/Events/SimpleEventDispatcher.php | 37 +- .../Swift/Events/TransportExceptionEvent.php | 3 - .../lib/classes/Swift/FailoverTransport.php | 4 +- .../lib/classes/Swift/FileSpool.php | 6 +- .../lib/classes/Swift/InputByteStream.php | 4 +- .../lib/classes/Swift/IoException.php | 5 +- .../classes/Swift/KeyCache/ArrayKeyCache.php | 19 +- .../classes/Swift/KeyCache/DiskKeyCache.php | 19 +- .../classes/Swift/KeyCache/NullKeyCache.php | 12 +- .../KeyCache/SimpleKeyCacheInputStream.php | 4 - .../classes/Swift/LoadBalancedTransport.php | 4 +- .../swiftmailer/lib/classes/Swift/Mailer.php | 7 +- .../Swift/Mailer/ArrayRecipientIterator.php | 4 +- .../lib/classes/Swift/MemorySpool.php | 2 +- .../swiftmailer/lib/classes/Swift/Message.php | 41 +- .../lib/classes/Swift/Mime/Attachment.php | 13 +- .../ContentEncoder/Base64ContentEncoder.php | 11 +- .../ContentEncoder/NativeQpContentEncoder.php | 8 +- .../ContentEncoder/PlainContentEncoder.php | 16 +- .../Mime/ContentEncoder/QpContentEncoder.php | 6 +- .../ContentEncoder/QpContentEncoderProxy.php | 4 +- .../Mime/ContentEncoder/RawContentEncoder.php | 9 +- .../lib/classes/Swift/Mime/EmbeddedFile.php | 8 +- .../lib/classes/Swift/Mime/Header.php | 2 +- .../HeaderEncoder/Base64HeaderEncoder.php | 2 +- .../Mime/HeaderEncoder/QpHeaderEncoder.php | 4 +- .../Swift/Mime/Headers/AbstractHeader.php | 29 +- .../classes/Swift/Mime/Headers/DateHeader.php | 2 - .../Mime/Headers/IdentificationHeader.php | 18 +- .../Swift/Mime/Headers/MailboxHeader.php | 17 +- .../Swift/Mime/Headers/OpenDKIMHeader.php | 4 +- .../Mime/Headers/ParameterizedHeader.php | 14 +- .../classes/Swift/Mime/Headers/PathHeader.php | 11 +- .../Swift/Mime/Headers/UnstructuredHeader.php | 3 +- .../lib/classes/Swift/Mime/MimePart.php | 8 +- .../Swift/Mime/SimpleHeaderFactory.php | 17 +- .../classes/Swift/Mime/SimpleHeaderSet.php | 42 +- .../lib/classes/Swift/Mime/SimpleMessage.php | 51 +- .../classes/Swift/Mime/SimpleMimeEntity.php | 67 +- .../lib/classes/Swift/MimePart.php | 2 +- .../lib/classes/Swift/NullTransport.php | 2 +- .../classes/Swift/Plugins/AntiFloodPlugin.php | 4 - .../Swift/Plugins/BandwidthMonitorPlugin.php | 12 +- .../classes/Swift/Plugins/DecoratorPlugin.php | 14 +- .../Swift/Plugins/ImpersonatePlugin.php | 4 - .../classes/Swift/Plugins/LoggerPlugin.php | 16 - .../Swift/Plugins/Loggers/ArrayLogger.php | 4 +- .../classes/Swift/Plugins/MessageLogger.php | 8 +- .../Swift/Plugins/PopBeforeSmtpPlugin.php | 11 +- .../Swift/Plugins/RedirectingPlugin.php | 22 +- .../classes/Swift/Plugins/ReporterPlugin.php | 4 - .../Swift/Plugins/Reporters/HitReporter.php | 11 +- .../Swift/Plugins/Reporters/HtmlReporter.php | 5 +- .../classes/Swift/Plugins/ThrottlerPlugin.php | 6 +- .../lib/classes/Swift/Preferences.php | 2 +- .../lib/classes/Swift/SendmailTransport.php | 2 +- .../swiftmailer/lib/classes/Swift/Signer.php | 1 - .../lib/classes/Swift/Signers/DKIMSigner.php | 54 +- .../classes/Swift/Signers/DomainKeySigner.php | 38 +- .../classes/Swift/Signers/OpenDKIMSigner.php | 22 +- .../lib/classes/Swift/Signers/SMimeSigner.php | 481 ++-- .../lib/classes/Swift/SmtpTransport.php | 2 +- .../lib/classes/Swift/SpoolTransport.php | 4 +- .../ByteArrayReplacementFilter.php | 30 +- .../StringReplacementFilterFactory.php | 6 +- .../lib/classes/Swift/SwiftException.php | 5 +- .../lib/classes/Swift/Transport.php | 2 +- .../Swift/Transport/AbstractSmtpTransport.php | 86 +- .../Esmtp/Auth/CramMd5Authenticator.php | 16 +- .../Esmtp/Auth/LoginAuthenticator.php | 18 +- .../Esmtp/Auth/NTLMAuthenticator.php | 71 +- .../Esmtp/Auth/PlainAuthenticator.php | 14 +- .../Esmtp/Auth/XOAuth2Authenticator.php | 14 +- .../Swift/Transport/Esmtp/AuthHandler.php | 43 +- .../Swift/Transport/Esmtp/Authenticator.php | 4 +- .../classes/Swift/Transport/EsmtpHandler.php | 4 +- .../Swift/Transport/EsmtpTransport.php | 86 +- .../Swift/Transport/FailoverTransport.php | 5 +- .../Swift/Transport/LoadBalancedTransport.php | 13 +- .../classes/Swift/Transport/NullTransport.php | 5 +- .../Swift/Transport/SendmailTransport.php | 23 +- .../lib/classes/Swift/Transport/SmtpAgent.php | 2 +- .../Swift/Transport/SpoolTransport.php | 7 +- .../classes/Swift/Transport/StreamBuffer.php | 32 +- .../lib/classes/Swift/TransportException.php | 5 +- .../lib/dependency_maps/cache_deps.php | 4 +- .../lib/dependency_maps/mime_deps.php | 62 +- .../lib/dependency_maps/transport_deps.php | 56 +- .../swiftmailer/lib/mime_types.php | 4 +- .../lib/swiftmailer_generate_mimes_config.php | 25 +- .../FileByteStreamAcceptanceTest.php | 4 +- ...leCharacterReaderFactoryAcceptanceTest.php | 36 +- .../Encoder/Base64EncoderAcceptanceTest.php | 4 +- .../Swift/Encoder/QpEncoderAcceptanceTest.php | 4 +- .../Encoder/Rfc2231EncoderAcceptanceTest.php | 4 +- .../Swift/MessageAcceptanceTest.php | 4 +- .../Base64ContentEncoderAcceptanceTest.php | 4 +- .../NativeQpContentEncoderAcceptanceTest.php | 4 +- .../PlainContentEncoderAcceptanceTest.php | 8 +- .../QpContentEncoderAcceptanceTest.php | 8 +- .../Swift/Mime/MimePartAcceptanceTest.php | 4 +- .../Mime/SimpleMessageAcceptanceTest.php | 148 +- .../BasicSocketAcceptanceTest.php | 6 +- .../StreamBuffer/ProcessAcceptanceTest.php | 4 +- .../StreamBuffer/SocketTimeoutTest.php | 4 +- .../StreamBuffer/SslSocketAcceptanceTest.php | 6 +- .../StreamBuffer/TlsSocketAcceptanceTest.php | 6 +- .../tests/bug/Swift/Bug111Test.php | 20 +- .../tests/bug/Swift/Bug206Test.php | 4 +- .../swiftmailer/tests/bug/Swift/Bug34Test.php | 6 +- .../swiftmailer/tests/bug/Swift/Bug35Test.php | 6 +- .../tests/bug/Swift/Bug534Test.php | 2 +- .../tests/bug/Swift/Bug650Test.php | 18 +- .../smoke/Swift/Smoke/AttachmentSmokeTest.php | 2 +- .../smoke/Swift/Smoke/BasicSmokeTest.php | 2 +- .../Smoke/HtmlWithAttachmentSmokeTest.php | 2 +- .../Swift/Smoke/InternationalSmokeTest.php | 2 +- .../Swift/ByteStream/ArrayByteStreamTest.php | 36 +- .../GenericFixedWidthReaderTest.php | 10 +- .../CharacterReader/UsAsciiReaderTest.php | 6 +- .../Swift/CharacterReader/Utf8ReaderTest.php | 12 +- .../ArrayCharacterStreamTest.php | 114 +- .../unit/Swift/DependencyContainerTest.php | 29 +- .../unit/Swift/Encoder/QpEncoderTest.php | 56 +- .../unit/Swift/Events/CommandEventTest.php | 6 +- .../tests/unit/Swift/Events/SendEventTest.php | 6 +- .../Events/SimpleEventDispatcherTest.php | 4 +- .../Mailer/ArrayRecipientIteratorTest.php | 20 +- .../tests/unit/Swift/MailerTest.php | 8 +- .../Swift/Mime/AbstractMimeEntityTest.php | 154 +- .../tests/unit/Swift/Mime/AttachmentTest.php | 78 +- .../PlainContentEncoderTest.php | 16 +- .../ContentEncoder/QpContentEncoderTest.php | 56 +- .../unit/Swift/Mime/EmbeddedFileTest.php | 6 +- .../HeaderEncoder/QpHeaderEncoderTest.php | 26 +- .../Mime/Headers/IdentificationHeaderTest.php | 22 +- .../Swift/Mime/Headers/MailboxHeaderTest.php | 210 +- .../Mime/Headers/ParameterizedHeaderTest.php | 26 +- .../Swift/Mime/Headers/PathHeaderTest.php | 19 +- .../Mime/Headers/UnstructuredHeaderTest.php | 2 +- .../tests/unit/Swift/Mime/MimePartTest.php | 56 +- .../Swift/Mime/SimpleHeaderFactoryTest.php | 10 +- .../unit/Swift/Mime/SimpleHeaderSetTest.php | 30 +- .../unit/Swift/Mime/SimpleMessageTest.php | 242 +- .../Plugins/BandwidthMonitorPluginTest.php | 8 +- .../Swift/Plugins/DecoratorPluginTest.php | 52 +- .../Swift/Plugins/RedirectingPluginTest.php | 84 +- .../unit/Swift/Plugins/ReporterPluginTest.php | 20 +- .../Plugins/Reporters/HitReporterTest.php | 10 +- .../unit/Swift/Signers/DKIMSignerTest.php | 22 +- .../unit/Swift/Signers/SMimeSignerTest.php | 198 +- .../ByteArrayReplacementFilterTest.php | 70 +- .../StringReplacementFilterTest.php | 6 +- .../AbstractSmtpEventSupportTest.php | 34 +- .../unit/Swift/Transport/AbstractSmtpTest.php | 236 +- .../Esmtp/Auth/CramMd5AuthenticatorTest.php | 19 +- .../Esmtp/Auth/LoginAuthenticatorTest.php | 23 +- .../Esmtp/Auth/NTLMAuthenticatorTest.php | 37 +- .../Esmtp/Auth/PlainAuthenticatorTest.php | 15 +- .../Swift/Transport/Esmtp/AuthHandlerTest.php | 26 +- .../EsmtpTransport/ExtensionSupportTest.php | 54 +- .../Swift/Transport/EsmtpTransportTest.php | 132 +- .../Swift/Transport/FailoverTransportTest.php | 28 +- .../Transport/LoadBalancedTransportTest.php | 32 +- .../Swift/Transport/SendmailTransportTest.php | 28 +- .../unit/Swift/Transport/StreamBufferTest.php | 10 +- .../AddConsoleCommandPassTest.php | 83 +- .../Exception/ClassNotFoundException.php | 3 + .../debug/Exception/FatalErrorException.php | 4 +- .../Exception/UndefinedFunctionException.php | 3 + .../Exception/UndefinedMethodException.php | 3 + .../Tests/Iterator/RealIteratorTestCase.php | 17 +- .../http-foundation/ResponseHeaderBag.php | 2 +- .../http-foundation/Session/Session.php | 19 +- .../Session/SessionBagProxy.php | 14 +- .../Storage/Handler/RedisSessionHandler.php | 2 +- .../http-foundation/Tests/RequestTest.php | 1 - vendor/symfony/http-kernel/CHANGELOG.md | 2 +- .../ArgumentResolver/ServiceValueResolver.php | 2 +- .../DataCollector/DumpDataCollector.php | 29 +- .../EventListener/AbstractSessionListener.php | 19 +- .../EventListener/DumpListener.php | 14 +- .../EventListener/ExceptionListener.php | 19 +- .../EventListener/ProfilerListener.php | 2 +- .../Fragment/InlineFragmentRenderer.php | 4 +- .../http-kernel/HttpCache/HttpCache.php | 6 +- vendor/symfony/http-kernel/Kernel.php | 6 +- .../ServiceValueResolverTest.php | 28 + .../DataCollector/DumpDataCollectorTest.php | 8 +- .../EventListener/ExceptionListenerTest.php | 17 - .../EventListener/SessionListenerTest.php | 48 +- .../ValidateRequestListenerTest.php | 5 + .../Fragment/InlineFragmentRendererTest.php | 25 +- .../Tests/HttpCache/HttpCacheTest.php | 40 + .../http-kernel/Tests/HttpKernelTest.php | 2 + vendor/symfony/http-kernel/composer.json | 6 +- vendor/symfony/process/ExecutableFinder.php | 2 +- .../process/Tests/ExecutableFinderTest.php | 30 + .../Matcher/Dumper/PhpMatcherDumper.php | 7 +- .../Matcher/Dumper/StaticPrefixCollection.php | 14 +- vendor/symfony/routing/RouteCompiler.php | 2 +- .../Tests/Fixtures/dumper/url_matcher1.php | 96 +- .../Tests/Fixtures/dumper/url_matcher10.php | 1998 ++++++++--------- .../Tests/Fixtures/dumper/url_matcher13.php | 10 +- .../Tests/Fixtures/dumper/url_matcher2.php | 96 +- .../Tests/Fixtures/dumper/url_matcher8.php | 12 +- .../routing/Tests/Matcher/UrlMatcherTest.php | 49 + .../routing/Tests/RouteCompilerTest.php | 1 + vendor/symfony/routing/composer.json | 1 - .../Extractor/AbstractFileExtractor.php | 2 +- .../symfony/var-dumper/Caster/SplCaster.php | 53 +- .../var-dumper/Cloner/AbstractCloner.php | 1 + .../var-dumper/Dumper/AbstractDumper.php | 2 +- .../var-dumper/Dumper/ServerDumper.php | 76 +- .../var-dumper/Resources/bin/var-dump-server | 0 .../Resources/css/htmlDescriptor.css | 14 +- .../var-dumper/Tests/Caster/SplCasterTest.php | 41 + .../Tests/Dumper/ServerDumperTest.php | 10 +- .../var-dumper/Tests/Fixtures/dump_server.php | 2 + vendor/vlucas/phpdotenv/composer.json | 6 +- vendor/vlucas/phpdotenv/src/Dotenv.php | 31 +- vendor/vlucas/phpdotenv/src/Loader.php | 73 +- vendor/vlucas/phpdotenv/src/Validator.php | 19 + 771 files changed, 9284 insertions(+), 5857 deletions(-) create mode 100644 app/Config.php create mode 100644 app/Http/Controllers/ConfigController.php create mode 100644 app/Notifications/mail.php create mode 100644 app/Notifications/sms.php create mode 100644 database/migrations/2018_08_29_172124_create_configs_table.php create mode 100644 database/seeds/ConfigsTableSeeder.php create mode 100644 database/seeds/JobsTableSeeder.php create mode 100644 database/seeds/RanksTableSeeder.php create mode 100644 database/seeds/UsersTableSeeder.php create mode 100644 resources/views/admin/job/add.blade.php create mode 100644 resources/views/admin/job/index.blade.php create mode 100644 resources/views/admin/message/add.blade.php create mode 100644 resources/views/admin/message/show.blade.php create mode 100644 resources/views/errors/404.blade.php create mode 100644 resources/views/errors/500.blade.php create mode 100644 resources/views/vendor/notifications/email.blade.php create mode 100644 resources/views/william.blade.php mode change 100644 => 120000 vendor/bin/phpunit mode change 100644 => 120000 vendor/bin/var-dump-server mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/AuthManager.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/AuthServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/DatabaseUserProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/EloquentUserProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/GenericUser.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/Passwords/DatabaseTokenRepository.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordBroker.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/Passwords/PasswordResetServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Auth/Passwords/TokenRepositoryInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/ApcStore.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/ApcWrapper.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/CacheManager.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/CacheServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/Console/ClearCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/Console/ForgetCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/DatabaseStore.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/FileStore.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/MemcachedConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/MemcachedStore.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/NullStore.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/RedisStore.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/Repository.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cache/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Config/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Console/Application.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Console/Command.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Console/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Container/Container.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Container/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Contracts/Support/Arrayable.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Contracts/Support/Jsonable.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Contracts/Support/MessageProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Contracts/Support/Renderable.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Contracts/Translation/Loader.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Contracts/View/Engine.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cookie/CookieJar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cookie/CookieServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Cookie/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Capsule/Manager.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connection.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/ConnectionInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/ConnectionResolver.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/ConnectionResolverInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectionFactory.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connectors/Connector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connectors/ConnectorInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connectors/MySqlConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connectors/PostgresConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connectors/SQLiteConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Connectors/SqlServerConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/BaseCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/InstallCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/MigrateCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RefreshCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/DatabaseManager.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/DatabaseServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Builder.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Collection.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/MassAssignmentException.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/ModelNotFoundException.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/RelationNotFoundException.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsTo.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasMany.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOne.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/HasOneOrMany.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphMany.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOne.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/MorphOneOrMany.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Pivot.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Eloquent/Relations/Relation.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Grammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/MigrationServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/DatabaseMigrationRepository.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/Migration.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationCreator.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/MigrationRepositoryInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/Migrator.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/blank.stub mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/create.stub mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Migrations/stubs/update.stub mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/MySqlConnection.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/PostgresConnection.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Builder.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Expression.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/Grammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/MySqlGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/PostgresGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/JoinClause.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Processors/PostgresProcessor.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Processors/Processor.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Query/Processors/SqlServerProcessor.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/README.md mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/SQLiteConnection.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/Blueprint.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/Builder.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/Grammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/MySqlGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/PostgresGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SQLiteGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/Grammars/SqlServerGrammar.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/MySqlBuilder.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Schema/PostgresBuilder.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/Seeder.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Database/SqlServerConnection.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Encryption/Encrypter.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Encryption/EncryptionServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Events/Dispatcher.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Events/EventServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Events/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Foundation/AliasLoader.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Foundation/Application.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Foundation/ProviderRepository.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Foundation/Providers/ComposerServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Hashing/HashServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Hashing/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Http/JsonResponse.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Http/RedirectResponse.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Http/Response.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Http/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Log/Logger.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Log/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Mail/MailServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Mail/Mailer.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Mail/Message.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Mail/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Pagination/PaginationServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Pagination/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/BeanstalkdQueue.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Connectors/BeanstalkdConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Connectors/ConnectorInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Connectors/SqsConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Connectors/SyncConnector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Console/ListenCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Jobs/BeanstalkdJob.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Jobs/Job.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Jobs/SqsJob.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Jobs/SyncJob.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Listener.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/Queue.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/QueueManager.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/QueueServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/SqsQueue.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Queue/SyncQueue.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Redis/RedisServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Redis/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Routing/Console/ControllerMakeCommand.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Routing/Redirector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Routing/Route.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Routing/RoutingServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Routing/UrlGenerator.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/CacheBasedSessionHandler.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/Console/stubs/database.stub mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/CookieSessionHandler.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/SessionManager.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/Store.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/TokenMismatchException.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Session/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Arr.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/App.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Artisan.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Auth.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Blade.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Config.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Cookie.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Crypt.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/DB.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Event.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Facade.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/File.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Hash.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Input.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Lang.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Log.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Mail.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Password.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Queue.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Redirect.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Redis.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Request.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Response.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Route.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Schema.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Session.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/URL.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/Validator.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Facades/View.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Fluent.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Manager.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/MessageBag.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/NamespacedItemResolver.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/Pluralizer.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/ServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Support/helpers.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Translation/FileLoader.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Translation/MessageSelector.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Translation/TranslationServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Translation/Translator.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Translation/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Validation/DatabasePresenceVerifier.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Validation/Factory.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Validation/PresenceVerifierInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Validation/ValidationServiceProvider.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Validation/Validator.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/Validation/composer.json mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/Compilers/Compiler.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/Compilers/CompilerInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/Engines/CompilerEngine.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/Engines/Engine.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/Engines/EngineResolver.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/Engines/PhpEngine.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/Factory.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/FileViewFinder.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/View.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/ViewFinderInterface.php mode change 100644 => 100755 vendor/laravel/framework/src/Illuminate/View/ViewServiceProvider.php mode change 100644 => 100755 vendor/nunomaduro/collision/LICENSE.md mode change 100644 => 100755 vendor/paragonie/random_compat/build-phar.sh mode change 100644 => 100755 vendor/phpunit/phpunit/phpunit mode change 100644 => 100755 vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php mode change 100644 => 100755 vendor/symfony/var-dumper/Resources/bin/var-dump-server diff --git a/app/Config.php b/app/Config.php new file mode 100644 index 00000000..161d2b8d --- /dev/null +++ b/app/Config.php @@ -0,0 +1,10 @@ +middleware('auth'); + + dd(Auth::user()->getAcces(2)); } /** diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index 7d9e4b5c..46dd73e6 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -3,6 +3,9 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use \App\Notifications\mail; +use \App\Notifications\sms; +use \App\Notifications\Alert; use \App\Log; use \App\Schedule; use \App\Local; @@ -71,43 +74,79 @@ class CalendarController extends Controller $calendar[$i] = $addingday; } - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - + echo '
    '; + echo '
    '; + echo '
    '.ucfirst(strftime("%B %Y", strtotime("01-".$month."-".$year))).'
    '; + echo '
    Dimanche
    Lundi
    Mardi
    Mercredi
    Jeudi
    Vendredi
    Samedi
    '; + echo '
    '; + echo '
    '; for ($i=0; $i < 6 ; $i++) { - echo '
    '; + echo '
    '; for ($a=0; $a < 7 ; $a++) { if (isset($calendar[(($i*7) + $a)])) { - echo '
    '; } else { - echo ''; + echo '
    '; } } - echo ''; + echo ''; } - echo '
    '.ucfirst(strftime("%B %Y", strtotime("01-".$month."-".$year))).'
    DimancheLundiMardiMercrediJeudiVendrediSamedi
    '; - + /** Date info */ $today = date("Y-m-d", strtotime($year."-".$month."-".$calendar[(($i*7) + $a)])); $activityToday = Schedule::where('date','=',$today)->get(); + + /** If nothing today */ if ($activityToday->isEmpty()) { - echo ''; + echo '
    '.date("j", strtotime($today)).'
    '; } else { + echo ''; $text = ""; foreach ($activityToday as $activity) { - $text = $text.'
    '.ucfirst($activity->data['event_name'])."

    "; + echo '
    '.date("j", strtotime($today)).'
    +
    '; + switch ($activity->type) { + case 'regular': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + case 'pilotage': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + case 'drill': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + case 'music': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + case 'biathlon': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + case 'marksmanship': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + case 'founding': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + case 'volunteer': + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + + default: + echo '
    '.ucfirst($activity->data['event_name'])."
    "; + break; + } + echo '
    '; } - - echo '    '; + echo ''; } - - - echo '
    '; } @@ -322,7 +361,7 @@ class CalendarController extends Controller $UserList = User::all(); $LocalList = Local::all(); - + return view('admin.calendar.calendar_add' ,['RequestDate' => $date, 'Userslist' => $UserList, 'LocalsList' => $LocalList]); } @@ -398,6 +437,10 @@ class CalendarController extends Controller $schedule->data = $eventData; $schedule->save(); + + /** Logs and Notification */ + Log::saveLog("Ajout de l'activité, ".$schedule->event_name." à l'horaire le ".$schedule->event_date); + } public function patch($id) diff --git a/app/Http/Controllers/ConfigController.php b/app/Http/Controllers/ConfigController.php new file mode 100644 index 00000000..73dc2c2b --- /dev/null +++ b/app/Http/Controllers/ConfigController.php @@ -0,0 +1,85 @@ +sortBy('name'); + + $jobs = $jobs_sorted->values(); + + return view('admin.job.index', ['jobs' => $jobs]); } /** diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php index ea93e144..cdba1aec 100644 --- a/app/Http/Controllers/MessageController.php +++ b/app/Http/Controllers/MessageController.php @@ -7,6 +7,17 @@ use Illuminate\Http\Request; class MessageController extends Controller { + + /** + * Create a new controller instance. + * + * @return void + */ + public function __construct() + { + $this->middleware('auth', ['except' => ['destroy']]); + } + /** * Display a listing of the resource. * @@ -14,7 +25,7 @@ class MessageController extends Controller */ public function index() { - return view('admin.message.index', ['messages' => \App\Message::all()]); + return view('admin.message.index', ['messages' => \App\Message::all()]); } /** @@ -24,7 +35,7 @@ class MessageController extends Controller */ public function create() { - // + return view('admin.message.add', ['messages' => \App\Message::all()]); } /** @@ -35,7 +46,26 @@ class MessageController extends Controller */ public function store(Request $request) { - // + $msg = new Message; + + $msg->title = request('msg_title'); + $msg->body = request('msg_body'); + + $msg->user_id = \Auth::user()->id; + + /** Basic Shit to change */ + + $msg->data = [ + 'as_seen' => "", + 'parameter' => "" + ]; + + $msg->publish = true; + $msg->private = true; + + $msg->save(); + + \App\Log::savelog("Publication du message : ".request('msg_title')); } /** @@ -44,9 +74,24 @@ class MessageController extends Controller * @param \App\Message $message * @return \Illuminate\Http\Response */ - public function show(Message $message) - { - // + public function show($id) + { + $this_msg = Message::find($id); + + if(isset($this_msg->data['as_seen'])) + { + if (!strpos($this_msg->data['as_seen'],"-".\Auth::user()->id."-")) { + $data = [ + 'as_seen' => $this_msg->data['as_seen']."-".\Auth::user()->id."-", + 'parameter' => $this_msg->data['parameter'] + ]; + + $this_msg->data = $data; + + $this_msg->save(); + } + } + return view('admin.message.show', ['message' => $this_msg]); } /** @@ -78,8 +123,12 @@ class MessageController extends Controller * @param \App\Message $message * @return \Illuminate\Http\Response */ - public function destroy(Message $message) + public function destroy() { - // + $id = request('id'); + + $msg = Message::find($id); + + $msg->delete(); } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 876a3f72..3259f082 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -80,8 +80,12 @@ class UserController extends Controller * @param int $id * @return \Illuminate\Http\Response */ - public function destroy($id) + public function destroy() { - // + $id = request('id'); + + $user = User::find($id); + + $user->delete(); } } diff --git a/app/Notifications/mail.php b/app/Notifications/mail.php new file mode 100644 index 00000000..16a007a6 --- /dev/null +++ b/app/Notifications/mail.php @@ -0,0 +1,52 @@ +myMsg = $msg; + $this->myTitle = $title; + $this->notifiable = $notifiable; + } + + /** + * Get the notification's delivery channels. + * + * @param mixed $notifiable + * @return array + */ + public function via($notifiable) + { + return ['mail']; + } + + /** + * Get the mail representation of the notification. + * + * @param mixed $notifiable + * @return \Illuminate\Notifications\Messages\MailMessage + */ + public function toMail($notifiable) + { + return (new MailMessage) + ->subject($this->myTitle.' - '.config('squadron.fullname')) + ->line('Vous avez reçus une nouvelle notification !') + ->line($this->myMsg) + ->action("Consulter !", url('/login')) + ->line('Merci'); + } +} diff --git a/app/Notifications/sms.php b/app/Notifications/sms.php new file mode 100644 index 00000000..d46ebe63 --- /dev/null +++ b/app/Notifications/sms.php @@ -0,0 +1,49 @@ +myNotification = $msg; + $this->notifiable = $notifiable; + } + + /** + * Get the notification's delivery channels. + * + * @param mixed $notifiable + * @return array + */ + public function via($notifiable) + { + return ['nexmo']; + } + + /** + * Get the mail representation of the notification. + * + * @param mixed $notifiable + * @return \Illuminate\Notifications\Messages\MailMessage + */ + public function toNexmo($notifiable) + { + return (new NexmoMessage) + ->content($this->myNotification) + ->unicode(); + } +} diff --git a/app/User.php b/app/User.php index 2699edb0..7a3ecab5 100644 --- a/app/User.php +++ b/app/User.php @@ -32,6 +32,13 @@ class User extends Authenticatable return $this->hasMany(Log::class); } + public function updateAPI() + { + $this->api_token = str_random(60); + + $this->save(); + } + public function fullname() { $fullname = $this->lastname.' '.$this->firstname; @@ -42,4 +49,53 @@ class User extends Authenticatable { return $this->hasMany(Message::class); } + + public function routeNotificationForNexmo($notification) + { + return $this->telephone; + } + + public function getPerm($perm) + { + $rank = \App\Rank::find($this->rank); + $job = \App\Job::find($this->job); + + $rank_perm_value = $rank->$perm; + $job_perm_value = $job->$perm; + $user_perm_value = $this->$perm; + + if ($user_perm_value == 1 ) { + $perm_value = 1; + } else if ($job_perm_value== 1) { + $perm_value = 1; + } else if ($rank_perm_value == 1) { + $perm_value = 1; + } else { + $perm_value = 0; + } + + dd($perm_value); + } + + public function getAcces($level) + { + $rank = \App\Rank::find($this->rank); + $job = \App\Job::find($this->job); + + $rank_perm_value = $rank->acces_level; + $job_perm_value = $job->acces_level; + $user_perm_value = $this->acces_level + + if ($user_perm_value >= $level ) { + $perm_value = true; + } else if ($job_perm_value >= $level) { + $perm_value = true; + } else if ($rank_perm_value >= $level) { + $perm_value = true; + } else { + $perm_value = false; + } + + return boolean $perm_value; + } } diff --git a/composer.json b/composer.json index 65bf8b4f..bf2e145f 100644 --- a/composer.json +++ b/composer.json @@ -7,8 +7,10 @@ "require": { "php": "^7.1.3", "fideloper/proxy": "^4.0", + "guzzlehttp/guzzle": "^6.3", "laravel/framework": "5.6.*", - "laravel/tinker": "^1.0" + "laravel/tinker": "^1.0", + "nexmo/client": "^1.4" }, "require-dev": { "filp/whoops": "^2.0", diff --git a/composer.lock b/composer.lock index 078de7b2..c433da54 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d5bca48e56bbf3a25645858fcab9c285", + "content-hash": "b914f34bb5ca62a2b7d916629dc30d1a", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -366,6 +366,187 @@ ], "time": "2018-02-07T20:20:57+00:00" }, + { + "name": "guzzlehttp/guzzle", + "version": "6.3.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.4", + "php": ">=5.5" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "psr/log": "^1.0" + }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.3-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2018-04-22T15:46:56+00:00" + }, + { + "name": "guzzlehttp/promises", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2016-12-20T10:07:11+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "request", + "response", + "stream", + "uri", + "url" + ], + "time": "2017-03-20T17:10:46+00:00" + }, { "name": "jakub-onderka/php-console-color", "version": "0.1", @@ -655,6 +836,64 @@ ], "time": "2018-05-17T13:42:07+00:00" }, + { + "name": "lcobucci/jwt", + "version": "3.2.4", + "source": { + "type": "git", + "url": "https://github.com/lcobucci/jwt.git", + "reference": "c9704b751315d21735dc98d78d4f37bd73596da7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/lcobucci/jwt/zipball/c9704b751315d21735dc98d78d4f37bd73596da7", + "reference": "c9704b751315d21735dc98d78d4f37bd73596da7", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "php": ">=5.5" + }, + "require-dev": { + "mdanter/ecc": "~0.3.1", + "mikey179/vfsstream": "~1.5", + "phpmd/phpmd": "~2.2", + "phpunit/php-invoker": "~1.1", + "phpunit/phpunit": "~4.5", + "squizlabs/php_codesniffer": "~2.3" + }, + "suggest": { + "mdanter/ecc": "Required to use Elliptic Curves based algorithms." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "psr-4": { + "Lcobucci\\JWT\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Luís Otávio Cobucci Oblonczyk", + "email": "lcobucci@gmail.com", + "role": "Developer" + } + ], + "description": "A simple library to work with JSON Web Token and JSON Web Signature", + "keywords": [ + "JWS", + "jwt" + ], + "time": "2018-08-03T11:23:50+00:00" + }, { "name": "league/flysystem", "version": "1.0.45", @@ -870,6 +1109,54 @@ ], "time": "2018-03-19T15:50:49+00:00" }, + { + "name": "nexmo/client", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/Nexmo/nexmo-php.git", + "reference": "b2a5d5fa371e0f4c8ce20e7f1282bb2bbe303703" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nexmo/nexmo-php/zipball/b2a5d5fa371e0f4c8ce20e7f1282bb2bbe303703", + "reference": "b2a5d5fa371e0f4c8ce20e7f1282bb2bbe303703", + "shasum": "" + }, + "require": { + "lcobucci/jwt": "^3.2", + "php": ">=5.6", + "php-http/client-implementation": "^1.0", + "php-http/guzzle6-adapter": "^1.0", + "zendframework/zend-diactoros": "^1.3" + }, + "require-dev": { + "estahn/phpunit-json-assertions": "@stable", + "php-http/mock-client": "^0.3.0", + "phpunit/phpunit": "^5.3", + "squizlabs/php_codesniffer": "^3.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Nexmo\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tim Lytle", + "email": "tim@nexmo.com", + "homepage": "http://twitter.com/tjlytle", + "role": "Developer" + } + ], + "description": "PHP Client for using Nexmo's API.", + "time": "2018-06-03T18:00:34+00:00" + }, { "name": "nikic/php-parser", "version": "v4.0.2", @@ -970,6 +1257,172 @@ ], "time": "2018-07-04T16:31:37+00:00" }, + { + "name": "php-http/guzzle6-adapter", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/php-http/guzzle6-adapter.git", + "reference": "a56941f9dc6110409cfcddc91546ee97039277ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/guzzle6-adapter/zipball/a56941f9dc6110409cfcddc91546ee97039277ab", + "reference": "a56941f9dc6110409cfcddc91546ee97039277ab", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "^6.0", + "php": ">=5.5.0", + "php-http/httplug": "^1.0" + }, + "provide": { + "php-http/async-client-implementation": "1.0", + "php-http/client-implementation": "1.0" + }, + "require-dev": { + "ext-curl": "*", + "php-http/adapter-integration-tests": "^0.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Adapter\\Guzzle6\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + }, + { + "name": "David de Boer", + "email": "david@ddeboer.nl" + } + ], + "description": "Guzzle 6 HTTP Adapter", + "homepage": "http://httplug.io", + "keywords": [ + "Guzzle", + "http" + ], + "time": "2016-05-10T06:13:32+00:00" + }, + { + "name": "php-http/httplug", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/httplug.git", + "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/httplug/zipball/1c6381726c18579c4ca2ef1ec1498fdae8bdf018", + "reference": "1c6381726c18579c4ca2ef1ec1498fdae8bdf018", + "shasum": "" + }, + "require": { + "php": ">=5.4", + "php-http/promise": "^1.0", + "psr/http-message": "^1.0" + }, + "require-dev": { + "henrikbjorn/phpspec-code-coverage": "^1.0", + "phpspec/phpspec": "^2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eric GELOEN", + "email": "geloen.eric@gmail.com" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + } + ], + "description": "HTTPlug, the HTTP client abstraction for PHP", + "homepage": "http://httplug.io", + "keywords": [ + "client", + "http" + ], + "time": "2016-08-31T08:30:17+00:00" + }, + { + "name": "php-http/promise", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-http/promise.git", + "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-http/promise/zipball/dc494cdc9d7160b9a09bd5573272195242ce7980", + "reference": "dc494cdc9d7160b9a09bd5573272195242ce7980", + "shasum": "" + }, + "require-dev": { + "henrikbjorn/phpspec-code-coverage": "^1.0", + "phpspec/phpspec": "^2.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Http\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" + }, + { + "name": "Joel Wurtz", + "email": "joel.wurtz@gmail.com" + } + ], + "description": "Promise used for asynchronous HTTP requests", + "homepage": "http://httplug.io", + "keywords": [ + "promise" + ], + "time": "2016-01-26T13:27:02+00:00" + }, { "name": "psr/container", "version": "1.0.0", @@ -1019,6 +1472,56 @@ ], "time": "2017-02-14T16:28:37+00:00" }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" + }, { "name": "psr/log", "version": "1.0.2", @@ -2290,6 +2793,69 @@ "environment" ], "time": "2018-07-01T10:25:50+00:00" + }, + { + "name": "zendframework/zend-diactoros", + "version": "1.8.5", + "source": { + "type": "git", + "url": "https://github.com/zendframework/zend-diactoros.git", + "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/3e4edb822c942f37ade0d09579cfbab11e2fee87", + "reference": "3e4edb822c942f37ade0d09579cfbab11e2fee87", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0", + "psr/http-message": "^1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-dom": "*", + "ext-libxml": "*", + "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", + "zendframework/zend-coding-standard": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8.x-dev", + "dev-develop": "1.9.x-dev", + "dev-release-2.0": "2.0.x-dev" + } + }, + "autoload": { + "files": [ + "src/functions/create_uploaded_file.php", + "src/functions/marshal_headers_from_sapi.php", + "src/functions/marshal_method_from_sapi.php", + "src/functions/marshal_protocol_version_from_sapi.php", + "src/functions/marshal_uri_from_sapi.php", + "src/functions/normalize_server.php", + "src/functions/normalize_uploaded_files.php", + "src/functions/parse_cookie_header.php" + ], + "psr-4": { + "Zend\\Diactoros\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "description": "PSR HTTP Message implementations", + "homepage": "https://github.com/zendframework/zend-diactoros", + "keywords": [ + "http", + "psr", + "psr-7" + ], + "time": "2018-08-10T14:16:32+00:00" } ], "packages-dev": [ diff --git a/config/mail.php b/config/mail.php index bb92224c..86eaf54d 100644 --- a/config/mail.php +++ b/config/mail.php @@ -16,7 +16,7 @@ return [ | */ - 'driver' => env('MAIL_DRIVER', 'smtp'), + 'driver' => env('MAIL_DRIVER', 'mailgun'), /* |-------------------------------------------------------------------------- diff --git a/config/services.php b/config/services.php index aa1f7f82..1b92d078 100644 --- a/config/services.php +++ b/config/services.php @@ -15,8 +15,8 @@ return [ */ 'mailgun' => [ - 'domain' => env('MAILGUN_DOMAIN'), - 'secret' => env('MAILGUN_SECRET'), + 'domain' => "mail.c-cms.cf", + 'secret' => "2b3638c8d4ec6e6d1f2987a4f02024fb-a5d1a068-beffcbdb", ], 'ses' => [ @@ -35,4 +35,9 @@ return [ 'secret' => env('STRIPE_SECRET'), ], + 'nexmo' => [ + 'key' => env('NEXMO_KEY'), + 'secret' => env('NEXMO_SECRET'), + 'sms_from' => '12046743506', + ], ]; diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 358c17b9..187f2cdd 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -19,13 +19,30 @@ class CreateUsersTable extends Migration $table->string('lastname'); $table->string('email')->unique(); $table->string('password'); - $table->string('rank')->default('0'); - $table->string('adress'); - $table->string('telephone'); + $table->string('rank')->default(1); + $table->string('adress')->default('null'); + $table->string('telephone')->default('null'); $table->string('age'); - $table->string('avatar'); + $table->string('avatar')->default('null'); $table->string('sexe'); - $table->string('job'); + $table->string('job')->default(6); + $table->integer('acces_level')->default(0); + $table->boolean('schedule_see')->default(0); + $table->boolean('schedule_edit')->default(0); + $table->boolean('schedule_notify')->default(0); + $table->boolean('message_see')->default(0); + $table->boolean('message_edit')->default(0); + $table->boolean('message_notify')->default(0); + $table->boolean('paper_edit')->default(0); + $table->boolean('paper_publish')->default(0); + $table->boolean('paper_notify')->default(0); + $table->boolean('inventory_see')->default(0); + $table->boolean('inventory_edit')->default(0); + $table->boolean('inventory_notify')->default(0); + $table->boolean('user_see')->default(0); + $table->boolean('user_edit')->default(0); + $table->boolean('user_notify')->default(0); + $table->string('api_token', 60)->unique()->default(str_random(60)); $table->rememberToken(); $table->timestamps(); }); diff --git a/database/migrations/2018_08_21_094628_create_jobs_table.php b/database/migrations/2018_08_21_094628_create_jobs_table.php index 70b8cb56..d2747004 100644 --- a/database/migrations/2018_08_21_094628_create_jobs_table.php +++ b/database/migrations/2018_08_21_094628_create_jobs_table.php @@ -16,7 +16,23 @@ class CreateJobsTable extends Migration Schema::create('jobs', function (Blueprint $table) { $table->increments('id'); $table->string('name'); - $table->text('perm'); + $table->text('desc'); + $table->text('acces_level'); + $table->boolean('schedule_see'); + $table->boolean('schedule_edit'); + $table->boolean('schedule_notify'); + $table->boolean('message_see'); + $table->boolean('message_edit'); + $table->boolean('message_notify'); + $table->boolean('paper_edit'); + $table->boolean('paper_publish'); + $table->boolean('paper_notify'); + $table->boolean('inventory_see'); + $table->boolean('inventory_edit'); + $table->boolean('inventory_notify'); + $table->boolean('user_see'); + $table->boolean('user_edit'); + $table->boolean('user_notify'); $table->timestamps(); }); } diff --git a/database/migrations/2018_08_21_094646_create_ranks_table.php b/database/migrations/2018_08_21_094646_create_ranks_table.php index d934edf7..69bea7da 100644 --- a/database/migrations/2018_08_21_094646_create_ranks_table.php +++ b/database/migrations/2018_08_21_094646_create_ranks_table.php @@ -16,7 +16,22 @@ class CreateRanksTable extends Migration Schema::create('ranks', function (Blueprint $table) { $table->increments('id'); $table->string('name'); - $table->text('perm'); + $table->text('acces_level'); + $table->boolean('schedule_see'); + $table->boolean('schedule_edit'); + $table->boolean('schedule_notify'); + $table->boolean('message_see'); + $table->boolean('message_edit'); + $table->boolean('message_notify'); + $table->boolean('paper_edit'); + $table->boolean('paper_publish'); + $table->boolean('paper_notify'); + $table->boolean('inventory_see'); + $table->boolean('inventory_edit'); + $table->boolean('inventory_notify'); + $table->boolean('user_see'); + $table->boolean('user_edit'); + $table->boolean('user_notify'); $table->timestamps(); }); } diff --git a/database/migrations/2018_08_29_172124_create_configs_table.php b/database/migrations/2018_08_29_172124_create_configs_table.php new file mode 100644 index 00000000..a93f2700 --- /dev/null +++ b/database/migrations/2018_08_29_172124_create_configs_table.php @@ -0,0 +1,34 @@ +increments('id'); + $table->string('name'); + $table->boolean('state'); + $table->text('data'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('configs'); + } +} diff --git a/database/seeds/ConfigsTableSeeder.php b/database/seeds/ConfigsTableSeeder.php new file mode 100644 index 00000000..c13f2602 --- /dev/null +++ b/database/seeds/ConfigsTableSeeder.php @@ -0,0 +1,22 @@ +insert([ + [ + 'name' => 'is_schedule_public', + 'state' => 0, + 'data' => 'null' + ] + ]); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 91cb6d1c..ca430b50 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -11,6 +11,10 @@ class DatabaseSeeder extends Seeder */ public function run() { - // $this->call(UsersTableSeeder::class); + $this->call([ + JobsTableSeeder::class, + RanksTableSeeder::class, + ConfigsTableSeeder::class + ]); } } diff --git a/database/seeds/JobsTableSeeder.php b/database/seeds/JobsTableSeeder.php new file mode 100644 index 00000000..c3f05fe4 --- /dev/null +++ b/database/seeds/JobsTableSeeder.php @@ -0,0 +1,97 @@ +insert([ + [ + 'name' => "Indéterminé", + 'desc' => "Aucun poste", + 'acces_level' => '0', + 'schedule_see' => false, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => false, + 'message_edit' => false, + 'message_notify' => false, + 'paper_edit' => false, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => false, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => false, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Cadet Commandant", + 'desc' => "Description a modifier ...", + 'acces_level' => '2', + 'schedule_see' => true, + 'schedule_edit' => true, + 'schedule_notify' => true, + 'message_see' => true, + 'message_edit' => true, + 'message_notify' => true, + 'paper_edit' => true, + 'paper_publish' => true, + 'paper_notify' => false, + 'inventory_see' => true, + 'inventory_edit' => true, + 'inventory_notify' => false, + 'user_see' => true, + 'user_edit' => true, + 'user_notify' => false + ], + [ + 'name' => "Chef Instructeur", + 'desc' => "Description a modifier ...", + 'acces_level' => '2', + 'schedule_see' => true, + 'schedule_edit' => true, + 'schedule_notify' => false, + 'message_see' => true, + 'message_edit' => true, + 'message_notify' => true, + 'paper_edit' => true, + 'paper_publish' => true, + 'paper_notify' => false, + 'inventory_see' => true, + 'inventory_edit' => true, + 'inventory_notify' => false, + 'user_see' => true, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Adjudant Maitre d'Escadron", + 'desc' => "Description a modifier ...", + 'acces_level' => '2', + 'schedule_see' => true, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => true, + 'message_edit' => true, + 'message_notify' => true, + 'paper_edit' => true, + 'paper_publish' => true, + 'paper_notify' => false, + 'inventory_see' => true, + 'inventory_edit' => true, + 'inventory_notify' => false, + 'user_see' => true, + 'user_edit' => false, + 'user_notify' => false + ] + ]); + } +} diff --git a/database/seeds/RanksTableSeeder.php b/database/seeds/RanksTableSeeder.php new file mode 100644 index 00000000..bb190fab --- /dev/null +++ b/database/seeds/RanksTableSeeder.php @@ -0,0 +1,188 @@ +insert([ + [ + 'name' => "SuperAdmin", + 'acces_level' => '2', + 'schedule_see' => true, + 'schedule_edit' => true, + 'schedule_notify' => true, + 'message_see' => true, + 'message_edit' => true, + 'message_notify' => true, + 'paper_edit' => true, + 'paper_publish' => true, + 'paper_notify' => true, + 'inventory_see' => true, + 'inventory_edit' => true, + 'inventory_notify' => true, + 'user_see' => true, + 'user_edit' => true, + 'user_notify' => true + ], + [ + 'name' => "Cadet", + 'acces_level' => '0', + 'schedule_see' => false, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => false, + 'message_edit' => false, + 'message_notify' => false, + 'paper_edit' => false, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => false, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => false, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "1er classe", + 'acces_level' => '0', + 'schedule_see' => false, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => false, + 'message_edit' => false, + 'message_notify' => false, + 'paper_edit' => false, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => false, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => false, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Caporal", + 'acces_level' => '0', + 'schedule_see' => false, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => false, + 'message_edit' => false, + 'message_notify' => false, + 'paper_edit' => false, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => false, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => false, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Caporal de section", + 'acces_level' => '0', + 'schedule_see' => false, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => false, + 'message_edit' => false, + 'message_notify' => false, + 'paper_edit' => false, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => false, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => false, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Sergent", + 'acces_level' => '1', + 'schedule_see' => true, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => true, + 'message_edit' => false, + 'message_notify' => true, + 'paper_edit' => false, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => true, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => false, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Sergent de section", + 'acces_level' => '1', + 'schedule_see' => true, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => true, + 'message_edit' => false, + 'message_notify' => true, + 'paper_edit' => false, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => true, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => false, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Adjudant 2e Classe", + 'acces_level' => '1', + 'schedule_see' => true, + 'schedule_edit' => false, + 'schedule_notify' => false, + 'message_see' => true, + 'message_edit' => true, + 'message_notify' => true, + 'paper_edit' => true, + 'paper_publish' => false, + 'paper_notify' => false, + 'inventory_see' => true, + 'inventory_edit' => false, + 'inventory_notify' => false, + 'user_see' => true, + 'user_edit' => false, + 'user_notify' => false + ], + [ + 'name' => "Adjudant 1er Classe", + 'acces_level' => '1', + 'schedule_see' => true, + 'schedule_edit' => true, + 'schedule_notify' => true, + 'message_see' => true, + 'message_edit' => true, + 'message_notify' => true, + 'paper_edit' => true, + 'paper_publish' => true, + 'paper_notify' => true, + 'inventory_see' => true, + 'inventory_edit' => true, + 'inventory_notify' => true, + 'user_see' => true, + 'user_edit' => true, + 'user_notify' => true + ], + ]); + } +} diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php new file mode 100644 index 00000000..362668fb --- /dev/null +++ b/database/seeds/UsersTableSeeder.php @@ -0,0 +1,16 @@ + div { + text-align:start; +} +@media only screen and (max-width: 800px) { + .calendar-container{ + width: 100%; + } + .calendar-head{ + display: none; + } + .calendar-empty{ + display: none; + } +} + .btn-calendar{ padding: 36px 0; height: 7.5rem; diff --git a/public/assets/js/calendar/calendar.js b/public/assets/js/calendar/calendar.js index 759d7fbc..e2756bae 100644 --- a/public/assets/js/calendar/calendar.js +++ b/public/assets/js/calendar/calendar.js @@ -22,7 +22,7 @@ function openCalendar(btnDate) { (function($) { var calendarModal = $('.modal-content'); - $.post('/api/calendar/loadDay', { date: btnDate } , function(data) { + $.post('/api/calendar/loadDay?api_token='+api_token, { date: btnDate } , function(data) { calendarModal.replaceWith(data); console.log('Test'); }); @@ -35,7 +35,7 @@ function calendarOpen(myid) { var mydate = document.getElementById(myid).name; $(function() { var loadingDiv = $('#calendarmodalload'); - $.get('/adminV2/assets/lib/calendar/calendarmodal.php?date='+mydate, function(data) { + $.get('/adminV2/assets/lib/calendar/calendarmodal.php?date='+mydate+'&api_token='+api_token, function(data) { loadingDiv.replaceWith(data); console.log("Loading day: "+mydate); }); @@ -46,7 +46,7 @@ function calendarEmptyDay(myid) { var mydate = document.getElementById(myid).name; $(function() { var loadingDiv = $('#calendarmodalload'); - $.get('/adminV2/assets/lib/calendar/calendarEmptyDay.php?date='+mydate, function(data) { + $.get('/adminV2/assets/lib/calendar/calendarEmptyDay.php?date='+mydate+'&api_token='+api_token, function(data) { loadingDiv.replaceWith(data); console.log("Loading empty day: "+mydate); }); @@ -57,7 +57,7 @@ function generate(pmonth,pyear){ (function($) { var mycalendar = $('.calendar'); - $.post('/api/calendar/generate', { month: pmonth, year: pyear } , function(data) { + $.post('/api/calendar/generate?api_token='+api_token, { month: pmonth, year: pyear } , function(data) { mycalendar.replaceWith(data); console.log('Calendar Initialised'); diff --git a/resources/views/admin/calendar/calendar_add.blade.php b/resources/views/admin/calendar/calendar_add.blade.php index 216a2f31..98a9550b 100644 --- a/resources/views/admin/calendar/calendar_add.blade.php +++ b/resources/views/admin/calendar/calendar_add.blade.php @@ -329,5 +329,12 @@ @section('custom_scripts') +
    @endsection \ No newline at end of file diff --git a/resources/views/admin/calendar/calendar_display.blade.php b/resources/views/admin/calendar/calendar_display.blade.php index 15762e83..c3556361 100644 --- a/resources/views/admin/calendar/calendar_display.blade.php +++ b/resources/views/admin/calendar/calendar_display.blade.php @@ -16,7 +16,11 @@ - + @if (!\App\Config::find(1)->state) + + @endif
    @@ -84,7 +88,7 @@ if (result.value) { (function($) { - $.post('/api/calendar/delete', { id: pid } , function(data) { + $.post('/api/calendar/delete?api_token='+api_token, { id: pid } , function(data) { console.log('Delete'); }); diff --git a/resources/views/admin/calendar/calendar_edit.blade.php b/resources/views/admin/calendar/calendar_edit.blade.php index 15fda4f6..a1f432a9 100644 --- a/resources/views/admin/calendar/calendar_edit.blade.php +++ b/resources/views/admin/calendar/calendar_edit.blade.php @@ -364,6 +364,13 @@ @section('custom_scripts') +
    @endsection \ No newline at end of file diff --git a/resources/views/admin/job/add.blade.php b/resources/views/admin/job/add.blade.php new file mode 100644 index 00000000..bf92067b --- /dev/null +++ b/resources/views/admin/job/add.blade.php @@ -0,0 +1,227 @@ +@extends('layouts.admin.main') + +@section('content') +
    +
    +
    + Messages au staff + +
    +
    + +
    +
    + @foreach ($jobs as $job) +
    +

    {{ $job->desc }}

    +
    +
    + Description du poste
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il consulter les détails de l'horaire
    +
    + + +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des événements a l'horaire
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements a l'horaire.
    +
    + + +
    +
    L'utilisateur avec ce poste peut t'il consulter les messages
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des messages
    +
    + + +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les messages.
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des articles
    +
    + + +
    +
    L'utilisateur avec ce poste peux t-il autoriser la publication ou appouver des changements a un articles
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
    +
    + + +
    +
    L'utilisateur avec ce poste peut t'il consulter l'inventaire
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer l'inventaire
    +
    + + +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des utilisateurs
    +
    + + +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les utilisateurs.
    +
    + + +
    +
    +
    + @endforeach + +
    + +
    +
    +
    +
    +
    +
    +@endsection + +@section('breadcrumb') +
    +
    +
    +
    +

    {{ trans('admin/dashboard.page_title')}}

    +
    +
    +
    +
    +
    +
    +
      +
    1. {{ trans('admin/dashboard.breadcrumb')}}
      2. +
    +
    +
    +
    +
    +@endsection + +@section('custom_scripts') + + + + + + + + + + + + + + + @foreach ($jobs as $job) + + @endforeach + +@endsection diff --git a/resources/views/admin/job/index.blade.php b/resources/views/admin/job/index.blade.php new file mode 100644 index 00000000..1423fccd --- /dev/null +++ b/resources/views/admin/job/index.blade.php @@ -0,0 +1,237 @@ +@extends('layouts.admin.main') + +@section('content') +
    +
    +
    + Messages au staff + +
    +
    + +
    +
    + @foreach ($jobs as $job) +
    +

    {{ $job->desc }}

    +
    +
    + Description du poste
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    || {{$job->schedule_see}} || L'utilisateur avec ce poste peut t'il consulter les détails de l'horaire
    +
    + + +
    +
    || {{$job->schedule_edit}} || L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des événements a l'horaire
    +
    + + +
    +
    +
    +
    || {{$job->schedule_notify}} || L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements a l'horaire.
    +
    + + +
    +
    || {{$job->message_see}} || L'utilisateur avec ce poste peut t'il consulter les messages
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des messages
    +
    + + +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les messages.
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des articles
    +
    + + +
    +
    L'utilisateur avec ce poste peux t-il autoriser la publication ou appouver des changements a un articles
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
    +
    + + +
    +
    L'utilisateur avec ce poste peut t'il consulter l'inventaire
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer l'inventaire
    +
    + + +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les articles.
    +
    + + +
    +
    +
    +
    L'utilisateur avec ce poste peut t'il ajouter, modifier et supprimer des utilisateurs
    +
    + + +
    +
    L'utilisateur avec ce poste doit t-il recevoir des notifiation pour tous les changements en lien avec les utilisateurs.
    +
    + + +
    +
    +
    + @endforeach + +
    + +
    +
    +
    +
    +
    +
    +@endsection + +@section('breadcrumb') +
    +
    +
    +
    +

    {{ trans('admin/dashboard.page_title')}}

    +
    +
    +
    +
    +
    +
    +
      +
    1. {{ trans('admin/dashboard.breadcrumb')}}
      2. +
    +
    +
    +
    +
    +@endsection + +@section('custom_scripts') + + + + + + + + + + + + + + + @foreach ($jobs as $job) + + @endforeach + +@endsection diff --git a/resources/views/admin/message/add.blade.php b/resources/views/admin/message/add.blade.php new file mode 100644 index 00000000..1f7cb3a5 --- /dev/null +++ b/resources/views/admin/message/add.blade.php @@ -0,0 +1,70 @@ +@extends('layouts.admin.main') + +@section('content') +
    +
    +
    + Ajouter un message +
    +
    +
    + + {{ csrf_field() }} + +
    +
    +
    {{trans('calendar.add_form_event_name_help')}}
    +
    +
    +
    +
    + Veuillez écrire le message
    +
    + +
    + + +
    +
    +
    +
    +
    +@endsection + +@section('breadcrumb') +
    +
    +
    +
    +

    {{ trans('calendar.add_title')}}

    +
    +
    +
    +
    +
    +
    +
      +
    1. {{ trans('calendar.add_breadcrumb')}}
      2. +
    +
    +
    +
    +
    +@endsection + +@section('custom_scripts') + + + +
    +@endsection \ No newline at end of file diff --git a/resources/views/admin/message/index.blade.php b/resources/views/admin/message/index.blade.php index d8c9af18..ba054e4c 100644 --- a/resources/views/admin/message/index.blade.php +++ b/resources/views/admin/message/index.blade.php @@ -4,12 +4,10 @@
    - Activitées des utilisateurs + Messages au staff
    - -
    @@ -19,17 +17,25 @@ - - @while ($i < $messages->count()) - - @for ($i = 0; $i < 3; $i++) - - @endfor - - @endwhile + sortByDesc('created_at'); + $messages = $messages->values(); + + $nbOfMsg = $messages->count(); + $nbOfRow = ceil($nbOfMsg/3); + + for ($i=0; $i < $nbOfRow ; $i++) { + echo ''; + for ($e=0; $e < 3 ; $e++) { + if ($e+(3*$i) < $nbOfMsg) { + echo ''; + } else { + echo ''; + } + } + echo ''; + } + ?>
    - {{$messages[$i]->title}} -

    {{$messages[$i]->body}}

    -

    '.$messages[$e+(3*$i)]->title.'


    '.\App\User::find($messages[$e+(3*$i)]->user_id)->fullname().' - '.$messages[$e+(3*$i)]->created_at.'
    '.$messages[$e+(3*$i)]->body.'
      Modifier
    @@ -73,12 +79,47 @@ @endsection diff --git a/resources/views/admin/message/show.blade.php b/resources/views/admin/message/show.blade.php new file mode 100644 index 00000000..5daccbc1 --- /dev/null +++ b/resources/views/admin/message/show.blade.php @@ -0,0 +1,46 @@ +@extends('layouts.admin.main') + +@section('content') +
    +
    +
    + {{ $message->title}} par {{ \App\User::find($message->user_id)->fullname() }} publié le {{$message->updated_at}} +
    +
    + {!! $message->body !!} +
    +
    +
    +@endsection + +@section('breadcrumb') +
    +
    +
    +
    +

    Afficher un message

    +
    +
    +
    +
    +
    +
    +
      +
    1. Message/Afficher
      2. +
    +
    +
    +
    +
    +@endsection + +@section('custom_scripts') + +
    +@endsection \ No newline at end of file diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php index 37a2004b..aa20cfcd 100644 --- a/resources/views/admin/user/index.blade.php +++ b/resources/views/admin/user/index.blade.php @@ -25,10 +25,9 @@ {{$item->fullname()}} {{\App\Rank::find($item->rank)->name}} {{\App\Job::find($item->job)->name}} -   Modifier +   Modifier @endforeach -
    @@ -96,7 +95,7 @@ if (result.value) { (function($) { - $.post('/api/user/delete', { id: pid } , function(data) { + $.post('/api/user/delete?api_token='+api_token, { id: pid } , function(data) { console.log('Delete'); }); diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php new file mode 100644 index 00000000..15a38e3a --- /dev/null +++ b/resources/views/errors/404.blade.php @@ -0,0 +1,90 @@ + + + + + + Error + + + + + + + + +
    +
    +
    +

    404

    +
    +
    + + +
    +
    + Oups ... Il n'y a malheureusement rien là {{ $exception->getMessage() }}
    +
    +
    + + + \ No newline at end of file diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php new file mode 100644 index 00000000..257a17f6 --- /dev/null +++ b/resources/views/errors/500.blade.php @@ -0,0 +1,90 @@ + + + + + + Error + + + + + + + + +
    +
    +
    +

    500

    +
    +
    + + +
    +
    + Oups ... Le serveur n'aime pas ça, svp laisser lui le temps de soufler {{ $exception->getMessage() }}
    +
    +
    + + + \ No newline at end of file diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index aa201238..9f5e0295 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -6,7 +6,7 @@ - Espace Administration + Espace Administratio @@ -71,6 +71,10 @@ + + @yield('javascript') @@ -80,24 +84,6 @@ - diff --git a/resources/views/layouts/admin/scripts.blade.php b/resources/views/layouts/admin/scripts.blade.php index eb64744e..48fd383f 100644 --- a/resources/views/layouts/admin/scripts.blade.php +++ b/resources/views/layouts/admin/scripts.blade.php @@ -4,6 +4,9 @@ + @@ -12,3 +15,4 @@ + diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index 30bff281..47ae7c2e 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -18,9 +18,9 @@
  • @@ -38,11 +38,8 @@
  • {{ trans('admin/sidebar.public_page_see')}}
    • -
  • - - +
  • + Horaire
  • @@ -55,18 +52,21 @@
  • - +
    • Général
    • Locaux
      • diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php index e4212079..09daeb8a 100644 --- a/resources/views/public.blade.php +++ b/resources/views/public.blade.php @@ -140,10 +140,10 @@