diff --git a/skolehjem/public/images/icons/eye.svg b/skolehjem/public/images/icons/eye.svg new file mode 100644 index 0000000..62175de --- /dev/null +++ b/skolehjem/public/images/icons/eye.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/images/icons/pencil-dark.svg b/skolehjem/public/images/icons/pencil-dark.svg new file mode 100644 index 0000000..78b717e --- /dev/null +++ b/skolehjem/public/images/icons/pencil-dark.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/images/icons/pencil.svg b/skolehjem/public/images/icons/pencil.svg new file mode 100644 index 0000000..fe3e29a --- /dev/null +++ b/skolehjem/public/images/icons/pencil.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/images/icons/plus.svg b/skolehjem/public/images/icons/plus.svg new file mode 100644 index 0000000..dfd9023 --- /dev/null +++ b/skolehjem/public/images/icons/plus.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/images/icons/trashcan-dark.svg b/skolehjem/public/images/icons/trashcan-dark.svg new file mode 100644 index 0000000..d5c6fbe --- /dev/null +++ b/skolehjem/public/images/icons/trashcan-dark.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/public/images/icons/trashcan.svg b/skolehjem/public/images/icons/trashcan.svg new file mode 100644 index 0000000..d07c97c --- /dev/null +++ b/skolehjem/public/images/icons/trashcan.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/skolehjem/resources/js/app.js b/skolehjem/resources/js/app.js index b682fbf..8cd4e33 100644 --- a/skolehjem/resources/js/app.js +++ b/skolehjem/resources/js/app.js @@ -3,11 +3,18 @@ * includes Vue and other libraries. It is a great starting point when * building robust, powerful web applications using Vue and Laravel. */ - +//Bootstrap require('./bootstrap'); -require('./navmenu/menu'); + +//Dependencies require('./date'); +//Sites +require('./sites/menuplan'); + +//Webapp hamburger menu +require('./navmenu/menu'); + // window.Vue = require('vue'); /** diff --git a/skolehjem/resources/js/navmenu/menu.js b/skolehjem/resources/js/navmenu/menu.js index b5f5012..3ab3947 100644 --- a/skolehjem/resources/js/navmenu/menu.js +++ b/skolehjem/resources/js/navmenu/menu.js @@ -1,11 +1,12 @@ document.addEventListener("DOMContentLoaded", function(){ // Handler when the DOM is fully loaded - start(); -}); + var path = window.location.pathname; -function start() { - document.getElementById ('toggle').addEventListener ('click', toggleMenu, false); -} + if(path === "/menuplan" || path === "/vagttelefon" || path === "/") + { + document.getElementById ('toggle').addEventListener ('click', toggleMenu, false); + } +}); function toggleMenu() { var buttonElement = document.getElementById('menuIcon'); diff --git a/skolehjem/resources/js/menuplan/menuplan.js b/skolehjem/resources/js/sites/menuplan.js similarity index 70% rename from skolehjem/resources/js/menuplan/menuplan.js rename to skolehjem/resources/js/sites/menuplan.js index 9a3d225..2f14dea 100644 --- a/skolehjem/resources/js/menuplan/menuplan.js +++ b/skolehjem/resources/js/sites/menuplan.js @@ -1,11 +1,12 @@ document.addEventListener("DOMContentLoaded", function(){ // Handler when the DOM is fully loaded - start(); -}); + var path = window.location.pathname; -function start() { - updateWeek(); -} + if(path === "/menuplan") + { + updateWeek(); + } +}); function updateWeek() { var elm = document.getElementById('week'); diff --git a/skolehjem/resources/sass/_forms.scss b/skolehjem/resources/sass/_forms.scss deleted file mode 100644 index 239469a..0000000 --- a/skolehjem/resources/sass/_forms.scss +++ /dev/null @@ -1,54 +0,0 @@ -/* Mobile */ -@media only screen -and (max-width : 900px) -{ - form { - max-width: 100%; - padding: 0 .45rem 0 .45rem; - display: flex; - flex-direction: column; - justify-content: center; - } - - input[type="email"], input[type="password"] { - border: none; - border-bottom: white solid 2px; - background-color: transparent; - font-size: 1rem; - color: rgba(255,255,255,1); - line-height: 2rem; - margin-bottom: 1rem; - } - - .btn { - border: 0; - border-radius: 4px; - padding: .75rem; - cursor: pointer; - font-weight: 700; - font-size: 1.05rem; - background-color: white; - color: $sde-black-80; - margin-bottom: .5rem; - } - - .btn-dark { - color: white; - background-color: $sde-black-80; - } - - .btn-sde-blue { - color: white; - background-color: $sde-blue; - } - - .btn-disabled { - color: white; - background-color: $sde-black-20; - } - - .form-inline { - display: inline-flex; - } - -} diff --git a/skolehjem/resources/sass/_sizes.scss b/skolehjem/resources/sass/_sizes.scss deleted file mode 100644 index 7cba17b..0000000 --- a/skolehjem/resources/sass/_sizes.scss +++ /dev/null @@ -1,23 +0,0 @@ -.w-100 { - width: 100%; -} - -.w-75 { - width: 75%; -} - -.w-50 { - width: 50%; -} - -.w-25 { - width: 25%; -} - -.min-height-100 { - min-height: 100%; -} - -.bg-sde-blue { - background-color: $sde-blue; -} diff --git a/skolehjem/resources/sass/admin/admin.scss b/skolehjem/resources/sass/admin/admin.scss new file mode 100644 index 0000000..27f01b1 --- /dev/null +++ b/skolehjem/resources/sass/admin/admin.scss @@ -0,0 +1,21 @@ +// App +@import '../app/app'; + +// +// Admin +// + +// Header +@import 'header/header'; + +// Nav +@import 'nav/nav'; + +// Directory Path +@import 'nav/directory'; + +// Content +@import 'content/content'; + +// Tables +@import "content/table"; diff --git a/skolehjem/resources/sass/admin/content/content.scss b/skolehjem/resources/sass/admin/content/content.scss new file mode 100644 index 0000000..b13460f --- /dev/null +++ b/skolehjem/resources/sass/admin/content/content.scss @@ -0,0 +1,8 @@ +.content { + border-radius: 2px; + background-color: #ffffff; + width: calc(96% - 2rem); + min-height: calc(100% - 40.8px - 8rem); + padding: 1rem; + margin: 2rem auto; +} diff --git a/skolehjem/resources/sass/admin/content/table.scss b/skolehjem/resources/sass/admin/content/table.scss new file mode 100644 index 0000000..54dff6e --- /dev/null +++ b/skolehjem/resources/sass/admin/content/table.scss @@ -0,0 +1,31 @@ +.tbl { + border-collapse: collapse; + width: 100%; +} + +.tbl td, .tbl th { + border: 1px solid #ddd; + padding: 8px; +} + +.tbl tr:nth-child(even){background-color: rgba(0, 0, 0, 0.1);} + +.tbl tr:hover {background-color: #ddd;} + +.tbl th { + padding-top: 12px; + padding-bottom: 12px; + text-align: left; + background-color: #00788a; + color: white; +} + +.tbl > tbody > tr > td > a { + width: 100%; + display: flex; +} + +.tbl > tbody > tr > td > a > img { + width: 1em; + margin: auto; +} diff --git a/skolehjem/resources/sass/admin/header/header.scss b/skolehjem/resources/sass/admin/header/header.scss new file mode 100644 index 0000000..11eb69f --- /dev/null +++ b/skolehjem/resources/sass/admin/header/header.scss @@ -0,0 +1,14 @@ +header { + height: 4.5rem; +} + +.brand { + width: calc(15% - 2rem); + padding: 0 1rem 0 1rem; + min-width: calc(194px - 2rem); +} + +main { + min-height: calc(100% - 4.5rem); + background-color: #333333; +} diff --git a/skolehjem/resources/sass/admin/nav/directory.scss b/skolehjem/resources/sass/admin/nav/directory.scss new file mode 100644 index 0000000..ee217eb --- /dev/null +++ b/skolehjem/resources/sass/admin/nav/directory.scss @@ -0,0 +1,11 @@ +.directorypath { + border-radius: 2px; + background-color: #333333; + width: calc(96% - 2rem); + padding: .5rem 1rem .5rem 1rem; + + margin-top: 2rem; + margin-bottom: 2rem; + margin-left: auto; + margin-right: auto; +} diff --git a/skolehjem/resources/sass/admin/nav/nav.scss b/skolehjem/resources/sass/admin/nav/nav.scss new file mode 100644 index 0000000..f200ee7 --- /dev/null +++ b/skolehjem/resources/sass/admin/nav/nav.scss @@ -0,0 +1,37 @@ +.nav { + width: 15%; + height: 100%; + min-width: 194px; +} + +.segment { + margin-bottom: 1.25rem; +} + +.segment > h3 { + margin-left: -1rem; + margin-top: 0; + width: calc(100% + 2rem); + background-color: rgba(0,0,0, 0.2); + text-align: center; +} + +.segment > div { + padding: 0 1.25rem 0 1.25rem; + width: calc(100% - 2.5rem); + align-items: center; + margin-bottom: .5rem; +} + +.segment > div:hover { + background-color: rgba(0,0,0,0.2); +} + +.segment > div > a > img { + height: 1em; + padding-right: 8px; +} + +.segment > div > a { + +} diff --git a/skolehjem/resources/sass/_variables.scss b/skolehjem/resources/sass/app/_variables.scss similarity index 100% rename from skolehjem/resources/sass/_variables.scss rename to skolehjem/resources/sass/app/_variables.scss diff --git a/skolehjem/resources/sass/app.scss b/skolehjem/resources/sass/app/app.scss similarity index 70% rename from skolehjem/resources/sass/app.scss rename to skolehjem/resources/sass/app/app.scss index b935aea..14ba35b 100644 --- a/skolehjem/resources/sass/app.scss +++ b/skolehjem/resources/sass/app/app.scss @@ -18,26 +18,20 @@ // Variables @import 'variables'; -// Defaults -@import "default"; - // Forms -@import "forms"; +@import "forms/forms"; // Displays -@import "displays"; +@import "general/displays"; // Texts -@import "texts"; +@import "general/texts"; // Margins -@import "margins"; +@import "general/margins"; // Sizes -@import "sizes"; +@import "general/sizes"; // Checkboxes -@import "checkboxes"; - -// Bootstrap -//@import '~bootstrap/scss/bootstrap'; +@import "forms/checkboxes"; diff --git a/skolehjem/resources/sass/_checkboxes.scss b/skolehjem/resources/sass/app/forms/_checkboxes.scss similarity index 100% rename from skolehjem/resources/sass/_checkboxes.scss rename to skolehjem/resources/sass/app/forms/_checkboxes.scss diff --git a/skolehjem/resources/sass/app/forms/_forms.scss b/skolehjem/resources/sass/app/forms/_forms.scss new file mode 100644 index 0000000..0cc3185 --- /dev/null +++ b/skolehjem/resources/sass/app/forms/_forms.scss @@ -0,0 +1,57 @@ +form { + max-width: 100%; + padding: 0 .45rem 0 .45rem; + display: flex; + flex-direction: column; + justify-content: center; +} + +.btn { + border: 0; + border-radius: 4px; + padding: .5rem; + cursor: pointer; + font-weight: 700; + font-size: 1.05rem; + background-color: white; + color: $sde-black-80; + margin-bottom: .5rem; +} + +.btn-dark { + color: white; + background-color: $sde-black-80; +} + +.btn-sde-blue { + color: white; + background-color: $sde-blue; +} + +.btn-disabled { + color: white; + background-color: $sde-black-20; +} + +.form-inline { + display: inline-flex; +} + +input{ + border: grey solid 2px; + border-radius: 4px; + background-color: transparent; + font-size: 1rem; + line-height: 2rem; + margin-bottom: 1rem; +} + +input.appinput { + border: none; + border-bottom: white solid 2px; + background-color: transparent; + font-size: 1rem; + color: rgba(255,255,255,1); + line-height: 2rem; + margin-bottom: 1rem; +} diff --git a/skolehjem/resources/sass/_displays.scss b/skolehjem/resources/sass/app/general/_displays.scss similarity index 73% rename from skolehjem/resources/sass/_displays.scss rename to skolehjem/resources/sass/app/general/_displays.scss index b5167bd..453b071 100644 --- a/skolehjem/resources/sass/_displays.scss +++ b/skolehjem/resources/sass/app/general/_displays.scss @@ -19,3 +19,11 @@ display: flex; flex-direction: column; } + +.cursor-normal { + cursor: default; +} + +.cursor-pointer { + cursor: pointer; +} diff --git a/skolehjem/resources/sass/_margins.scss b/skolehjem/resources/sass/app/general/_margins.scss similarity index 80% rename from skolehjem/resources/sass/_margins.scss rename to skolehjem/resources/sass/app/general/_margins.scss index 21c2481..2dd4e99 100644 --- a/skolehjem/resources/sass/_margins.scss +++ b/skolehjem/resources/sass/app/general/_margins.scss @@ -34,6 +34,22 @@ margin-top: 0; } +.ml-1 { + margin-left: .75rem; +} + +.mr-1 { + margin-right: .75rem; +} + +.mb-1 { + margin-bottom: .75rem; +} + +.mt-1 { + margin-top: .75rem; +} + .ml-2 { margin-left: 3rem; } diff --git a/skolehjem/resources/sass/app/general/_sizes.scss b/skolehjem/resources/sass/app/general/_sizes.scss new file mode 100644 index 0000000..40dbfa0 --- /dev/null +++ b/skolehjem/resources/sass/app/general/_sizes.scss @@ -0,0 +1,59 @@ +* { + font-family: $font-family-sans-serif; +} + +html, body { + width: 100%; + margin: 0; + padding: 0; + height: 100%; +} + +::placeholder { + opacity: 1; +} + +a { + color: #000000; + text-decoration: none; +} + +.w-100 { + width: 100%; +} + +.w-85 { + width: 85%; +} + +.w-75 { + width: 75%; +} + +.w-50 { + width: 50%; +} + +.w-25 { + width: 25%; +} + +.w-15 { + width: 15%; +} + +.h-100 { + height: 100%; +} + +.h-90 { + height: 90%; +} + +.h-10 { + height: 10%; +} + +.bg-sde-blue { + background-color: $sde-blue; +} diff --git a/skolehjem/resources/sass/_texts.scss b/skolehjem/resources/sass/app/general/_texts.scss similarity index 100% rename from skolehjem/resources/sass/_texts.scss rename to skolehjem/resources/sass/app/general/_texts.scss diff --git a/skolehjem/resources/sass/_default.scss b/skolehjem/resources/sass/webapp/_default.scss similarity index 78% rename from skolehjem/resources/sass/_default.scss rename to skolehjem/resources/sass/webapp/_default.scss index 98e74fb..833f4ca 100644 --- a/skolehjem/resources/sass/_default.scss +++ b/skolehjem/resources/sass/webapp/_default.scss @@ -1,23 +1,12 @@ -* { - font-family: $font-family-sans-serif; +main { + max-width: 900px; + display: flex; + flex-direction: column; + justify-content: center; + margin: auto; + padding: 0 1.25rem 0 1.25rem; } -html, body { - width: 100%; - margin: 0; - height: 100%; -} - -::placeholder { - opacity: 1; -} - -a { - color: #000000; - text-decoration: none; -} - - // Mobile @media only screen and (max-width : 900px) @@ -67,7 +56,7 @@ and (max-width : 900px) } span { - font-size: 5vw; + font-size: 12px; } p { diff --git a/skolehjem/resources/sass/webapp/webapp.scss b/skolehjem/resources/sass/webapp/webapp.scss new file mode 100644 index 0000000..af500a5 --- /dev/null +++ b/skolehjem/resources/sass/webapp/webapp.scss @@ -0,0 +1,9 @@ +// App +@import '../app/app'; + +// +// Webapp +// + +// Defaults +@import "default"; diff --git a/skolehjem/resources/views/admin/index.blade.php b/skolehjem/resources/views/admin/index.blade.php new file mode 100644 index 0000000..bfa392e --- /dev/null +++ b/skolehjem/resources/views/admin/index.blade.php @@ -0,0 +1,10 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Home - Admin Panel +@endsection + +@section("content") + +@endsection diff --git a/skolehjem/resources/views/admin/layout/base.blade.php b/skolehjem/resources/views/admin/layout/base.blade.php new file mode 100644 index 0000000..c6841e5 --- /dev/null +++ b/skolehjem/resources/views/admin/layout/base.blade.php @@ -0,0 +1,51 @@ + + + + @yield("title") + + + + + +@yield("header") +
+
+
+

