Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master
Conflicts: skolehjem/resources/views/app/users/index.blade.php
This commit is contained in:
commit
90a36d85b9
|
@ -369,7 +369,6 @@ class UserController extends Controller
|
||||||
->orWhere('name_last', 'LIKE', $request->search . '%')
|
->orWhere('name_last', 'LIKE', $request->search . '%')
|
||||||
->orWhere('phone', 'LIKE', $request->search . '%')
|
->orWhere('phone', 'LIKE', $request->search . '%')
|
||||||
->orWhere('email', 'LIKE', $request->search . '%')
|
->orWhere('email', 'LIKE', $request->search . '%')
|
||||||
->orWhere('name', 'LIKE', $request->search . '%')
|
|
||||||
->get();
|
->get();
|
||||||
$roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get();
|
$roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get();
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,6 @@
|
||||||
data: {'search':$value},
|
data: {'search':$value},
|
||||||
success:function (data) {
|
success:function (data) {
|
||||||
$('tbody').html(data);
|
$('tbody').html(data);
|
||||||
console.log(data);
|
|
||||||
},
|
},
|
||||||
error:function (data) {
|
error:function (data) {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<form method="post" action="{{ route("events.store") }}">
|
<form method="post" action="{{ route("events.store") }}">
|
||||||
@csrf
|
@csrf
|
||||||
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på Evt Navn, Evt Dato"></input>
|
<input type="text" class="form-controller" id="search" name="search" placeholder="//TODO: Søg på navn, efternavn, tlf"></input>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -53,7 +53,6 @@
|
||||||
data: {'search':$value},
|
data: {'search':$value},
|
||||||
success:function (data) {
|
success:function (data) {
|
||||||
$('tbody').html(data);
|
$('tbody').html(data);
|
||||||
console.log(data);
|
|
||||||
},
|
},
|
||||||
error:function (data) {
|
error:function (data) {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
data: {'search':$value},
|
data: {'search':$value},
|
||||||
success:function (data) {
|
success:function (data) {
|
||||||
$('tbody').html(data);
|
$('tbody').html(data);
|
||||||
console.log(data);
|
|
||||||
},
|
},
|
||||||
error:function (data) {
|
error:function (data) {
|
||||||
console.log(data);
|
console.log(data);
|
||||||
|
|
|
@ -81,7 +81,6 @@
|
||||||
url: '{{route('users.search')}}',
|
url: '{{route('users.search')}}',
|
||||||
data: {'search':$value, 'isCheck': $checkboxValue, 'page': page },
|
data: {'search':$value, 'isCheck': $checkboxValue, 'page': page },
|
||||||
success:function (data) {
|
success:function (data) {
|
||||||
console.log($checkboxValue);
|
|
||||||
$('tbody').html(data);
|
$('tbody').html(data);
|
||||||
},
|
},
|
||||||
error:function (data) {
|
error:function (data) {
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
<form method="post" action="{{ route("washing-reservations.store") }}">
|
<form method="post" action="{{ route("washing-reservations.store") }}">
|
||||||
@csrf
|
@csrf
|
||||||
<input type="text" class="form-controller" id="search" name="search" placeholder="Søg på vaskemaskine, tid"></input>
|
<input type="text" class="form-controller" id="search" name="search" placeholder="//TODO: Søg på vaskemaskine, tid, bruger"></input>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
|
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<header class="row align-items-center">
|
<header class="row align-items-center" id="header">
|
||||||
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
|
<a href="{{ route("root.index") }}"><img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole"></a>
|
||||||
<button class="ml-auto" id="toggle">
|
<button class="ml-auto" id="toggle">
|
||||||
<i id="icon" class="fas fa-bars"></i>
|
<i id="icon" class="fas fa-bars"></i>
|
||||||
</button>
|
</button>
|
||||||
|
@ -43,14 +43,14 @@
|
||||||
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
|
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
|
||||||
Vagttelefon
|
Vagttelefon
|
||||||
</a>
|
</a>
|
||||||
<a href="{{ route("users.account") }}">
|
|
||||||
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
|
|
||||||
Konto
|
|
||||||
</a>
|
|
||||||
<a href="{{ route("guides.index") }}">
|
<a href="{{ route("guides.index") }}">
|
||||||
<img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Guide">
|
<img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Guide">
|
||||||
Vejledning
|
Vejledning
|
||||||
</a>
|
</a>
|
||||||
|
<a href="{{ route("users.account") }}">
|
||||||
|
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
|
||||||
|
Konto
|
||||||
|
</a>
|
||||||
<a href="{{ route('users.logout') }}">
|
<a href="{{ route('users.logout') }}">
|
||||||
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
|
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
|
||||||
Log Ud
|
Log Ud
|
||||||
|
|
|
@ -1,16 +1,17 @@
|
||||||
@extends('app.layout.base')
|
@extends('app.layout.base')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<main>
|
<main id="main" style="justify-content: space-between;">
|
||||||
<div class="d-flex col block-container mt-2">
|
<div class="d-flex col block-container mt-2">
|
||||||
<a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">Menuplan</a>
|
<a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">Menuplan</a>
|
||||||
<a href="{{ route('events.index') }}" class="block text-center mb-1">Aktiviteter</a>
|
<a href="{{ route('events.index') }}" class="block text-center mb-1">Aktiviteter</a>
|
||||||
<a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">Reservationer</a>
|
<a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">Reservationer</a>
|
||||||
<a href="{{ route('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
|
<a href="{{ route('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
|
||||||
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
|
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
|
||||||
|
<a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
|
||||||
</div>
|
</div>
|
||||||
<!--
|
<!--
|
||||||
<div class="row" style="position: absolute; bottom: 8px; align-self: center;">
|
<div class="row" style="align-self: center; margin: 8px 0 8px 0;">
|
||||||
<a href="https://www.facebook.com" target="_blank" class="link">
|
<a href="https://www.facebook.com" target="_blank" class="link">
|
||||||
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
|
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
|
||||||
</a>
|
</a>
|
||||||
|
@ -20,7 +21,17 @@
|
||||||
<a href="https://www.instagram.com" target="_blank" class="link">
|
<a href="https://www.instagram.com" target="_blank" class="link">
|
||||||
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
|
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
</div>-->
|
</div>-->
|
||||||
</main>
|
</main>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
|
@section('scripts')
|
||||||
|
<script>
|
||||||
|
function mainHeight() {
|
||||||
|
document.getElementById('main').style.height = (window.innerHeight - document.getElementById('header').clientHeight) + "px";
|
||||||
|
}
|
||||||
|
|
||||||
|
window.onresize = mainHeight;
|
||||||
|
mainHeight();
|
||||||
|
</script>
|
||||||
|
@endsection
|
||||||
|
|
|
@ -67,7 +67,7 @@
|
||||||
header.appendChild(headerDay);
|
header.appendChild(headerDay);
|
||||||
|
|
||||||
let date = moment().locale("da").day(weekDay).week(week);
|
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()) + "-" + prependZero(moment().locale("da").day(weekDay).week(week).date());
|
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");
|
let dayHolder = document.createElement("div");
|
||||||
dayHolder.classList.add("calendar-table__col");
|
dayHolder.classList.add("calendar-table__col");
|
||||||
|
|
Loading…
Reference in New Issue