From 60bd31e54bdc8d99f45734db0305a38f3e7995e7 Mon Sep 17 00:00:00 2001 From: Frederikmillingpytlick Date: Tue, 16 Jun 2020 09:04:25 +0200 Subject: [PATCH 1/4] Created, moved and renamed views --- .../{read.blade.php => show.blade.php} | 0 .../admin/{user => users}/create.blade.php | 0 .../views/admin/users/delete.blade.php | 13 ++++++++ .../views/admin/users/edit.blade.php | 14 ++++++++ .../read.blade.php => users/index.blade.php} | 2 +- .../views/admin/users/login.blade.php | 26 +++++++++++++++ .../views/admin/users/logout.blade.php | 14 ++++++++ .../views/admin/users/show.blade.php | 33 +++++++++++++++++++ .../views/admin/users/store.blade.php | 14 ++++++++ .../admin/{user => users}/update.blade.php | 0 skolehjem/resources/views/index.blade.php | 12 +++---- 11 files changed, 121 insertions(+), 7 deletions(-) rename skolehjem/resources/views/admin/menuplan/{read.blade.php => show.blade.php} (100%) rename skolehjem/resources/views/admin/{user => users}/create.blade.php (100%) create mode 100644 skolehjem/resources/views/admin/users/delete.blade.php create mode 100644 skolehjem/resources/views/admin/users/edit.blade.php rename skolehjem/resources/views/admin/{user/read.blade.php => users/index.blade.php} (98%) create mode 100644 skolehjem/resources/views/admin/users/login.blade.php create mode 100644 skolehjem/resources/views/admin/users/logout.blade.php create mode 100644 skolehjem/resources/views/admin/users/show.blade.php create mode 100644 skolehjem/resources/views/admin/users/store.blade.php rename skolehjem/resources/views/admin/{user => users}/update.blade.php (100%) diff --git a/skolehjem/resources/views/admin/menuplan/read.blade.php b/skolehjem/resources/views/admin/menuplan/show.blade.php similarity index 100% rename from skolehjem/resources/views/admin/menuplan/read.blade.php rename to skolehjem/resources/views/admin/menuplan/show.blade.php diff --git a/skolehjem/resources/views/admin/user/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php similarity index 100% rename from skolehjem/resources/views/admin/user/create.blade.php rename to skolehjem/resources/views/admin/users/create.blade.php diff --git a/skolehjem/resources/views/admin/users/delete.blade.php b/skolehjem/resources/views/admin/users/delete.blade.php new file mode 100644 index 0000000..78aa7cb --- /dev/null +++ b/skolehjem/resources/views/admin/users/delete.blade.php @@ -0,0 +1,13 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Bruger - Fjern +@endsection + +@section("path") + Fjern Bruger / +@endsection + +@section("content") +@endsection diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php new file mode 100644 index 0000000..1acf7e1 --- /dev/null +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Bruger - Rediger +@endsection + +@section("path") + Rediger Bruger / +@endsection + +@section("content") + +@endsection diff --git a/skolehjem/resources/views/admin/user/read.blade.php b/skolehjem/resources/views/admin/users/index.blade.php similarity index 98% rename from skolehjem/resources/views/admin/user/read.blade.php rename to skolehjem/resources/views/admin/users/index.blade.php index e00506e..0f8507c 100644 --- a/skolehjem/resources/views/admin/user/read.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -2,7 +2,7 @@ @extends("admin.layout.header") @section("title") - User - Read + Bruger - Vis @endsection @section("path") diff --git a/skolehjem/resources/views/admin/users/login.blade.php b/skolehjem/resources/views/admin/users/login.blade.php new file mode 100644 index 0000000..5d9ade1 --- /dev/null +++ b/skolehjem/resources/views/admin/users/login.blade.php @@ -0,0 +1,26 @@ +@extends("app.layout.base") + +@section("title") + Login +@endsection + +@section("content") +
+
+ Syddansk Erhvervsskole +
+
+ + + + + +
+ Forgot password? +
+@endsection diff --git a/skolehjem/resources/views/admin/users/logout.blade.php b/skolehjem/resources/views/admin/users/logout.blade.php new file mode 100644 index 0000000..096c00e --- /dev/null +++ b/skolehjem/resources/views/admin/users/logout.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Home - Logud +@endsection + +@section("path") + Logud / +@endsection + +@section("content") + +@endsection diff --git a/skolehjem/resources/views/admin/users/show.blade.php b/skolehjem/resources/views/admin/users/show.blade.php new file mode 100644 index 0000000..0f8507c --- /dev/null +++ b/skolehjem/resources/views/admin/users/show.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Bruger - Vis +@endsection + +@section("path") + Vis Brugere / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/users/store.blade.php b/skolehjem/resources/views/admin/users/store.blade.php new file mode 100644 index 0000000..afc56ee --- /dev/null +++ b/skolehjem/resources/views/admin/users/store.blade.php @@ -0,0 +1,14 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Bruger - Opbevar +@endsection + +@section("path") + Opbevar Brugere / +@endsection + +@section("content") + +@endsection diff --git a/skolehjem/resources/views/admin/user/update.blade.php b/skolehjem/resources/views/admin/users/update.blade.php similarity index 100% rename from skolehjem/resources/views/admin/user/update.blade.php rename to skolehjem/resources/views/admin/users/update.blade.php diff --git a/skolehjem/resources/views/index.blade.php b/skolehjem/resources/views/index.blade.php index cd728b3..8e80084 100644 --- a/skolehjem/resources/views/index.blade.php +++ b/skolehjem/resources/views/index.blade.php @@ -3,10 +3,10 @@ {{----}} {{--Login--}} -{{--@extends("app.user.login")--}} +{{--@extends("app.users.login")--}} {{--Register--}} -{{--@extends("app.user.register")--}} +{{--@extends("app.users.register")--}} {{--Vagttelefon--}} @@ -17,19 +17,19 @@ {{----}} {{--Create User--}} -{{--@extends("admin.user.create")--}} +{{--@extends("admin.users.create")--}} {{--Read User--}} -{{--@extends("admin.user.read")--}} +{{--@extends("admin.users.show")--}} {{--Update User--}} -{{--@extends("admin.user.update")--}} +{{--@extends("admin.users.update")--}} {{--Create Menuplan--}} {{----}}@extends("admin.menuplan.create") {{--Read Menuplan--}} -{{--@extends("admin.menuplan.read")--}} +{{--@extends("admin.menuplan.show")--}} {{--Update Menuplan--}} {{--@extends("admin.menuplan.update")--}} From 7478766927326afc2a2b5c98a661cce711e6c334 Mon Sep 17 00:00:00 2001 From: Frederikmillingpytlick Date: Tue, 16 Jun 2020 09:06:45 +0200 Subject: [PATCH 2/4] Created views --- .../admin/washing-machines/create.blade.php | 33 +++++++++++++++++++ .../admin/washing-machines/delete.blade.php | 33 +++++++++++++++++++ .../admin/washing-machines/edit.blade.php | 33 +++++++++++++++++++ .../admin/washing-machines/index.blade.php | 33 +++++++++++++++++++ .../admin/washing-machines/show.blade.php | 33 +++++++++++++++++++ .../admin/washing-machines/store.blade.php | 33 +++++++++++++++++++ .../admin/washing-machines/update.blade.php | 33 +++++++++++++++++++ 7 files changed, 231 insertions(+) create mode 100644 skolehjem/resources/views/admin/washing-machines/create.blade.php create mode 100644 skolehjem/resources/views/admin/washing-machines/delete.blade.php create mode 100644 skolehjem/resources/views/admin/washing-machines/edit.blade.php create mode 100644 skolehjem/resources/views/admin/washing-machines/index.blade.php create mode 100644 skolehjem/resources/views/admin/washing-machines/show.blade.php create mode 100644 skolehjem/resources/views/admin/washing-machines/store.blade.php create mode 100644 skolehjem/resources/views/admin/washing-machines/update.blade.php diff --git a/skolehjem/resources/views/admin/washing-machines/create.blade.php b/skolehjem/resources/views/admin/washing-machines/create.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-machines/create.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-machines/delete.blade.php b/skolehjem/resources/views/admin/washing-machines/delete.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-machines/delete.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-machines/edit.blade.php b/skolehjem/resources/views/admin/washing-machines/edit.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-machines/edit.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-machines/index.blade.php b/skolehjem/resources/views/admin/washing-machines/index.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-machines/index.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-machines/show.blade.php b/skolehjem/resources/views/admin/washing-machines/show.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-machines/show.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-machines/store.blade.php b/skolehjem/resources/views/admin/washing-machines/store.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-machines/store.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/washing-machines/update.blade.php b/skolehjem/resources/views/admin/washing-machines/update.blade.php new file mode 100644 index 0000000..e7c4ae2 --- /dev/null +++ b/skolehjem/resources/views/admin/washing-machines/update.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Vaskemaskiner - Vis +@endsection + +@section("path") + Vis Vaskemaskiner / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection From 99c2b1675232082415dbce986df7ba6385220f3a Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 17 Jun 2020 09:08:26 +0200 Subject: [PATCH 3/4] Changed create.blade.php --- skolehjem/resources/views/admin/users/create.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index 8f4307f..de65661 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -11,7 +11,7 @@ @section("content")