Brugere

+
+ ReadVis Brugere +
+
+ CreateOpret Bruger +
+
+ UpdateRediger Bruger +
+
+
+

Menuplan

+
+ ReadVis Menuplan +
+
+ CreateOpret Menuplan +
+
+ UpdateRediger Menuplan +
+
+
+
+
+ Home / @yield("path") +
+
+ @yield("content") +
+
+
+ + +@yield("scripts") + + diff --git a/skolehjem/resources/views/admin/layout/header.blade.php b/skolehjem/resources/views/admin/layout/header.blade.php new file mode 100644 index 0000000..619a08d --- /dev/null +++ b/skolehjem/resources/views/admin/layout/header.blade.php @@ -0,0 +1,7 @@ +@section("header") +
+ Syddansk Erhvervsskole + User: Admin + Log ud +
+@endsection diff --git a/skolehjem/resources/views/admin/menuplan/create.blade.php b/skolehjem/resources/views/admin/menuplan/create.blade.php new file mode 100644 index 0000000..3d1ddba --- /dev/null +++ b/skolehjem/resources/views/admin/menuplan/create.blade.php @@ -0,0 +1,32 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Menuplan - Opret +@endsection + +@section("path") + Opret Menuplan / +@endsection + +@section("content") +

Opret Menuplan:

