Compare commits

..

1 commit

Author SHA1 Message Date
Renovate Bot
21504bc0b5 chore(deps): update dependency eslint-plugin-vue to v10 2025-04-16 20:02:57 +00:00
17 changed files with 119 additions and 349 deletions

View file

@ -1,29 +1,5 @@
## [Unreleased]
## 5.1.1
### Fixed
* fix(build): define appName to fix this error: "The `@nextcloud/vue` library was used without setting / replacing the `appName`"
* fix #349: add custom controller to retrieve core apps
## 5.1.0
### Added
* fix #425: allow to set a color using hex code
### Fixed
* #422: usage of `OC\AppFramework\Http\Request` instead of `$_SERVER`
## 5.0.3
### Fixed
* fix #422: undefined array key "HTTP_USER_AGENT"
## 5.0.2
### Fixed
* fix #413: add user-agent check for memories mobile app
* fix #418: allow non admin user to access their settings
## 5.0.1
### Fixed
* fix(StandardMenu): appLimit must return a value > 0
## 5.0.0
### Fixed
* fix apps's order in the standard menu

View file

@ -24,7 +24,8 @@ You like this app and you want to support me? ☕ [Buy me a coffee](https://www.
Requirements
------------
* PHP >= 8.1
* PHP >= 8.0
* App `theming` enabled
Installation and upgrade
------------------------
@ -40,7 +41,7 @@ If you want to install it from source, go to https://gitnet.fr/deblan/side_menu/
```
$ cd /path/to/nextcloud/apps
$ VERSION=x.y.z; curl -sS https://gitnet.fr/deblan/side_menu/releases/download/v${VERSION}/side_menu_v${VERSION}.tar.gz | tar xvfz -
$ curl -sS https://gitnet.fr/attachments/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | tar xvfz -
```
Administrators can edit many settings using the administration page.

View file

@ -30,7 +30,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>5.1.1</version>
<version>5.0.0</version>
<licence>agpl</licence>
<author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
<namespace>SideMenu</namespace>

View file

@ -2,9 +2,8 @@
namespace OCA\SideMenu\AppInfo;
use OC\AllConfig;
use OC;
use OC\App\AppStore\Fetcher\CategoryFetcher;
use OC\AppFramework\Http\Request;
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
use OC\User\User;
use OCA\SideMenu\Service\AppRepository;
@ -32,12 +31,23 @@ use Psr\Container\ContainerInterface;
class Application extends App implements IBootstrap
{
public const APP_ID = 'side_menu';
public const APP_NAME = 'Custom menu';
protected AllConfig $config;
protected ContentSecurityPolicyNonceManager $cspnm;
protected Request $request;
protected ?User $user = null;
/**
* @var OC\AllConfig
*/
protected $config;
/**
* @var ContentSecurityPolicyNonceManager
*/
protected $cspnm;
/**
* @var User
*/
protected $user;
public function __construct(array $urlParams = [])
{
@ -86,7 +96,6 @@ class Application extends App implements IBootstrap
$this->config = \OC::$server->getConfig();
$this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
$this->user = \OC::$server[IUserSession::class]->getUser();
$this->request = \OC::$server->getRequest();
if (!$this->isEnabled()) {
return;
@ -97,10 +106,6 @@ class Application extends App implements IBootstrap
protected function isEnabled(): bool
{
if (isset($this->request->server['HTTP_USER_AGENT']) && preg_match('/MemoriesNative/', $this->request->server['HTTP_USER_AGENT'])) {
return false;
}
$enabled = true;
$isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');

View file

@ -1,74 +0,0 @@
<?php
/**
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace OCA\SideMenu\Controller;
use OCA\SideMenu\Service\AppRepository;
use OCA\SideMenu\Service\ConfigProxy;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\FrontpageRoute;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IRequest;
use OCP\IUserSession;
class CoreController extends Controller
{
public function __construct(
string $appName,
IRequest $request,
protected ConfigProxy $config,
protected AppRepository $appRepository,
) {
parent::__construct($appName, $request);
}
#[NoCSRFRequired]
#[NoAdminRequired]
#[PublicPage]
#[FrontpageRoute(verb: 'GET', url: '/core/apps')]
public function items(): JSONResponse
{
$user = \OC::$server[IUserSession::class]->getUser();
$items = [];
if (!$user) {
return new JSONResponse([
'items' => $items,
]);
}
$apps = $this->appRepository->getOrderedApps($user);
$keys = ['id', 'name', 'category', 'href', 'icon'];
foreach ($apps as &$app) {
foreach ($app as $key => $value) {
if (!in_array($key, $keys)) {
unset($app[$key]);
}
}
}
return new JSONResponse([
'items' => $apps,
]);
}
}

View file

@ -20,6 +20,7 @@
namespace OCA\SideMenu\Controller;
use OC\User\User;
use OCA\SideMenu\AppInfo\Application;
use OCA\SideMenu\Service\ConfigProxy;
use OCA\Theming\ThemingDefaults;
use OCP\AppFramework\Controller;
@ -28,12 +29,10 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\IAvatarManager;
use OCP\INavigationManager;
use OCP\IURLGenerator;
class JsController extends Controller
{
@ -45,13 +44,14 @@ class JsController extends Controller
protected ConfigProxy $config,
protected ThemingDefaults $themingDefaults,
protected IFactory $l10nFactory,
protected IAvatarManager $avatarManager,
protected IUserSession $userSession,
protected INavigationManager $navigationManager,
protected IURLGenerator $urlGenerator,
) {
parent::__construct($appName, $request);
$this->user = $this->userSession->getUser();
$this->themingDefaults = $themingDefaults;
$this->user = \OC::$server[IUserSession::class]->getUser();
$this->config = $config;
$this->l10nFactory = $l10nFactory;
}
#[NoCSRFRequired]
@ -99,25 +99,25 @@ class JsController extends Controller
$targetBlankApps = $userTargetBlankApps;
}
$isAvatarSet = $this->avatarManager->getAvatar($this->user->getUID())->exists();
$isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
if ($useAvatar && $isAvatarSet) {
$avatar = $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
'userId' => $this->user->getUID(),
$avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
'userId' => $this->user->getUid(),
'size' => 128,
'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
]);
}
if ($this->config->getAppValueBool('show-settings', '0')) {
$settingsNav = $this->navigationManager->getAll('settings');
$settingsNav = \OC::$server->getNavigationManager()->getAll('settings');
if (isset($settingsNav['settings'])) {
$settings = [
'href' => $settingsNav['settings']['href'],
'name' => $settingsNav['settings']['name'],
'avatar' => $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
'userId' => $this->user->getUID(),
'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
'userId' => $this->user->getUid(),
'size' => 32,
'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
]),
@ -126,7 +126,7 @@ class JsController extends Controller
}
}
$indexUrl = $this->urlGenerator->linkTo('', 'index.php');
$indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
return [
'opener-position' => $this->config->getAppValue('opener-position', 'before'),

View file

@ -98,7 +98,6 @@ class PersonalSettingController extends Controller
}
#[NoCSRFRequired]
#[NoAdminRequired]
#[FrontpageRoute(verb: 'GET', url: '/user/config')]
public function configuration(): JSONResponse
{

View file

@ -36,7 +36,7 @@
"css-loader": "^7.1.2",
"eslint": "^9.19.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-vue": "^9.32.0",
"eslint-plugin-vue": "^10.0.0",
"file-loader": "^6.2.0",
"mini-css-extract-plugin": "^2.9.1",
"postcss-loader": "^8.1.1",

View file

@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<template>
<NcColorPicker
v-model="model"
:advancedFields="true"
class="cm-settings-form-colorpicker"
>
<div

View file

@ -1,20 +1,15 @@
'Custom menu': '­­­Menu personnalisé'
'Custom menu': 'Menu personnalisé'
'Enable the custom menu': 'Activer le menu personnalisé'
'No': 'Non'
'Yes': 'Oui'
'Menu': 'Menu'
'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': 'Utiliser
le raccourcis clavier Ctrl+o pour ouvrir et fermer le menu latéral. Utiliser tab
key pour naviguer.'
'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': 'Utiliser le raccourcis clavier Ctrl+o pour ouvrir et fermer le menu latéral. Utiliser tab key pour naviguer.'
'Top menu': 'Menu supérieur'
'Apps that not must be moved in the side menu': 'Les applications qui ne doivent pas
être affichées dans le menu latéral'
'If there is no selection then the global configuration is applied.': "Si il n'y a
aucune sélection alors la configuration globale sera appliquée."
'Apps that not must be moved in the side menu': 'Les applications qui ne doivent pas être affichées dans le menu latéral'
'If there is no selection then the global configuration is applied.': "Si il n'y a aucune sélection alors la configuration globale sera appliquée."
'Experimental': 'Expérimental'
'Save': 'Sauvegarder'
'You like this app and you want to support me?': "Vous aimer cette application et
vous souhaitez m'aider ?"
'You like this app and you want to support me?': "Vous aimer cette application et vous souhaitez m'aider ?"
'Buy me a coffee ☕': 'Offrez moi un café ☕'
'Hidden': 'Caché'
'Small': 'Petit'
@ -48,22 +43,17 @@
'Before the logo': 'Avant le logo'
'After the logo': 'Après le logo'
'Position': 'Position'
'Show only the opener (hidden logo)': "Afficher uniquement le bouton d'ouverture (masquer
le logo)"
'Do not display the side menu and the opener if there is no application (eg: public pages).': "Ne
pas afficher le menu latéral et le bouton d'ouverture s'il n'y a aucune application
(exemple : page publiques)."
'Show only the opener (hidden logo)': "Afficher uniquement le bouton d'ouverture (masquer le logo)"
'Do not display the side menu and the opener if there is no application (eg: public pages).': "Ne pas afficher le menu latéral et le bouton d'ouverture s'il n'y a aucune application (exemple : page publiques)."
'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)'
'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'
'Display the logo': 'Afficher le logo'
'Icons and texts': 'Icônes et textes'
'Loader enabled': "Activation de l'indicateur de chargement"
'Tips': 'Astuces'
'Always displayed': 'Toujours affiché'
'This is the automatic behavior when the menu is always displayed.': "C'est le comportement
automatique lorsque le menu est toujours affiché."
'This is the automatic behavior when the menu is always displayed.': "C'est le comportement automatique lorsque le menu est toujours affiché."
'Not compatible with touch screens.': 'Incompatible avec les écrans tactiles.'
'Big menu': 'Menu large'
'Live preview': 'Aperçu en direct'
@ -72,21 +62,16 @@
'Use my selection': 'Utiliser ma sélection'
'Show and hide the list of applications': 'Afficher et masquer la liste des applications'
'Use the avatar instead of the logo': "Utiliser l'avatar à la place du logo"
'You do not have permission to change the settings.': "Vous n'avez pas la permission
de changer les paramètres."
'You do not have permission to change the settings.': "Vous n'avez pas la permission de changer les paramètres."
'Force this configuration to users': 'Forcer cette configuration aux utilisateurs'
'Export the configuration': 'Exporter la configuration'
'Purge the cache': 'Purger le cache'
'Show the link to settings': 'Afficher le lien vers les paramètres'
'The menu is enabled by default for users': 'Le menu est activé par défaut pour les
utilisateurs'
'The menu is enabled by default for users': 'Le menu est activé par défaut pour les utilisateurs'
'Except when the configuration is forced.': 'Sauf lorsque la configuration est forcée.'
'Apps that should not be displayed in the menu': 'Applications qui ne doivent pas
être affichées dans le menu'
'This feature is only compatible with the <code>big menu</code> display.': "Compatible
avec l'affichage <code>Menu large</code>."
'The logo is a link to the default app': "Le logo est un lien vers l'application par
défaut"
'Apps that should not be displayed in the menu': 'Applications qui ne doivent pas être affichées dans le menu'
'This feature is only compatible with the <code>big menu</code> display.': "Compatible avec l'affichage <code>Menu large</code>."
'The logo is a link to the default app': "Le logo est un lien vers l'application par défaut"
'Others': 'Autres'
'Categories': 'Catégories'
'Customize sorting': 'Personnaliser le tri'
@ -94,8 +79,7 @@
'Name': 'Nom'
'Customed': 'Personnalisé'
'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.'
'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'
'Custom categories': 'Catégories personnalisées'
@ -103,12 +87,9 @@
'Reset to default': 'Restaurer les valeurs par défaut'
'Applications': 'Applications'
'Applications kept in the top menu': 'Applications conservées dans le menu supérieur'
'Applications kept in the top menu but also shown in side menu': 'Applications conservées
dans le menu supérieur mais également affichées dans le menu latéral'
'These applications must be selected in the previous option.': "Ces applications doivent
également être sélectionnées dans l'option précédente."
'Hide labels on mouse over': 'Masquer le libellé des applications au passage de la
souris'
'Applications kept in the top menu but also shown in side menu': 'Applications conservées dans le menu supérieur mais également affichées dans le menu latéral'
'These applications must be selected in the previous option.': "Ces applications doivent également être sélectionnées dans l'option précédente."
'Hide labels on mouse over': 'Masquer le libellé des applications au passage de la souris'
'Except the hovered app': "À l'exception de l'application survolée"
'Search': 'Rechercher'
'Toggle the menu': 'Basculer le menu'

View file

@ -43,8 +43,8 @@
'Before the logo': 'Перед логотипом'
'After the logo': 'После логотипа'
'Position': 'Положение'
'Show only the opener (hidden logo)': 'Показать только открывающую кнопку (скрытый логотип)'
'Do not display the side menu and the opener if there is no application (eg: public pages).': 'Не отображать боковое меню и открывалку, если нет доступного приложения (н.п. публичные страницы).'
'Show only the opener (hidden logo)': 'Показать только открывающую часть (скрытый логотип)'
'Do not display the side menu and the opener if there is no application (eg: public pages).': 'Не отображать боковое меню и открывалку, если нет приложения (например, публичные страницы).'
'Panel': 'Панель'
'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': 'Открывать меню при наведении мыши на открывалку (автоматически отключается на сенсорных экранах)'
'Display the big menu': 'Отобразить большое меню'
@ -63,21 +63,21 @@
'Show and hide the list of applications': 'Показать или скрыть список приложений'
'Use the avatar instead of the logo': 'Использовать аватар вместо логотипа'
'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': 'Это меню включено по умолчанию для пользователей'
'Except when the configuration is forced.': 'За исключением случаев, когда настройка принудительная.'
'Except when the configuration is forced.': 'За исключением случаев, когда конфигурация является принудительной.'
'Apps that should not be displayed in the menu': 'Ппрограммы, скрытые из меню'
'This feature is only compatible with the <code>big menu</code> display.': 'Эта возможность совместима только с отображением <code>большого меню</code>.'
'This feature is only compatible with the <code>big menu</code> display.': 'Эта функция совместима только с отображением <code>большого меню</code>.'
'The logo is a link to the default app': 'Логотип открывает приложение по умолчанию'
'Others': 'Прочие'
'Categories': 'Категории'
'Customize sorting': 'Настроить сортировку'
'Order by': 'В порядке'
'Name': 'Название'
'Customed': 'Приспособлено'
'Customed': 'Customed'
'Show and hide the list of categories': 'Показать или скрыть список категорий'
'This parameters are used when Dark theme or Breeze Dark Theme are enabled.': 'Эти настройки используются темами Тёмная и Тёмная Breeze.'
'Dark mode colors': 'Цвета тёмной темы'
@ -90,22 +90,22 @@
'Applications kept in the top menu but also shown in side menu': 'Приложения хранящиеся в верхнем меню, но также отображающиеся в боковом меню'
'These applications must be selected in the previous option.': 'Эти приложения необходимо выбрать в предыдущем выборе.'
'Hide labels on mouse over': 'Скрыть название при наведении мыши'
'Except the hovered app': 'Кроме приложения на котором сейчас'
'Except the hovered app': 'Кроме приложения, на котором курсор'
'Search': 'Поиск'
'Toggle the menu': 'Переключить меню'
'Open the documentation': 'Open the documentation'
'Ask the developer': 'Спросить разработчика'
'New request': 'Новый запрос'
'Report a bug': 'Пожаловаться на ошибку'
'Show the configuration': 'Показать конфигурацию'
'Ask the developer': 'Ask the developer'
'New request': 'New request'
'Report a bug': 'Report a bug'
'Show the configuration': 'Show the configuration'
'Configuration:': 'Configuration:'
'Done!': 'Готово!'
'Copy': 'Копировать'
'Need help': 'Нужна помощь'
'I would like a new feature': 'Я хочу новую возможность'
'Something went wrong': 'Что-то пошло не так'
'Select apps': 'Выберете приложения'
'Sort': 'Сортировать'
'Customize': 'Приспособить'
'Done!': 'Done!'
'Copy': 'Copy'
'Need help': 'Need help'
'I would like a new feature': 'I would like a new feature'
'Something went wrong': 'Something went wrong'
'Select apps': 'Select apps'
'Sort': 'Sort'
'Customize': 'Customize'
'Custom': 'Custom'
'Close': 'Закрыть'
'Close': 'Close'

View file

@ -90,7 +90,7 @@
'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'
'Toggle the menu': 'Prepnite ponuku'
'Toggle the menu': 'Toggle the menu'
'Open the documentation': 'Open the documentation'
'Ask the developer': 'Ask the developer'
'New request': 'New request'

View file

@ -1,111 +0,0 @@
'Custom menu': ''
'Enable the custom menu': ''
'No': ''
'Yes': ''
'Menu': ''
'Use the shortcut Ctrl+o to open and to hide the side menu. Use tab key to navigate.': ''
'Top menu': ''
'Apps that not must be moved in the side menu': ''
'If there is no selection then the global configuration is applied.': ''
'Experimental': ''
'Save': ''
'You like this app and you want to support me?': ''
'Buy me a coffee ☕': ''
'Hidden': ''
'Small': ''
'Normal': ''
'Big': ''
'Hidden icon': ''
'Small icon': ''
'Normal icon': ''
'Big icon': ''
'Hidden text': ''
'Small text': ''
'Normal text': ''
'Big text': ''
'Colors': ''
'Background color': ''
'Background color of current app': ''
'Text color': ''
'Loader': ''
'Icon': ''
'Same color': ''
'Opposite color': ''
'Transparent': ''
'Opaque': ''
'Opener': ''
'Default': ''
'Default (dark)': ''
'Hamburger': ''
'Hamburger (dark)': ''
'Hamburger 2': ''
'Hamburger 2 (dark)': ''
'Before the logo': ''
'After the logo': ''
'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': ''
'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': ''
'Display the big menu': ''
'Display the logo': ''
'Icons and texts': ''
'Loader enabled': ''
'Tips': ''
'Always displayed': ''
'This is the automatic behavior when the menu is always displayed.': ''
'Not compatible with touch screens.': ''
'Big menu': ''
'Live preview': ''
'Open apps in new tab': ''
'Use the global setting': ''
'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.': ''
'Force this configuration to users': ''
'Export the configuration': ''
'Purge the cache': ''
'Show the link to settings': ''
'The menu is enabled by default for users': ''
'Except when the configuration is forced.': ''
'Apps that should not be displayed in the menu': ''
'This feature is only compatible with the <code>big menu</code> display.': ''
'The logo is a link to the default app': ''
'Others': ''
'Categories': ''
'Customize sorting': ''
'Order by': ''
'Name': ''
'Customed': ''
'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': ''
'Custom categories': ''
'Customize application categories': ''
'Reset to default': ''
'Applications': ''
'Applications kept in the top menu': ''
'Applications kept in the top menu but also shown in side menu': ''
'These applications must be selected in the previous option.': ''
'Hide labels on mouse over': ''
'Except the hovered app': ''
'Search': ''
'Toggle the menu': ''
'Open the documentation': ''
'Ask the developer': ''
'New request': ''
'Report a bug': ''
'Show the configuration': ''
'Configuration:': ''
'Done!': ''
'Copy': ''
'Need help': ''
'I would like a new feature': ''
'Something went wrong': ''
'Select apps': ''
'Sort': ''
'Customize': ''
'Custom': ''
'Close': ''

View file

@ -1,9 +1,9 @@
'Custom menu': '自定义菜单'
'Enable the custom menu': '启用自定义菜单'
'No': ''
'Yes': ''
'No': '取消'
'Yes': '确定'
'Menu': '菜单'
'Use the shortcut Ctrl+o to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': '使用快捷键 Ctrl+o 打开或隐藏侧边栏菜单。使用 <span class="keyboard-key">Tab</span> 键来导航。'
'Use the shortcut Ctrl+o to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.': '使用快捷键 Ctrl+o 打开或隐藏侧边栏菜单。使用<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.': '如果没有选择,则应用全局配置。'
@ -25,7 +25,7 @@
'Opposite color': '相反颜色'
'Transparent': '透明'
'Opaque': '不透明'
'Opener': '触发器'
'Opener': '器'
'Default': '默认'
'Default (dark)': '默认(深色)'
'Hamburger': 'Hamburger'
@ -35,10 +35,10 @@
'Before the logo': '在徽标之前'
'After the logo': '在徽标之后'
'Position': '位置'
'Show only the opener (hidden logo)': '仅显示触发器(隐藏徽标)'
'Do not display the side menu and the opener if there is no application (eg: public pages).': '如果没有应用程序(例如:公共页面),则不要显示侧边栏菜单和触发器。'
'Show only the opener (hidden logo)': '只显示容器(隐藏徽标)'
'Do not display the side menu and the opener if there is no application (eg: public pages).': '如果没有应用程序(例如:公共页面),则不要显示侧边栏菜单和器。'
'Panel': '面板'
'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': '‌当鼠标悬停在触发器上时打开菜单(在触摸屏上自动禁用)'
'Open the menu when the mouse is hover the opener (automatically disabled on touch screens)': '鼠标悬停时打开菜单 (触摸屏时将自动禁用)'
'Display the big menu': '显示大型菜单'
'Display the logo': '显示徽标'
'Icons and texts': '图标和文本'
@ -63,7 +63,7 @@
'Except when the configuration is forced.': '除非强制配置。'
'Apps that should not be displayed in the menu': '禁止在菜单中显示的应用'
'This feature is only compatible with the <code>big menu</code> display.': '此功能只和<code>大型菜单</code>兼容。'
'The logo is a link to the default app': '徽标链接到默认应用'
'The logo is a link to the default app': 'logo链接到默认应用'
'Others': '其他'
'Categories': '类别'
'Customize sorting': '自定义排序'
@ -85,27 +85,27 @@
'Small text': '小文本'
'Normal text': '普通文本'
'Big text': '大文本'
'Applications': '应用程序'
'Applications kept in the top menu': '应用程序保留在顶部菜单中'
'Applications kept in the top menu but also shown in side menu': '应用程序保留在顶部菜单中,但也显示在侧边栏菜单中'
'These applications must be selected in the previous option.': '必须在上一个选项中选择这些应用程序。'
'Hide labels on mouse over': '鼠标悬停时隐藏标签'
'Except the hovered app': '除了悬停的应用'
'Search': '搜索'
'Toggle menu': '切换菜单'
'Open the documentation': '打开文档'
'Ask the developer': '询问开发者'
'New request': '新请求'
'Report a bug': '报告错误'
'Show the configuration': '显示配置'
'Configuration:': '配置:'
'Done!': '完成!'
'Copy': '复制'
'Need help': '需要帮助'
'I would like a new feature': '我想要一个新功能'
'Something went wrong': '出了点问题'
'Select apps': '选择应用'
'Sort': '排序'
'Customize': '自定义'
'Custom': '自定义'
'Close': '关闭'
'Applications': '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'
'Except the hovered app': 'Except the hovered app'
'Search': 'Search'
'Toggle menu': 'Toggle menu'
'Open the documentation': 'Open the documentation'
'Ask the developer': 'Ask the developer'
'New request': 'New request'
'Report a bug': 'Report a bug'
'Show the configuration': 'Show the configuration'
'Configuration:': 'Configuration:'
'Done!': 'Done!'
'Copy': 'Copy'
'Need help': 'Need help'
'I would like a new feature': 'I would like a new feature'
'Something went wrong': 'Something went wrong'
'Select apps': 'Select apps'
'Sort': 'Sort'
'Customize': 'Customize'
'Custom': 'Custom'
'Close': 'Close'

View file

@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
:data-app-id="app.id"
class="app-menu-entry"
:class="{
'app-menu-entry__active': app.id === activeApp,
'app-menu-entry__active': app.active,
'app-menu-entry__hidden-label': hiddenLabels === 1,
'app-menu-main__show-hovered': hiddenLabels === 2,
}"
@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
:class="{ 'has-unread': app.unread > 0 }"
:aria-label="app.name"
:target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
:aria-current="app.id === activeApp ? 'page' : false"
:aria-current="app.active ? 'page' : false"
>
<img
:src="app.icon"
@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
v-for="app in popoverAppList"
:key="app.id"
:aria-label="app.name"
:aria-current="app.id === activeApp ? 'page' : false"
:aria-current="app.active ? 'page' : false"
:href="app.href"
:style="makeStyle(app)"
class="cm-standardmenu-app-menu-popover-entry app-menu-popover-entry"
@ -101,7 +101,6 @@ import { ref, onMounted } from 'vue'
import { useConfigStore } from '../store/config.js'
import { useNavStore } from '../store/nav.js'
import { NcActions, NcActionLink } from '@nextcloud/vue'
import { getActiveAppId } from '../lib/app.js'
const navStore = useNavStore()
const configStore = useConfigStore()
@ -113,7 +112,6 @@ const topMenuApps = ref([])
const appsOrder = ref([])
const mainAppList = ref([])
const popoverAppList = ref([])
const activeApp = ref(null)
let resizeTimeout = null
const setApps = (value) => {
@ -144,7 +142,7 @@ const appLimit = () => {
})
}
return Math.max(0, Math.floor((body.offsetWidth - size) / 70))
return Math.floor((body.offsetWidth - size) / 70)
}
const makeStyle = (app) => {
@ -160,11 +158,6 @@ const computeLists = () => {
popoverAppList.value = appList.value.slice(appLimit()).sort((a, b) => a.order - b.order)
}
const reComputeLists = (delay) => {
window.clearTimeout(resizeTimeout)
resizeTimeout = window.setTimeout(computeLists, delay || 100)
}
onMounted(async () => {
const config = await configStore.getConfig()
@ -172,12 +165,14 @@ onMounted(async () => {
hiddenLabels.value = config['top-menu-mouse-over-hidden-label']
topMenuApps.value = config['top-menu-apps']
appsOrder.value = config['apps-order']
activeApp.value = getActiveAppId()
ready.value = true
setApps(await navStore.getCoreApps())
window.addEventListener('resize', reComputeLists)
window.addEventListener('resize', () => {
window.clearTimeout(resizeTimeout)
resizeTimeout = window.setTimeout(computeLists, 100)
})
})
</script>

View file

@ -41,7 +41,10 @@ export const useNavStore = defineStore('nav', () => {
async function getCoreApps() {
if (coreApps == null) {
coreApps = await await axios.get(generateUrl('/apps/side_menu/core/apps')).then((response) => response.data.items)
coreApps = await axios
.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
.then((response) => response.data)
.then((value) => value.ocs.data)
}
return coreApps

View file

@ -77,10 +77,6 @@ module.exports = {
new webpack.ProvidePlugin({
Buffer: ['buffer', 'Buffer'],
}),
new webpack.DefinePlugin({
appName: JSON.stringify(appName),
}),
],
resolve: {