Opret Bruger:

-
+ From fe9a97656ff72f85d2f3866cb24efa5c5e149d8b Mon Sep 17 00:00:00 2001 From: frederikpyt Date: Wed, 17 Jun 2020 11:28:48 +0200 Subject: [PATCH 4/4] Updated hrefs --- .../views/admin/layout/base.blade.php | 12 +++------- .../views/admin/layout/header.blade.php | 10 ++++++-- .../views/admin/users/create.blade.php | 2 +- .../views/admin/users/edit.blade.php | 19 +++++++++++++-- .../views/admin/users/index.blade.php | 2 +- .../views/admin/users/show.blade.php | 23 ++----------------- .../views/admin/users/store.blade.php | 6 ++--- .../views/admin/users/update.blade.php | 19 ++------------- skolehjem/resources/views/index.blade.php | 5 +++- 9 files changed, 41 insertions(+), 57 deletions(-) diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php index c6841e5..77277fd 100644 --- a/skolehjem/resources/views/admin/layout/base.blade.php +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -13,13 +13,10 @@
@@ -30,14 +27,11 @@ -
- Home / @yield("path") + Home / @yield("path")
@yield("content") diff --git a/skolehjem/resources/views/admin/layout/header.blade.php b/skolehjem/resources/views/admin/layout/header.blade.php index 619a08d..d3ab485 100644 --- a/skolehjem/resources/views/admin/layout/header.blade.php +++ b/skolehjem/resources/views/admin/layout/header.blade.php @@ -1,7 +1,13 @@ @section("header")
Syddansk Erhvervsskole - User: Admin - Log ud + + @auth + User: {{ Auth::user()->name }} + Log ud + @else + Log ind + @endauth +
@endsection diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php index de65661..7976d5d 100644 --- a/skolehjem/resources/views/admin/users/create.blade.php +++ b/skolehjem/resources/views/admin/users/create.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Opret Bruger / + Opret Bruger / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/users/edit.blade.php b/skolehjem/resources/views/admin/users/edit.blade.php index 1acf7e1..6377d40 100644 --- a/skolehjem/resources/views/admin/users/edit.blade.php +++ b/skolehjem/resources/views/admin/users/edit.blade.php @@ -6,9 +6,24 @@ @endsection @section("path") - Rediger Bruger / + Rediger Bruger / @endsection @section("content") - +

