Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp
Conflicts: skolehjem/resources/views/admin/layout/base.blade.php skolehjem/resources/views/app/layout/base.blade.php skolehjem/routes/web.php
This commit is contained in:
commit
03c609175d
|
|
@ -3,6 +3,8 @@
|
|||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Http\Response;
|
||||
use App\Contact;
|
||||
|
||||
class ContactController extends Controller
|
||||
{
|
||||
|
|
@ -11,9 +13,12 @@ class ContactController extends Controller
|
|||
*
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index()
|
||||
public function index(Request $request)
|
||||
{
|
||||
//
|
||||
|
||||
$contact = Contact::query()->paginate($request->input("limit", 20));
|
||||
|
||||
return Response::detect("contact.index", [ "contact" => $contact]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<svg id="Layer_1" enable-background="new 0 0 512 512" height="512" fill="#fff" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m256 512c-60.615 0-119.406-21.564-165.543-60.721-10.833-9.188-20.995-19.375-30.201-30.275-38.859-46.06-60.256-104.657-60.256-165.004 0-68.381 26.628-132.668 74.98-181.02s112.639-74.98 181.02-74.98 132.668 26.628 181.02 74.98 74.98 112.639 74.98 181.02c0 60.348-21.397 118.945-60.251 164.998-9.211 10.906-19.373 21.093-30.209 30.284-46.134 39.154-104.925 60.718-165.54 60.718zm0-480c-123.514 0-224 100.486-224 224 0 52.805 18.719 104.074 52.709 144.363 8.06 9.543 16.961 18.466 26.451 26.516 40.364 34.256 91.801 53.121 144.84 53.121s104.476-18.865 144.837-53.119c9.493-8.052 18.394-16.976 26.459-26.525 33.985-40.281 52.704-91.55 52.704-144.356 0-123.514-100.486-224-224-224z"/><path d="m256 256c-52.935 0-96-43.065-96-96s43.065-96 96-96 96 43.065 96 96-43.065 96-96 96zm0-160c-35.29 0-64 28.71-64 64s28.71 64 64 64 64-28.71 64-64-28.71-64-64-64z"/><path d="m411.202 455.084c-1.29 0-2.6-.157-3.908-.485-8.57-2.151-13.774-10.843-11.623-19.414 2.872-11.443 4.329-23.281 4.329-35.185 0-78.285-63.646-142.866-141.893-143.99l-2.107-.01-2.107.01c-78.247 1.124-141.893 65.705-141.893 143.99 0 11.904 1.457 23.742 4.329 35.185 2.151 8.571-3.053 17.263-11.623 19.414s-17.263-3.052-19.414-11.623c-3.512-13.989-5.292-28.448-5.292-42.976 0-46.578 18.017-90.483 50.732-123.63 32.683-33.114 76.285-51.708 122.774-52.358.075-.001.149-.001.224-.001l2.27-.011 2.27.01c.075 0 .149 0 .224.001 46.489.649 90.091 19.244 122.774 52.358 32.715 33.148 50.732 77.053 50.732 123.631 0 14.528-1.78 28.987-5.292 42.976-1.823 7.262-8.343 12.107-15.506 12.108z"/></g></svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -0,0 +1 @@
|
|||
<svg id="Layer_1" enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m256 512c-60.615 0-119.406-21.564-165.543-60.721-10.833-9.188-20.995-19.375-30.201-30.275-38.859-46.06-60.256-104.657-60.256-165.004 0-68.381 26.628-132.668 74.98-181.02s112.639-74.98 181.02-74.98 132.668 26.628 181.02 74.98 74.98 112.639 74.98 181.02c0 60.348-21.397 118.945-60.251 164.998-9.211 10.906-19.373 21.093-30.209 30.284-46.134 39.154-104.925 60.718-165.54 60.718zm0-480c-123.514 0-224 100.486-224 224 0 52.805 18.719 104.074 52.709 144.363 8.06 9.543 16.961 18.466 26.451 26.516 40.364 34.256 91.801 53.121 144.84 53.121s104.476-18.865 144.837-53.119c9.493-8.052 18.394-16.976 26.459-26.525 33.985-40.281 52.704-91.55 52.704-144.356 0-123.514-100.486-224-224-224z"/><path d="m256 256c-52.935 0-96-43.065-96-96s43.065-96 96-96 96 43.065 96 96-43.065 96-96 96zm0-160c-35.29 0-64 28.71-64 64s28.71 64 64 64 64-28.71 64-64-28.71-64-64-64z"/><path d="m411.202 455.084c-1.29 0-2.6-.157-3.908-.485-8.57-2.151-13.774-10.843-11.623-19.414 2.872-11.443 4.329-23.281 4.329-35.185 0-78.285-63.646-142.866-141.893-143.99l-2.107-.01-2.107.01c-78.247 1.124-141.893 65.705-141.893 143.99 0 11.904 1.457 23.742 4.329 35.185 2.151 8.571-3.053 17.263-11.623 19.414s-17.263-3.052-19.414-11.623c-3.512-13.989-5.292-28.448-5.292-42.976 0-46.578 18.017-90.483 50.732-123.63 32.683-33.114 76.285-51.708 122.774-52.358.075-.001.149-.001.224-.001l2.27-.011 2.27.01c.075 0 .149 0 .224.001 46.489.649 90.091 19.244 122.774 52.358 32.715 33.148 50.732 77.053 50.732 123.631 0 14.528-1.78 28.987-5.292 42.976-1.823 7.262-8.343 12.107-15.506 12.108z"/></g></svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -45,6 +45,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")
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@
|
|||
{{--@extends("app.washing-reservations.index")--}}
|
||||
|
||||
{{--Menuplan--}}
|
||||
{{--@extends("app.menuplans.index")--}}
|
||||
{{----}}@extends("app.menuplans.index")
|
||||
|
||||
{{--Contact--}}
|
||||
{{----}}@extends("app.contact.index")
|
||||
{{--@extends("app.contact.index")--}}
|
||||
|
||||
{{----}}
|
||||
{{------Admin Panel
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
@extends('app.layout.base')
|
||||
|
||||
@section('content')
|
||||
<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>
|
||||
|
|
@ -18,4 +19,5 @@
|
|||
</a>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ Route::get("/logout", "UserController@logout")->name("users.logout");
|
|||
|
||||
Route::get("phones", "PhoneController@index")->name("phones.index");
|
||||
|
||||
|
||||
Route::resource("contacts", "ContactController");
|
||||
Route::resource("menu-plans", "MenuPlanController");
|
||||
Route::resource("users", "UserController");
|
||||
Route::resource("events", "EventController");
|
||||
|
|
|
|||
Loading…
Reference in New Issue