Romain/portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import app Models User change

Browse Source
This commit is contained in:
Romulus21
2020-09-11 20:42:45 +02:00
parent f466ce7cc9 c27bc367ef
commit e91671a78f
34 changed files with 665 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
@@ -60,7 +60,7 @@ class RegisterController extends Controller
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\User
* @return \App\Models\User
*/
protected function create(array $data)
{

2
app/Http/Controllers/EventController.php
View File

@@ -6,7 +6,7 @@ use App\Http\Requests\EventRequest;
use App\Models\Event;
use App\Http\Resources\Event as EventResource;
use App\Models\EventGuestsNonUsers;
use App\User;
use App\Models\User;
use Illuminate\Http\Request;
class EventController extends Controller

2
app/Http/Controllers/ImageController.php
View File

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
use App\Http\Resources\Image as ImageResource;
use App\Models\Memo;
use App\User;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\File;
use Intervention\Image\Facades\Image;

2
app/Http/Controllers/UserController.php
View File

@@ -3,7 +3,7 @@
namespace App\Http\Controllers;
use App\Jobs\SendMailNewUserJob;
use App\User;
use App\Models\User;
use App\Http\Resources\User as UserResource;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Str;

4
app/Http/Resources/Event.php
View File

@@ -3,7 +3,7 @@
namespace App\Http\Resources;
use App\Http\Resources\User as UserResource;
use App\Http\Resources\EventCategory as EventCategoryRessource;
use App\Http\Resources\EventCategory as EventCategoryResource;
use App\Http\Resources\EventGuestWithoutEmail as GuestsWithoutEmailResource;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -28,7 +28,7 @@ class Event extends JsonResource
'start_date' => $this->start_date,
'end_date' => $this->end_date,
'location' => $this->location,
'category' => new EventCategoryRessource($this->category),
'category' => new EventCategoryResource($this->category),
'invitations' => UserResource::collection($this->guests),
'invitations-with-email' => [
'data' => GuestsWithoutEmailResource::collection($this->emailedGuests)