diff --git a/skolehjem/app/Http/Controllers/NewsController.php b/skolehjem/app/Http/Controllers/NewsController.php
index 9e3aee2..d303ad6 100644
--- a/skolehjem/app/Http/Controllers/NewsController.php
+++ b/skolehjem/app/Http/Controllers/NewsController.php
@@ -31,7 +31,7 @@ class NewsController extends Controller
*/
public function index(Request $request)
{
- $news = News::query()->orderBy('id', 'asc')->paginate(20);
+ $news = News::query()->orderBy('id', 'desc')->paginate(20);
return Response::detect("news.index", [ "news" => $news ]);
}
diff --git a/skolehjem/public/css/admin.css b/skolehjem/public/css/admin.css
index 33a7dda..ad1d5e4 100644
--- a/skolehjem/public/css/admin.css
+++ b/skolehjem/public/css/admin.css
@@ -18,6 +18,14 @@
font-weight: 700;
}
+* {
+ word-break: break-word;
+ -webkit-hyphens: auto;
+ -ms-hyphens: auto;
+ hyphens: auto;
+ overflow-x: hidden;
+}
+
form {
max-width: 100%;
padding: 0 0.45rem 0 0.45rem;
@@ -197,6 +205,10 @@ nav {
margin-top: auto;
}
+.calendar-table__col.disabled > .calendar-table__item {
+ color: darkgrey;
+}
+
.text-white {
color: #ffffff;
}
diff --git a/skolehjem/public/css/webapp.css b/skolehjem/public/css/webapp.css
index 1ee81d2..16e3f6c 100644
--- a/skolehjem/public/css/webapp.css
+++ b/skolehjem/public/css/webapp.css
@@ -18,6 +18,14 @@
font-weight: 700;
}
+* {
+ word-break: break-word;
+ -webkit-hyphens: auto;
+ -ms-hyphens: auto;
+ hyphens: auto;
+ overflow-x: hidden;
+}
+
form {
max-width: 100%;
padding: 0 0.45rem 0 0.45rem;
@@ -197,6 +205,10 @@ nav {
margin-top: auto;
}
+.calendar-table__col.disabled > .calendar-table__item {
+ color: darkgrey;
+}
+
.text-white {
color: #ffffff;
}
@@ -7059,10 +7071,6 @@ main {
bottom: 30px;
}
-.container > * {
- word-break: break-word;
-}
-
#snackbar.show {
visibility: visible;
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
diff --git a/skolehjem/public/css/webappdark.css b/skolehjem/public/css/webappdark.css
index 45d2074..dab00f9 100644
--- a/skolehjem/public/css/webappdark.css
+++ b/skolehjem/public/css/webappdark.css
@@ -18,6 +18,14 @@
font-weight: 700;
}
+* {
+ word-break: break-word;
+ -webkit-hyphens: auto;
+ -ms-hyphens: auto;
+ hyphens: auto;
+ overflow-x: hidden;
+}
+
form {
max-width: 100%;
padding: 0 0.45rem 0 0.45rem;
@@ -197,6 +205,10 @@ nav {
margin-top: auto;
}
+.calendar-table__col.disabled > .calendar-table__item {
+ color: darkgrey;
+}
+
.text-white {
color: #ffffff;
}
@@ -7059,10 +7071,6 @@ main {
bottom: 30px;
}
-.container > * {
- word-break: break-word;
-}
-
#snackbar.show {
visibility: visible;
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
diff --git a/skolehjem/resources/sass/app/app.scss b/skolehjem/resources/sass/app/app.scss
index 077d616..a2d2ea3 100644
--- a/skolehjem/resources/sass/app/app.scss
+++ b/skolehjem/resources/sass/app/app.scss
@@ -15,6 +15,12 @@
font-weight: 700;
}
+* {
+ word-break: break-word;
+ hyphens: auto;
+ overflow-x: hidden;
+}
+
// Variables
@import 'variables';
diff --git a/skolehjem/resources/sass/app/general/_displays.scss b/skolehjem/resources/sass/app/general/_displays.scss
index 3f9d892..e3d69f9 100644
--- a/skolehjem/resources/sass/app/general/_displays.scss
+++ b/skolehjem/resources/sass/app/general/_displays.scss
@@ -68,3 +68,7 @@ nav > .pagination {
nav {
margin-top: auto;
}
+
+.calendar-table__col.disabled > .calendar-table__item {
+ color: darkgrey;
+}
diff --git a/skolehjem/resources/sass/webapp/_default.scss b/skolehjem/resources/sass/webapp/_default.scss
index 3b6f714..4a33da4 100644
--- a/skolehjem/resources/sass/webapp/_default.scss
+++ b/skolehjem/resources/sass/webapp/_default.scss
@@ -524,10 +524,6 @@ $primary-color: $blue;
bottom: 30px;
}
-.container > * {
- word-break: break-word;
-}
-
#snackbar.show {
visibility: visible;
-webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s;
diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php
index b8a8368..8fc9d65 100644
--- a/skolehjem/resources/views/app/users/account.blade.php
+++ b/skolehjem/resources/views/app/users/account.blade.php
@@ -8,7 +8,16 @@
{{__('msg.konto')}}
- {{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}
+ @if(\App\Resource::query()->where("id", "=", Auth::user()->resource_id)->first() !== null)
+ resource_id)->first()->filename }}">
+ @else
+ @if(request()->cookie("mode") == "dark")
+
+ @else
+
+ @endif
+ @endif
+ {{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}
{{__('msg.email')}}: {{ Auth::user()->email }}
{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}
diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php
index 5f6f70b..b91a4ce 100644
--- a/skolehjem/resources/views/app/washing-reservations/create.blade.php
+++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php
@@ -86,6 +86,8 @@
let date = moment().locale("da").day(weekDay).week(week);
var datetext = moment().locale("da").day(weekDay).week(week).year() + "-" + prependZero((moment().locale("da").day(weekDay).week(week).month() + 1)) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date());
+
+
let dayHolder = document.createElement("div");
dayHolder.classList.add("calendar-table__col");
@@ -95,9 +97,16 @@
dayHolder.appendChild(day);
- //When clicking on a date run "onDateSelect()"
- dayHolder.onclick = function() {
- onDateSelect(date, dayHolder, datetext);
+ //If date hasn't already happened
+ if(date > moment().subtract(1, "days").locale("da")) {
+ //When clicking on a date run "onDateSelect()"
+ dayHolder.onclick = function () {
+ onDateSelect(date, dayHolder, datetext);
+ }
+ }
+ else
+ {
+ dayHolder.classList.add("disabled");
}
calendarRow.appendChild(dayHolder);
@@ -301,12 +310,15 @@
//Add times 8:00-20:00
- for (let hour = 8; hour <= 20; hour++) {
+ for (let hour = 8; hour < 20; hour++) {
+ if(hour < new Date().getHours())
+ continue;
+
let value = datetext + " " + prependZero(hour) + ":00:00";
let option = document.createElement("option");
- option.text = prependZero(hour) + ":00";
+ option.text = prependZero(hour) + ":00-" + prependZero(hour+1) + ":00";
option.value = value;
option.id = value;
element.appendChild(option);