Merge pull request 'fix(build): remove css directory' (#408) from develop into master

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

CHANGELOG.md

@@ -1,24 +1,5 @@
 ## [Unreleased]
 
-## 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

README.md

@@ -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.

appinfo/info.xml

@@ -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.0</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>

lib/AppInfo/Application.php

@@ -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;
+     * @var OC\AllConfig
-    protected Request $request;
+     */
-    protected ?User $user = null;
+    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');
 

lib/Controller/PersonalSettingController.php

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

src/components/settings/form/FormColorPicker.vue

@@ -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

src/menus/StandardMenu.vue

@@ -142,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) => {
@@ -158,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()
 
@@ -174,7 +169,10 @@ onMounted(async () => {
 
   setApps(await navStore.getCoreApps())
 
-  window.addEventListener('resize', reComputeLists)
+  window.addEventListener('resize', () => {
+    window.clearTimeout(resizeTimeout)
+    resizeTimeout = window.setTimeout(computeLists, 100)
+  })
 })
 </script>