Merge remote-tracking branch 'origin/master'

2020-08-19 10:35:51 +02:00
parent 3f2dcf1a0c 5aebe1328d
commit ae306c8f1b
14 changed files with 251 additions and 6 deletions
@@ -79,6 +79,7 @@
                    </div>
                </div>
            @endforeach
+            {{ $events->links() }}
        @else
            <p class="text-center" style="margin-bottom: auto">{{__('msg.dereringenaktiviteter')}}!</p>
        @endif
@@ -54,6 +54,7 @@
                    </div>
                </div>
            @endforeach
+            {{ $guides->links() }}
        @else
            <p style="margin: 0 18px; margin-bottom: auto; text-align: center">{{__('msg.dereringenvejledninger')}}.</p>
        @endif
@@ -80,6 +80,12 @@
        {{ __('msg.logud') }}
    </a>
 </div>
+<style>
+    option, textarea {
+        color: black;
+    }
+
+</style>
@yield("content")
 <script src="{{ mix("/js/app.js") }}"></script>
@if(request()->cookie("mode") == "dark")
@@ -69,8 +69,11 @@
        @endforeach
        @if(count(\App\News::query()->orderBy("created_at", "desc")->get()) == 0)
            <p class="text-center">{{__('msg.ingennyheder')}}</p>
+        @else
+            {{ $news->links() }}
        @endif
            <div id="snackbar"></div>
+
    </main>
@endsection
@section("scripts")
@@ -45,12 +45,14 @@
    <script src="{{ asset("/js/moment-with-locales.min.js") }}"></script>
    <script src="{{ asset("/js/da.min.js") }}"></script>
    <script>
+        //Global vars to use outside functions
        var momentDate = null;
        var dateText = null;

        //Custom forEach
        NodeList.prototype.forEach = Array.prototype.forEach;

+        //Generates the calender when the site loads
        function generateCalendar(weekOffset = 0) {
            const week = (moment().week() + weekOffset);

@@ -109,6 +111,7 @@
            calendar.appendChild(calendarBody);
        }

+        //When a date is selected
        function onDateSelect(date, dayHolder, datetext) {
            //Set selected date and dateText
            momentDate = date;
@@ -22,6 +22,8 @@
        @endforeach
        @if(count($reservations) < 1)
            <p style="margin: 0 18px;">{{__('msg.duharingenreservationer')}}.</p>
+        @else
+            {{ $reservations->links() }}
        @endif
        <a href="{{ route("washing-reservations.create") }}" class="btn btn-sde-blue mt-auto mb-1">{{__('msg.reservervaskemaskine')}}</a>
    </main>