Merge pull request 'release of v3.7.2' (#238) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/238

.gitea/issue_template/ISSUE_TEMPLATE.yml

@@ -26,7 +26,7 @@ body:
     id: configuration
     attributes:
       label: Configuration
-      description: Export the configuration using the admin page and copy/paste here.
+      description: Export the configuration using the admin page and copy/paste here ([documentation](https://deblan.gitnet.page/side_menu_doc/tips/#export-the-configuration)).
       value: |
         ```
         {

.woodpecker.yml

@@ -1,25 +1,34 @@
 pipeline:
   dependencies:
-    image: gitnet.fr/deblan/devenv
+    image: node:16
+    pull: true
     commands:
-      - make dep
+      - npm i
     when:
       event: [tag, push, pull_request]
-      branch: [master, develop, feature/*, translations]
+      branch: [master, develop, feature/*, fix/*, translations]
 
   osv_detector:
-    image: gitnet.fr/deblan/docker-osv-detector:v0.9
+    image: gitnet.fr/deblan/osv-detector:v0.10
     commands:
       - osv-detector package-lock.json
     failure: ignore
 
-  build:
+  build_js:
-    image: gitnet.fr/deblan/devenv
+    image: node:16
     commands:
-      - make build
+      - npm run build
     when:
-      branch: [master, develop, feature/*, translations]
+      branch: [master, develop, feature/*, fix/*, translations]
-      event: [push, pull_request]
+      event: [tag, push, pull_request]
+
+  build_php:
+    image: deblan/php:8.0
+    commands:
+      - php bin/generate_l10n.php
+    when:
+      branch: [master, develop, feature/*, fix/*, translations]
+      event: [tag, push, pull_request]
 
   code_quality:
     image: sonarsource/sonar-scanner-cli
@@ -37,11 +46,13 @@ pipeline:
       event: [pull_request]
 
   package:
-    image: gitnet.fr/deblan/devenv
+    image: deblan/php:8.0
     volumes:
       - /var/www/html/artifacts:/var/www/html/artifacts
     secrets: [app_certificate]
     commands:
+      - apt-get update
+      - apt-get install -y zip make
       - 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)

CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased]
 
+## 3.7.2
+### Added
+* update pipeline conditions allowing `fix/*`
+### Fixed
+* fix #233: load configuration and then retrieve apps in default side menu display
+
+## 3.7.1
+### Fixed
+* fix build process (#230)
+
+## 3.7.0
+### Added
+* add translations (thanks to AHOHNMYC)
+* add compatibility with NC26
+
 ## 3.6.0
 ### Added
 * add hidden apps compatible with default menu (#219)

Makefile

@@ -9,7 +9,7 @@ dep:
 	npm link @nextcloud/vue || sudo npm link @nextcloud/vue
 
 .ONESHELL:
-release: build translations
+release:
 	if [ -z "$$VERSION" ]; then
 		echo "VERSION required"
 		exit 1

README.md

@@ -3,6 +3,7 @@
 
 [![Build Status](https://ci.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci.gitnet.fr/deblan/side_menu)
 [![Translations](https://translate.codeberg.org/widgets/custom-menu/-/application/svg-badge.svg)](https://translate.codeberg.org/engage/custom-menu/)
+![Downloads](https://img.shields.io/badge/dynamic/json?color=brightgreen&label=downloads&query=%24.K_downloads&suffix=K&url=https%3A%2F%2Fapi-side-menu.deblan.org%2Fdownloads.php)
 
 Allows you to modify the position of the main menu by creating a panel on the left of the interface or with a big menu on the top.
 You can also add and sort custom categories, define apps that must be displayed in the top menu, etc. Fully customisable.

appinfo/info.xml

@@ -32,7 +32,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>3.6.0</version>
+    <version>3.7.2</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -54,7 +54,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_big_menu.png</screenshot>
     <screenshot>https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png</screenshot>
     <dependencies>
-        <nextcloud min-version="25" max-version="25"/>
+        <nextcloud min-version="25" max-version="26"/>
         <php min-version="7.4"/>
     </dependencies>
     <settings>

src/SideMenu.vue

@@ -93,7 +93,11 @@ export default {
 
       for (let id in ncApps) {
         if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
-          continue;
+          continue
+        }
+
+        if (this.hiddenApps.includes(id)) {
+          continue
         }
 
         let app = ncApps[id]
@@ -104,10 +108,10 @@ export default {
 
       finalApps.sort((a, b) => {
         if (a.order === null || b.order === null) {
-          return a.name < b.name ? -1 : 1;
+          return a.name < b.name ? -1 : 1
         }
 
-        return a.order < b.order ? -1 : 1;
+        return a.order < b.order ? -1 : 1
       })
 
       this.apps = finalApps
@@ -118,24 +122,23 @@ export default {
     },
 
     retrieveConfig() {
-      axios
-        .get(OC.generateUrl('/apps/side_menu/js/config'))
-        .then((response) => {
-          const config = response.data
-
-          this.targetBlankApps = config['target-blank-apps']
-          this.forceLightIcon = config['force-light-icon']
-          this.avatar = config['avatar']
-          this.logo = config['logo']
-          this.logoLink = config['logo-link']
-          this.settings = config['settings']
-          this.hiddenApps = config['big-menu-hidden-apps']
-        })
     },
   },
   mounted() {
-    this.retrieveConfig()
+    axios
-    this.retrieveApps()
+      .get(OC.generateUrl('/apps/side_menu/js/config'))
+      .then((response) => {
+        const config = response.data
+
+        this.targetBlankApps = config['target-blank-apps']
+        this.forceLightIcon = config['force-light-icon']
+        this.avatar = config['avatar']
+        this.logo = config['logo']
+        this.logoLink = config['logo-link']
+        this.settings = config['settings']
+        this.hiddenApps = config['big-menu-hidden-apps']
+        this.retrieveApps()
+      })
   }
 }
 </script>

src/l10n/fixtures/ru.yaml

@@ -7,7 +7,7 @@
 : 'Используйте сочетание клавиш <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span>, чтобы открыть или скрыть боковое меню. Используйте <span class="keyboard-key">Tab</span> для навигации.'
 "Top menu": "Верхнее меню"
 "Apps that not must be moved in the side menu": "Приложения не перемещаемые в боковое меню"
-"If there is no selection then the global configuration is applied.": "If there is no selection then the global configuration is applied."
+"If there is no selection then the global configuration is applied.": "Если тут ничего не отмечено, применяются глобальные настройки."
 "Experimental": "Экспериментальный"
 "Save": "Сохранить"
 "You like this app and you want to support me?": "Вам нравится приложение или вы хотите поддержать меня?"
@@ -16,11 +16,11 @@
 "Small": "Маленький"
 "Normal": "Средний"
 "Big": "Большой"
-"Hidden icon": "Скрытая иконка"
+"Hidden icon": "Без иконки"
 "Small icon": "Маленькая иконка"
 "Normal icon": "Средняя иконка"
 "Big icon": "Большая иконка"
-"Hidden text": "Скрытый текст"
+"Hidden text": "Без текста"
 "Small text": "Маленький текст"
 "Normal text": "Средний текст"
 "Big text": "Большой текст"
@@ -35,44 +35,44 @@
 "Transparent": "Прозрачный"
 "Opaque": "Непрозрачный"
 "Opener": "Открывалка"
-"Default": "По-умолчанию"
+"Default": "По умолчанию"
-"Default (dark)": "По-умолчанию (тёмный)"
+"Default (dark)": "По умолчанию (тёмный)"
 "Hamburger": "Гамбургер"
 "Hamburger (dark)": "Гамбургер (тёмный)"
 "Hamburger 2": "Гамбургер 2"
 "Hamburger 2 (dark)": "Гамбургер 2 (тёмный)"
 "Before the logo": "Перед логотипом"
 "After the logo": "После логотипа"
-"Position": "Позиция"
+"Position": "Положение"
 "Show only the opener (hidden logo)": "Показать только открывающую часть (скрытый логотип)"
 "Do not display the side menu and the opener if there is no application (eg: public pages).": "Не отображать боковое меню и открывалку, если нет приложения (например, публичные страницы)."
-"Panel": "Панеот"
+"Panel": "Панель"
 "Open the menu when the mouse is hover the opener (automatically disabled on touch screens)": "Открывать меню при наведении мыши на экран (автоматически отключается на сенсорных экранах)"
 "Display the big menu": "Отобразить большое меню"
-"Display the logo": "Показать лого"
+"Display the logo": "Показать логотип"
 "Icons and texts": "Иконки и текст"
-"Loader enabled": "Loader enabled"
+"Loader enabled": "Загрузчик включен"
 "Tips": "Советы"
 "Always displayed": "Всегда отображается"
 "This is the automatic behavior when the menu is always displayed.": "This is the automatic behavior when the menu is always displayed."
-"Not compatible with touch screens.": "Не совместимо с сенсорными экранами"
+"Not compatible with touch screens.": "Не совместимо с сенсорными экранами."
 "Big menu": "Большое меню"
 "Live preview": "Live preview"
 "Open apps in new tab": "Открывать приложения в новой вкладке"
-"Use the global setting": "Use the global setting"
+"Use the global setting": "Использовать глобальные настройки"
-"Use my selection": "Use my selection"
+"Use my selection": "Использовать мои настройки"
 "Show and hide the list of applications": "Показать или скрыть список приложений"
 "Use the avatar instead of the logo": "Использовать аватар вместо логотипа"
-"You do not have permission to change the settings.": "У вас нет разрешения изменять настройки"
+"You do not have permission to change the settings.": "У вас нет разрешения изменять настройки."
 "Force this configuration to users": "Force this configuration to users"
 "Export the configuration": "Экспортировать конфигурацию"
 "Purge the cache": "Очистить кэш"
 "Show the link to settings": "Показать ссылку на настройки"
-"The menu is enabled by default for users": "The menu is enabled by default for users"
+"The menu is enabled by default for users": "Это меню включено по умолчанию для пользователей"
 "Except when the configuration is forced.": "Except when the configuration is forced."
-"Apps that should not be displayed in the menu": "Apps that should not be displayed in the menu"
+"Apps that should not be displayed in the menu": "Ппрограммы, скрытые из меню"
 "This feature is only compatible with the <code>big menu</code> display.": "This feature is only compatible with the <code>big menu</code> display."
-"The logo is a link to the default app": "The logo is a link to the default app"
+"The logo is a link to the default app": "Логотип открывает приложение по умолчанию"
 "Others": "Прочие"
 "Categories": "Категории"
 "Customize sorting": "Настроить сортировку"
@@ -80,14 +80,14 @@
 "Name": "Название"
 "Customed": "Customed"
 "Show and hide the list of categories": "Показать или скрыть список категорий"
-"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "This parameters are used when Dark theme or Breeze Dark Theme are enabled."
+"This parameters are used when Dark theme or Breeze Dark Theme are enabled.": "Эти настройки используются темами Тёмная и Тёмная Breeze."
 "Dark mode colors": "Цвета тёмной темы"
 "With categories": "С категориями"
-"Custom categories": "Custom categories"
+"Custom categories": "Пользовательские категории"
-"Customize application categories": "Customize application categories"
+"Customize application categories": "Изменить категории приложений"
-"Reset to default": "Сбросить к значениям по-умолчанию"
+"Reset to default": "Сбросить к значениям по умолчанию"
 "Applications": "Приложения"
 "Applications kept in the top menu": "Applications kept in the top menu"
 "Applications kept in the top menu but also shown in side menu": "Applications kept in the top menu but also shown in side menu"
 "These applications must be selected in the previous option.": "These applications must be selected in the previous option."
-"Hide labels on mouse over": "Hide labels on mouse over"
+"Hide labels on mouse over": "Скрыть название при наведении мыши"