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

skolehjem/resources/views/admin/events/create.blade.php

@@ -17,10 +17,17 @@
         .toggle__text::before {
             border-color: black;
         }
-        .ck-editor__main {
+
+        .tox-notification {
+            display: none !important;
+        }
+
+        .tox {
+            border-radius: 4px !important;
             margin-bottom: 1rem;
         }
     </style>
+    <script src="https://cdn.tiny.cloud/1/ikwmbvigw8ass90tn37xiql6mk1gjoks77t3m6tld60hdjov/tinymce/5/tinymce.min.js" referrerpolicy="origin"></script>
     <h1>Opret Aktivitet:</h1>
     <form method="post" action="{{ route("events.store") }}">
         @csrf
@@ -42,13 +49,13 @@
     </form>
 
     <script>
-        ClassicEditor
-            .create( document.querySelector( '#editor' ))
-            .then( editor => {
-                console.log( editor );
-            } )
-            .catch( error => {
-                console.error( error );
-            } );
+        tinymce.init({
+            selector: 'textarea',
+            setup: function (editor) {
+                editor.on('change', function () {
+                    tinymce.triggerSave();
+                });
+            }
+        });
     </script>
 @endsection

skolehjem/resources/views/admin/events/edit.blade.php

@@ -17,7 +17,17 @@
         .toggle__text::before {
             border-color: black;
         }
+
+        .tox-notification {
+            display: none !important;
+        }
+
+        .tox {
+            border-radius: 4px !important;
+            margin-bottom: 1rem;
+        }
     </style>
+    <script src="https://cdn.tiny.cloud/1/ikwmbvigw8ass90tn37xiql6mk1gjoks77t3m6tld60hdjov/tinymce/5/tinymce.min.js" referrerpolicy="origin"></script>
     <h1>Rediger Link:</h1>
     <form method="post" action="{{route("events.update", ["event" => $event])}}">
         @csrf
@@ -27,7 +37,7 @@
         <label for="accountable">Event Ansvarlig:</label>
         <input value="{{$event->accountable}}" type="text" name="accountable" id="accountable" required>
         <label for="description">Beskrivelse</label>
-        <input value="{!! $event->description !!}" type="text" name="description" id="description" required>
+        <textarea type="text" name="description" id="description" required>{!! $event->description !!}</textarea>
         <label for="date">Beskrivelse</label>
         <input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
         <label class="toggle">
@@ -38,4 +48,15 @@
         </label>
         <input type="submit" class="btn btn-dark text-white" value="Rediger">
     </form>
+
+    <script>
+        tinymce.init({
+            selector: 'textarea',
+            setup: function (editor) {
+                editor.on('change', function () {
+                    tinymce.triggerSave();
+                });
+            }
+        });
+    </script>
 @endsection

skolehjem/resources/views/admin/menuplans/index.blade.php

@@ -24,20 +24,12 @@
     <table class="tbl mt-2">
         <tr>
             <th>Uge</th>
-            <th>Mandag</th>
-            <th>Tirsdag</th>
-            <th>Onsdag</th>
-            <th>Torsdag</th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
         </tr>
         @foreach($menuPlans as $menuplan)
         <tr>
             <td>{{$menuplan->week}}</td>
-            <td>{{$menuplan->monday}}</td>
-            <td>{{$menuplan->tuesday}}</td>
-            <td>{{$menuplan->wednesday}}</td>
-            <td>{{$menuplan->thursday}}</td>
             <td><a href="{{ route("menu-plans.edit", [ "menu_plan" => $menuplan ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
             <td><form method="post" action="{{ route("menu-plans.destroy", [ "menu_plan" => $menuplan ]) }}" class="w-100 nostyle">
                     @csrf

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

@@ -48,9 +48,13 @@
     </style>
     <main style="min-height: calc(100% - 61.3px)">
         <table class="tbl" style="margin: 2rem 8px 0px 8px; width: calc(100% - 16px);">
-            <tr>
-                <th style="text-align: center;">{{ __('msg.tilmeldtesnavn') }}</th>
-            </tr>
+            @if(count($events) == 0)
+                <p class="text-center mt-2">{{__('msg.ingentilmeldte')}}</p>
+            @else
+                <tr>
+                    <th style="text-align: center;">{{ __('msg.tilmeldtesnavn') }}</th>
+                </tr>
+            @endif
             @foreach($events as $UE)
                 @if ($UE->name_first != null && $UE->name_last != null && $UE->phone != null && $UE->event_id != null && $UE->user_id != null)
                     <tr>
@@ -58,9 +62,6 @@
                     </tr>
                 @endif
             @endforeach
-            @if(count($events) == 0)
-                <p class="text-center">Der er ingen tilmeldte</p>
-            @endif
         </table>
         <button onclick="window.history.back();" style="margin-top: auto; margin-bottom: 8px;" class="btn btn-sde-blue text-white">{{ __('msg.tilbage') }}</button>
     </main>