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

skolehjem/resources/views/app/events/index.blade.php

@@ -39,8 +39,9 @@
 
         /*Alert box*/
         .alert {
+            opacity: 0.8;
             padding: 20px;
-            background-color: #f44336;
+            background-color: #00788A;
             color: white;
             border-radius: 10px;
         }

skolehjem/resources/views/app/washing-reservations/index.blade.php

@@ -16,7 +16,7 @@
                     <h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
                     <div class="row align-items-center">
                         <span style="font-size: 4vw; white-space: pre-line;"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}
-                            - {{ $reservation->name }}</span>
+                            - {{ \App\Location::query()->where('id', '=', \App\WashingMachine::query()->find($reservation->machine_id)->location_id)->first()->name }}</span>
                         <form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
                             @csrf
                             @method("delete")