Merge pull request 'update makefile for assets build' (#75 ) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/75
update makefile for assets build
2021-11-14 17:33:55 +01:00 · 2021-11-14 17:32:54 +01:00 · 2021-11-14 17:22:49 +01:00 · 2021-11-14 17:17:46 +01:00 · 2021-11-14 17:03:04 +01:00 · 2021-11-14 16:44:52 +01:00
30 changed files with 1250 additions and 1372 deletions
@@ -0,0 +1,42 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: dependencies
+    image: deblan/devenv
+    commands:
+      - npm install
+
+  - name: build
+    image: deblan/devenv
+    commands:
+      - make npm-build
+    when:
+      branch:
+        - develop
+        - feature/*
+
+  - name: release
+    image: deblan/devenv
+    volumes:
+      - name: artifacts
+        path: /artifacts
+    environment:
+      APP_CERTIFICATE:
+        from_secret: app_certificate
+    commands:
+      - mkdir -p "$HOME/.nextcloud/certificates"
+      - echo "$APP_CERTIFICATE" > "$HOME/.nextcloud/certificates/side_menu.key"
+      - export VERSION=$(grep "<version>" appinfo/info.xml | grep -o "[0-9]*\.[0-9]*\.[0-9]*" --color=never)
+      - export RELEASE_DIRECTORY="/artifacts/deblan/side_menu"
+      - make release
+    when:
+      branch:
+        - master
+
+volumes:
+  - name: artifacts
+    host:
+      path: /var/www/html/artifacts
@@ -0,0 +1,7 @@
+version: '1'
+image: deblan/devenv
+jobs:
+  build:
+    script:
+      - npm install
+      - make npm-build
@@ -1,8 +1,35 @@
 ## [Unreleased]

+## 2.0.0
+### Fixed
+- fix #66: removing usage of setInterval
+- fix #73: icon background
+### Changed
+- fix #67: replace jQuery with Vanilla JS
+### Removed
+- Nextcloud 18 is not supported anymore
+
+## 1.28.0
+### Added
+- fix #63: add a new side menu with categories
+
+## 1.27.2
+### Fixed
+- fix #62: hide app notification icon
+
+## 1.27.1
+### Fixed
+- fix German translation render
+
+## 1.27.0
+### Added
+- hide personal settings access when settings are forced by the administrator
+### Fixed
+- improve German translations
+
 ## 1.26.0
 ### Added
- add czech translation
+- add Czech translation

 ## 1.25.2
 ### Fixed
@@ -11,10 +11,14 @@ release: npm-build translations
 		exit 1
 	fi

-	test -d releases/$$VERSION && rm -fr releases/$$VERSION
-	mkdir -p releases/$$VERSION/side_menu
-	cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots releases/$$VERSION/side_menu
-	cd releases/$$VERSION
+	if [ -z "$$RELEASE_DIRECTORY" ]; then
+		RELEASE_DIRECTORY=releases
+	fi
+
+	test -d $$RELEASE_DIRECTORY/$$VERSION && rm -fr $$RELEASE_DIRECTORY/$$VERSION
+	mkdir -p $$RELEASE_DIRECTORY/$$VERSION/side_menu
+	cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor $$RELEASE_DIRECTORY/$$VERSION/side_menu
+	cd $$RELEASE_DIRECTORY/$$VERSION
 	zip -r side_menu_v$$VERSION.zip side_menu
 	tar cvzf side_menu_v$$VERSION.tar.gz side_menu
 	rm -fr side_menu
@@ -10,6 +10,7 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co

 * [Installation and upgrade](#installation-and-upgrade)
 * [How to contribute?](#how-to-contribute)
+* [Support](#support)
 * [Screenshots](https://gitnet.fr/deblan/side_menu/src/branch/master/screenshots/)

 You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
@@ -58,3 +59,8 @@ If you are a developer:
 Build javascripts using `make npm-build` (or `make npm-watch` to build them in real time).

 Then commit and create a pull request.
+
+Support
+-------
+
+You can join the official room on Matrix: [#custommenu:neutralnetwork.org](https://matrix.to/#/#custommenu:neutralnetwork.org).
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>1.26.0</version>
+    <version>2.0.0</version>
    <licence>agpl</licence>
    <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
    <namespace>SideMenu</namespace>
@@ -46,7 +46,7 @@ If you like this application and if you want to support the development:
    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc20_big_menu_responsive.png</screenshot>
    <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/personal_settings.png</screenshot>
    <dependencies>
-        <nextcloud min-version="18" max-version="22"/>
+        <nextcloud min-version="19" max-version="22"/>
        <php min-version="7.3"/>
    </dependencies>
    <settings>
@@ -20,7 +20,7 @@
    margin: 10px 0 10px 0;
 }

-#side-menu-section input[type="checkbox"] {
+#-dropside-menu-section input[type="checkbox"] {
    vertical-align: middle;
 }

@@ -81,6 +81,12 @@
    cursor: pointer;
 }

+.side-menu-setting-list-drop {
+    background: yellow;
+    border-color: yellow;
+    height: 34px;
+}
+
 .side-menu-setting.arrow {
    color: #ccc;
    padding-right: 5px;
@@ -34,7 +34,7 @@
 }

 #header .side-menu-opener {
-    margin-left: 5px;
+    margin-left: 0px;
 }

 .side-menu-settings {
@@ -67,10 +67,19 @@

 .side-menu-opener {
    background: var(--side-menu-opener, url('../img/side-menu-opener.svg'));
-    height: 40px;
-    width: 40px;
-    border-radius: 0;
-    border: 0;
+    background-color: transparent !important;
+    height: 40px !important;
+    width: 40px !important;
+    border-radius: 0 !important;
+    border: 0 !important;
+    padding-right: 12px !important;
+    padding-left: 12px !important;
+    margin-left: 5px !important;
+    margin-left: 3px !important;
+}
+
+.side-menu-opener:active {
+    background-color: var(--color-background-dark) !important;
 }

 .side-menu-closer {
@@ -105,6 +114,10 @@
    margin-top: -3px;
 }

+.side-menu-app-icon .app-icon-notification {
+    display: none;
+}
+
 .side-menu-app a {
    line-height: 30px;
    color: var(--side-menu-text-color, #fff);
@@ -135,7 +148,6 @@
    max-width: 250px;
    position: fixed;
    padding-top: 2px;
-    padding-left: 5px;
    top: 0;
 }

@@ -158,23 +170,23 @@
    transition-property: width;
 }

-#side-menu.side-menu-big {
+#side-menu.side-menu-big, #side-menu.side-menu-with-categories {
    max-width: 100%;
    height: auto;
 }

-.side-menu-big .side-menu-header {
+.side-menu-big .side-menu-header, .side-menu-with-categories .side-menu-header {
    height: auto;
 }

-.side-menu-big .side-menu-apps-list {
+.side-menu-big .side-menu-apps-list, .side-menu-with-categories .side-menu-apps-list {
    height: auto;
    position: static;
    max-width: 100vw;
    overflow: auto;
 }

-.side-menu-big .side-menu-app a {
+.side-menu-big .side-menu-app a, .side-menu-with-categories .side-menu-app a {
    padding: 7px 0 7px 7px;
 }

@@ -213,7 +225,7 @@
    stroke: var(--side-menu-text-color, #fff);
 }

-.side-menu-big .side-menu-app-icon {
+.side-menu-with-categories .side-menu-app-icon, .side-menu-big .side-menu-app-icon {
    vertical-align: middle;
    margin-top: -2px;
 }
@@ -267,6 +279,20 @@
    transform: translateX(calc(-100% + 50px)) !important;
 }

+#side-menu.side-menu-with-categories {
+    max-width: 290px;
+    height: 100vh;
+}
+
+.side-menu-with-categories .side-menu-categories {
+    display: block;
+    padding: 0;
+}
+
+.side-menu-with-categories .side-menu-category {
+    padding: 10px 0;
+}
+
@media screen and (max-width: 1024px) {
    #side-menu.side-menu-big {
        max-width: 290px;
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="571.907"
+   height="156.921"
+   viewBox="0 0 151.317 41.519"
+   version="1.1"
+   id="svg901"
+   sodipodi:docname="layout-side-menu-with-categories.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata907">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs905" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview903"
+     showgrid="false"
+     inkscape:zoom="1.6086532"
+     inkscape:cx="455.61054"
+     inkscape:cy="16.694081"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg901"
+     showguides="false" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18zM62.735.18h58.532v41.16H62.735z"
+     id="path853" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g857">
+    <path
+       d="M84.066 21.35l5.055-5.056M82.925 29.835l18.152-18.151M95.893 25.225l3.585-3.586"
+       id="path855" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M62.735.18h58.532v41.16H62.735z"
+     id="path861" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v5.063H.18z"
+     id="path877" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18z"
+     id="path879" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M1.357 1.034h3.496V4.39H1.357z"
+     id="path881" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M6.068 1.034h6.102V4.39H6.068z"
+     id="path883" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g887">
+    <path
+       d="M21.51 21.35l5.056-5.056M20.37 29.835L38.52 11.684M33.337 25.225l3.586-3.586"
+       id="path885" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.28v41.16h-25.28z"
+     id="path889" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v5.063h-25.257z"
+     id="path891" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v41.16h-25.257z"
+     id="path893" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#4d4d4d"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h20.829v41.16h-20.83z"
+     id="path895" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.034 1.034h3.496V4.39h-3.496z"
+     id="path897" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.569 10.155h1.893v1.81h-1.893zM130.498 10.486h12.463v1.148h-12.463zM127.569 13.696h1.893v1.81h-1.893zM130.498 14.027h10.592v1.148h-10.592zM127.569 17.104h1.893v1.81h-1.893zM130.498 17.435h12.997v1.148h-12.997zM127.569 24.708h1.893v1.81h-1.893zM130.498 25.04h7.585v1.147h-7.585zM127.569 28.116h1.893v1.81h-1.893zM130.498 28.447h11.46v1.148h-11.46zM127.569 31.657h1.893v1.81h-1.893zM130.498 31.988h9.322v1.148h-9.322zM127.569 35.065h1.893v1.81h-1.893zM130.498 35.396h11.126v1.148h-11.126zM127.616 6.848h11.518v1.148h-11.518zM127.569 21.311h9.344v1.148h-9.344z"
+     id="path899" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#4d4d4d;stroke:#b3b3b3;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 62.728587,0.17999881 h 20.829 V 41.34 h -20.83 z"
+     id="path895-5" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#666666;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 63.905587,1.0339988 h 3.496 V 4.389999 h -3.496 z"
+     id="path897-3" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#e6e6e6;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 64.440587,10.154999 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.463 v 1.148 h -12.463 z m -2.929,3.21 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 10.592 v 1.148 h -10.592 z m -2.929,3.077 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.997 v 1.148 h -12.997 z m -2.929,7.273 h 1.893 V 26.518 h -1.893 z m 2.929,0.332 h 7.585 v 1.147 h -7.585 z m -2.929,3.076001 h 1.893 v 1.81 h -1.893 z m 2.929,0.330999 h 11.46 v 1.147999 h -11.46 z m -2.929,3.21 h 1.893 v 1.809999 h -1.893 z m 2.929,0.330999 h 9.322 v 1.148001 h -9.322 z m -2.929,3.077001 h 1.893 v 1.809999 h -1.893 z m 2.929,0.331001 h 11.126 v 1.147999 h -11.126 z m -2.882,-28.5480012 h 11.518 v 1.1480001 h -11.518 z m -0.047,14.4630002 h 9.344 v 1.148 h -9.344 z"
+     id="path899-5" />
+</svg>
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="571.907"
+   height="156.921"
+   viewBox="0 0 151.317 41.519"
+   version="1.1"
+   id="svg901"
+   sodipodi:docname="layout-side-menu-with-categories.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata907">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs905" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1918"
+     inkscape:window-height="1036"
+     id="namedview903"
+     showgrid="false"
+     inkscape:zoom="1.6086532"
+     inkscape:cx="455.61054"
+     inkscape:cy="16.694081"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg901" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18zM62.735.18h58.532v41.16H62.735z"
+     id="path853" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g857">
+    <path
+       d="M84.066 21.35l5.055-5.056M82.925 29.835l18.152-18.151M95.893 25.225l3.585-3.586"
+       id="path855" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M62.735.18h58.532v41.16H62.735z"
+     id="path861" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v5.063H.18z"
+     id="path877" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M.18.18h58.532v41.16H.18z"
+     id="path879" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M1.357 1.034h3.496V4.39H1.357z"
+     id="path881" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M6.068 1.034h6.102V4.39H6.068z"
+     id="path883" />
+  <g
+     fill="#b3b3b3"
+     stroke="#ccc"
+     fill-rule="evenodd"
+     stroke-width="1.465"
+     stroke-linecap="round"
+     id="g887">
+    <path
+       d="M21.51 21.35l5.056-5.056M20.37 29.835L38.52 11.684M33.337 25.225l3.586-3.586"
+       id="path885" />
+  </g>
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#fff"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.28v41.16h-25.28z"
+     id="path889" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#f9f9f9"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v5.063h-25.257z"
+     id="path891" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="none"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h25.257v41.16h-25.257z"
+     id="path893" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#4d4d4d"
+     stroke="#b3b3b3"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M125.857.18h20.829v41.16h-20.83z"
+     id="path895" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#666"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.034 1.034h3.496V4.39h-3.496z"
+     id="path897" />
+  <path
+     style="marker:none"
+     color="#000"
+     overflow="visible"
+     fill="#e6e6e6"
+     stroke="#ccc"
+     stroke-width=".359"
+     stroke-linecap="square"
+     paint-order="fill markers stroke"
+     d="M127.569 10.155h1.893v1.81h-1.893zM130.498 10.486h12.463v1.148h-12.463zM127.569 13.696h1.893v1.81h-1.893zM130.498 14.027h10.592v1.148h-10.592zM127.569 17.104h1.893v1.81h-1.893zM130.498 17.435h12.997v1.148h-12.997zM127.569 24.708h1.893v1.81h-1.893zM130.498 25.04h7.585v1.147h-7.585zM127.569 28.116h1.893v1.81h-1.893zM130.498 28.447h11.46v1.148h-11.46zM127.569 31.657h1.893v1.81h-1.893zM130.498 31.988h9.322v1.148h-9.322zM127.569 35.065h1.893v1.81h-1.893zM130.498 35.396h11.126v1.148h-11.126zM127.616 6.848h11.518v1.148h-11.518zM127.569 21.311h9.344v1.148h-9.344z"
+     id="path899" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#4d4d4d;stroke:#b3b3b3;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 62.728587,0.17999881 h 20.829 V 41.34 h -20.83 z"
+     id="path895-5" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#666666;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 63.905587,1.0339988 h 3.496 V 4.389999 h -3.496 z"
+     id="path897-3" />
+  <path
+     inkscape:connector-curvature="0"
+     style="color:#000000;overflow:visible;fill:#e6e6e6;stroke:#cccccc;stroke-width:0.359;stroke-linecap:square;marker:none;paint-order:fill markers stroke"
+     overflow="visible"
+     d="m 64.440587,10.154999 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.463 v 1.148 h -12.463 z m -2.929,3.21 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 10.592 v 1.148 h -10.592 z m -2.929,3.077 h 1.893 v 1.81 h -1.893 z m 2.929,0.331 h 12.997 v 1.148 h -12.997 z m -2.929,7.273 h 1.893 V 26.518 h -1.893 z m 2.929,0.332 h 7.585 v 1.147 h -7.585 z m -2.929,3.076001 h 1.893 v 1.81 h -1.893 z m 2.929,0.330999 h 11.46 v 1.147999 h -11.46 z m -2.929,3.21 h 1.893 v 1.809999 h -1.893 z m 2.929,0.330999 h 9.322 v 1.148001 h -9.322 z m -2.929,3.077001 h 1.893 v 1.809999 h -1.893 z m 2.929,0.331001 h 11.126 v 1.147999 h -11.126 z m -2.882,-28.5480012 h 11.518 v 1.1480001 h -11.518 z m -0.047,14.4630002 h 9.344 v 1.148 h -9.344 z"
+     id="path899-5" />
+</svg>
@@ -152,6 +152,7 @@ class JsController extends Controller
            'hide-when-no-apps' => $this->config->getAppValueBool('hide-when-no-apps', '0'),
            'loader-enabled' => $this->config->getAppValueBool('loader-enabled', '1'),
            'always-displayed' => $this->config->getAppValueBool('always-displayed', '0'),
+            'side-with-categories' => $this->config->getAppValueBool('side-with-categories', '0'),
            'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
            'avatar' => $avatar,
@@ -102,6 +102,7 @@ class Admin implements ISettings
            'cache' => $this->config->getAppValue('cache', '0'),
            'always-displayed' => $this->config->getAppValue('always-displayed', '0'),
            'big-menu' => $this->config->getAppValue('big-menu', '0'),
+            'side-with-categories' => $this->config->getAppValue('side-with-categories', '0'),
            'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
            'display-logo' => $this->config->getAppValue('display-logo', '1'),
            'add-logo-link' => $this->config->getAppValue('add-logo-link', '1'),
@@ -19,6 +19,7 @@
 namespace OCA\SideMenu\Settings;

 use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
@@ -35,10 +36,16 @@ class PersonalSection implements IIconSection
     */
    private $url;

-    public function __construct(IURLGenerator $url, IL10N $l)
+    /**
+     * @var ConfigProxy
+     */
+    private $configProxy;
+
+    public function __construct(IURLGenerator $url, IL10N $l, ConfigProxy $configProxy)
    {
        $this->url = $url;
        $this->l = $l;
+        $this->configProxy = $configProxy;
    }

    /**
@@ -49,6 +56,10 @@ class PersonalSection implements IIconSection
     */
    public function getID()
    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return '';
+        }
+
        return Application::APP_ID;
    }

