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

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:
Neerholt 2020-08-05 09:14:28 +02:00
parent fbaed9bedd b4634d4933
commit 90a36d85b9
9 changed files with 24 additions and 18 deletions
skolehjem
app/Http/Controllers
UserController.php
resources/views
admin
events
index.blade.phpsignups.blade.php
roles
index.blade.php
users
index.blade.php
washing-reservations
index.blade.php
app
layout
base.blade.php
users
index.blade.php
washing-reservations
create.blade.php

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

@ -369,7 +369,6 @@ class UserController extends Controller
->orWhere('name_last', 'LIKE', $request->search . '%')
->orWhere('phone', 'LIKE', $request->search . '%')
->orWhere('email', 'LIKE', $request->search . '%')
->orWhere('name', 'LIKE', $request->search . '%')
->get();
$roles = Role::query()->where('name', 'LIKE', $request->search . '%')->get();

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

@ -60,7 +60,6 @@
data: {'search':$value},
success:function (data) {
$('tbody').html(data);
console.log(data);
},
error:function (data) {
console.log(data);

3
skolehjem/resources/views/admin/events/signups.blade.php
View File

@ -14,7 +14,7 @@
<form method="post" action="{{ route("events.store") }}">
@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>
</div>
@ -53,7 +53,6 @@
data: {'search':$value},
success:function (data) {
$('tbody').html(data);
console.log(data);
},
error:function (data) {
console.log(data);

1
skolehjem/resources/views/admin/roles/index.blade.php
View File

@ -53,7 +53,6 @@
data: {'search':$value},
success:function (data) {
$('tbody').html(data);
console.log(data);
},
error:function (data) {
console.log(data);

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

@ -81,7 +81,6 @@
url: '{{route('users.search')}}',
data: {'search':$value, 'isCheck': $checkboxValue, 'page': page },
success:function (data) {
console.log($checkboxValue);
$('tbody').html(data);
},
error:function (data) {

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

@ -15,7 +15,7 @@
<form method="post" action="{{ route("washing-reservations.store") }}">
@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>

12
skolehjem/resources/views/app/layout/base.blade.php
View File

@ -6,8 +6,8 @@
<link type="text/css" rel="stylesheet" href="{{ mix("/css/webapp.css") }}">
</head>
<body>
<header class="row align-items-center">
<img class="w-50" id="sdeLogo" src="{{URL::asset('/images/logos/Logo-normal.svg')}}" alt="Syddansk Erhvervsskole">
<header class="row align-items-center" id="header">
<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">
<i id="icon" class="fas fa-bars"></i>
</button>
@ -43,14 +43,14 @@
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>
<a href="{{ route("users.account") }}">
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
Konto
</a>
<a href="{{ route("guides.index") }}">
<img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Guide">
Vejledning
</a>
<a href="{{ route("users.account") }}">
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
Konto
</a>
<a href="{{ route('users.logout') }}">
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
Log Ud

19
skolehjem/resources/views/app/users/index.blade.php
View File

@ -1,16 +1,17 @@
@extends('app.layout.base')
@section('content')
<main>
<main id="main" style="justify-content: space-between;">
<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('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('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('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
</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">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
</a>
@ -20,7 +21,17 @@
<a href="https://www.instagram.com" target="_blank" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a>
</div>-->
</main>
@endsection
@section('scripts')
<script>
function mainHeight() {
document.getElementById('main').style.height = (window.innerHeight - document.getElementById('header').clientHeight) + "px";
}
window.onresize = mainHeight;
mainHeight();
</script>
@endsection

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

@ -67,7 +67,7 @@
header.appendChild(headerDay);
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");
dayHolder.classList.add("calendar-table__col");