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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anders
2020-06-29 10:46:35 +02:00
parent 246ae2235d 419672a302
commit 7120b85784
23 changed files with 356 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skolehjem/resources/js/navmenu/menu.js
Vendored
-29
View File
@@ -1,32 +1,3 @@
// function toggleMenu() {
// var buttonElement = document.getElementById('menuIcon');
//
// var htmlElement = document.getElementsByTagName('html')[0];
// var logoElement = document.getElementById('sdeLogo');
// var mainElement = document.getElementsByTagName('main')[0];
//
// var menu = document.getElementById('menu');
//
// if(buttonElement.alt === '-')
// {
// htmlElement.style.backgroundColor = 'rgb(0, 120, 138)';
// logoElement.src = '/images/logos/Logo-hvid.svg';
// menu.classList.remove('d-none');
// mainElement.classList.add('d-none');
//
// buttonElement.alt = 'X';
// }
// else
// {
// htmlElement.style.backgroundColor = 'rgb(255, 255, 255)';
// logoElement.src = '/images/logos/Logo-normal.svg';
// menu.classList.add('d-none');
// mainElement.classList.remove('d-none');
//
// buttonElement.alt = '-';
// }
// }
function toggleMenu(menu) {
let menuElement = document.getElementById(menu);
let logoElement = document.getElementById("sdeLogo");
skolehjem/resources/views/admin/contacts/create.blade.php
+26
View File
@@ -0,0 +1,26 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Kontakter - Opret
@endsection
@section("path")
<a href="" class="text-white">Opret Kontakt</a> /
@endsection
@section("content")
<h1>Opret Kontakt:</h1>
<form method="post" action="{{ route("contacts.store") }}">
@csrf
<label for="name_first">Fornavn:</label>
<input type="text" name="name_first" id="name_first" placeholder="Fornavn" required>
<label for="name_last">Efternavn:</label>
<input type="text" name="name_last" id="name_last" placeholder="Efternavn" required>
<label for="email">Email:</label>
<input type="email" name="email" id="email" placeholder="x@y.z" required>
<label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
@endsection
skolehjem/resources/views/admin/contacts/index.blade.php
+33
View File
@@ -0,0 +1,33 @@
@extends("admin.layout.base")
@extends("admin.layout.header")
@section("title")
Events - Vis
@endsection
@section("path")
<a href="" class="text-white">Vis Kontakter</a> /
@endsection
@section("content")
<table class="tbl">
<tr>
<th>Kontakt Navn</th>
<th>Titel</th>
<th>E-mail</th>
<th>Tlf</th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/pencil.svg') }}" alt="Update"></th>
<th style="width: 1em;"><img class="w-100" src="{{ asset('/images/icons/trashcan.svg') }}" alt="Delete"></th>
</tr>
@foreach($contacts as $contact)
<tr>
<td>{{ $contact->name }}</td>
<td>{{ $contact->title }}</td>
<td>{{ $contact->email }}</td>
<td>{{ $contact->phone }}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
</tr>
@endforeach
</table>
@endsection
skolehjem/resources/views/admin/external-links/edit.blade.php
+5 -4
View File
@@ -6,17 +6,18 @@
@endsection
@section("path")
<a href="../external-links/edit.blade.php" class="text-white">Rediger Link</a> /
<a href="{{route('external-links.edit', ['external_link' => $link])}}" class="text-white">Rediger Link</a> /
@endsection
@section("content")
<h1>Rediger Link:</h1>
<form method="post" action="{{ route("external-links.edit", ['external_link' => $link]) }}">
<form method="post" action="{{route("external-links.update", ["external_link" => $link])}}">
@csrf
@method("PUT")
<label for="title">Titel:</label>
<input type="text" name="title" id="title" required>
<input value="{{$link->name}}" type="text" name="title" id="title" required>
<label for="link">Linket:</label>
<input type="text" name="link" id="link" required>
<input value="{{$link->link}}" type="text" name="link" id="link" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
skolehjem/resources/views/admin/external-links/index.blade.php
+7 -2
View File
@@ -21,8 +21,13 @@
<tr>
<th>{{$link->name}}</th>
<th><a href="{{$link->link}}">{{$link->link}}</th>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
<td><a href="{{ route("external-links.edit", [ "external_link" => $link ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td> <form method="post" action="{{ route("external-links.destroy", [ "external_link" => $link ]) }}" class="w-100">
@csrf
@method("delete")
<button class="w-100" type="submit"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form></td>
</tr>
@endforeach
</table>
skolehjem/resources/views/admin/external-links/update.blade.php
+1 -1
View File
@@ -6,7 +6,7 @@
@endsection
@section("path")
<a href="{{ route('external-links.index') }}" class="text-white">External link</a> /
<a href="{{ route('external-links.edit', ["external_link" => $link]) }}" class="text-white">External link</a> /
@endsection
@section("content")
skolehjem/resources/views/admin/layout/base.blade.php
+9
View File
@@ -40,6 +40,15 @@
<a href="{{ route('washing-machines.create') }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Vaskemaskine</a>
</div>
</div>
<div class="segment">
<h3 class="text-white">Kontakter</h3>
<div class="row">
<a href="{{ route("contacts.index") }}" class="text-white"><img src="{{ asset('/images/icons/eye.svg') }}" alt="Read">Vis Kontakter</a>
</div>
<div class="row">
<a href="{{ route("contacts.create") }}" class="text-white"><img src="{{ asset('/images/icons/plus.svg') }}" alt="Create">Opret Kontakt</a>
</div>
</div>
</div>
<div class="w-85" style="background-color: #cccccc;">
<div class="directorypath text-white">
skolehjem/resources/views/admin/users/create.blade.php
+7 -7
View File
@@ -14,17 +14,17 @@
<form method="post" action="{{ route("users.store") }}">
@csrf
<label for="name_first">Fornavn:</label>
<input type="text" name="name_first" id="name_first" required>
<input type="text" name="name_first" id="name_first" placeholder="Fornavn" required>
<label for="name_last">Efternavn:</label>
<input type="text" name="name_last" id="name_last" required>
<input type="text" name="name_last" id="name_last" placeholder="Efternavn" required>
<label for="email">Email:</label>
<input type="email" name="email" id="email" required>
<input type="email" name="email" id="email" placeholder="x@y.z" required>
<label for="password1">Password:</label>
<input type="password" name="password" id="password1" required>
<label for="password2">Confirm Password:</label>
<input type="password" id="password2" required>
<input type="password" name="password" placeholder="Password" id="password1" required>
<label for="password2">Bekræft Password:</label>
<input type="password" id="password2" placeholder="Bekræft Password" required>
<label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" required>
<input type="tel" name="phone" id="tel" placeholder="12345678" pattern="[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{2}" required>
<input type="submit" class="btn btn-dark text-white" value="Opret">
</form>
@endsection
skolehjem/resources/views/admin/users/edit.blade.php
+9 -8
View File
@@ -6,25 +6,26 @@
@endsection
@section("path")
<a href="{{ route('users.edit', ['id' => $user->id]) }}" class="text-white">Rediger Bruger</a> /
<a href="{{ route('users.edit', ['user' => $user]) }}" class="text-white">Rediger Bruger</a> /
@endsection
@section("content")
<h1>Rediger Bruger:</h1>
<form method="post" action="">
<form method="post" action="{{ route("users.update", ['user' => $user]) }}">
@csrf
@method("put")
<label for="name_first">Fornavn:</label>
<input type="text" name="name_first" id="name_first" value="{Fornavn}" required>
<input type="text" name="name_first" id="name_first" value="{{ $user->name_first }}" required>
<label for="name_last">Efternavn:</label>
<input type="text" name="name_last" id="name_last" value="{Efternavn}" required>
<input type="text" name="name_last" id="name_last" value="{{ $user->name_last }}" required>
<label for="email">Email:</label>
<input type="email" name="email" id="email" value="{Email}" required>
<input type="email" name="email" id="email" value="{{ $user->name_email }}" required>
<label for="password1">Password:</label>
<input type="password" name="password" id="password1" value="{Password}" required>
<input type="password" name="password" id="password1" value="" required>
<label for="password2">Confirm Password:</label>
<input type="password" id="password2" value="{Password}" required>
<input type="password" id="password2" value="" required>
<label for="tel">Telefon nr:</label>
<input type="tel" name="phone" id="tel" value="{Telefon}" required>
<input type="tel" name="phone" id="tel" value="{{ $user->phone }}" required>
<input type="submit" class="btn btn-dark text-white" value="Rediger">
</form>
@endsection
skolehjem/resources/views/admin/users/index.blade.php
+9 -2
View File
@@ -25,8 +25,15 @@
<td>{{ $user->name_last }}</td>
<td>{{ $user->email }}</td>
<td>{{ $user->phone }}</td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td><a href=""><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></a></td>
<td><a href="{{ route("users.edit", [ "user" => $user->id ]) }}"><img class="w-100" src="{{ asset('/images/icons/pencil-dark.svg') }}" alt="Update"></a></td>
<td>
<form method="post" action="{{ route("users.destroy", [ "user" => $user ]) }}" class="w-100">
@csrf
@method("delete")
<button type="submit"><img class="w-100" src="{{ asset('/images/icons/trashcan-dark.svg') }}" alt="Delete"></button>
</form>
</td>
</tr>
@endforeach
</table>
skolehjem/resources/views/app/contact/index.blade.php
+37 -6
View File
@@ -7,11 +7,42 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">Kontakt</h1>
<h4 class="mt-0">Email: x@x.x</h4>
<span class="text-center sde-black-20 mt-1">+45 xx xx xx xx</span>
<a class="btn text-center btn-sde-blue" href="tel:+45" id="call">Tilkald x</a>
<h4 class="mt-3">Email: x@x.x</h4>
<span class="text-center sde-black-20 mt-1">+45 xx xx xx xx</span>
<a class="btn text-center btn-sde-blue" href="tel:+45" id="call">Tilkald x</a>
<h4 class="mt-0">Navn: Claus Trasbo</h4>
<h4 class="mt-0">Email: ctr@sde.dk</h4>
<h4 class="mt-0">Forstander for Erhvervskollegiet</h4>
<span class="text-center sde-black-20 mt-1">+45 40 88 65 15 og +45 63 12 65 15</span>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+4540886515">Ring</a>
<h4 class="mt-2">Navn: Birgitte True</h4>
<h4 class="mt-0">Email: bit@sde.dk</h4>
<h4 class="mt-0">Telefontid:</h4>
<h4 class="mt-0">Mandag-Torsdag kl. 8.00-15.00</h4>
<h4 class="mt-0">Fredag kl. 8.00-12.00</h4>
<span class="text-center sde-black-20 mt-1">+45 63 12 67 15</span>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+4563126715">Ring</a>
<h4 class="mt-2">Navn: Thomas Thomsen</h4>
<h4 class="mt-0">Email: thth@sde.dk</h4>
<h4 class="mt-0">Kollegieassistent</h4>
<span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
<h4 class="mt-2">Navn: Anja Holm Brix</h4>
<h4 class="mt-0">Email: ahb@sde.dk</h4>
<h4 class="mt-0">Kollegieassistent</h4>
<span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
<h4 class="mt-2">Navn: Britta Overgaard Brink Olsen</h4>
<h4 class="mt-0">Email: brio@sde.dk</h4>
<h4 class="mt-0">Kollegieassistent</h4>
<span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
<h4 class="mt-2">Navn: Jesper Sandberg</h4>
<h4 class="mt-0">Email: jesa@sde.dk</h4>
<h4 class="mt-0">Kollegieassistent</h4>
<span class="text-center sde-black-20 mt-1">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+4524629450">Ring</a>
</main>
@endsection
skolehjem/resources/views/app/layout/base.blade.php
+5 -1
View File
@@ -32,7 +32,7 @@
<img src="{{URL::asset('/images/icons/Galleri.svg')}}" alt="Galleri">
Galleri
</a>
<a href="#">
<a href="{{ route("contacts.index") }}">
<img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
Kontoret
</a>
@@ -40,6 +40,10 @@
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
</a>
<a href="#">
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
Konto
</a>
</div>
@yield("content")
skolehjem/resources/views/app/root/index.blade.php
+2 -2
View File
@@ -12,7 +12,7 @@
{{--@extends("app.users.register")--}}
{{--Events--}}
{{----}}@extends("app.events.index")
{{--@extends("app.events.index")--}}
{{--Vagttelefon--}}
{{--@extends("app.vagttelefons.index")--}}
@@ -21,7 +21,7 @@
{{--@extends("app.washing-reservations.index")--}}
{{--Menuplan--}}
{{--@extends("app.menuplans.index")--}}
{{----}}@extends("app.menuplans.index")
{{--Contact--}}
{{--@extends("app.contact.index")--}}
skolehjem/resources/views/app/users/index.blade.php
+18 -16
View File
@@ -1,21 +1,23 @@
@extends('app.layout.base')
@section('content')
<div class="d-flex col block-container mt-2">
<a href="" class="block text-center mb-1">Menu</a>
<a href="" class="block text-center mb-1">Aktiviteter</a>
<a href="" class="block text-center mb-1">Kalender</a>
</div>
<div class="links row">
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a>
<main>
<div class="d-flex col block-container mt-2">
<a href="" class="block text-center mb-1">Menu</a>
<a href="" class="block text-center mb-1">Aktiviteter</a>
<a href="" class="block text-center mb-1">Kalender</a>
</div>
<div class="links row">
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/facebook-icon.png') }}" class="h-100" alt="Facebook">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/yt.png') }}" class="h-100" alt="Youtube">
</a>
<a href="" class="link">
<img src="{{ URL::asset('/images/icons/instagram.png') }}" class="h-100" alt="Instagram">
</a>
</div>
</div>
</main>
@endsection