From 22313d657ffbe1191eec878014b9922409bad23d Mon Sep 17 00:00:00 2001 From: grandeljay Date: Sun, 27 Feb 2022 19:47:02 +0100 Subject: [PATCH 1/4] Experiment with hamburger menu --- src/assets/css/default.css | 9 +++++++++ src/assets/js/default.js | 16 ++++++++++++++++ src/classes/page.php | 10 +++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/assets/css/default.css b/src/assets/css/default.css index f9424eef..615e00cc 100644 --- a/src/assets/css/default.css +++ b/src/assets/css/default.css @@ -206,3 +206,12 @@ p .ui.horizontal.label { margin-bottom: 0; } } + +/** + * Menu + */ +@media (min-width: 768px) { + .menu.toggle { + display: none; + } +} diff --git a/src/assets/js/default.js b/src/assets/js/default.js index c252dd7f..43120adc 100644 --- a/src/assets/js/default.js +++ b/src/assets/js/default.js @@ -95,6 +95,22 @@ $(function() { $.fn.toast.settings.class = 'success'; $.fn.toast.settings.showIcon = 'check'; $.fn.toast.settings.title = 'Success'; + + /** + * Menu + */ + $(document).on('click', '.menu.toggle', function() { + $('.menu.sidebar').sidebar('show'); + }); + + $(window).resize(function(event) { + if ($(window).width() > 768) { + $('.menu.sidebar').removeClass('vertical sidebar'); + } else { + $('.menu.sidebar').addClass('vertical sidebar'); + } + }); + $(window).trigger('resize'); }); /** diff --git a/src/classes/page.php b/src/classes/page.php index 1af1067b..5af4a071 100644 --- a/src/classes/page.php +++ b/src/classes/page.php @@ -255,7 +255,7 @@ class Page ); } ?> -
+
@@ -298,6 +298,14 @@ class Page
+
+
+ + + Menu + +
+
Date: Mon, 28 Feb 2022 09:13:29 +0100 Subject: [PATCH 2/4] Add user icon to account menu --- src/classes/page.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/classes/page.php b/src/classes/page.php index 0a560d6f..f54beebb 100644 --- a/src/classes/page.php +++ b/src/classes/page.php @@ -281,6 +281,7 @@ class Page = 2) { ?>
+ Account
From b5bd5d753008df347f11bad6bd28518fdc462141 Mon Sep 17 00:00:00 2001 From: Jay Trees Date: Mon, 28 Feb 2022 09:48:35 +0100 Subject: [PATCH 3/4] Add hamburger menu --- src/assets/css/default.css | 20 +++++- src/assets/js/default.js | 8 --- src/classes/page.php | 136 +++++++++++++++++++++++++------------ src/pages/wishlists.php | 2 + 4 files changed, 114 insertions(+), 52 deletions(-) diff --git a/src/assets/css/default.css b/src/assets/css/default.css index 08f77e6d..efe54354 100644 --- a/src/assets/css/default.css +++ b/src/assets/css/default.css @@ -215,8 +215,24 @@ p .ui.horizontal.label { /** * Menu */ -@media (min-width: 768px) { - .menu.toggle { +.pusher .menu.toggle { + display: none; +} + +.ui.attached.menu.sidebar:not(.tabular) { + border: 0; +} + +@media (max-width: 767px) { + .pusher .menu.toggle { + display: block; + } + + .pusher > .footer { + display: none; + } + + .pusher .menu.attached.desktop { display: none; } } diff --git a/src/assets/js/default.js b/src/assets/js/default.js index 43120adc..76e2be77 100644 --- a/src/assets/js/default.js +++ b/src/assets/js/default.js @@ -103,14 +103,6 @@ $(function() { $('.menu.sidebar').sidebar('show'); }); - $(window).resize(function(event) { - if ($(window).width() > 768) { - $('.menu.sidebar').removeClass('vertical sidebar'); - } else { - $('.menu.sidebar').addClass('vertical sidebar'); - } - }); - $(window).trigger('resize'); }); /** diff --git a/src/classes/page.php b/src/classes/page.php index f54beebb..b60e8aed 100644 --- a/src/classes/page.php +++ b/src/classes/page.php @@ -219,6 +219,12 @@ class Page <?= $this->title ?> - wishthis + +
+ - + wishthis logo My lists -
- + - updateAvailable && $user && 100 === $user->power) { ?> - - Update - - + updateAvailable && $user && 100 === $user->power) { ?> + + Update + + - - - - - - = 2) { ?> -
- - Account - -
- = 2) { - foreach ($pagesAccount as $item) { - ?> - - - - - + + + + + + +
+ + footer() ?> +
+ +
+
+
+ + + + + + My lists + + +
+ + + updateAvailable && $user && 100 === $user->power) { ?> + + Update + + + + + + + + + = 2) { ?> +
+ + Account + +
+ = 2) { + foreach ($pagesAccount as $item) { + ?> + + + + + + ?> +
-
- + +
-
-
-
- - - Menu - + +
+
+ + + Menu + +
-
- -
+
+ +
diff --git a/src/pages/wishlists.php b/src/pages/wishlists.php index 64f52c36..9af5c5ae 100644 --- a/src/pages/wishlists.php +++ b/src/pages/wishlists.php @@ -10,6 +10,7 @@ use wishthis\{Page, User, Wishlist}; $page = new page(__FILE__, 'My lists'); $page->header(); +$page->bodyStart(); $page->navigation(); ?>
@@ -165,3 +166,4 @@ $page->navigation(); footer(); +$page->bodyEnd(); From fbdfe39a023d110fff083cbf10fd4575adcaf2ee Mon Sep 17 00:00:00 2001 From: Jay Trees Date: Mon, 28 Feb 2022 09:50:58 +0100 Subject: [PATCH 4/4] Fix invalid HTML --- src/pages/home.php | 2 ++ src/pages/install.php | 1 + src/pages/login-as.php | 2 ++ src/pages/login.php | 2 ++ src/pages/logout.php | 2 ++ src/pages/power.php | 2 ++ src/pages/register.php | 2 ++ src/pages/update.php | 2 ++ src/pages/wish.php | 2 ++ src/pages/wishlist.php | 2 ++ 10 files changed, 19 insertions(+) diff --git a/src/pages/home.php b/src/pages/home.php index 5d2e0e5e..210f7aba 100644 --- a/src/pages/home.php +++ b/src/pages/home.php @@ -10,6 +10,7 @@ use wishthis\Page; $page = new page(__FILE__, 'Home'); $page->header(); +$page->bodyStart(); $page->navigation(); ?> @@ -74,4 +75,5 @@ $page->navigation(); footer(); +$page->bodyEnd(); ?> diff --git a/src/pages/install.php b/src/pages/install.php index bba42a15..aef5b818 100644 --- a/src/pages/install.php +++ b/src/pages/install.php @@ -15,6 +15,7 @@ if ($options && $options->getOption('isInstalled')) { $page = new page(__FILE__, 'Install'); $page->header(); +$page->bodyStart(); $step = isset($_POST['step']) ? $_POST['step'] : 1; diff --git a/src/pages/login-as.php b/src/pages/login-as.php index 72b4516b..a2a0c0d7 100644 --- a/src/pages/login-as.php +++ b/src/pages/login-as.php @@ -25,6 +25,7 @@ if (isset($_POST['email'])) { } $page->header(); +$page->bodyStart(); $page->navigation(); ?>
@@ -56,3 +57,4 @@ $page->navigation(); footer(); +$page->bodyEnd(); diff --git a/src/pages/login.php b/src/pages/login.php index 71c9adf1..40ced7e5 100644 --- a/src/pages/login.php +++ b/src/pages/login.php @@ -37,6 +37,7 @@ if (isset($_SESSION['user'])) { } $page->header(); +$page->bodyStart(); $page->navigation(); ?>
@@ -69,3 +70,4 @@ $page->navigation(); footer(); +$page->bodyEnd(); diff --git a/src/pages/logout.php b/src/pages/logout.php index bccc7a80..becda65d 100644 --- a/src/pages/logout.php +++ b/src/pages/logout.php @@ -18,6 +18,7 @@ if (PHP_SESSION_ACTIVE === session_status()) { } $page->header(); +$page->bodyStart(); $page->navigation(); ?>
@@ -33,3 +34,4 @@ $page->navigation(); footer(); +$page->bodyEnd(); diff --git a/src/pages/power.php b/src/pages/power.php index 847f37d1..f6b038b9 100644 --- a/src/pages/power.php +++ b/src/pages/power.php @@ -10,6 +10,7 @@ use wishthis\Page; $page = new page(__FILE__, 'Insufficient power'); $page->header(); +$page->bodyStart(); $page->navigation(); ?> @@ -29,4 +30,5 @@ $page->navigation(); footer(); +$page->bodyEnd(); ?> diff --git a/src/pages/register.php b/src/pages/register.php index edf9f1f8..e2de1b7b 100644 --- a/src/pages/register.php +++ b/src/pages/register.php @@ -82,6 +82,7 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) { } $page->header(); +$page->bodyStart(); $page->navigation(); ?>
@@ -140,3 +141,4 @@ $page->navigation();
footer(); +$page->bodyEnd(); diff --git a/src/pages/update.php b/src/pages/update.php index 2410c2e6..feca04fa 100644 --- a/src/pages/update.php +++ b/src/pages/update.php @@ -10,6 +10,7 @@ use wishthis\{Page, User}; $page = new page(__FILE__, 'Update', 100); $page->header(); +$page->bodyStart(); $page->navigation(); /** @@ -127,4 +128,5 @@ if ('POST' === $_SERVER['REQUEST_METHOD']) { footer(); +$page->bodyEnd(); ?> diff --git a/src/pages/wish.php b/src/pages/wish.php index c99b17ae..8db44bfa 100644 --- a/src/pages/wish.php +++ b/src/pages/wish.php @@ -43,6 +43,7 @@ if (!$userIsAuthenticated) { $page = new page(__FILE__, $wish->title); $page->header(); +$page->bodyStart(); $page->navigation(); $referer = '/?page=wishlists&wishlist=' . $wish->wishlist; @@ -213,4 +214,5 @@ $referer = '/?page=wishlists&wishlist=' . $wish->wishlist; footer(); +$page->bodyEnd(); ?> diff --git a/src/pages/wishlist.php b/src/pages/wishlist.php index 8c332c02..4b28319a 100644 --- a/src/pages/wishlist.php +++ b/src/pages/wishlist.php @@ -21,6 +21,7 @@ if (!$wishlist->exists) { $page = new page(__FILE__, $wishlist->data['name']); $page->header(); +$page->bodyStart(); $page->navigation(); ?> @@ -84,4 +85,5 @@ $page->navigation(); footer(); +$page->bodyEnd(); ?>