From 84f5c51c48f37d985205709b87630636204990b5 Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 7 Sep 2020 08:28:49 +0200 Subject: [PATCH] v0.11.2b - Made a support user account --- .../app/Http/Controllers/RolesController.php | 14 ++++- .../app/Http/Controllers/UserController.php | 55 ++++++++++++----- skolehjem/public/css/webappdark.css | 4 +- .../resources/sass/webapp/_defaultdark.scss | 4 +- .../views/admin/users/create.blade.php | 4 +- .../resources/views/app/news/index.blade.php | 59 ++++++++++++++----- 6 files changed, 103 insertions(+), 37 deletions(-) diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index 29aca2c..e3bd28b 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -29,7 +29,7 @@ class RolesController extends Controller */ public function index(Request $request) { - $roles = Role::query()->paginate($request->input("limit", 20)); + $roles = Role::query()->where("id", "!=", 1)->paginate($request->input("limit", 20)); return Response::detect("roles.index", [ "roles" => $roles]); } @@ -42,7 +42,6 @@ class RolesController extends Controller public function create() { return Response::detect("roles.create"); - } /** @@ -105,6 +104,9 @@ class RolesController extends Controller */ public function edit($id) { + if($id == 1) + return redirect()->route("roles.index"); + $role = Role::find($id); return Response::detect("roles.edit", ["role" => $role]); } @@ -118,6 +120,9 @@ class RolesController extends Controller */ public function update(Request $request, $id) { + if($id == 1) + return redirect()->route("roles.index"); + $data = $request->validate([ "name" => "required|max:255", "description" => "required|max:255" @@ -165,6 +170,9 @@ class RolesController extends Controller */ public function destroy($id) { + if($id == 1) + return redirect()->route("roles.index"); + $role = Role::find($id); $role->delete(); return redirect()->route("roles.index"); @@ -179,7 +187,7 @@ class RolesController extends Controller "\"Update\"". "\"Delete\"". ""; - $roles = DB::table('roles')->where('name', 'LIKE',$request->search.'%')->get(); + $roles = DB::table('roles')->where("id", "!=", 1)->where('name', 'LIKE',$request->search.'%')->get(); if(count($roles) !== 0){ foreach ($roles as $key => $role){ diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index a291610..f43ba51 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -42,7 +42,7 @@ class UserController extends Controller public function index(Request $request) { //$users = User::query()->paginate($request->query("page", 20)); - $users = User::query()->orderBy('id', 'asc')->paginate(20); + $users = User::query()->where("id", "!=", 1)->orderBy('id', 'asc')->paginate(20); return Response::detect("users.index", [ "users" => $users ]); } @@ -91,10 +91,16 @@ class UserController extends Controller $user = new User($data); + if($request->file("resource")) { + $user->resource_id = ResourceController::store($request)->id; + } + $user->assignRole($roles); $user->save(); + + return redirect()->route('users.index'); } @@ -124,6 +130,10 @@ class UserController extends Controller $roles = Role::all(); $user = User::find($id); + if($id == 1) + return redirect()->route("users.index"); + + return Response::detect("users.edit", [ "user" => $user, "roles" => $roles, @@ -139,6 +149,9 @@ class UserController extends Controller */ public function update(Request $request, $id) { + if($id == 1) + return redirect()->route("users.index"); + $user = User::find($id); if($request->file("resource")) { @@ -191,6 +204,8 @@ class UserController extends Controller */ public function destroy($id) { + if($id == 1) + return redirect()->route("users.index"); if(Auth::user()->hasPermissionTo("user.delete")) { $user = User::find($id); @@ -421,6 +436,7 @@ class UserController extends Controller "Email". "Tlf nr". "Rolle(r)". + 'ShowImage'. "\"Update\"". "\"Delete\"". ""; @@ -436,18 +452,18 @@ class UserController extends Controller //filter search if($request->isCheck === "navn") - $users = User::query()->where('name_first', 'LIKE',$request->search.'%')->get(); + $users = User::query()->firstWhere("id", "!=", 1)->where('name_first', 'LIKE',$request->search.'%')->get(); elseif ($request->isCheck === "efternavn") - $users = User::query()->where('name_last', 'LIKE',$request->search.'%')->get(); + $users = User::query()->firstWhere("id", "!=", 1)->where('name_last', 'LIKE',$request->search.'%')->get(); elseif ($request->isCheck === "email") - $users = User::query()->where('email', 'LIKE',$request->search.'%')->get(); + $users = User::query()->firstWhere("id", "!=", 1)->where('email', 'LIKE',$request->search.'%')->get(); elseif ($request->isCheck === "telefon") - $users = User::query()->where('phone', 'LIKE',$request->search.'%')->get(); + $users = User::query()->firstWhere("id", "!=", 1)->where('phone', 'LIKE',$request->search.'%')->get(); elseif ($request->isCheck === "telefon") - $users = User::query()->where('phone', 'LIKE',$request->search.'%')->get(); + $users = User::query()->firstWhere("id", "!=", 1)->where('phone', 'LIKE',$request->search.'%')->get(); elseif ($request->isCheck) { $roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get(); - $usersTEMP = User::all(); + $usersTEMP = User::query()->where("id", "!=", 1)->get(); $users = []; foreach ($usersTEMP as $user) { @@ -460,20 +476,22 @@ class UserController extends Controller } if($request->search == "") - $users = User::all(); + $users = User::query()->where("id", "!=", 1)->get(); } else { $usersTEMP = User::query() + ->whereKeyNot(1) ->where('name_first', 'LIKE', $request->search . '%') ->orWhere('name_last', 'LIKE', $request->search . '%') ->orWhere('phone', 'LIKE', $request->search . '%') ->orWhere('email', 'LIKE', $request->search . '%') - ->get(); + ->get()->except(1); + $roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get(); $users = new Collection(); - $allUsers = User::all(); + $allUsers = User::query()->where("id", "!=", 1)->get(); //For hver user i systemet, check om han har en af de roller der matcher søgeordet foreach ($allUsers as $user) { @@ -501,7 +519,7 @@ class UserController extends Controller } if($request->search == "") - $users = User::all(); + $users = User::query()->where("id", "!=", 1)->get(); $unique = $users->flatten()->unique('phone'); @@ -515,11 +533,14 @@ class UserController extends Controller $roles = null; $rolesString = null; - foreach (User::all() as $usr) { + foreach (User::query()->where("id", "!=", 1)->get() as $usr) { if($usr->id == $user->id) $roles = $usr->roles; } + if(!is_a($roles, 'Illuminate\Database\Eloquent\Collection')) + dd([$roles, $user]); + for($i = 0; $i < count($roles); $i++) { if(count($roles)-1 != $i) { $rolesString .= $roles[$i]->name.","; @@ -533,8 +554,13 @@ class UserController extends Controller '' . $user->name_last . ''. '' . $user->email . ''. '' . $user->phone .''. - '' . $rolesString .''. - ' $user->id ]) . '">Update'. + '' . $rolesString .''; + if($user->resource_id !== null) + $output .= ''; + else + $output .= ''; + + $output .= ' $user->id ]) . '">Update'. '
$user->id ]). '" class="w-100 nostyle">'. csrf_field(). method_field("delete"). @@ -553,6 +579,7 @@ class UserController extends Controller ''. ''. ''. + ''. ''; } return Response($output); diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css index 15d8a9e..aceed77 100644 --- a/skolehjem/public/css/webappdark.css +++ b/skolehjem/public/css/webappdark.css @@ -7127,11 +7127,11 @@ main { html, body { - background-color: #2c2f33; + background-color: #2F3136; } main { - background-color: #2c2f33; + background-color: #2F3136; } * { diff --git a/skolehjem/resources/sass/webapp/_defaultdark.scss b/skolehjem/resources/sass/webapp/_defaultdark.scss index 76a950f..f59b9b8 100644 --- a/skolehjem/resources/sass/webapp/_defaultdark.scss +++ b/skolehjem/resources/sass/webapp/_defaultdark.scss @@ -1,9 +1,9 @@ html, body { - background-color: #2c2f33; + background-color: #2F3136; } main { - background-color: #2c2f33; + background-color: #2F3136; } * { diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 668d55e..49d2903 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -11,7 +11,7 @@ @section("content")

Opret Bruger:

- + @csrf @@ -42,6 +42,8 @@ @endforeach + +
@endsection diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php index d4ddf37..b741746 100644 --- a/skolehjem/resources/views/app/news/index.blade.php +++ b/skolehjem/resources/views/app/news/index.blade.php @@ -10,7 +10,7 @@ margin-bottom: 7px; width: auto; @if(request()->cookie("mode") == "dark") - background-color: rgba(0,0,0, 0.3); + background-color: #36393F; @else background-color: white; @endif @@ -69,12 +69,27 @@ .information{ text-align: center; + @if(request()->cookie("mode") == "dark") + background-color: #202225; + @else background-color: rgba(240,240,240,0.8); + @endif border-bottom: 1px solid rgba(0, 0, 0, .1); width: 100%; height: 25px; } + .information2{ + text-align: center; + @if(request()->cookie("mode") == "dark") + background-color: #202225; + @else + background-color: rgba(240,240,240,0.8); + @endif + width: 100%; + height: 25px; + } + .card > .img > a > img, .card > .img > img { width: 100%; } @@ -125,20 +140,34 @@
{{ $new->subname }}
@if($new->resource_id !== null)
- @endif -
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} | {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}}
-
- {!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!} -
- @if (count(\App\UserEvent::query()->where('event_id', '=', $new->arrangement_id)->where('user_id', '=', Auth::user()->id)->get()) > 0) - {{__('msg.afmeld')}} - @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}} - {{__('msg.tilmeld')}} - @endif - $new->arrangement_id ])}}">{{__('msg.læsmere')}} - $new->arrangement_id ])}}">{{__('msg.sedeltagere')}} +
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} | {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}}
+
+ {!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!} +
+ @if (count(\App\UserEvent::query()->where('event_id', '=', $new->arrangement_id)->where('user_id', '=', Auth::user()->id)->get()) > 0) + {{__('msg.afmeld')}} + @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}} + {{__('msg.tilmeld')}} + @endif + $new->arrangement_id ])}}">{{__('msg.læsmere')}} + $new->arrangement_id ])}}">{{__('msg.sedeltagere')}} +
-
+ @else +
+ {!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!} +
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->date))->format('d/m/Y \k\l\. H:i') }} | {{\App\Event::query()->where('id', '=', $new->arrangement_id)->first()->accountable}}
+
+ @if (count(\App\UserEvent::query()->where('event_id', '=', $new->arrangement_id)->where('user_id', '=', Auth::user()->id)->get()) > 0) + {{__('msg.afmeld')}} + @else {{-- ^ If you're already participating in the event, then show a ´cancel´ button - v Else show a ´participate´ button --}} + {{__('msg.tilmeld')}} + @endif + $new->arrangement_id ])}}">{{__('msg.læsmere')}} + $new->arrangement_id ])}}">{{__('msg.sedeltagere')}} +
+
+ @endif
@else
@@ -151,7 +180,7 @@
{!! \App\Helpers::closetags(substr($new->content, 0, 300) ) !!} @if ($new->type == 'Guide') {{-- Else if's displaying guides, then show `Læs mere` --}} -
+
$new->arrangement_id])}}" class="sde-blue">{{__('msg.læsmere')}}
@endif {{-- Else if it's a menu or news, then don't show a button at bottom --}}