+
+ + + + + + + + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/menuplan/read.blade.php b/skolehjem/resources/views/admin/menuplan/read.blade.php new file mode 100644 index 0000000..b733ab6 --- /dev/null +++ b/skolehjem/resources/views/admin/menuplan/read.blade.php @@ -0,0 +1,39 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Menuplan - Read +@endsection + +@section("path") + Vis Menuplan / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + + + + + + + +
IDFredagTirsdagOnsdagTorsdagFredagLørdagSøndagUpdateDelete
{ID}{Fredag}{Tirsdag}{Onsdag}{Torsdag}{Fredag}{Lørdag}{Søndag}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/menuplan/update.blade.php b/skolehjem/resources/views/admin/menuplan/update.blade.php new file mode 100644 index 0000000..37b19fa --- /dev/null +++ b/skolehjem/resources/views/admin/menuplan/update.blade.php @@ -0,0 +1,32 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Menuplan - Rediger +@endsection + +@section("path") + Rediger Menuplan / +@endsection + +@section("content") +

Rediger Menuplan:

+
+ + + + + + + + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/user/create.blade.php b/skolehjem/resources/views/admin/user/create.blade.php new file mode 100644 index 0000000..8f4307f --- /dev/null +++ b/skolehjem/resources/views/admin/user/create.blade.php @@ -0,0 +1,29 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Bruger - Opret +@endsection + +@section("path") + Opret Bruger / +@endsection + +@section("content") +

