Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp

skolehjem/app/Http/Controllers/UserEventController.php

@@ -20,9 +20,14 @@ class UserEventController extends Controller
         return Response::detect("events.yourevents", [ "userevents" => $userevents ]);
     }
 
+    public function store() {
+
+    }
+
     /**
      * Update the specified resource in storage.
      *
+     * @param UserEvent $eventid
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
@@ -72,4 +77,12 @@ class UserEventController extends Controller
     public function show()
     {
     }
+
+    public function edit() {
+
+    }
+
+    public function update() {
+
+    }
 }

skolehjem/app/Http/Controllers/WashingReservationController.php

@@ -179,7 +179,6 @@ class WashingReservationController extends Controller
 
 
 
-
     function search(Request $request){
         if($request->ajax()){
             $output = "<tr>".
@@ -192,6 +191,12 @@ class WashingReservationController extends Controller
 
 
             //Kan ikke søge på vaskemaskine da det er en foreign key
+            //Kan ikke søge på bruger
+            //Man kan søge på tidspunkt!
+
+
+
+
 
             //filter search
             if($request->isCheck === "vaskemaskine")
@@ -237,5 +242,6 @@ class WashingReservationController extends Controller
 
 
 
+
 }
 

skolehjem/resources/views/admin/layout/header.blade.php

@@ -3,7 +3,7 @@
         <img src="{{ URL::asset('/images/logos/Logo-hvid.svg') }}" class="h-100 brand" alt="Syddansk Erhvervsskole">
 
         @auth
-            <a href="" class="btn btn-dark text-white m-0 ml-auto">Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}</a>
+            <a href="{{ route("users.account") }}" class="btn btn-dark text-white m-0 ml-auto">Bruger: {{ ucfirst(Auth::user()->name_first) }} {{ ucfirst(Auth::user()->name_last) }}</a>
             <a href="{{ route('users.logout') }}" class="btn btn-dark text-white m-0 ml-1 mr-1">Log ud</a>
         @else
             <a href="{{ route('users.login') }}" class="btn btn-dark text-white m-0 ml-auto mr-1">Log ind</a>

skolehjem/resources/views/admin/users/account.blade.php

@@ -0,0 +1,40 @@
+@extends("admin.layout.base")
+@extends("admin.layout.header")
+
+@section("title")
+    Account
+@endsection
+
+@section("path")
+    <a href="" class="text-white">Profil Oplysninger</a> /
+@endsection
+
+@section("content")
+    <table class="tbl mt-2">
+        <tr>
+            <th>Fornavn</th>
+            <th>Efternavn</th>
+            <th>Email</th>
+            <th>Tlf nr</th>
+            <th>Rolle(r)</th>
+            <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
+        </tr>
+            <tr>
+                <td>{{ Auth::user()->name_first }}</td>
+                <td>{{ Auth::user()->name_last }}</td>
+                <td>{{ Auth::user()->email }}</td>
+                <td>{{ Auth::user()->phone }}</td>
+                <td>
+
+                    @for($i = 0; $i < count(Auth::user()->roles); $i++)
+                        @if(count(Auth::user()->roles)-1 != $i)
+                            {{Auth::user()->roles[$i]->name}},
+                        @else
+                            {{Auth::user()->roles[$i]->name}}
+                        @endif
+                    @endfor
+                </td>
+                <td><a href="{{ route("users.edit", [ "user" => Auth::user()->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
+            </tr>
+    </table>
+@endsection