Rediger Bruger:

+ + + + + + + + + + + + + + + @endsection diff --git a/skolehjem/resources/views/admin/users/index.blade.php b/skolehjem/resources/views/admin/users/index.blade.php index 0f8507c..d9b22ee 100644 --- a/skolehjem/resources/views/admin/users/index.blade.php +++ b/skolehjem/resources/views/admin/users/index.blade.php @@ -6,7 +6,7 @@ @endsection @section("path") - Vis Brugere / + Vis Brugere / @endsection @section("content") diff --git a/skolehjem/resources/views/admin/users/show.blade.php b/skolehjem/resources/views/admin/users/show.blade.php index 0f8507c..1138114 100644 --- a/skolehjem/resources/views/admin/users/show.blade.php +++ b/skolehjem/resources/views/admin/users/show.blade.php @@ -6,28 +6,9 @@ @endsection @section("path") - Vis Brugere / + Vis Brugere / @endsection @section("content") - - - - - - - - - - - - - - - - - - - -
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+ show.blade.php @endsection diff --git a/skolehjem/resources/views/admin/users/store.blade.php b/skolehjem/resources/views/admin/users/store.blade.php index afc56ee..c4f58ef 100644 --- a/skolehjem/resources/views/admin/users/store.blade.php +++ b/skolehjem/resources/views/admin/users/store.blade.php @@ -2,13 +2,13 @@ @extends("admin.layout.header") @section("title") - Bruger - Opbevar + Bruger - Opret @endsection @section("path") - Opbevar Brugere / + Opret Brugere / @endsection @section("content") - + Brugeren blev (ikke) oprettet. @endsection diff --git a/skolehjem/resources/views/admin/users/update.blade.php b/skolehjem/resources/views/admin/users/update.blade.php index 8833554..2e76335 100644 --- a/skolehjem/resources/views/admin/users/update.blade.php +++ b/skolehjem/resources/views/admin/users/update.blade.php @@ -6,24 +6,9 @@ @endsection @section("path") - Rediger Bruger / + Rediger Bruger / @endsection @section("content") -

Rediger Bruger:

-
- - - - - - - - - - - - - -
+ Din bruger blev (ikke) redigeret. @endsection diff --git a/skolehjem/resources/views/index.blade.php b/skolehjem/resources/views/index.blade.php index 8e80084..840da1d 100644 --- a/skolehjem/resources/views/index.blade.php +++ b/skolehjem/resources/views/index.blade.php @@ -16,6 +16,9 @@ {{------Admin Panel {{----}} +{{--Index--}} +{{----}}@extends("admin.index") + {{--Create User--}} {{--@extends("admin.users.create")--}} @@ -26,7 +29,7 @@ {{--@extends("admin.users.update")--}} {{--Create Menuplan--}} -{{----}}@extends("admin.menuplan.create") +{{--@extends("admin.menuplan.create")--}} {{--Read Menuplan--}} {{--@extends("admin.menuplan.show")--}}