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

 Conflicts:

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

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

@@ -17,15 +17,20 @@
         .toggle__text::before {
             border-color: black;
         }
+        .ck-editor__main {
+            margin-bottom: 1rem;
+        }
     </style>
     <h1>Opret Aktivitet:</h1>
     <form method="post" action="{{ route("events.store") }}">
         @csrf
-        <label for="name">Navn:</label>
+        <label for="name">Event Navn:</label>
         <input type="text" name="name" id="name" max="60" required>
-        <label for="description">Beskrivelse:</label>
-        <input type="text" name="description" id="description" max="500" required>
-        <label for="date">Aktivitet dato:</label>
+        <label for="accountable">Event Ansvarlig:</label>
+        <input type="text" name="accountable" id="accountable" required>
+        <label for="description">Event Beskrivelse:</label>
+        <textarea name="description" id="editor"></textarea>
+        <label for="date">Event dato:</label>
         <input type="datetime-local" name="date" id="date" required>
         <label class="toggle">
             <input class="toggle__input" type="checkbox" name="newsoption">
@@ -35,4 +40,15 @@
         </label>
         <input type="submit" class="btn btn-dark text-white" value="Opret">
     </form>
+
+    <script>
+        ClassicEditor
+            .create( document.querySelector( '#editor' ))
+            .then( editor => {
+                console.log( editor );
+            } )
+            .catch( error => {
+                console.error( error );
+            } );
+    </script>
 @endsection

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

@@ -24,8 +24,10 @@
         @method("PUT")
         <label for="event_title">Event Titel:</label>
         <input value="{{$event->name}}" type="text" name="name" id="event_title" required>
+        <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>
+        <input value="{!! $event->description !!}" type="text" name="description" id="description" required>
         <label for="date">Beskrivelse</label>
         <input value="{{$event->date}}" type="datetime-local" name="date" id="date" required>
         <label class="toggle">

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

@@ -23,7 +23,7 @@
     <table class="tbl mt-2">
         <tr>
             <th>Event Navn</th>
-            <th>Event Beskrivelse</th>
+            <th>Event Ansvarlig</th>
             <th>Event Dato</th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/eye.svg') }}" alt="Show"></th>
             <th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
@@ -32,7 +32,7 @@
         @foreach($events as $event)
             <tr>
                 <td>{{ $event->name }}</td>
-                <td>{{ $event->description }}</td>
+                <td>{{ $event->accountable }}</td>
                 <td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</td>
                 <td><a href="{{ route("events.signups", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/eye-dark.svg') }}" alt="Show"></a></td>
                 <td><a href="{{ route("events.edit", [ "event" => $event ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>

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

@@ -47,13 +47,12 @@
                     options: [
                         { model: 'paragraph', title: 'Paragraph', class: 'ck-heading_paragraph' },
                         { model: 'heading1', view: 'h3', title: 'Heading 1', class: 'sde-blue' },
-                        { model: 'heading2', view: 'h4', title: 'Heading 2', class: 'sde-blue' }
+                        { model: 'heading2', view: 'h4', title: 'Heading 2', class: 'sde-blue' },
                     ]
                 }
             } )
             .catch( error => {
                 console.log( error );
             } );
-
     </script>
 @endsection

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

@@ -19,6 +19,9 @@
                     <span class="toggle__text text-white">Remember password</span>
                 </span>
             </label>
+            {!! session()->get('success#passwordchange') !!}
+            {!! session()->get('error#wrongcredentials') !!}
+            {!! session()->get('success#loggedout') !!}
             <input class="btn btn-dark" type="submit" value="Sign in">
         </form>
         <a class="text-white text-center" href="{{ route('users.show-forgot') }}">Forgot password?</a>