From b8f2c57fc0ed1bba404d318a6c2d747a738baa08 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 09:21:54 +0200 Subject: [PATCH 1/6] Created konto entry in hamburger menu --- skolehjem/public/images/icons/user-hvid.svg | 1 + skolehjem/public/images/icons/user.svg | 1 + skolehjem/resources/views/app/layout/base.blade.php | 4 ++++ 3 files changed, 6 insertions(+) create mode 100644 skolehjem/public/images/icons/user-hvid.svg create mode 100644 skolehjem/public/images/icons/user.svg diff --git a/skolehjem/public/images/icons/user-hvid.svg b/skolehjem/public/images/icons/user-hvid.svg new file mode 100644 index 0000000..12fae85 --- /dev/null +++ b/skolehjem/public/images/icons/user-hvid.svg @@ -0,0 +1 @@ + diff --git a/skolehjem/public/images/icons/user.svg b/skolehjem/public/images/icons/user.svg new file mode 100644 index 0000000..042ffb1 --- /dev/null +++ b/skolehjem/public/images/icons/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 8abab34..1d3857e 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -40,6 +40,10 @@ Vagttelefon Vagttelefon + + Konto + Konto + @yield("content") From fc1d7c5a5ba8908b08f8dc07e82365dab0903a35 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 09:26:07 +0200 Subject: [PATCH 2/6] Fixes --- skolehjem/resources/js/navmenu/menu.js | 29 ------------------- .../resources/views/app/root/index.blade.php | 4 +-- 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js index 7f47606..f73942f 100644 --- a/skolehjem/resources/js/navmenu/menu.js +++ b/skolehjem/resources/js/navmenu/menu.js @@ -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"); diff --git a/skolehjem/resources/views/app/root/index.blade.php b/skolehjem/resources/views/app/root/index.blade.php index a2a2422..df2b1fe 100644 --- a/skolehjem/resources/views/app/root/index.blade.php +++ b/skolehjem/resources/views/app/root/index.blade.php @@ -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 From 2726ccadbf15ee0268ccd69e7452c8bf45190c6f Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 09:28:57 +0200 Subject: [PATCH 3/6] Fixes --- .../resources/views/app/users/index.blade.php | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/skolehjem/resources/views/app/users/index.blade.php b/skolehjem/resources/views/app/users/index.blade.php index 60543b6..033a81e 100644 --- a/skolehjem/resources/views/app/users/index.blade.php +++ b/skolehjem/resources/views/app/users/index.blade.php @@ -1,21 +1,23 @@ @extends('app.layout.base') @section('content') -
- Menu - Aktiviteter - Kalender -
-
- - Facebook - - - Youtube - - - Instagram - +
+
+ Menu + Aktiviteter + Kalender +
+
+ + Facebook + + + Youtube + + + Instagram + -
+
+ @endsection From 6bdf7d34477853931f0c88e783dab87c1be85a24 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 09:57:21 +0200 Subject: [PATCH 4/6] Fixes --- .../resources/views/admin/users/create.blade.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index d5d02ed..427d2cd 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -14,17 +14,17 @@
@csrf - + - + - + - - - + + + - +
@endsection From 3115b337cdf2a5ad2b957e4b880b34d8631f280b Mon Sep 17 00:00:00 2001 From: Neerholt Date: Mon, 29 Jun 2020 10:07:42 +0200 Subject: [PATCH 5/6] =?UTF-8?q?jeg=20er=20ikke=20sikker=20p=C3=A5=20hvad?= =?UTF-8?q?=20der=20der=20sket=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skolehjem/app/Http/Controllers/ContactController.php | 9 +++++++-- skolehjem/resources/views/app/layout/base.blade.php | 2 +- skolehjem/routes/web.php | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index 4b00410..63eea17 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -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]); } /** diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 1d3857e..50fb89c 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -32,7 +32,7 @@ Galleri Galleri - + Kontoret Kontoret diff --git a/skolehjem/routes/web.php b/skolehjem/routes/web.php index 862379c..260a3f8 100644 --- a/skolehjem/routes/web.php +++ b/skolehjem/routes/web.php @@ -26,7 +26,7 @@ Route::get("/logout", "UserController@logout")->name("users.logout"); - +Route::resource("contacts", "ContactController"); Route::resource("menu-plans", "MenuPlanController"); Route::resource("users", "UserController"); Route::resource("events", "EventController"); From d4abbfc189099cd137613f871aaadfacb604b533 Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Mon, 29 Jun 2020 10:12:58 +0200 Subject: [PATCH 6/6] Fixes --- skolehjem/resources/views/admin/layout/base.blade.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index 67cf268..0706b73 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -40,6 +40,12 @@ CreateOpret Vaskemaskine +
+

Kontakter

+
+ ReadVis Kontakter +
+