Ensembia/nextcloud-side_menu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feature/nc34' (#500) from feature/nc34 into develop

Browse Source 
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/500
This commit is contained in:
Simon Vieille
2026-07-17 18:43:53 +02:00
parent ce01983f1c ad162f5821
commit 35afa38f73
5 changed files with 2146 additions and 677 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+607 -253
View File
File diff suppressed because it is too large Load Diff
appinfo/info.xml
+1 -1
View File
@@ -53,7 +53,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
<screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot> <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
<dependencies> <dependencies>
<php min-version="8.1" max-version="8.5" /> <php min-version="8.1" max-version="8.5" />
<nextcloud min-version="31" max-version="33"/> <nextcloud min-version="31" max-version="34"/>
</dependencies> </dependencies>
<settings> <settings>
<admin>OCA\SideMenu\Settings\Admin</admin> <admin>OCA\SideMenu\Settings\Admin</admin>
lib/AppInfo/Application.php
+10 -7
View File
@@ -6,6 +6,7 @@ use OC\AllConfig;
use OC\App\AppStore\Fetcher\CategoryFetcher; use OC\App\AppStore\Fetcher\CategoryFetcher;
use OC\AppFramework\Http\Request; use OC\AppFramework\Http\Request;
use OC\Security\CSP\ContentSecurityPolicyNonceManager; use OC\Security\CSP\ContentSecurityPolicyNonceManager;
use OC\Security\CSRF\CsrfTokenManager;
use OC\User\User; use OC\User\User;
use OCA\SideMenu\Service\AppRepository; use OCA\SideMenu\Service\AppRepository;
use OCA\SideMenu\Service\CategoryRepository; use OCA\SideMenu\Service\CategoryRepository;
@@ -19,8 +20,11 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\EventDispatcher\IEventDispatcher; use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig; use OCP\IConfig;
use OCP\INavigationManager; use OCP\INavigationManager;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\L10N\IFactory; use OCP\L10N\IFactory;
use OCP\Server;
use OCP\Util; use OCP\Util;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
@@ -34,9 +38,9 @@ class Application extends App implements IBootstrap
public const APP_ID = 'side_menu'; public const APP_ID = 'side_menu';
public const APP_NAME = 'Custom menu'; public const APP_NAME = 'Custom menu';
protected AllConfig $config; protected IConfig $config;
protected ContentSecurityPolicyNonceManager $cspnm; protected ContentSecurityPolicyNonceManager $cspnm;
protected Request $request; protected IRequest $request;
protected ?User $user = null; protected ?User $user = null;
public function __construct(array $urlParams = []) public function __construct(array $urlParams = [])
@@ -83,10 +87,9 @@ class Application extends App implements IBootstrap
public function boot(IBootContext $context): void public function boot(IBootContext $context): void
{ {
$this->config = \OC::$server->getConfig(); $this->config = Server::get(IConfig::class);
$this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager(); $this->user = Server::get(IUserSession::class)->getUser();
$this->user = \OC::$server[IUserSession::class]->getUser(); $this->request = Server::get(IRequest::class);
$this->request = \OC::$server->getRequest();
if (!$this->isEnabled()) { if (!$this->isEnabled()) {
return; return;
@@ -138,7 +141,7 @@ class Application extends App implements IBootstrap
$cache = $this->config->getAppValue(self::APP_ID, 'cache', '0'); $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
foreach ($assets as $value) { foreach ($assets as $value) {
$route = \OC::$server->getURLGenerator()->linkToRoute( $route = Server::get(IURLGenerator::class)->linkToRoute(
$value['route'], $value['route'],
['v' => $cache] ['v' => $cache]
); );
package-lock.json
Generated
+1526 -414
View File
File diff suppressed because it is too large Load Diff
package.json
+1 -1
View File
@@ -13,7 +13,7 @@
"@babel/core": ">=7.12.0 <8.0.0", "@babel/core": ">=7.12.0 <8.0.0",
"@formatjs/intl-segmenter": "^12.0.8", "@formatjs/intl-segmenter": "^12.0.8",
"@nextcloud/router": "^3.0.1", "@nextcloud/router": "^3.0.1",
"@nextcloud/vue": "^9.0.0-alpha.8", "@nextcloud/vue": "^9.9.0",
"node-polyfill-webpack-plugin": "^4.1.0", "node-polyfill-webpack-plugin": "^4.1.0",
"pinia": "^3.0.1", "pinia": "^3.0.1",
"postcss": "^7.0.0 || ^8.0.1", "postcss": "^7.0.0 || ^8.0.1",