From b89df0c0219fcde1b3863d2c8c88fcba06b1d29f Mon Sep 17 00:00:00 2001
From: Carmine De Rosa <dslaky@gmail.com>
Date: Wed, 19 Aug 2020 10:49:21 +0200
Subject: [PATCH] fix menu open/close

---
 components/header/header.html |  4 ++--
 components/header/header.js   | 31 +++++++++++++------------------
 components/home/home.js       |  4 ++--
 pages/home.ejs                |  4 +---
 pages/index.ejs               | 19 ++++++++-----------
 webpack.config.js             |  3 ++-
 6 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/components/header/header.html b/components/header/header.html
index 8d7e230..3dc6e1f 100644
--- a/components/header/header.html
+++ b/components/header/header.html
@@ -13,7 +13,7 @@
     </div>
 
     <ul class="menu">
-      <li class="item <?php if($_GET['q'] == 'iolovolio') { echo "active";}?>">
+      <li class="item <?php if(!$_GET['q'] || $_GET['q'] == 'iolovolio') { echo "active";}?>">
         <a href="/iolovolio" class="label"><b>io</b>lov<b>olio ...</b></a>
       </li>
       <li class="item <?php if($_GET['q'] == 'buy') { echo "active";}?>">
@@ -28,7 +28,7 @@
     </ul>
 
     <ul class="sidebar-menu">
-      <li class="item <?php if($_GET['q'] == 'iolovolio') { echo "active";}?>">
+      <li class="item <?php if(!$_GET['q'] || $_GET['q'] == 'iolovolio') { echo "active";}?>">
         <a href="/iolovolio" class="label"><b>io</b>lov<b>olio ...</b></a>
       </li>
       <li class="item <?php if($_GET['q'] == 'buy') { echo "active";}?>">
diff --git a/components/header/header.js b/components/header/header.js
index 8d67a13..eec0076 100644
--- a/components/header/header.js
+++ b/components/header/header.js
@@ -2,27 +2,22 @@
 $(document).ready( () => {
   console.log('Load component - header')
 
-  const components = $('.component-header')
+  const component = $('.component-header')
 
-  components.each( (i, e) => {
-    const component = $(e)
-    const hamburger = component.find('.hamburger')
-    const menu = component.find('.sidebar-menu')
+  const hamburger = component.find('.hamburger')
+  const menu = component.find('.sidebar-menu')
 
-    hamburger.on('click', (e) => {
-      const hamburger = $(e.currentTarget)
-      hamburger.toggleClass('is-active')
+  hamburger.off('.click').on('click.click', (e) => {
+    const ham = $(e.currentTarget)
 
-      if(hamburger.hasClass('is-active')){
-        menu.addClass('active')
-        //items.slideDown()
-        //$('html, body').css({overflow: 'hidden'})
-      } else {
-        menu.removeClass('active')
-        //items.slideUp()
-        //$('html, body').css({overflow: 'auto'})
-      }
-    })
+    ham.toggleClass('is-active')
+    console.log(ham, menu)
+
+    if(ham.hasClass('is-active')){
+      menu.addClass('active')
+    } else {
+      menu.removeClass('active')
+    }
   })
 
 })
diff --git a/components/home/home.js b/components/home/home.js
index 8379788..2bfacb9 100644
--- a/components/home/home.js
+++ b/components/home/home.js
@@ -1,5 +1,5 @@
-
+/*
 $(document).ready( () => {
   console.log('Load component - home')
 
-})
\ No newline at end of file
+})*/
diff --git a/pages/home.ejs b/pages/home.ejs
index 7c8f042..331e28a 100644
--- a/pages/home.ejs
+++ b/pages/home.ejs
@@ -1,7 +1,5 @@
 
-
-
-    ${require('../components/home/home.html')}
+ ${require('../components/home/home.html')}
 
 
 
diff --git a/pages/index.ejs b/pages/index.ejs
index 39123d9..88383a8 100644
--- a/pages/index.ejs
+++ b/pages/index.ejs
@@ -13,21 +13,18 @@
 
 
     <?php
-      if(!$_GET['q'] || $_GET['q'] == 'home') {
+      if(!$_GET['q'] || $_GET['q'] == 'home' || $_GET['q'] == 'iolovolio') {
         @include 'home.php';
       } else {
-
-      ?>
-        <main class="main-content">
-      <?php
+    ?>
+      <main class="main-content">
+    <?php
         @include $_GET['q'].'.php';
-      ?>
-        </main>
-      <?php
+    ?>
+      </main>
+    <?php
       }
-      ?>
-
-
+    ?>
 
     ${require('../components/footer/footer.html')}
 
diff --git a/webpack.config.js b/webpack.config.js
index a9e4c96..90c28ca 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -75,7 +75,8 @@ module.exports = (env) => {
       plugins.push(
         new HtmlWebpackPlugin({
           template: path.resolve(pagesPath, page),
-          filename: path.resolve(distPath, page.substr(0, page.lastIndexOf(".")) + ".php")
+          filename: path.resolve(distPath, page.substr(0, page.lastIndexOf(".")) + ".php"),
+          inject: page == 'index.ejs'
         })
       )
     }