release v1.3.2

README.md

@@ -39,7 +39,7 @@ $ unzip -d side_menu /path/to/side_menu_vX.Y.Z.zip
 
 ![](https://upload.deblan.org/u/2020-03/5e81b219.jpg)
 
-![](https://upload.deblan.org/u/2020-04/5e8ee1f7.jpg)
+![](https://upload.deblan.org/u/2020-04/5e9d9058.png)
 
 
 How to contribute?

appinfo/app.php

@@ -24,6 +24,11 @@ use OCP\Util;
 
 $config = \OC::$server->getConfig();
 $cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
+
+
+Util::addScript('side_menu', 'sideMenu');
+Util::addStyle('side_menu', 'sideMenu');
+
 $stylesheet = \OC::$server->getURLGenerator()->linkToRoute(
     'side_menu.Css.stylesheet',
     [
@@ -31,6 +36,13 @@ $stylesheet = \OC::$server->getURLGenerator()->linkToRoute(
     ]
 );
 
+$script = \OC::$server->getURLGenerator()->linkToRoute(
+    'side_menu.Js.script',
+    [
+        'v' => $config->getAppValue('side_menu', 'cache', '0'),
+    ]
+);
+
 Util::addHeader(
     'link',
     [
@@ -40,13 +52,11 @@ Util::addHeader(
     ''
 );
 
-Util::addScript('side_menu', 'main');
+Util::addHeader(
-Util::addScript('side_menu', 'sideMenu');
+    'script',
-Util::addStyle('side_menu', 'sideMenu');
+    [
-// whitelist the URL to allow loading JS from this external domain
+        'src' => $script,
-// $CSPManager = \OC::$server->getContentSecurityPolicyManager();
+		'nonce' => $cspnm->getNonce(),
-// $policy = new ContentSecurityPolicy();
+    ],
-// $policy->addAllowedScriptDomain($url);
+    ''
-// $policy->addAllowedImageDomain($url);
+);
-// $policy->addAllowedConnectDomain($url);
-// $CSPManager->addDefaultPolicy($policy);

appinfo/info.xml

@@ -6,7 +6,7 @@
     <description>Move the top menu to the left side.</description>
     <licence>agpl</licence>
     <author mail="dev+sidemenu@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.2.4</version>
+    <version>1.3.2</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>
@@ -14,7 +14,7 @@
     <repository type="git">https://gitnet.fr/deblan/side_menu</repository>
     <screenshot>https://upload.deblan.org/u/2020-03/5e7fab2b.jpg</screenshot>
     <screenshot>https://upload.deblan.org/u/2020-03/5e81b219.jpg</screenshot>
-    <screenshot>https://upload.deblan.org/u/2020-04/5e8ee1f7.jpg</screenshot>
+    <screenshot>https://upload.deblan.org/u/2020-04/5e9d9058.png</screenshot>
     <dependencies>
         <nextcloud min-version="18" max-version="18"/>
     </dependencies>

appinfo/routes.php

@@ -19,6 +19,7 @@
 
 return [
     'routes' => [
-		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet.css', 'verb' => 'GET'],
+		['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
+		['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
     ],
 ];

css/sideMenu.css

@@ -45,6 +45,10 @@
     border: 0;
 }
 
+#side-menu.hide-opener .side-menu-opener {
+    display: none;
+}
+
 .side-menu-apps-list {
     height: calc(100vh - 150px);
     z-index: 2200;
@@ -94,3 +98,7 @@
     padding-top: 2px;
     top: 0;
 }
+
+#side-menu.hide-opener .side-menu-logo {
+    margin-top: 20px;
+}

lib/Controller/CssController.php

@@ -51,10 +51,6 @@ class CssController extends Controller
      */
     public function stylesheet()
     {
-        $requestUri = $this->request->server['REQUEST_URI'];
-        $assetsRoot = str_replace('/index.php', '', $requestUri);
-        $assetsRoot = preg_replace('#apps/side_menu/.*#s', 'apps/side_menu', $assetsRoot);
-
         $parameters = [
             'vars' => [
                 'background-color' => $this->config->getAppValue('side_menu', 'background-color', '#333333'),
@@ -63,7 +59,6 @@ class CssController extends Controller
                 'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
             ],
             'display-logo' => (bool) $this->config->getAppValue('side_menu', 'display-logo', 1),
-            'assetsRoot' => $assetsRoot,
         ];
 
         $response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');

lib/Controller/JsController.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\Response;
+use OCP\IConfig;
+use OCP\IRequest;
+
+class JsController extends Controller
+{
+
+    /** @var \OCP\IConfig */
+    protected $config;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct($appName, IRequest $request, IConfig $config)
+    {
+        parent::__construct($appName, $request);
+
+        $this->config = $config;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     * @PublicPage
+     *
+     * @return Response
+     */
+    public function script()
+    {
+        $parameters = [
+            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
+            'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
+        ];
+
+        $response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');
+        $response->addHeader('Content-Type', 'text/javascript');
+
+        return $response;
+    }
+}

lib/Settings/Admin.php

@@ -54,6 +54,8 @@ class Admin implements ISettings
             'cache' => $this->config->getAppValue('side_menu', 'cache', '0'),
             'opener' => $this->config->getAppValue('side_menu', 'opener', 'side-menu-opener'),
             'display-logo' => $this->config->getAppValue('side_menu', 'display-logo', '1'),
+            'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
+            'opener-hover' => $this->config->getAppValue('side_menu', 'opener-hover', '0'),
         ];
 
         return new TemplateResponse('side_menu', 'settings/admin-form', $parameters, '');

src/SideMenu.js

@@ -30,6 +30,7 @@ const mountSideMenuComponent = () => {
 
     if (sideMenuContainer) {
         sideMenu.$mount('#side-menu')
+        $('body').trigger('side-menu.ready')
     } else {
         window.setTimeout(mountSideMenuComponent, 50)
     }

src/admin.js

@@ -20,6 +20,8 @@ const elements = [
     'side-menu-current-app-background-color',
     'side-menu-text-color',
     'side-menu-opener',
+    'side-menu-opener-position',
+    'side-menu-opener-hover',
     'side-menu-display-logo',
     'side-menu-cache',
 ];

src/main.js

@@ -1,30 +0,0 @@
-/**
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-const sideMenuContainer = $('<div id="side-menu-container">')
-const sideMenuOpener = $('<button class="side-menu-opener"></button>')
-const sideMenu = $('<div id="side-menu">')
-
-sideMenuContainer.append(sideMenu);
-
-$('body').append(sideMenuContainer);
-
-sideMenuOpener.insertBefore('#nextcloud');
-
-$('body').on('click', '.side-menu-opener', () => {
-    $('#side-menu').toggleClass('open');
-})

templates/css/stylesheet.php

@@ -1,7 +1,7 @@
 :root {
     <?php foreach ($_['vars'] as $key => $value): ?>
         <?php if ($key === 'opener'): ?>
-            --side-menu-<?php echo $key ?>: url('<?php echo $_['assetsRoot'] ?>/img/<?php echo $value ?>.svg');
+            --side-menu-<?php echo $key ?>: url('<?php print_unescaped(image_path('side_menu', $value.'.svg')); ?>');
         <?php else: ?>
             --side-menu-<?php echo $key ?>: <?php echo $value ?>;
         <?php endif; ?>
@@ -21,4 +21,13 @@
     height: calc(100vh - 60px);
     top: 60px;
 }
+
+#side-menu.hide-opener .side-menu-header {
+    display: none;
+}
+
+#side-menu.hide-opener .side-menu-apps-list {
+    height: calc(100vh);
+    top: 0;
+}
 <?php endif; ?>

templates/js/script.php

@@ -0,0 +1,57 @@
+(function() {
+    var sideMenuContainer = $('<div id="side-menu-container">')
+    var sideMenuOpener = $('<button class="side-menu-opener"></button>')
+    var sideMenu = $('<div id="side-menu">')
+    var body = $('body')
+
+    body.append(sideMenuContainer)
+
+    sideMenuContainer.append(sideMenu)
+
+    <?php if ($_['opener-position'] === 'before'): ?>
+        sideMenuOpener.insertBefore('#nextcloud')
+    <?php else: ?>
+        sideMenuOpener.insertAfter('#nextcloud')
+    <?php endif; ?>
+
+    var isTouchDevice = window.matchMedia("(pointer: coarse)").matches
+
+    body.on('side-menu.ready', function() {
+        sideMenu = $('#side-menu')
+
+        var headerMenuOpener = $('#header .side-menu-opener')
+        var sideMenuOpener = $('#side-menu .side-menu-opener')
+
+        <?php if ($_['opener-hover']): ?>
+            var sideMenuMouseLeave = function() {
+                sideMenu
+                    .removeClass('open')
+                    .off('mouseleave', sideMenuMouseLeave)
+            }
+
+            var sideMenuMouseEnter = function() {
+                sideMenu.on('mouseleave', sideMenuMouseLeave)
+            }
+
+            var sideMenuOpenerMouseEnter = function() {
+                sideMenu
+                    .addClass('open')
+                    .on('mouseenter', sideMenuMouseEnter)
+            }
+
+            if (!isTouchDevice) {
+                headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
+
+                sideMenu.addClass('hide-opener')
+            }
+        <?php endif; ?>
+
+        headerMenuOpener.on('click', function() {
+            sideMenu.addClass('open');
+        })
+
+        sideMenuOpener.on('click', function() {
+            sideMenu.removeClass('open');
+        })
+    })
+})();

templates/settings/admin-form.php

@@ -18,100 +18,169 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
+style('side_menu', 'support');
 
+$choicesYesNo = [
+    'No' => '0',
+    'Yes' => '1',
+];
 ?>
 
-<div id="side-menu-section" class="section">
+<div id="side-menu-section">
-	<h2 class="inlineblock"><?php p($l->t('Side menu settings')); ?></h2>
+    <div class="section">
+        <h2>
+            <?php p($l->t('Colors')); ?>
+        </h2>
 
-    <div>
+        <div>
-        <label for="side-menu-background-color" class="settings-hint">
+            <label for="side-menu-background-color" class="settings-hint">
-            <?php p($l->t('Background color')); ?>
+                <?php p($l->t('Background color')); ?>
-        </label>
+            </label>
-    </div>
+        </div>
-    <div>
+        <div>
-        <input
+            <input
-            id="side-menu-background-color"
+                id="side-menu-background-color"
-            name="background-color"
+                name="background-color"
-            type="color"
+                type="color"
-            value="<?php print_unescaped($_['background-color']); ?>">
+                value="<?php print_unescaped($_['background-color']); ?>">
+        </div>
+
+        <div>
+            <label for="side-menu-current-app-background-color" class="settings-hint">
+                <?php p($l->t('Background color of current app')); ?>
+            </label>
+        </div>
+        <div>
+            <input
+                id="side-menu-current-app-background-color"
+                name="current-app-background-color"
+                type="color"
+                value="<?php print_unescaped($_['current-app-background-color']); ?>">
+        </div>
+
+        <div>
+            <label for="side-menu-text-color" class="settings-hint">
+                <?php p($l->t('Text color')); ?>
+            </label>
+        </div>
+        <div>
+            <input
+                id="side-menu-text-color"
+                name="text-color"
+                type="color"
+                value="<?php print_unescaped($_['text-color']); ?>">
+        </div>
     </div>
 
-    <div>
+    <div class="section">
-        <label for="side-menu-current-app-background-color" class="settings-hint">
+        <h2>
-            <?php p($l->t('Background color of current app')); ?>
+            <?php p($l->t('Opener')); ?>
-        </label>
+        </h2>
-    </div>
+
-    <div>
+        <?php
-        <input
+            $choices = [
-            id="side-menu-current-app-background-color"
+                'Default' => 'side-menu-opener',
-            name="current-app-background-color"
+                'Hamburger' => 'side-menu-opener-hamburger',
-            type="color"
+            ];
-            value="<?php print_unescaped($_['current-app-background-color']); ?>">
+        ?>
+
+        <div>
+            <label for="side-menu-opener" class="settings-hint">
+                <?php p($l->t('Icon')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-opener" name="opener">
+                <?php foreach ($choices as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['opener']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
+        <?php
+            $choices = [
+                'Before the logo' => 'before',
+                'After the logo' => 'after',
+            ];
+        ?>
+
+        <div>
+            <label for="side-menu-opener-position" class="settings-hint">
+                <?php p($l->t('Position')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-opener-position" name="opener-position">
+                <?php foreach ($choices as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['opener-position']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
     </div>
 
-    <div>
+    <div class="section">
-        <label for="side-menu-text-color" class="settings-hint">
+        <h2>
-            <?php p($l->t('Text color')); ?>
+            <?php p($l->t('Panel')); ?>
-        </label>
+        </h2>
-    </div>
+
-    <div>
+        <div>
-        <input
+            <label for="side-menu-opener" class="settings-hint">
-            id="side-menu-text-color"
+                <?php p($l->t('Open the menu when the mouse is hover the opener (automatically disabled on touch screens)')); ?>
-            name="text-color"
+            </label>
-            type="color"
+        </div>
-            value="<?php print_unescaped($_['text-color']); ?>">
+
+        <div>
+            <select id="side-menu-opener-hover" name="opener-hover">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['opener-hover']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
+        <div>
+            <label for="side-menu-opener" class="settings-hint">
+                <?php p($l->t('Display the logo')); ?>
+            </label>
+        </div>
+
+        <div>
+            <select id="side-menu-display-logo" name="display-logo">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
     </div>
 
-    <div>
+    <div class="section">
-        <label for="side-menu-opener" class="settings-hint">
+        <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>">
-            <?php p($l->t('Opener icon')); ?>
+
-        </label>
+        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
+
+        <span id="side-menu-message" class="msg"></span>
+
+        <div style="height: 30px"></div>
+
+        <div>
+            <span for="side-menu-opener" class="settings-hint">
+                <?php p($l->t('You like this app and you want to support me?')); ?>
+
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                    <button>
+                        <?php p($l->t('Buy me a coffe ☕')); ?>
+                    </button>
+                </a>
+            </span>
+        </div>
     </div>
-
-    <?php
-        $choices = [
-            'Default' => 'side-menu-opener',
-            'Hamburger' => 'side-menu-opener-hamburger',
-        ];
-    ?>
-
-    <div>
-        <select id="side-menu-opener" name="opener">
-            <?php foreach ($choices as $label => $value): ?>
-                <option value="<?php echo $value ?>" <?php if ($value === $_['opener']): ?>selected<?php endif; ?>>
-                    <?php echo $l->t($label);  ?>
-                </option>
-            <?php endforeach; ?>
-        </select>
-    </div>
-
-    <div>
-        <label for="side-menu-opener" class="settings-hint">
-            <?php p($l->t('Display the logo')); ?>
-        </label>
-    </div>
-
-    <?php
-        $choices = [
-            'Yes' => '1',
-            'No' => '0',
-        ];
-    ?>
-
-    <div>
-        <select id="side-menu-display-logo" name="display-logo">
-            <?php foreach ($choices as $label => $value): ?>
-                <option value="<?php echo $value ?>" <?php if ($value === $_['display-logo']): ?>selected<?php endif; ?>>
-                    <?php echo $l->t($label);  ?>
-                </option>
-            <?php endforeach; ?>
-        </select>
-    </div>
-
-    <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>">
-
-    <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-
-    <span id="side-menu-message" class="msg"></span>
 </div>

webpack.js

@@ -4,7 +4,6 @@ const StyleLintPlugin = require('stylelint-webpack-plugin')
 
 module.exports = {
 	entry: {
-		'main': path.join(__dirname, 'src', 'main.js'),
 		'admin': path.join(__dirname, 'src', 'admin.js'),
 		'sideMenu': path.join(__dirname, 'src', 'SideMenu.js'),
 	},