@@ -60,6 +71,10 @@ class PersonalSection implements IIconSection
     */
    public function getName()
    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return '';
+        }
+
        return $this->l->t(Application::APP_NAME);
    }

@@ -72,6 +87,10 @@ class PersonalSection implements IIconSection
     */
    public function getPriority()
    {
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            return null;
+        }
+
        return 70;
    }

@@ -18,11 +18,9 @@
 import Vue from 'vue'
 import SideMenu from './SideMenu.vue'
 import SideMenuBig from './SideMenuBig.vue'
+import SideMenuWithCategories from './SideMenuWithCategories.vue'

-// Vue.prototype.t = t
 Vue.prototype.OC = OC
-// Vue.prototype.OC = OCP
-

 const mountSideMenuComponent = () => {
    const sideMenuContainer = document.querySelector('#side-menu')
@@ -32,6 +30,8 @@ const mountSideMenuComponent = () => {

        if (sideMenuContainer.getAttribute('data-bigmenu')) {
            component = SideMenuBig
+        } else if(sideMenuContainer.getAttribute('data-sidewithcategories')) {
+            component = SideMenuWithCategories
        } else {
            component = SideMenu
        }
@@ -41,7 +41,7 @@ const mountSideMenuComponent = () => {

        sideMenu.$mount('#side-menu')

-        $('body').trigger('side-menu.ready')
+        document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.ready'))
    } else {
        window.setTimeout(mountSideMenuComponent, 50)
    }
@@ -122,13 +122,15 @@ export default {
                        name: trim(element.querySelector('span').innerHTML),
                        icon: svg,
                        active: element.classList.contains('active')
-                    });
+                    })
                }
            }

            (function(apps) {
                window.setTimeout(function() {
-                    jQuery('body').trigger('side-menu.apps', [apps])
+                    document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
+                        detail: {apps: apps},
+                    }))
                }, 1000)
            })(this.apps)
        },
