vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v0.10.14c - Various fixes

This commit is contained in:
Neerholt 2020-08-24 11:27:17 +02:00
parent 6b3af7e667
commit fa5cd1c3e2
9 changed files with 74 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skolehjem/app/Http/Controllers/NewsController.php
View File

@ -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 ]);
}

12
skolehjem/public/css/admin.css vendored
View File

@ -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;
}

16
skolehjem/public/css/webapp.css vendored
View File

@ -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;

16
skolehjem/public/css/webappdark.css vendored
View File

@ -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;

6
skolehjem/resources/sass/app/app.scss vendored
View File

@ -15,6 +15,12 @@
font-weight: 700;
}
* {
word-break: break-word;
hyphens: auto;
overflow-x: hidden;
}
// Variables
@import 'variables';

4
skolehjem/resources/sass/app/general/_displays.scss vendored
View File

@ -68,3 +68,7 @@ nav > .pagination {
nav {
margin-top: auto;
}
.calendar-table__col.disabled > .calendar-table__item {
color: darkgrey;
}

4
skolehjem/resources/sass/webapp/_default.scss vendored
View File

@ -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;

11
skolehjem/resources/views/app/users/account.blade.php
View File

@ -8,7 +8,16 @@
<script src="{{ asset("/js/jquery-3.2.1.min.js") }}"></script>
<main style="justify-content: unset">
<h1 class="text-center sde-blue mt-1">{{__('msg.konto')}}</h1>
<h4 class="mt-0">{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>
@if(\App\Resource::query()->where("id", "=", Auth::user()->resource_id)->first() !== null)
<img style="width: calc(100% - 72px); margin: auto;" src="{{ \App\Resource::query()->where("id", "=",Auth::user()->resource_id)->first()->filename }}">
@else
@if(request()->cookie("mode") == "dark")
<img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user-hvid.svg") }}">
@else
<img style="width: calc(100% - 72px); margin: auto;" src="{{ asset("/images/icons/user.svg") }}">
@endif
@endif
<h4 class="mt-2">{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>
<h4 class="mt-0">{{__('msg.email')}}: {{ Auth::user()->email }}</h4>
<h4 class="mt-0">{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}</h4>

18
skolehjem/resources/views/app/washing-reservations/create.blade.php
View File

@ -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,10 +97,17 @@
dayHolder.appendChild(day);
//If date hasn't already happened
if(date > moment().subtract(1, "days").locale("da")) {
//When clicking on a date run "onDateSelect()"
dayHolder.onclick = function() {
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);