Opret Bruger:

+
+ + + + + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/admin/user/read.blade.php b/skolehjem/resources/views/admin/user/read.blade.php new file mode 100644 index 0000000..e00506e --- /dev/null +++ b/skolehjem/resources/views/admin/user/read.blade.php @@ -0,0 +1,33 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + User - Read +@endsection + +@section("path") + Vis Brugere / +@endsection + +@section("content") + + + + + + + + + + + + + + + + + + + +
IDFornavnEfternavnEmailTlf nrUpdateDelete
{ID}{Fornavn}{Efternavn}{Email}{TLF}UpdateDelete
+@endsection diff --git a/skolehjem/resources/views/admin/user/update.blade.php b/skolehjem/resources/views/admin/user/update.blade.php new file mode 100644 index 0000000..8833554 --- /dev/null +++ b/skolehjem/resources/views/admin/user/update.blade.php @@ -0,0 +1,29 @@ +@extends("admin.layout.base") +@extends("admin.layout.header") + +@section("title") + Bruger - Rediger +@endsection + +@section("path") + Rediger Bruger / +@endsection + +@section("content") +

Rediger Bruger:

+
+ + + + + + + + + + + + + +
+@endsection diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php new file mode 100644 index 0000000..2bef7f9 --- /dev/null +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -0,0 +1,15 @@ + + + + @yield("title") + + + + + + @yield("content") + + + @yield("scripts") + + diff --git a/skolehjem/resources/views/app/user/index.blade.php b/skolehjem/resources/views/app/user/index.blade.php new file mode 100644 index 0000000..eff75b4 --- /dev/null +++ b/skolehjem/resources/views/app/user/index.blade.php @@ -0,0 +1,4 @@ +@extends('webapp.layout.base') + +@section('content') +@endsection diff --git a/skolehjem/resources/views/user/login.blade.php b/skolehjem/resources/views/app/user/login.blade.php similarity index 74% rename from skolehjem/resources/views/user/login.blade.php rename to skolehjem/resources/views/app/user/login.blade.php index 4d2ec0d..5d9ade1 100644 --- a/skolehjem/resources/views/user/login.blade.php +++ b/skolehjem/resources/views/app/user/login.blade.php @@ -1,17 +1,17 @@ -@extends("layout.base") +@extends("app.layout.base") @section("title") Login @endsection @section("content") -
+
Syddansk Erhvervsskole
- - + +