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

2020-08-11 09:15:43 +02:00 · 2020-08-11 09:15:43 +02:00 · 40b0c8c805
parent dd017311f7 64c260a63f
commit 40b0c8c805
12 changed files with 111 additions and 36 deletions
--- a/skolehjem/app/Http/Middleware/SetLocale.php
+++ b/skolehjem/app/Http/Middleware/SetLocale.php
@ -3,6 +3,7 @@
 namespace App\Http\Middleware;

 use Closure;
+use Illuminate\Http\Response;

 class SetLocale
 {
@ -15,7 +16,11 @@ class SetLocale
     */
    public function handle($request, Closure $next)
    {
-        app()->setLocale($request->user()->getLocale($request));
+        if($request->user() != null)
+            app()->setLocale($request->user()->getLocale($request));
+        else
+            return redirect()->route("users.login");
+
        return $next($request);
    }
 }
--- a/skolehjem/public/css/webappdark.css
+++ b/skolehjem/public/css/webappdark.css
@ -6994,3 +6994,29 @@ main {
  color: white;
 }

+input,
+select {
+  border-color: white;
+}
+
+input::-moz-placeholder {
+  color: white;
+}
+
+input:-ms-input-placeholder {
+  color: white;
+}
+
+input::-ms-input-placeholder {
+  color: white;
+}
+
+input::placeholder {
+  color: white;
+}
+
+.fa-eye {
+  background-color: #666666;
+  color: white;
+}
+
--- a/skolehjem/resources/lang/dk/msg.php
+++ b/skolehjem/resources/lang/dk/msg.php
@ -5,7 +5,7 @@ return[
    "aktiviteter" => "Aktiviteter",
    "Home" => "Home",
    "reservationer" => "Reservationer",
-    "kontoret" => "Kontoret",
+    "kontoret" => "Kontakter",
    "vagttelefon" => "Vagttelefon",
    "vejledning" => "Vejledninger",
    "konto" => "Konto",
@ -46,6 +46,8 @@ return[
    "nytpassword" => "Ny Adgangskode",
    "confirmpassword" => "Gentag Adgangskode",
    "ingennyheder" => "Der er ingen nyheder",
+    "mørk" => "Mørk",
+    "lys" => "Lys",



--- a/skolehjem/resources/lang/en/msg.php
+++ b/skolehjem/resources/lang/en/msg.php
@ -4,7 +4,7 @@ return[
    "menuplan" => "Menu",
    "aktiviteter" => "Activities",
    "reservationer" => "Reservations",
-    "kontoret" => "The Bureau",
+    "kontoret" => "Contacts",
    "vagttelefon" => "Emergency phone",
    "vejledning" => "Guide",
    "home" => "Home",
@ -18,19 +18,19 @@ return[
    "uge" => "week",
    "ugestor" => "Week",
    "dereringenaktiviteter" => "There is no activity this week",
-    "setilmeldteaktiviteter" => "See Registered Activities",
-    "tilmeldteaktiviteter" => "Your Registered Activities",
+    "setilmeldteaktiviteter" => "See registered Activities",
+    "tilmeldteaktiviteter" => "Your registered Activities",
    "tilmeldtesnavn" => "Participants",
    "ingentilmeldte" => "There are no participants",
    "duharikketilmeldtdignogenaktiviteter" => "You have not signed up for any activities",
-    "afmeld" => "Cancel",
-    "tilbage" => "Go Back",
-    "dinereservationer" => "Your Reservations",
+    "afmeld" => "Stop participating",
+    "tilbage" => "Go back",
+    "dinereservationer" => "Your reservations",
    "fjern" => "Remove",
    "tid" => "Time",
    "reservervaskemaskine" => "Reserve washing machine",
    "duharingenreservationer" => "You have no reservations",
-    "bookingliste" => "Booking List",
+    "bookingliste" => "Booking list",
    "dereringenvaskemaskiner" => "There are no washing machines",
    "tilgængeligetider" => "Available times",
    "maskiner" => "Washing machines",
@ -46,13 +46,15 @@ return[
    "dereringenkontakter" => "There are no contacts",
    "accepter" => "Accept",
    "dereringenvejledninger" => "There are no guides",
-    "tilmeld" => "Participating",
+    "tilmeld" => "Participate",
    "telefon" => "Phone",
    "redigeroplysninger" => "Edit information",
-    "ændrepassword" => "Change Password",
+    "ændrepassword" => "Change password",
    "rediger" => "Edit",
    "nuværendepassword" => "Current password",
    "nytpassword" => "New password",
    "confirmpassword" => "Confirm password",
    "ingennyheder" => "No news were found",
+    "mørk" => "Dark",
+    "lys" => "Light",
 ];
--- a/skolehjem/resources/sass/webapp/_defaultdark.scss
+++ b/skolehjem/resources/sass/webapp/_defaultdark.scss
@ -13,3 +13,16 @@ main {
 .sde-blue {
    color: white;
 }
+
+input, select {
+    border-color: white;
+}
+
+input::placeholder {
+    color: white;
+}
+
+.fa-eye {
+    background-color: #666666;
+    color: white;
+}
--- a/skolehjem/resources/views/app/events/index.blade.php
+++ b/skolehjem/resources/views/app/events/index.blade.php
@ -36,10 +36,10 @@
        <h1 class="text-center sde-blue mb-0">{{ __('msg.aktiviteter') }}</h1>
        @if(!$events->isEmpty())
            @foreach($events as $event)
-                <form method="get" action="{{ route("userevents.create") }}">
+                <form method="get" action="{{ route("userevents.create") }}" id="form{{$event->id}}">
                    <div class="card">
                        <div class="header">
-                            <h3>{{ $event->name}}</h3>
+                            <h3>{{ $event->name }}</h3>
                            <p class="text-center mt-0">Af: {{ $event->accountable }}</p>
                            <p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($event->date))->format('d/m/Y \k\l\. H:i') }}</p>
                        </div>
@ -48,8 +48,10 @@
                            <input type="hidden" name="event_id" value="{{ $event->id }}">
                            {!! session()->get('error#' . $event->id) !!}
                            {!! session()->get('signup#' . $event->id) !!}
-                            <button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">{{__('msg.tilmeld')}}</button>
-                            <a style="width: 33%; margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="{{route("events.show", ["event" => $event->id ])}}">Læs mere</a>
+                            <div class="row">
+                                <a style="width: 50%; margin: 0; padding: 0; text-align: start; font-weight: 700;" class="sde-blue" href="javascript:;" onclick="document.getElementById('form{{$event->id}}').submit();" >Tilmeld</a>
+                                <a style="width: 50%; margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="{{route("events.show", ["event" => $event->id ])}}">Læs mere</a>
+                            </div>
                        </div>
                    </div>
                </form>
--- a/skolehjem/resources/views/app/guides/index.blade.php
+++ b/skolehjem/resources/views/app/guides/index.blade.php
@ -32,8 +32,8 @@
            padding-right: 8px;
        }
    </style>
-    <main>
-        <h1 class="text-center sde-blue mt-0">{{__('msg.vejledning')}}</h1>
+    <main style="min-height: calc(100% - 61.34px);">
+        <h1 class="text-center sde-blue mt-0" style="margin-bottom: auto;">{{__('msg.vejledning')}}</h1>
        @if(!$guides->isEmpty())
            @foreach($guides as $guide)
                <div class="card">
@ -49,6 +49,6 @@
        @else
            <p style="margin: 0 18px;">{{__('msg.dereringenvejledninger')}}.</p>
        @endif
-        <button onclick="window.history.back()" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
+        <button onclick="window.history.back()" style="margin-top: auto;" class="btn btn-sde-blue text-white mb-1 mt-1" >{{__('msg.tilbage')}}</button>
    </main>
@endsection
--- a/skolehjem/resources/views/app/layout/base.blade.php
+++ b/skolehjem/resources/views/app/layout/base.blade.php
@ -75,6 +75,7 @@
            let menuElement = document.getElementById(menu);
            let logoElement = document.getElementById("sdeLogo");
            let htmlElement = document.getElementsByTagName('html')[0];
+            let bodyElement = document.getElementsByTagName('body')[0];
            let mainElement = document.getElementsByTagName('main')[0];
            let iconElement = document.getElementById("icon");
            let headerElement = document.getElementById("header");
@ -83,6 +84,7 @@
                menuElement.classList.remove("hide");
                mainElement.classList.remove("d-none");
                htmlElement.style.backgroundColor = '';
+                bodyElement.style.backgroundColor = '#666666';
                logoElement.src = '/images/logos/Logo-hvid.svg';
                iconElement.classList.remove("fa-times");
                iconElement.classList.add("fa-bars");
@ -91,6 +93,7 @@
                menuElement.classList.add("hide");
                mainElement.classList.add("d-none");
                htmlElement.style.backgroundColor = 'rgb(0, 120, 138)';
+                bodyElement.style.backgroundColor = 'rgb(0, 120, 138)';
                logoElement.src = '/images/logos/Logo-hvid.svg';
                iconElement.classList.remove("fa-bars");
                iconElement.classList.add("fa-times");
--- a/skolehjem/resources/views/app/news/index.blade.php
+++ b/skolehjem/resources/views/app/news/index.blade.php
@ -120,6 +120,7 @@
            let menuElement = document.getElementById(menu);
            let logoElement = document.getElementById("sdeLogo");
            let htmlElement = document.getElementsByTagName('html')[0];
+            let bodyElement = document.getElementsByTagName('body')[0];
            let mainElement = document.getElementsByTagName('main')[0];
            let iconElement = document.getElementById("icon");
            let headerElement = document.getElementById("header");
@ -128,6 +129,7 @@
                menuElement.classList.remove("hide");
                mainElement.classList.remove("d-none");
                htmlElement.style.backgroundColor = '';
+                bodyElement.style.backgroundColor = '#666666';
                logoElement.src = '/images/logos/Logo-hvid.svg';
                iconElement.classList.remove("fa-times");
                iconElement.classList.add("fa-bars");
@ -136,6 +138,7 @@
                menuElement.classList.add("hide");
                mainElement.classList.add("d-none");
                htmlElement.style.backgroundColor = 'rgb(0, 120, 138)';
+                bodyElement.style.backgroundColor = 'rgb(0, 120, 138)';
                logoElement.src = '/images/logos/Logo-hvid.svg';
                iconElement.classList.remove("fa-bars");
                iconElement.classList.add("fa-times");
--- a/skolehjem/resources/views/app/users/account.blade.php
+++ b/skolehjem/resources/views/app/users/account.blade.php
@ -31,17 +31,17 @@
        </select>


-        <label for="dark">Sprog / Languages:</label>
+        <label for="dark">Tema / Theme:</label>
        <select name="light" id="darkmode">
            @if(request()->cookie('mode') == "light")
-                <option selected name="ligthmode" value="Light">Light</option>
+                <option selected name="ligthmode" style="color: black;" value="Light">{{ __("msg.lys") }}</option>
            @else
-                <option name="light" value="light">Light</option>
+                <option name="light" style="color: black;" value="light">{{ __("msg.lys") }}</option>
            @endif
            @if(request()->cookie('mode') == "dark")
-                <option selected name="darkmode" value="dark">Dark</option>
+                <option selected name="darkmode" style="color: black;" value="dark">{{ __("msg.mørk") }}</option>
            @else
-                <option name="dark" value="dark">Dark</option>
+                <option name="dark" style="color: black;" value="dark">{{ __("msg.mørk") }}</option>
            @endif

        </select>
--- a/skolehjem/resources/views/app/users/edit.blade.php
+++ b/skolehjem/resources/views/app/users/edit.blade.php
@ -17,7 +17,7 @@
            <span>{{__('msg.telefon')}} Nr.:</span>
            <input type="text" name="phone" id="phone" value="{{ Auth::user()->phone }}" required>
            <button type="submit" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
-            <button onclick="window.location.href = '{{ route('users.account') }}';" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</button>
+            <a href="{{ route('users.account') }}" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
        </form>
    </main>
@endsection
--- a/skolehjem/resources/views/app/users/editpass.blade.php
+++ b/skolehjem/resources/views/app/users/editpass.blade.php
@ -40,18 +40,37 @@
@endsection

@section("scripts")
-    <script>
-        function show($passID, $faID) {
-            var inputPass = document.getElementById($passID);
-            var faEye = document.getElementById($faID);
+    @if(request()->cookie("mode") == "dark")
+        <script>
+            function show($passID, $faID) {
+                var inputPass = document.getElementById($passID);
+                var faEye = document.getElementById($faID);

-            if (inputPass.type === "password") {
-                inputPass.type = "text";
-                faEye.style.color = "#000";
-            } else {
-                inputPass.type = "password";
-                faEye.style.color = "#808080";
+
+                if (inputPass.type === "password") {
+                    inputPass.type = "text";
+                    faEye.style.color = "#333333";
+                } else {
+                    inputPass.type = "password";
+                    faEye.style.color = "#ffffff";
+                }
            }
-        }
-    </script>
+        </script>
+    @else
+        <script>
+            function show($passID, $faID) {
+                var inputPass = document.getElementById($passID);
+                var faEye = document.getElementById($faID);
+
+
+                if (inputPass.type === "password") {
+                    inputPass.type = "text";
+                    faEye.style.color = "#333333";
+                } else {
+                    inputPass.type = "password";
+                    faEye.style.color = "#808080";
+                }
+            }
+        </script>
+    @endif
@endsection