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

v1.4.8k Fixed overflow hidden. forgot password and signup now works on pc

This commit is contained in:
victor 2020-11-24 13:14:25 +01:00
parent dc314bb2bc
commit c74f48dde5
14 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,7 @@ class UserController extends Controller
{
$this->middleware([ "auth" ])->only(["accountupdate", "accountedit", "accounteditpass", "account", "logout"]);
$this->middleware([ "guest" ])->only(["login", "signup", "signupStore"]);
$this->middleware([ "guest" ])->only(["login", "signup", "signupStore", "showForgot", "forgot"]);
$this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot", "signup", "nameCheck", "signupStore"]);
$this->middleware([ "check.auth:user.show" ])->only("show", "index");

2
skolehjem/app/Providers/DetectorServiceProvider.php
View File

@ -33,7 +33,7 @@ class DetectorServiceProvider extends ServiceProvider
if(Auth()->user()->can('admin.panel.show') == true)
return view(config("detector.defaultPath") . "." . $view, $args);
}
if($view == "users.login" || $view == "users.logout")
if($view == "users.login" || $view == "users.logout" || $view == "users.forgot" || $view == "users.signup")
return view(config("detector.mobilePath") . "." . $view, $args);
return view("errors.403", $args);

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

@ -6769,6 +6769,11 @@ nav > .pagination {
font-weight: bold;
}
.fixOverflow {
text-overflow: ellipsis;
overflow: hidden;
}
.tbl {
border-collapse: collapse;
width: 100%;

5
skolehjem/resources/sass/admin/content/content.scss vendored
View File

@ -39,3 +39,8 @@ nav > .pagination {
.pagination > .page-item.active {
font-weight: bold;
}
.fixOverflow{
text-overflow: ellipsis;
overflow: hidden;
}

2
skolehjem/resources/views/admin/contacts/index.blade.php
View File

@ -20,7 +20,7 @@
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('contacts.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
@endif
</div>
<table class="tbl mt-2 letterSpaceTable" id="table_id">
<table class="tbl mt-2 letterSpaceTable fixOverflow" id="table_id">
<thead>
<th>Kontakt Navn</th>
<th>Titel</th>

2
skolehjem/resources/views/admin/events/index.blade.php
View File

@ -24,7 +24,7 @@
@endif
</div>
<table class="tbl mt-2 letterSpaceTable" id="table_id">
<table class="tbl mt-2 letterSpaceTable fixOverflow" id="table_id">
<thead>
<th>Aktivitet Navn</th>
<th>Aktivitet Ansvarlig</th>

2
skolehjem/resources/views/admin/guides/index.blade.php
View File

@ -23,7 +23,7 @@
@endif
<div id="guides" class="letterSpaceTable">
<label>Vejledninger</label>
<table class="tbl">
<table class="tbl fixOverflow">
<tr>
<th>Navn</th>
<th>Kategori</th>

43
skolehjem/resources/views/admin/index.blade.php
View File

@ -59,14 +59,19 @@
letter-spacing: 2px;
}
.fixOverflow{
overflow: hidden !important;
.dot {
height: 10px;
width: 10px;
background-color: #bbb;
border-radius: 50%;
display: inline-block;
}
</style>
<div class="card">
<div class="card fixOverflow">
<div class="head letterSpaceNotTable" style="background-color: #575756;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/users-hvid.svg") }}" alt="">
@ -80,13 +85,13 @@
</tr>
@for($i = 0; $i < 10 && $i < count(\App\User::query()->orderByDesc("id")->get()); $i++)
<tr class="letterSpaceTable">
<td>{!! \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first)), 0, 24) ) . ' ' . \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)), 0, 23) ) !!}</td>
<td>{!! (ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_first))) . ' ' . \App\Helpers::closetags(substr(ucfirst(strtolower(\App\User::query()->orderByDesc("id")->get()[$i]->name_last)), 0, 23) ) !!}</td>
</tr>
@endfor
</table>
</div>
<div class="card">
<div class="card fixOverflow">
<div class="head letterSpaceNotTable" style="background-color: #6796b0;">
<div>
<img style="margin-top: 8px;width: 3rem;" src="{{ asset("/images/icons/Aktiviteter.svg") }}" alt="">
@ -109,25 +114,20 @@
<div class="header" style="padding-top: 0">
<table class="tbl mt-0 letterSpaceTable">
<tr>
<td><label>Aktivitet navn</label></td>
<td>{!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->name, 0, 15)) !!}</td>
<td><label>Aktivitets navn <span class="dot"></span> {!! (\App\Event::query()->orderBy("date", "asc")->first()->name) !!}</label></td>
</tr>
<tr>
<td><label>Aktivitet ansvarlig</label></td>
<td>Af: {!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->accountable, 0, 15) ) !!}</td>
<td><label>Aktivitets ansvarlig <span class="dot"></span> {!! (\App\Event::query()->orderBy("date", "asc")->first()->accountable) !!}</label></td>
</tr>
<tr>
<td><label>Tidspunkt</label></td>
<td>{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->orderBy("date", "asc")->first()->date))->format('d/m/Y \k\l\. H:i') }}</td>
<td><label>Tidspunkt <span class="dot"></span> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime(\App\Event::query()->orderBy("date", "asc")->first()->date))->format('d/m/Y \k\l\. H:i') }}</label></td>
</tr>
</table>
</div>
<div class="container letterSpaceTable" style="margin-top: 8px;">
<table style="border: 1px solid lightgrey; width: 100%;">
<tr>
<td> {!! \App\Helpers::closetags(substr(\App\Event::query()->orderBy("date", "asc")->first()->description, 0, 300) )!!}</td>
<td> {!!(\App\Event::query()->orderBy("date", "asc")->first()->description)!!}</td>
</tr>
</table>
<input type="hidden" name="event_id" value="{{ \App\Event::query()->orderBy("date", "asc")->first()->id }}">
@ -139,7 +139,7 @@
@endif
</div>
<div class="card">
<div class="card fixOverflow">
<div class="head letterSpaceNotTable" style="background-color: #152f4b;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/Vejledninger.svg") }}" alt="">
@ -165,7 +165,7 @@
</table>
</div>
<div class="card">
<div class="card fixOverflow">
<div class="head" style="background-color: #01788a; letter-spacing: 2px;">
<div>
<img style="width: 4rem;" src="{{ asset("/images/icons/Menuplan.svg") }}" alt="">
@ -181,23 +181,22 @@
{{-- \App\MenuPlan::query()->where("week", "=", date('W'))->first() --}}
<tr>
<td class="letterSpaceTable"><label>Mandag </label></td>
\App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday, 0, 45) )
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday, 0, 45) ) !!}</td>
<td class="letterSpaceTable">{!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->monday) !!}</td>
</tr>
<td class="letterSpaceTable"><label>Tirsdag</label></td>
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday, 0, 45) ) !!}</td>
<td class="letterSpaceTable">{!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->tuesday) !!}</td>
</tr>
<td class="letterSpaceTable"><label>Onsdag</label></td>
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday, 0, 45) ) !!}</td>
<td class="letterSpaceTable">{!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->wednesday) !!}</td>
</tr>
<td class="letterSpaceTable"><label>Torsdag</label></td>
<td class="letterSpaceTable">{!! \App\Helpers::closetags(substr(\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday, 0, 45) ) !!}</td>
<td class="letterSpaceTable">{!! (\App\MenuPlan::query()->where("week", "=", date('W'))->first()->thursday) !!}</td>
</tr>
<!--The code above is retarded, but it is what it is :) BigSmoke -->
@else
<tr>
<td colspan="2" class="text-center letterSpaceTable">Der er ingen menuplan for denne uge</td>
<td colspan="2" class="text-center letterSpaceTable">Ingen menuplan</td>
</tr>
@endif
</table>

