diff --git a/skolehjem/app/Http/Middleware/SetLocale.php b/skolehjem/app/Http/Middleware/SetLocale.php
index 3d9a932..2b562b2 100644
--- 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);
}
}
diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css
index b662a5c..3a0976f 100644
--- 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;
+}
+
diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php
index b8fed23..cdf566a 100644
--- 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",
diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php
index a472800..2ec5ca4 100644
--- 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",
];
diff --git a/skolehjem/resources/sass/webapp/_defaultdark.scss b/skolehjem/resources/sass/webapp/_defaultdark.scss
index 94357b7..7dc49a5 100644
--- 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;
+}
diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php
index 0299b41..1ef3c87 100644
--- a/skolehjem/resources/views/app/events/index.blade.php
+++ b/skolehjem/resources/views/app/events/index.blade.php
@@ -36,10 +36,10 @@
{{ __('msg.aktiviteter') }}
@if(!$events->isEmpty())
@foreach($events as $event)
-
diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php
index a6a5b4a..12750f2 100644
--- 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;
}
-
- {{__('msg.vejledning')}}
+
+ {{__('msg.vejledning')}}
@if(!$guides->isEmpty())
@foreach($guides as $guide)
@@ -49,6 +49,6 @@
@else
{{__('msg.dereringenvejledninger')}}.
@endif
-
+
@endsection
diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php
index 6dc33f3..4e7dcf8 100644
--- 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");
diff --git a/skolehjem/resources/views/app/news/index.blade.php b/skolehjem/resources/views/app/news/index.blade.php
index c6a2e7c..1e447eb 100644
--- 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");
diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php
index 6a0e1d1..74a23f4 100644
--- a/skolehjem/resources/views/app/users/account.blade.php
+++ b/skolehjem/resources/views/app/users/account.blade.php
@@ -31,17 +31,17 @@
-
+
diff --git a/skolehjem/resources/views/app/users/edit.blade.php b/skolehjem/resources/views/app/users/edit.blade.php
index f6f8f33..5d24194 100644
--- a/skolehjem/resources/views/app/users/edit.blade.php
+++ b/skolehjem/resources/views/app/users/edit.blade.php
@@ -17,7 +17,7 @@
{{__('msg.telefon')}} Nr.:
-
+
{{__('msg.tilbage')}}
@endsection
diff --git a/skolehjem/resources/views/app/users/editpass.blade.php b/skolehjem/resources/views/app/users/editpass.blade.php
index ecc20d4..10f32a5 100644
--- 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")
-
+
+ @else
+
+ @endif
@endsection