@@ -147,7 +149,7 @@ export default {
                    that.logo = config['logo']
                    that.logoLink = config['logo-link']
                    that.settings = config['settings']
-                });
+                })
        },
    },
    mounted() {
@@ -97,8 +97,10 @@ export default {
                        }
                    }

-                    jQuery('body').trigger('side-menu.apps', [apps])
-                });
+                    document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
+                        detail: {apps: apps},
+                    }))
+                })
        },

        retrieveActiveApp() {
@@ -116,7 +118,7 @@ export default {

                    that.targetBlankApps = config['target-blank-apps']
                    that.settings = config['settings']
-                });
+                })
        },
    },
    mounted() {
@@ -0,0 +1,128 @@
+<!--
+@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/>.
+-->
+<template>
+    <div id="side-menu" class="side-menu-with-categories">
+        <div class="side-menu-header">
+            <SettingsButton
+                v-if="settings"
+                v-bind:href="settings.href"
+                v-bind:label="settings.name"
+                v-bind:avatar="settings.avatar"
+            />
+
+            <OpenerButton />
+        </div>
+
+        <div class="side-menu-categories-wrapper">
+            <div class="side-menu-categories">
+                <Loader v-if="!items.length" />
+
+                <div class="side-menu-category" v-for="category in items">
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+
+                    <ul class="side-menu-apps-list">
+                        <SideMenuBigApp
+                            v-for="(app, appId) in category.apps"
+                            v-bind:classes="{'side-menu-app': true, 'active': activeApp === appId}"
+                            v-bind:icon="app.icon"
+                            v-bind:label="app.name"
+                            v-bind:href="app.href"
+                            v-bind:target="targetBlankApps.indexOf(appId) !== -1 ? '_blank' : undefined"
+                        />
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import trim from 'trim'
+import axios from 'axios'
+import OpenerButton from './OpenerButton'
+import CloserButton from './CloserButton'
+import SettingsButton from './SettingsButton'
+import Loader from './Loader'
+import SideMenuBigApp from './SideMenuBigApp'
+
+export default {
+    name: 'SideMenuWithCategories',
+    components: {
+        SettingsButton,
+        OpenerButton,
+        CloserButton,
+        Loader,
+        SideMenuBigApp,
+    },
+    data() {
+        return {
+            items: [],
+            activeApp: null,
+            targetBlank: false,
+            targetBlankApps: [],
+            settings: null,
+        }
+    },
+    methods: {
+        retrieveApps() {
+            this.apps = []
+            let that = this
+
+            axios
+                .get(OC.generateUrl('/apps/side_menu/nav/items'))
+                .then(function(response) {
+                    that.items = response.data.items
+
+                    let apps = []
+
+                    for (let category of that.items) {
+                        for (let a in category.apps) {
+                            apps.push(category.apps[a])
+                        }
+                    }
+
+                    document.querySelector('body').dispatchEvent(new CustomEvent('side-menu.apps', {
+                        detail: {apps: apps},
+                    }))
+                })
+        },
+
+        retrieveActiveApp() {
+            let activeAppLink = document.querySelector('#appmenu a.active')
+            this.activeApp = activeAppLink ? activeAppLink.parentNode.getAttribute('data-id') : null
+        },
+
+        retrieveConfig() {
+            let that = this
+
+            axios
+                .get(OC.generateUrl('/apps/side_menu/js/config'))
+                .then(function(response) {
+                    const config = response.data
+
+                    that.targetBlankApps = config['target-blank-apps']
+                    that.settings = config['settings']
+                })
+        },
+    },
+    mounted() {
+        this.retrieveConfig()
+        this.retrieveApps()
+        this.retrieveActiveApp()
+    }
+}
+</script>
@@ -17,13 +17,23 @@

 let elements = []

-const selector = '#side-menu-message';
+const selector = '#side-menu-message'

 const userConfig = (name, value, callbacks) => {
    const url = OC.generateUrl('/apps/side_menu/personalSetting/valueSet')
+    const formData = new FormData()
+    formData.append('name', name)
+    formData.append('value', value)

-    $.post(url, {name: name, value: value}, callbacks.success)
-        .fail(callbacks.error)
+    fetch(url, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body: formData
+    })
+    .then(callbacks.success)
+    .catch(callbacks.error)
 }

 const appConfig = (name, value, callbacks) => {
@@ -31,23 +41,29 @@ const appConfig = (name, value, callbacks) => {
 }

 const saveSettings = (key) => {
-    const element = elements.get(key)
+    const element = elements[key]
+
+    if (!element) {
+        return
+    }
+
    let value
    let name

-    if (jQuery(element).is('[data-checkbox]')) {
-        name = jQuery(element).attr('data-name')
-        const inputs = jQuery('input[name="' + name + '[]"]:checked')
+    if (element.hasAttribute('data-checkbox')) {
+        name = element.getAttribute('data-name')
        value = []

-        inputs.each((i, v) => {
-            value.push(v.value)
-        })
+        const inputs = document.querySelectorAll('input[name="' + name + '[]"]:checked')
+
+        for (let input of inputs) {
+            value.push(input.value)
+        }

        value = JSON.stringify(value)
    } else {
-        name = jQuery(element).attr('name')
-        value = jQuery(element).val()
+        name = element.getAttribute('name')
+        value = element.value
    }

    const size = elements.length
@@ -63,8 +79,8 @@ const saveSettings = (key) => {
                t('side_menu', (key + 1) + '/' + size)
            )

-            if (key < size - 1) {
-                saveSettings(++key)
+            if (key < size) {
+                saveSettings(key + 1)
            } else {
                OC.msg.finishedSuccess(selector, t('side_menu', 'Saved'))
            }
@@ -74,7 +90,7 @@ const saveSettings = (key) => {
        }
    }

-    if (jQuery(element).is('[data-personal]')) {
+    if (element.hasAttribute('data-personal')) {
        userConfig(name, value, callbacks)
    } else {
        appConfig(name, value, callbacks)
@@ -82,83 +98,105 @@ const saveSettings = (key) => {
 }

 const elementToggler = (element) => {
-    jQuery(element).toggle()
+    let display = 'none'
+
+    if (window.getComputedStyle(element).display === 'none') {
+        display = 'block'
+    }
+
+    element.style.display = display
 }

-jQuery(document).ready(() => {
-    elements = jQuery('.side-menu-setting')
+document.addEventListener('DOMContentLoaded', () => {
+    elements = document.querySelectorAll('.side-menu-setting')

-    jQuery('#side-menu-save').on('click', (event) => {
+    document.querySelector('#side-menu-save').addEventListener('click', (event) => {
        event.preventDefault()
        OC.msg.startSaving(selector)

        saveSettings(0)
-    });
-
-    jQuery('.side-menu-display').on('click', (event) => {
-        var target = jQuery(event.target)
-
-        jQuery('.side-menu-display').removeClass('is-active')
-        target.addClass('is-active')
-
-        jQuery('#side-menu-always-displayed').val(target.attr('data-alwaysdiplayed'))
-        jQuery('#side-menu-big-menu').val(target.attr('data-bigmenu'))
    })

-    jQuery('.side-menu-setting-live').on('change', (event) => {
-        var target = jQuery(event.target)
-        var name = target.attr('name')
-        var value = target.val()
+    const displays = document.querySelectorAll('.side-menu-display')

-        if ('background-color-opacity' === name) {
-            return $('#side-menu-background-color, #side-menu-background-color-to').trigger('change');
-        } else if ('dark-mode-background-color-opacity' === name) {
-            return $('#side-menu-dark-mode-background-color, #side-menu-dark-mode-background-color-to').trigger('change');
-        }
+    for (let display of displays) {
+        display.addEventListener('click', (event) => {
+            const target = event.target

-        if (name === 'opener') {
-            var url = OC.generateUrl(`/apps/side_menu/img/${value}.svg`).replace('/index.php', '')
+            for (let d of displays) {
+                d.classList.toggle('is-active', d === display)
+            }

-            value = `url(${url})`;
-        }
+            document.querySelector('#side-menu-always-displayed').value = target.getAttribute('data-alwaysdiplayed')
+            document.querySelector('#side-menu-big-menu').value = target.getAttribute('data-bigmenu')
+            document.querySelector('#side-menu-side-with-categories').value = target.getAttribute('data-sidewithcategories')
+        })
+    }

-        if (name === 'icon-invert-filter' || name === 'icon-opacity') {
-            value/=100;
-        }
+    for (let item of document.querySelectorAll('.side-menu-setting-live')) {
+        item.addEventListener('change', (event) => {
+            const target = event.target
+            const name = target.getAttribute('name')

-        if (['dark-mode-background-color', 'dark-mode-background-color-to'].indexOf(name) > -1) {
-            var opacity = parseInt($('#side-menu-dark-mode-background-color-opacity').val() * 255 / 100);
+            let value = target.value
+            let id = null

-            value = [value, opacity.toString(16)].join('');
-        } else if (['background-color', 'background-color-to'].indexOf(name) > -1) {
-            var opacity = parseInt($('#side-menu-background-color-opacity').val() * 255 / 100);
+            if (name === 'background-color-opacity') {
+                id = '#side-menu-background-color, #side-menu-background-color-to'
+            } else if (name === 'dark-mode-background-color-opacity') {
+                id = '#side-menu-dark-mode-background-color, #side-menu-dark-mode-background-color-to'
+            }

-            value = [value, opacity.toString(16)].join('');
-        }
+            if (id) {
+                document.querySelector(id).dispatchEvent(new CustomEvent('change'))

-        document.documentElement.style.setProperty('--side-menu-' + name, value)
+                return
+            }
+
+            if (name === 'opener') {
+                const url = OC.generateUrl(`/apps/side_menu/img/${value}.svg`).replace('/index.php', '')
+
+                value = `url(${url})`
+            }
+
+            if (name === 'icon-invert-filter' || name === 'icon-opacity') {
+                value/=100
+            }
+
+            if (['dark-mode-background-color', 'dark-mode-background-color-to'].indexOf(name) > -1) {
+                const opacity = parseInt(document.querySelector('#side-menu-dark-mode-background-color-opacity').value * 255 / 100)
+
+                value = [value, opacity.toString(16)].join('')
+            } else if (['background-color', 'background-color-to'].indexOf(name) > -1) {
+                const opacity = parseInt(document.querySelector('#side-menu-background-color-opacity').value * 255 / 100)
+
+                value = [value, opacity.toString(16)].join('')
+            }
+
+            document.documentElement.style.setProperty('--side-menu-' + name, value)
+        })
+    }
+
+    for (let toggler of document.querySelectorAll('.side-menu-toggler')) {
+        toggler.addEventListener('click', (event) => {
+            const target = event.target
+            const element = document.querySelector(target.getAttribute('data-target'))
+
+            elementToggler(element)
+        })
+    }
+
+    sortable('#categories-list .side-menu-setting-list', {
+        placeholderClass: 'side-menu-setting-list-drop'
    })

-    jQuery('.side-menu-toggler').on('click', (event) => {
-        var target = jQuery(event.target)
-        var element = target.attr('data-target')
+    sortable('#categories-list .side-menu-setting-list')[0].addEventListener('sortstop', (e) => {
+        let value = []

-        elementToggler(element)
+        for (let item of document.querySelectorAll('#categories-list .side-menu-setting-list-item')) {
+            value.push(item.getAttribute('data-id'))
+        }
+
+        document.querySelector('input[name="categories-order"]').value = JSON.stringify(value)
    })
-
-    jQuery("#categories-list .side-menu-setting-list").sortable({
-		forcePlaceholderSize: true,
-		placeholder: 'placeholder',
-		stop: function (event, ui) {
-            let value = []
-
-            jQuery('#categories-list .side-menu-setting-list-item').each(function() {
-                value.push(jQuery(this).attr('data-id'))
-            });
-
-            value = JSON.stringify(value)
-
-            jQuery('input[name="categories-order"]').val(value)
-		}
-	});
-});
+})
@@ -40,7 +40,7 @@
 "Panel": "Panel"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Otevřít nabídku při najetím ukazatelem na tlačítko nabídky (automaticky vypnuto pro dotykové obrazovky)."
 "Display the big menu": "Zobrazit velkou nabídku"
-"The big menu is not compatible with AppOrder.": "Velká nabídka není kompatibilní s jinou aplikací (doplňkem) „Pořadí aplikací“."
+"This menu is not compatible with AppOrder.": "Nabídka není kompatibilní s jinou aplikací (doplňkem) „Pořadí aplikací“."
 "Display the logo": "Zobrazit logo"
 "This feature is not compatible with the <code>big menu</code> display.": "Tato funkce není kompatibilní se zobrazením <code>velké nabídky</code>."
 "Icons and texts": "Ikony a texty"
@@ -76,3 +76,4 @@
 "Show and hide the list of categories": "Zobrazit/skrýt seznam kategorií"
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Tyto parametry jsou použity v případě, že je zapnutý (Breeze) tmavý motiv vzhledu."
 "Dark mode colors": "Barvy tmavého režimu"
+"With categories": "S kategoriemi"
@@ -1,31 +1,31 @@
 "Custom menu": "Benutzerdefiniertes Menü"
-"Enable the custom menu": "Aktiviere das Benutzerdefiniertes Menü"
+"Enable the custom menu": "Benutzerdefiniertes Menü aktivieren"
 "No": "Nein"
 "Yes": "Ja"
 "Menu": "Menü"
 'Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': 'Verwende die Tastenkombination <span class="keyboard-key">Strg</span>+<span class="keyboard-key">o</span>, um das Seitenmenü ein- und auszublenden. Verwende <span class="keyboard-key">tab</span> zum Navigieren.'
-"Top menu": "Hauptmenü"
-"Apps that not must be moved in the side menu": "Apps, die nicht ins Seitenmenü verschoben werden müssen"
+"Top menu": "Obere Navigationsleiste"
+"Apps that not must be moved in the side menu": "Anwendungen, die nicht ins Seitenmenü verschoben werden sollen"
 "If there is no selection then the global configuration is applied.": "Wenn keine Auswahl vorhanden ist, wird die globale Konfiguration angewendet."
 "Experimental": "Experimentell"
 "Save": "Speichern"
-"You like this app and you want to support me?": "Du magst diese App und möchtest mich unterstützen?"
-"Buy me a coffee ☕": "Gib mir einen Kaffee ☕"
-"Hidden": "Versteckt"
+"You like this app and you want to support me?": "Du magst diese Anwendung und möchtest mich unterstützen?"
+"Buy me a coffee ☕": "Gib mir einen Kaffee aus ☕"
+"Hidden": "Ausblenden"
 "Small": "Klein"
 "Normal": "Normal"
 "Big": "Groß"
 "Colors": "Farben"
 "Background color": "Hintergrundfarbe"
-"Background color of current app": "Hintergrundfarbe der aktuellen App"
+"Background color of current app": "Hintergrundfarbe der aktuellen Anwendung"
 "Text color": "Textfarbe"
 "Loader": "Ladestandanzeige"
 "Icon": "Symbol"
 "Same color": "Selbe Farbe"
 "Opposite color": "Gegenfarbe"
 "Transparent": "Transparent"
-"Opaque": "Undurchsichtig"
-"Opener": "Öffner"
+"Opaque": "Nicht transparent"
+"Opener": "Menü-Symbol"
 "Default": "Standard"
 "Default (dark)": "Standard (dunkel)"
 "Hamburger": "Hamburger"
@@ -35,44 +35,45 @@
 "Before the logo": "Vor dem Logo"
 "After the logo": "Nach dem Logo"
 "Position": "Position"
-"Show only the opener (hidden logo)": "Nur den Öffner anzeigen (verstecktes Logo)"
-"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und den Öffner nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
+"Show only the opener (hidden logo)": "Nur das Menü-Symbol anzeigen (Logo wird ausgeblendet)"
+"Do not display the side menu and the opener if there is no application (eg: public pages).": "Zeige das Seitenmenü und das Menü-Symbol nicht an, wenn keine Anwendung vorhanden ist (z.B. bei öffentlichen Seiten)."
 "Panel": "Panel"
-"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über den Öffner bewegt wird (auf Touchscreens automatisch deaktiviert)."
+"Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Öffne das Menü, wenn die Maus über das Menü-Symbol bewegt wird (auf Touchscreens automatisch deaktiviert)."
 "Display the big menu": "Großes Menü anzeigen"
-"The big menu is not compatible with AppOrder.": "Das große Menü ist nicht mit AppOrder kompatibel."
+"This menu is not compatible with AppOrder.": "Dieses Menü ist nicht mit <code>AppOrder</code> kompatibel."
 "Display the logo": "Logo anzeigen"
-"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit <code>großes Menü</code> kompatibel."
+"This feature is not compatible with the <code>big menu</code> display.": "Diese Funktion ist nicht mit dem <code>großen Menü</code> kompatibel."
 "Icons and texts": "Symbole und Texte"
-"Loader enabled": "Loader aktiviert"
+"Loader enabled": "Ladestandanzeige aktiviert"
 "Tips": "Tipps"
-"Always displayed": "Wird immer angezeigt"
+"Always displayed": "Immer anzeigen"
 "The logo will be hidden when the menu is always displayed.": "Das Logo wird ausgeblendet, wenn das Menü immer angezeigt wird."
 "This is the automatic behavior when the menu is always displayed.": "Dies ist das automatische Verhalten, wenn das Menü immer angezeigt wird."
 "Not compatible with touch screens.": "Nicht kompatibel mit Touchscreens."
 "Big menu": "Großes Menü"
-"Live preview": "Live Vorschau"
-"Open apps in new tab": "Öffne Apps in einem neuen Tab"
+"Live preview": "Live-Vorschau"
+"Open apps in new tab": "Öffne Anwendungen in einem neuen Tab"
 "Use the global setting": "Verwende die globale Einstellung"
 "Use my selection": "Verwende meine Auswahl"
 "Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
-"Use the avatar instead of the logo": "Verwenden Sie den Avatar anstelle des Logos"
-"You do not have permission to change the settings.": "Sie haben keine Berechtigung zum Ändern der Einstellungen."
-"Force this configuration to users": "Erzwingen Sie diese Konfiguration für Benutzer"
-"Export the configuration": "Exportieren Sie die Konfiguration"
-"Purge the cache": "Leeren Sie den Cache"
-"Show the link to settings": "Zeigen Sie den Link zu den Einstellungen an"
-"The menu is enabled by default for users": "Das Menü ist standardmäßig für Benutzer aktiviert"
-"Except when the configuration is forced.": "Außer wenn die Konfiguration erzwungen wird."
-"Apps that should not be displayed in the menu": "Apps, die nicht im Menü angezeigt werden sollen"
-"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit der Anzeige <code> Großes Menü </ code>."
+"Use the avatar instead of the logo": "Avatar anstelle des Logos anzeigen"
+"You do not have permission to change the settings.": "Du hast keine Berechtigung, die Einstellungen dieser Anwendung zu ändern."
+"Force this configuration to users": "Konfiguration für alle Benutzer erzwingen"
+"Export the configuration": "Konfiguration exportieren"
+"Purge the cache": "Cache leeren"
+"Show the link to settings": "Link zu den Einstellungen anzeigen"
+"The menu is enabled by default for users": "Das Menü ist standardmäßig für alle Benutzer aktiviert"
+"Except when the configuration is forced.": "Gilt nicht, wenn die Konfiguration erzwungen wird."
+"Apps that should not be displayed in the menu": "Anwendungen, die nicht im Menü angezeigt werden sollen"
+"This feature is only compatible with the <code>big menu</code> display.": "Kompatibel mit dem <code>großen Menü</code>."
 "The logo is a link to the default app": "Das Logo ist ein Link zur Standard-App"
 "Others": "Andere"
 "Categories": "Kategorien"
 "Customize sorting": "Sortierung anpassen"
 "Order by": "Sortieren nach"
 "Name": "Name"
-"Customed": "Kundenspezifisch"
+"Customed": "Benutzerdefiniert"
 "Show and hide the list of categories": "Liste der Kategorien ein- und ausblenden"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Parameter werden verwendet, wenn Dark Theme oder Breeze Dark Theme aktiviert sind."
-"Dark mode colors": "Dunkle Modusfarben"
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Diese Optionen werden auf <code>Dark Theme</code> oder <code>Breeze Dark Theme</code> angewendet."
+"Dark mode colors": "Farben für den dunklen Modus"
+"With categories": "Mit Kategorien"
@@ -40,7 +40,7 @@
 "Panel": "Panneau"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Ouvrir le menu au passage de la souris (automatiquement désactivé sur les écrans tactiles)"
 "Display the big menu": "Afficher le menu large"
-"The big menu is not compatible with AppOrder.": "Le menu large n'est pas compatible avec l'application AppOrder"
+"This menu is not compatible with AppOrder.": "Ce menu n'est pas compatible avec l'application AppOrder"
 "Display the logo": "Afficher le logo"
 "This feature is not compatible with the <code>big menu</code> display.": "Cette fonctionnalité n'est pas compatible avec l'affichage du menu large."
 "Icons and texts": "Icônes et textes"
@@ -76,3 +76,4 @@
 "Show and hide the list of categories": "Afficher et masquer la liste des catégories"
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Ces paramètres sont utilisés lorsque le thème sombre ou le thème Breeze Dark sont activés."
 "Dark mode colors": "Couleurs du mode sombre"
+"With categories": "Avec les catégories"
@@ -40,7 +40,7 @@
 "Panel": "面板"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "鼠标悬停时打开菜单 (触摸屏时将自动禁用)"
 "Display the big menu": "显示大型菜单"
-"The big menu is not compatible with AppOrder.": "大型菜单与应用顺序不兼容"
+"This menu is not compatible with AppOrder.": "型菜单与应用顺序不兼容"
 "Display the logo": "显示logo"
 "This feature is not compatible with the <code>big menu<\/code> display.": "此功能与显示<code>大型菜单<\/code>不兼容。"
 "Icons and texts": "图标与文字"
@@ -76,3 +76,4 @@
 "Show and hide the list of categories": "显示或隐藏类别列表"
 "This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "此参数将应用于暗黑主题激活时。"
 "Dark mode colors": "暗黑模式颜色"
+"With categories": "有类别"
@@ -1,21 +1,19 @@
-var alwaysDisplayed = function() {
-    var elements = document.querySelectorAll('*');
-    var fixedElements = []
-
-    for (var i in elements) {
-        var element = elements[i]
+const alwaysDisplayed = function() {
+    const elements = querySelectorAll('*')
+    const fixedElements = []

+    for (var element of elements) {
        if (typeof element !== 'object') {
            continue
        }

-        var position = window.getComputedStyle(element, null).getPropertyValue('position');
+        const position = window.getComputedStyle(element, null).getPropertyValue('position')

        if (position !== 'fixed') {
            continue
        }

-        var id = element.getAttribute('id')
+        const id = element.getAttribute('id')

        if (id === 'header' || id === 'side-menu' || id === 'side-menu-loader') {
            continue
@@ -25,7 +23,21 @@ var alwaysDisplayed = function() {
            continue
        }

-        if (jQuery(element).parents('#side-menu').length) {
+        let elementIsInSideMenu = false
+        let parent = element.parentNode
+
+        while (parent && !elementIsInSideMenu) {
+            try {
+                if  (parent.getAttribute('id') === 'side-menu') {
+                    elementIsInSideMenu = true
+                }
+            } catch (e) {
+            }
+
+            parent = parent.parentNode
+        }
+
+        if (elementIsInSideMenu) {
            continue
        }

@@ -33,19 +45,19 @@ var alwaysDisplayed = function() {
    }

    for (var i in fixedElements) {
-        var element = fixedElements[i]
-        var computedStyle = window.getComputedStyle(element, null)
-        var left = computedStyle.getPropertyValue('left')
-        var right = computedStyle.getPropertyValue('right')
+        const element = fixedElements[i]
+        const computedStyle = window.getComputedStyle(element, null)
+        const left = computedStyle.getPropertyValue('left')
+        const right = computedStyle.getPropertyValue('right')

        if (right !== '0px') {
-            var intValue = parseInt(left.replace('px', ''))
-            element.style.setProperty('transform', 'translateX(' + (intValue + 50) + 'px)')
+            const intValue = parseInt(left.replace('px', '')) + 50
+            element.style.setProperty('transform', 'translateX(' + intValue.toString() + 'px)')
        }
    }
 }

-let content = document.getElementById('content')
+const content = querySelector('#content')

 if (content && content.classList.contains('app-settings')) {
    let loaded = false
@@ -56,7 +68,7 @@ if (content && content.classList.contains('app-settings')) {
    }
    const observer = new MutationObserver(() => {
        if (loaded) {
-            return;
+            return
        }

        const element = content.querySelector('#app-category-your-apps') || content.querySelector('#app-navigation ul')
@@ -1,15 +1,14 @@
-var pageLoader = jQuery('<div id="side-menu-loader">')
-var pageLoaderBar = jQuery('<div id="side-menu-loader-bar">')
+let pageLoader = createElement('div', {id: 'side-menu-loader'})
+let pageLoaderBar = createElement('div', {id: 'side-menu-loader-bar'})

-body.append(pageLoader)
-pageLoader.append(pageLoaderBar)
+pageLoader.appendChild(pageLoaderBar)
+querySelector('body').appendChild(pageLoader)

-var pageLoaderValue = 0
-
-$(window).on('beforeunload', function() {
-    setInterval(function() {
-        pageLoaderBar.width(pageLoaderValue.toString() + '%')
+let pageLoaderValue = 0

+window.addEventListener('beforeunload', () => {
+    setInterval(() => {
+        pageLoaderBar.style.width = pageLoaderValue.toString() + '%'
        pageLoaderValue = Math.min(pageLoaderValue + .2, 100)
    }, 25)
 })
@@ -1,32 +1,55 @@
-var menuCache = null
+let menuCache = null

-var updateTopMenu = function() {
-    var breakpointMobileWidth = 1024
-    var menu = jQuery('#appmenu')
-    var apps = menu.find('li')
-    var minAppsDesktop = 8
-    var usePercentualAppMenuLimit = 0.8
-    var isMobile = jQuery(window).width() < breakpointMobileWidth
-    var lastShownApp = null
-    var appShown = []
-    var moreApps = jQuery('#more-apps')
-    var navigation = jQuery('#navigation')
-    var navigationApps = jQuery('#apps ul')
-    var appCount = null
+const breakpointMobileWidth = 1024
+const usePercentualAppMenuLimit = 0.8
+const minAppsDesktop = 8

-    var currentMenuCache = menu.html() + menu.next().html()
+const handleMenuClick = (e, icon) => {
+    let element = e.target

-    if (currentMenuCache === menuCache) {
+    while (element.tagName !== 'LI') {
+        element = element.parentNode
+    }
+
+    const a = querySelector('a', element)
+
+    if (a.getAttribute('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey) {
+        for (let tag of ['svg', 'div']) {
+            let el = querySelector(tag, element)
+
+            if (el) {
+                el.remove()
+            }
+        }
+
+        const loader = createElement('div', {'class': icon})
+
+        a.insertBefore(loader, querySelector('span', a))
+    }
+}
+
+const updateTopMenu = function() {
+    const isMobile = window.innerWidth < breakpointMobileWidth
+    const menu = querySelector('#appmenu')
+    const moreApps = querySelector('#more-apps')
+    const navigation = querySelector('#navigation')
+    const navigationApps = querySelector('#apps ul')
+
+    let apps = querySelectorAll('li', menu)
+    let lastShownApp = null
+    let appShown = []
+
+    if ((menu.innerHTML + menu.nextSibling.innerHTML) === menuCache) {
        return
    }

-    navigationApps.html('')
+    navigationAppsHtml = ''

-    apps.each(function(i, app) {
-        var dataId = app.getAttribute('data-id')
+    for (let app of apps) {
+        const dataId = app.getAttribute('data-id')

        if (dataId === null) {
-            return
+            continue
        }

        if (topMenuApps.indexOf(dataId) === -1) {
@@ -35,26 +58,31 @@ var updateTopMenu = function() {
        } else {
            app.classList.remove('hidden')
            app.classList.add('app-external-site')
+
            appShown.push(app)
-            navigationApps.append(app.outerHTML)
+
+            navigationAppsHtml = navigationAppsHtml + app.outerHTML
        }

        if (targetBlankApps.indexOf(dataId) !== -1) {
-            jQuery(app).children('a').attr('target', '_blank');
+            querySelector('a', app).setAttribute('target', '_blank')
        }
-    })

-    var rightHeaderWidth = jQuery('.header-right').outerWidth()
-    var headerWidth = jQuery('header').outerWidth()
-    var availableWidth = headerWidth - jQuery('#nextcloud').outerWidth()
-                            - jQuery('#header .side-menu-opener').outerWidth()
-                            - (rightHeaderWidth > 230 ? rightHeaderWidth : 230)
-
-    if (!isMobile) {
-        availableWidth = availableWidth * usePercentualAppMenuLimit
    }

-    appCount = Math.floor(availableWidth / jQuery('#appmenu li').width())
+    navigationApps.innerHTML = navigationAppsHtml
+
+    const rightHeaderWidth = querySelector('.header-right').offsetWidth
+    const headerWidth = querySelector('header').offsetWidth
+
+    let availableWidth = headerWidth
+
+    availableWidth -= nextcloud.offsetWidth
+    availableWidth -= querySelector('#header .side-menu-opener').offsetWidth
+    availableWidth -= rightHeaderWidth > 230 ? rightHeaderWidth : 230
+    availableWidth *= isMobile ? usePercentualAppMenuLimit : 1
+
+    let appCount = Math.floor(availableWidth / querySelector('#appmenu li:not(.hidden)').offsetWidth)

    if (isMobile && appCount > minAppsDesktop) {
        appCount = minAppsDesktop
@@ -62,111 +90,125 @@ var updateTopMenu = function() {
        appCount = minAppsDesktop
    }

-    if (appCount === 0) {
-        menu.addClass('hidden')
-    }
-
-    menu.removeClass('hidden')
-    menu.css('opacity', 1)
+    menu.style.opacity = 1

    if (appShown.length - 1 - appCount >= 1) {
        appCount--
    }

-    moreApps.find('a').removeClass('active')
+    for (let item of querySelectorAll('a', moreApps)) {
+        item.classList.remove('active')
+    }

-    var k = 0
-    var notInHeader = 0
-    var name
+    let k = 0
+    let notInHeader = 0

-    jQuery(appShown).each(function(i, app) {
-        app = jQuery(app)
-        name = app.data('id')
+
+    for (let app of appShown) {
+        const name = app.getAttribute('data-id')
+        const li = querySelector('#apps li[data-id=' + name + '].app-external-site')

        if (k < appCount && appCount > 0) {
-            app.removeClass('hidden')
-            lastShownApp = app
+            app.classList.remove('hidden')
+            li.classList.add('in-header')

-            jQuery('#apps li[data-id=' + name + '].app-external-site').addClass('in-header')
+            lastShownApp = app
        } else {
-            app.addClass('hidden')
+            app.classList.add('hidden')
+            li.classList.remove('in-header')
+
            notInHeader++

-            jQuery('#apps li[data-id=' + name + '].app-external-site').removeClass('in-header')
+            const a = querySelector('a', app)

-            if (appCount > 0 && app.children('a').hasClass('active')) {
-                lastShownApp.addClass('hidden')
-                app.removeClass('hidden')
+            if (appCount > 0 && a.classList.contains('active')) {
+                lastShownApp.classList.add('hidden')
+                app.classList.remove('hidden')
                notInHeader++

-                jQuery('#apps li[data-id=' + name + '].app-external-site')
-                    .removeClass('in-header')
-                    .addClass('in-header')
+                li.classList.add('in-header')
            }
        }

        k++
-    })
+    }

-    // Hack for https://github.com/nextcloud/server/blob/23b0b63c213f5b31eecae817ffd4a9e26f6624d0/core/src/components/MainMenu.js#L74-L96
-    menu.undelegate('li:not(#more-apps) > a', 'click')
-    menu.delegate('li:not(#more-apps) > a', 'click', function(e) {
-        var a = $(e.target)
+    // Hack for:
+    // - https://github.com/nextcloud/server/blob/master/core/src/components/MainMenu.js#L97-L119
+    // - https://github.com/nextcloud/server/blob/master/core/src/components/MainMenu.js#L97-L119
+    jQuery(menu).undelegate('li:not(#more-apps) > a', 'click')
+    jQuery(navigation).undelegate('a', 'click')

-        if (!a.is('a')) {
-            a = a.closest('a')
+    const confs = [
+        {
+            items: querySelectorAll('#navigation li'),
+            icon: 'icon-loading-small'
+        },
+        {
+            items: querySelectorAll('li:not(#more-apps)', menu),
+            icon: OCA.Theming && OCA.Theming.inverted ? 'icon-loading-small' : 'icon-loading-small-dark'
+        },
+    ]
+
+    for (let conf of confs) {
+        for (let item of conf.items) {
+            item.addEventListener('click', (e) => {
+                handleMenuClick(e, conf.icon)
+            })
        }
+    }

-        if (a.attr('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey && a.parent('#more-apps').length === 0) {
-            a.find('svg').remove()
-            a.find('div').remove()
-            a.prepend(jQuery('<div/>').addClass(
-                OCA.Theming && OCA.Theming.inverted
-                ? 'icon-loading-small'
-                : 'icon-loading-small-dark'
-            ))
+    for (let app of querySelectorAll('#apps li.app-external-site')) {
+        const appId = app.getAttribute('data-id')

-            window.location.href = a.attr('href')
-        }
-    })
-
-    jQuery('#apps li.app-external-site').each(function(i, app) {
-        app = jQuery(app)
-        var appId = app.attr('data-id')
-
-        if (app.hasClass('in-header')) {
-            app.find('svg').find('defs').remove()
+        if (app.classList.contains('in-header')) {
+            for (let defs of querySelectorAll('svg defs', app)) {
+                defs.remove()
+            }
        } else {
-            var svg = app.find('svg');
+            const svg = querySelector('svg', app)

-            if (svg.find('defs').length > 0) {
-                return;
+            if (querySelectorAll('svg defs', app).length > 0) {
+                continue
            }

-            var defs = `
+            const defs = `
                <defs>
                    <filter id="invertMenuMore-${appId}">
                        <feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix>
                    </filter>
                </defs>`

-            svg.prepend(defs)
-            svg.find('image').attr('filter', `url(#invertMenuMore-${appId})`)
+            svg.innerHTML = defs + svg.innerHTML

-            var html = svg.get(0).innerHTML.replace(/fecolormatrix/g, 'feColorMatrix');
+            for (let image of querySelectorAll('image', svg)) {
+                image.setAttribute('filter', `url(#invertMenuMore-${appId})`)
+            }

-            svg.html(html)
+            svg.innerHTML = svg.innerHTML.replace(/fecolormatrix/g, 'feColorMatrix')
        }
-    })
-
-    if (notInHeader === 0) {
-        moreApps.hide()
-        navigation.hide()
-    } else {
-        moreApps.show()
    }

-    menuCache = menu.html() + menu.next().html()
+    if (notInHeader === 0) {
+        moreApps.style.display = 'none'
+        navigation.style.display = 'none'
+    } else {
+        moreApps.style.display = 'flex'
+    }
+
+    menuCache = menu.innerHTML + menu.nextSibling.innerHTML
 }

-setInterval(updateTopMenu, 50)
+for (let timeout of [300, 500, 700, 900, 1100]) {
+    setTimeout(updateTopMenu, timeout)
+}
+
+let resizeTimeout = null;
+
+window.addEventListener('resize', () => {
+    if (resizeTimeout !== null) {
+        clearTimeout(resizeTimeout)
+    }
+
+    resizeTimeout = setTimeout(updateTopMenu, 100)
+})
@@ -1,59 +1,110 @@
-(function() {
-    var sideMenuContainer = jQuery('<div id="side-menu-container">')
-    var sideMenuOpener = jQuery('<button class="side-menu-opener"></button>')
-    var sideMenu = jQuery('<div id="side-menu">')
-    var body = jQuery('body')
-    var html = jQuery('html')
-    var isTouchDevice = window.matchMedia("(pointer: coarse)").matches
+<?php

-    <?php if ($_['big-menu']): ?>
-        sideMenu.attr('data-bigmenu', '1')
+$display = 'default';
+
+if ($_['always-displayed']) {
+    $display = 'always-displayed';
+} elseif ($_['big-menu']) {
+    $display = 'big-menu';
+} elseif ($_['side-with-categories']) {
+    $display = 'side-with-categories';
+}
+
+?>
+
+(function() {
+    const querySelector = function(selector, element) {
+        if (element) {
+            return element.querySelector(selector)
+        }
+
+        return document.querySelector(selector)
+    }
+
+    const querySelectorAll = function(selector, element) {
+        if (element) {
+            return element.querySelectorAll(selector)
+        }
+
+        return document.querySelectorAll(selector)
+    }
+
+    const createElement = function(tagName, attributes) {
+        const element = document.createElement(tagName)
+
+        if (typeof attributes === 'object') {
+            for (let i in attributes) {
+                element.setAttribute(i, attributes[i])
+            }
+        }
+
+        return element
+    }
+
+    const sideMenuContainer = createElement('div', {id: 'side-menu-container'})
+    const sideMenuOpener = createElement('button', {'class': 'side-menu-opener'})
+    const sideMenu = createElement('div', {id: 'side-menu'})
+
+    const body = querySelector('body')
+    const html = querySelector('html')
+    const nextcloud = querySelector('#nextcloud')
+
+    const isTouchDevice = window.matchMedia("(pointer: coarse)").matches
+    const targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>
+
+    <?php if ($display === 'big-menu'): ?>
+        sideMenu.setAttribute('data-bigmenu', '1')
+    <?php elseif ($display === 'side-with-categories'): ?>
+        sideMenu.setAttribute('data-sidewithcategories', '1')
    <?php endif; ?>

-    var targetBlankApps = <?php echo json_encode($_['target-blank-apps']) ?>;
+    querySelector('body').addEventListener('side-menu.apps', (e) => {
+        const apps = e.detail.apps;

-    body.on('side-menu.apps', function(e, apps) {
        <?php if ($_['hide-when-no-apps']): ?>
-            sideMenu = jQuery('#side-menu')
+            const sideMenu = querySelector('#side-menu')

            if (apps.length === 0) {
-                sideMenu.removeClass('open')
-                sideMenu.addClass('hide')
-                sideMenuOpener.addClass('hide')
+                sideMenu.classList.remove('open')
+                sideMenu.classList.add('hide')
+                sideMenuOpener.classList.add('hide')
            } else {
-                sideMenu.removeClass('hide')
-                sideMenuOpener.removeClass('hide')
+                sideMenu.classList.remove('hide')
+                sideMenuOpener.classList.remove('hide')
            }

-            <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
+            <?php if ($display === 'always-displayed'): ?>
                if (apps.length === 0) {
-                    html.removeClass('side-menu-always-displayed');
+                    html.classList.remove('side-menu-always-displayed')
                } else {
-                    html.addClass('side-menu-always-displayed');
+                    html.classList.add('side-menu-always-displayed')
                }
            <?php endif; ?>
        <?php else: ?>
-            <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
+            <?php if ($display === 'always-displayed'): ?>
                if (apps.length === 0) {
-                    html.removeClass('side-menu-always-displayed');
+                    html.classList.remove('side-menu-always-displayed')
                } else {
-                    html.addClass('side-menu-always-displayed');
+                    html.classList.add('side-menu-always-displayed')
                }
            <?php endif; ?>
        <?php endif; ?>
    })

-    body.on('side-menu.ready', function() {
-        sideMenu = jQuery('#side-menu')
+    body.addEventListener('side-menu.ready', () => {
+        const sideMenu = querySelector('#side-menu')
+        const headerMenuOpener = querySelector('#header .side-menu-opener')
+        const sideMenuOpener = querySelectorAll('#side-menu .side-menu-opener')

-        var headerMenuOpener = jQuery('#header .side-menu-opener')
-        var sideMenuOpener = jQuery('#side-menu .side-menu-opener')
+        sideMenuFocus = () => {
+            let a = querySelector('.side-menu-app.active a', sideMenu)

-        sideMenuFocus = function() {
-            var a = sideMenu.find('.side-menu-app.active a')
+            if (!a) {
+                return
+            }

            if (a.length === 0) {
-                a = sideMenu.find('.side-menu-app:first-child a')
+                a = querySelector('.side-menu-app:first-child a', sideMenu)
            }

            if (a.length > 0) {
@@ -61,84 +112,87 @@
            }
        }

-        <?php if ($_['opener-hover'] || ($_['always-displayed'] && !$_['big-menu'])): ?>
-            var sideMenuMouseLeave = function() {
-                sideMenu
-                    .removeClass('open')
-                    .off('mouseleave', sideMenuMouseLeave)
+        <?php if ($_['opener-hover']): ?>
+            const sideMenuMouseLeave = () => {
+                sideMenu.classList.remove('open')
+                sideMenu.removeEventListener('mouseleave', sideMenuMouseLeave)
            }

-            var sideMenuMouseEnter = function() {
-                sideMenu.on('mouseleave', sideMenuMouseLeave)
+            const sideMenuMouseEnter = () => {
+                sideMenu.addEventListener('mouseleave', sideMenuMouseLeave)
            }

-            var sideMenuOpenerMouseEnter = function() {
-                sideMenu
-                    .addClass('open')
-                    .on('mouseenter', sideMenuMouseEnter)
+            const sideMenuOpenerMouseEnter = () => {
+                sideMenu.classList.add('open')
+                sideMenu.addEventListener('mouseenter', sideMenuMouseEnter)

                sideMenuFocus()
            }

            if (!isTouchDevice) {
                <?php if ($_['opener-hover']): ?>
-                    headerMenuOpener.on('mouseenter', sideMenuOpenerMouseEnter)
+                    headerMenuOpener.addEventListener('mouseenter', sideMenuOpenerMouseEnter)

-                    sideMenu.addClass('hide-opener')
+                    sideMenu.classList.add('hide-opener')
                <?php endif ?>

-                sideMenu.on('mouseleave', sideMenuMouseLeave)
-                sideMenu.on('mouseenter', sideMenuOpenerMouseEnter)
+                sideMenu.addEventListener('mouseleave', sideMenuMouseLeave)
+                sideMenu.addEventListener('mouseenter', sideMenuOpenerMouseEnter)
            }
        <?php endif; ?>

-        headerMenuOpener.on('click', function() {
-            sideMenu.addClass('open')
-            sideMenu.find('.side-menu-app.active a').focus()
+        headerMenuOpener.addEventListener('click', () => {
+            sideMenu.classList.add('open')
+
+            const a = querySelector('.side-menu-app.active a', sideMenu)
+
+            if (a !== null) {
+                a.focus()
+            }
        })

-        <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
-            sideMenuOpener.on('click', function() {
-                sideMenu.toggleClass('open')
+        for (let opener of sideMenuOpener) {
+            opener.addEventListener('click', () => {
+                <?php if ($display === 'always-displayed'): ?>
+                    sideMenu.classList.toggle('open')
+                <?php else: ?>
+                    sideMenu.classList.remove('open')
+                <?php endif; ?>
            })
-        <?php else: ?>
-            sideMenuOpener.on('click', function() {
-                sideMenu.removeClass('open')
-            })
-        <?php endif; ?>
+        }

-        jQuery(document).keydown(function(e) {
+        document.addEventListener('keydown', (e) => {
            var key = e.key || e.keyCode

            if ((key === 'o' || key === 79) && e.ctrlKey === true) {
                e.preventDefault()

-                sideMenu.toggleClass('open')
+                sideMenu.classList.toggle('open')
                sideMenuFocus()
            }
        })
    })

-    body.append(sideMenuContainer)
-    sideMenuContainer.append(sideMenu)
+    body.appendChild(sideMenuContainer)
+    sideMenuContainer.appendChild(sideMenu)

    <?php if ($_['loader-enabled'] === true): ?>
        <?php require_once __DIR__.'/_loaderEnabled.js'; ?>
    <?php endif; ?>

    <?php if ($_['opener-position'] === 'before'): ?>
-        sideMenuOpener.insertBefore('#nextcloud')
+        nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
    <?php else: ?>
-        sideMenuOpener.insertAfter('#nextcloud')
+        nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
    <?php endif; ?>

    <?php if (!empty($_['top-menu-apps'])): ?>
-        var topMenuApps = <?php echo json_encode($_['top-menu-apps']); ?>;
+        const topMenuApps = <?php echo json_encode($_['top-menu-apps']); ?>

        <?php require_once __DIR__.'/_topMenuApps.js'; ?>
    <?php endif; ?>

-    <?php if ($_['always-displayed'] && !$_['big-menu']): ?>
+    <?php if ($display === 'always-displayed'): ?>
        <?php require_once __DIR__.'/_alwaysDisplayed.js'; ?>
    <?php endif; ?>
 })();
@@ -20,6 +20,7 @@ use OCP\IURLGenerator;
 use OCP\IConfig;
 use OCA\SideMenu\AppInfo\Application;

+vendor_script('side_menu', 'html5sortable.min');
 script('side_menu', 'admin');
 style('side_menu', 'admin');

@@ -217,7 +218,7 @@ $choicesSizes = [
        </h2>

        <p>
-            <?php p($l->t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.')); ?>
+            <?php echo $l->t('This parameters are used when Dark theme or Breeze Dark Theme are enabled.'); ?>
        </p>

        <div class="side-menu-setting-table">
@@ -441,41 +442,56 @@ $choicesSizes = [
            <?php p($l->t('Panel')); ?>
        </h2>

+        <?php
+            $displays = [
+                'default' => !$_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'always-displayed' => $_['always-displayed'] && !$_['big-menu'] && !$_['side-with-categories'],
+                'side-with-categories' => $_['side-with-categories'] && !$_['always-displayed'] && !$_['big-menu'],
+                'big-menu' => $_['big-menu'] && !$_['always-displayed'] && !$_['side-with-categories'],
+            ];
+        ?>
+
        <div>
            <label>
                <?php p($l->t('Default')); ?>
            </label>
        </div>
-
-        <?php
-            $displays = [
-                'default' => !$_['always-displayed'] && !$_['big-menu'],
-                'always-displayed' => $_['always-displayed'] && !$_['big-menu'],
-                'big-menu' => $_['big-menu'],
-            ];
-        ?>
-
        <p>
            <img
                class="side-menu-display <?php echo $displays['default'] ? 'is-active' : '' ?>"
                data-alwaysdiplayed="0"
                data-bigmenu="0"
+                data-sidewithcategories="0"
                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-default.svg')); ?>" alt="<?php p($l->t('Default')); ?>">
        </p>

+        <div>
+            <label>
+                <?php p($l->t('With categories')); ?>
+            </label>
+        </div>
+        <p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
+        <p>
+            <img
+                class="side-menu-display <?php echo $displays['side-with-categories'] ? 'is-active' : '' ?>"
+                data-alwaysdiplayed="0"
+                data-bigmenu="0"
+                data-sidewithcategories="1"
+                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-side-with-categories.svg')); ?>" alt="<?php p($l->t('With categories')); ?>">
+        </p>
+
        <div>
            <label for="side-menu-opener">
                <?php p($l->t('Big menu')); ?>
            </label>
        </div>
-
-        <p><em><?php p($l->t('The big menu is not compatible with AppOrder.')); ?></em></p>
-
+        <p><em><?php echo $l->t('This menu is not compatible with AppOrder.'); ?></em></p>
        <p>
            <img
                class="side-menu-display <?php echo $displays['big-menu'] ? 'is-active' : '' ?>"
                data-alwaysdiplayed="0"
                data-bigmenu="1"
+                data-sidewithcategories="0"
                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-big-menu.svg')); ?>" alt="<?php p($l->t('Big menu')); ?>">
        </p>

@@ -485,20 +501,37 @@ $choicesSizes = [
                <small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
            </label>
        </div>
-
        <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
-
        <p>
            <img
                class="side-menu-display <?php echo $displays['always-displayed'] ? 'is-active' : '' ?>"
                data-alwaysdiplayed="1"
                data-bigmenu="0"
+                data-sidewithcategories="0"
                src="<?php print_unescaped(image_path('side_menu', 'admin/layout-always-displayed.svg')); ?>" alt="<?php p($l->t('Always displayed')); ?>">
        </p>

-        <input type="hidden" class="side-menu-setting" name="always-displayed" id="side-menu-always-displayed" value="<?php echo (int) $_['always-displayed'] ?>">
-        <input type="hidden" class="side-menu-setting" name="big-menu" id="side-menu-big-menu" value="<?php echo (int) $_['big-menu'] ?>">
-
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="always-displayed"
+            id="side-menu-always-displayed"
+            value="<?php echo (int) $_['always-displayed'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="big-menu"
+            id="side-menu-big-menu"
+            value="<?php echo (int) $_['big-menu'] ?>"
+        >
+        <input
+            type="hidden"
+            class="side-menu-setting"
+            name="side-with-categories"
+            id="side-menu-side-with-categories"
+            value="<?php echo (int) $_['side-with-categories'] ?>"
+        >
        <br>


@@ -767,7 +800,7 @@ $choicesSizes = [
                        🖱️ <?php p($l->t('Show and hide the list of categories')); ?>
                    </a>

-                    <div class="side-menu-setting" data-name="categories" id="categories-list" style="display: none">
+                    <div id="categories-list" style="display: none">
                        <ul class="side-menu-setting-list">
                            <?php foreach ($_['categories'] as $key => $label): ?>
                                <li data-id="<?php echo $key; ?>" class="side-menu-setting-list-item">
@@ -44,8 +44,6 @@ $choicesYesNo = [
                <?php p($l->t('Menu')); ?>
            </h2>

-
-
            <div>
                <label for="side-menu-enabled">
                    <?php p($l->t('Enable the custom menu')); ?>
Author	SHA1	Message	Date
Simon Vieille	70caa80af6	Merge pull request 'update makefile for assets build' (#75 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/75	2021-11-14 17:33:55 +01:00
Simon Vieille	48f403882a	update makefile for assets build	2021-11-14 17:32:54 +01:00
Simon Vieille	6296c1c807	Merge pull request 'Release v2.0.0' (#74 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/74	2021-11-14 17:22:49 +01:00
Simon Vieille	71b9bc4766	release v2.0.0	2021-11-14 17:17:46 +01:00
Simon Vieille	228f07ea25	Merge branch 'feature/removing-jquery' into develop	2021-11-14 17:03:04 +01:00
Simon Vieille	fd2ae59d16	remove background and border from opener (#73 )	2021-11-14 16:44:52 +01:00
Simon Vieille	9124de3c81	fix the code of conduct	2021-11-06 20:11:53 +01:00
Simon Vieille	5e308b610d	update the build task to include vendor/	2021-11-05 20:20:42 +01:00
Simon Vieille	db2220e745	replace the sortable jquery plugin with html5sortable	2021-11-05 20:19:08 +01:00
Simon Vieille	1143843a5b	fix ci/cd conf	2021-11-03 23:02:57 +01:00
Simon Vieille	74d26106dc	Merge pull request 'add ci/cd conf' (#72 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/72	2021-11-03 20:04:03 +01:00
Simon Vieille	539a81c07e	add ci/cd conf	2021-11-03 20:01:54 +01:00
Simon Vieille	d978da2c72	Merge branch 'develop' into feature/removing-jquery	2021-11-03 19:52:55 +01:00
Simon Vieille	544ed1a1fa	add ci/cd conf (drone)	2021-11-03 19:52:24 +01:00
Simon Vieille	ff5ba04217	Merge pull request 'add ci/cd conf (drone)' (#71 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/71	2021-11-03 19:20:36 +01:00
Simon Vieille	56e87d470d	add ci/cd conf (drone)	2021-11-03 19:17:29 +01:00
Simon Vieille	9173ca37c7	add ci/cd conf (drone)	2021-11-02 20:48:54 +01:00
Simon Vieille	240b564e22	Merge pull request 'update documentation' (#70 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/70	2021-10-31 19:44:17 +01:00
Simon Vieille	11ccdceb98	update documentation	2021-10-31 19:43:25 +01:00
Simon Vieille	0608011d80	Merge pull request 'update metroline conf file' (#69 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/69	2021-10-31 18:45:36 +01:00
Simon Vieille	3d3da18322	update metroline conf file	2021-10-31 18:44:30 +01:00
Simon Vieille	3a999b22b0	Merge branch 'develop' into feature/removing-jquery	2021-10-31 17:48:06 +01:00
Simon Vieille	1544b28b57	Merge pull request 'add ci configuration' (#68 ) from develop into master Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/68	2021-10-31 17:47:47 +01:00
Simon Vieille	e72d0555db	update metroline conf file	2021-10-31 17:44:21 +01:00
Simon Vieille	7866089532	add metroline conf file	2021-10-31 17:42:22 +01:00
Simon Vieille	ed2531db55	add fetch to make request	2021-10-31 17:27:08 +01:00
Simon Vieille	c53221d112	fix indentation	2021-10-31 17:02:09 +01:00
Simon Vieille	9a95151156	remove console log	2021-10-31 16:56:52 +01:00
Simon Vieille	80369a39e1	remove jquery excepted for sorting categories	2021-10-31 16:55:43 +01:00
Simon Vieille	7471e93847	fix null setting update	2021-10-31 16:55:04 +01:00
Simon Vieille	d1faf881da	add timeout	2021-10-31 16:54:16 +01:00
Simon Vieille	96ffdf93ea	remove useless vars	2021-10-29 15:30:22 +02:00
Simon Vieille	6f0c4e98e0	fix top menu generation; fix issue #66 by removing usage of setInterval	2021-10-29 13:56:48 +02:00
Simon Vieille	c2e6d24b95	remove ';' on endline	2021-10-29 11:27:45 +02:00
Simon Vieille	5d93d02960	refactoring of alwaysDisplayed function	2021-10-29 11:24:01 +02:00
Simon Vieille	a074d747c1	remove most of jquery from top menu	2021-10-29 11:14:27 +02:00
Simon Vieille	cc7c9f6ed5	remove most of jquery	2021-10-28 15:47:03 +02:00
Simon Vieille	f26adb6ac1	remove jquery from components	2021-10-28 13:50:16 +02:00
Simon Vieille	1e64b34cff	Merge branch 'develop'	2021-10-28 13:17:04 +02:00
Simon Vieille	3b6b8ad54a	add missing svg	2021-10-28 13:16:55 +02:00
Simon Vieille	cc71fda3b0	Merge branch 'develop'	2021-10-21 21:43:51 +02:00
Simon Vieille	64c4d7a1e1	release v1.28.0	2021-10-21 21:43:30 +02:00
Simon Vieille	fd367fe2d4	Merge branch 'develop'	2021-10-21 21:37:40 +02:00
Simon Vieille	3975f3be28	fix #63 : add a new side menu with categories	2021-10-21 21:37:32 +02:00
Simon Vieille	3f590a97bc	Merge branch 'develop'	2021-10-21 20:06:41 +02:00
Simon Vieille	1896bb399d	fix #62 : hide app notification icon	2021-10-21 20:06:17 +02:00
Simon Vieille	d77c2ef9ae	release v1.27.1	2021-08-11 14:43:52 +02:00
Simon Vieille	db0fa60ce8	fix German translation render	2021-08-11 14:43:04 +02:00
Simon Vieille	aac9f2cb16	Merge branch 'develop'	2021-08-11 11:58:25 +02:00
Simon Vieille	33d7c6a7f0	release v1.27.0	2021-08-11 11:58:15 +02:00
Simon Vieille	a72bb87aa2	hide personal settings access when settings are forced by the administrator	2021-08-11 11:57:43 +02:00
Simon Vieille	5e4a7bcae4	improved German translations	2021-08-11 11:57:01 +02:00