From 49d3915ae5d0732a2631c60cdda505a5cc5a7abc Mon Sep 17 00:00:00 2001 From: Sergey Yarkov Date: Fri, 13 Dec 2019 23:20:15 +0300 Subject: [PATCH] includes fixed --- .../js/config/admin.materialize.config.js | 27 ++++++++++--------- .../js/config/main.materialize.config.js | 2 -- dist/views/admin/admin.pug | 4 +-- dist/views/admin/administrators.pug | 2 +- dist/views/admin/assets/head.pug | 15 +++++++++++ dist/views/admin/categories.pug | 2 +- dist/views/admin/content.pug | 2 +- dist/views/admin/control-panel.pug | 2 +- dist/views/admin/database.pug | 2 +- dist/views/admin/items.pug | 2 +- 10 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 dist/views/admin/assets/head.pug diff --git a/dist/public/js/config/admin.materialize.config.js b/dist/public/js/config/admin.materialize.config.js index 2e57d48..a994647 100644 --- a/dist/public/js/config/admin.materialize.config.js +++ b/dist/public/js/config/admin.materialize.config.js @@ -26,18 +26,21 @@ document.addEventListener('DOMContentLoaded', function () { M.Sidenav.init(document.querySelectorAll('.sidenav')); M.Collapsible.init(document.querySelectorAll('.collapsible')); M.Modal.init(document.querySelectorAll('.modal')); + M.updateTextFields(); // Окраска li по нажатию - const currentPage = document.querySelector('#currentPage').dataset.current; - const pages = Array.from(document.querySelectorAll('.collapsible li')); - pages.forEach(function (page) { - if (page.dataset.page) { - if (currentPage === page.dataset.page) { - document.querySelector('#dashboard').classList.remove('active'); - page.classList.add('active'); - const collapse = M.Collapsible.getInstance(page.closest('.collapsible')); - collapse.open(); - } - } - }); + if (document.querySelector('#currentPage')) { + const currentPage = document.querySelector('#currentPage').dataset.current; + const pages = Array.from(document.querySelectorAll('.collapsible li')); + pages.forEach(function (page) { + if (page.dataset.page) { + if (currentPage === page.dataset.page) { + document.querySelector('#dashboard').classList.remove('active'); + page.classList.add('active'); + const collapse = M.Collapsible.getInstance(page.closest('.collapsible')); + collapse.open(); + } + } + }); + } }); diff --git a/dist/public/js/config/main.materialize.config.js b/dist/public/js/config/main.materialize.config.js index 4094f46..c41fe7e 100644 --- a/dist/public/js/config/main.materialize.config.js +++ b/dist/public/js/config/main.materialize.config.js @@ -1,6 +1,4 @@ document.addEventListener('DOMContentLoaded', function () { - // Nav-mobile menu init M.Sidenav.init(document.querySelectorAll('.sidenav')) M.FormSelect.init(document.querySelectorAll('select')) - M.updateTextFields(); }); \ No newline at end of file diff --git a/dist/views/admin/admin.pug b/dist/views/admin/admin.pug index 22eb1b5..08a8155 100644 --- a/dist/views/admin/admin.pug +++ b/dist/views/admin/admin.pug @@ -1,4 +1,4 @@ -include ../assets/head.pug +include ./assets/head.pug main if messages.error #notification @@ -22,4 +22,4 @@ main label(for="password") Пароль input(type="password" id="password" name="password" required) button(class="waves-light btn-large" type="submit") Вход -include ../assets/scripts.pug \ No newline at end of file +include ./assets/scripts.pug \ No newline at end of file diff --git a/dist/views/admin/administrators.pug b/dist/views/admin/administrators.pug index 509b9d0..6e3ae48 100644 --- a/dist/views/admin/administrators.pug +++ b/dist/views/admin/administrators.pug @@ -1,4 +1,4 @@ -include ../assets/head.pug +include ./assets/head.pug body.has-fixed-sidenav include ./assets/templates/header.pug main.admin-main diff --git a/dist/views/admin/assets/head.pug b/dist/views/admin/assets/head.pug new file mode 100644 index 0000000..c2bb91a --- /dev/null +++ b/dist/views/admin/assets/head.pug @@ -0,0 +1,15 @@ +doctype +html(lang='ru') + head + meta(charset='utf-8') + meta(http-equiv='Cоntent-Type' cоntent='text/html;' charset='utf-8') + title #{title} + // Materialize CSS + link(rel="stylesheet", href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css") + // Style CSS + link(rel="stylesheet", href="../css/style.css") + // Media CSS + link(rel="stylesheet", href="../css/media.css") + // Material Icons + link(rel="stylesheet", href="https://fonts.googleapis.com/icon?family=Material+Icons") + body \ No newline at end of file diff --git a/dist/views/admin/categories.pug b/dist/views/admin/categories.pug index 13f47bf..b0aa9ca 100644 --- a/dist/views/admin/categories.pug +++ b/dist/views/admin/categories.pug @@ -1,4 +1,4 @@ -include ../assets/head.pug +include ./assets/head.pug body.has-fixed-sidenav include ./assets/templates/header.pug main.admin-main diff --git a/dist/views/admin/content.pug b/dist/views/admin/content.pug index d068404..f46c207 100644 --- a/dist/views/admin/content.pug +++ b/dist/views/admin/content.pug @@ -1,4 +1,4 @@ -include ../assets/head.pug +include ./assets/head.pug body.has-fixed-sidenav include ./assets/templates/header.pug main.admin-main diff --git a/dist/views/admin/control-panel.pug b/dist/views/admin/control-panel.pug index 97c7a8b..b0d558a 100644 --- a/dist/views/admin/control-panel.pug +++ b/dist/views/admin/control-panel.pug @@ -1,4 +1,4 @@ -include ../assets/head.pug +include ./assets/head.pug body.has-fixed-sidenav include ./assets/templates/header.pug main.admin-main diff --git a/dist/views/admin/database.pug b/dist/views/admin/database.pug index 5357722..537025f 100644 --- a/dist/views/admin/database.pug +++ b/dist/views/admin/database.pug @@ -1,4 +1,4 @@ -include ../assets/head.pug +include ./assets/head.pug body.has-fixed-sidenav include ./assets/templates/header.pug main.admin-main diff --git a/dist/views/admin/items.pug b/dist/views/admin/items.pug index 9e7398e..2ebb75b 100644 --- a/dist/views/admin/items.pug +++ b/dist/views/admin/items.pug @@ -1,4 +1,4 @@ -include ../assets/head.pug +include ./assets/head.pug body.has-fixed-sidenav include ./assets/templates/header.pug main.admin-main