2
skolehjem/resources/views/admin/news/index.blade.php
View File

@ -20,7 +20,7 @@
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('news.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Nyheder</a>
</div>
@endif
<table class="tbl letterSpaceTable" id="table_id">
<table class="tbl letterSpaceTable fixOverflow" id="table_id">
<thead>
<th>Navn</th>
<th>Udløbsdato</th>

2
skolehjem/resources/views/admin/users/account.blade.php
View File

@ -10,7 +10,7 @@
@endsection
@section("content")
<table class="tbl mt-2">
<table class="tbl mt-2 fixOverflow">
<tr>
<th>Fornavn</th>
<th>Efternavn</th>

2
skolehjem/resources/views/admin/users/forgot.blade.php Normal file → Executable file
View File

@ -1,7 +1,7 @@
@extends("user.layout.base")
@section("title")
Login
Login Forgot
@endsection
@section("content")

2
skolehjem/resources/views/admin/users/index.blade.php
View File

@ -55,7 +55,7 @@
<a class="btn btn-inline btn-sde-blue mb-0" href="{{ route('users.create') }}"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Bruger</a>
@endif
</div>
<table class="tbl mt-2 letterSpaceTable" id="table_id">
<table class="tbl mt-2 letterSpaceTable fixOverflow" id="table_id">
<thead>
<th>Fornavn</th>
<th>Efternavn</th>

2
skolehjem/resources/views/admin/washing-machines/index.blade.php
View File

@ -33,7 +33,7 @@
</div>
<div id="searchWashingMachine" class="mt-2">
<label>Vaskemaskiner</label>
<table id="washingSearch" class="tbl letterSpaceTable">
<table id="washingSearch" class="tbl letterSpaceTable fixOverflow">
<thead>
<th>Navn</th>
<th>Lokation</th>

2
skolehjem/resources/views/admin/washing-reservations/index.blade.php
View File

@ -18,7 +18,7 @@
letter-spacing: 1.2px;
}
</style>
<table class="tbl mt-0 letterSpaceTable" id="table_id">
<table class="tbl mt-0 letterSpaceTable fixOverflow" id="table_id">
<thead>
<th>Lokation</th>
<th>Vaskemaskine</th>