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/news/index.blade.php

@@ -45,16 +45,26 @@
 
         .img{
             width: 1em;
+            height: calc(1em + 20px);
             margin-top: 5px;
             margin-bottom: 5px;
             margin-left: 5px;
             font-size: 20px;
-            padding: 3px 10px;
-            border-color: cadetblue;
+            padding: 0 10px;
+            border-color: #00788a;
             border-radius: 100%;
-            background-color: cadetblue;
+            background-color: #00788a;
             line-height: 30px;
             float: left;
+            display: flex;
+            justify-content: center;
+        }
+
+        .img > a {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            justify-content: center;
         }
 
         .information{
@@ -69,7 +79,7 @@
             width: 100%;
         }
 
-        html,body,main{
+        html,main{
             @if(request()->cookie("mode") == "dark")
 
             @else

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

@@ -174,11 +174,7 @@
                 //Fill locations
                 fillLocations(data["locations"], location_id);
 
-                //Fill washing-machines
-                fillMachines(data["washingmachines"], machine_id);
-
-                //Fill events (times) and remove unavailable_times
-                fillTimes(data["unavailable_times"], datetext, date);
+                updateForm();
             });
         }
 
@@ -410,7 +406,7 @@
                             var data = response.data;
 
                             //Fill events (times) and remove unavailable_times
-                            fillTimes(data["unavailable_times"], dateText);
+                            fillTimes(data["unavailable_times"], dateText, momentDate);
                         });
                 });
         }

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")