fix: ui fixes to remove rounded corners and make the ui/ux similar to…

… recommendation widget. cs fix. composer fix no dev and review comments from Joas and Côme addressed

Signed-off-by: yemkareems <[email protected]>

apps/dashboard/src/DashboardApp.vue

@@ -39,7 +39,7 @@
 							{{ t('dashboard', '"{title} icon"', { title: apiWidgets[panels[panelId].id].title }) }}
 						</span>
 					</div>
-					<div class="panel--content">
+					<div class="panel--content" :id="`panel-${panels[panelId].id}`">
 						<ApiDashboardWidget :widget="apiWidgets[panels[panelId].id]"
 							:data="apiWidgetItems[panels[panelId].id]"
 							:loading="loadingItems" />

apps/files/css/style.css

@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+#panel-files-favorites {
+	.avatardiv {
+		border-radius: var(--border-radius);
+		flex-shrink: 0;
+
+		& > img {
+			border-radius: var(--border-radius);
+			flex-shrink: 0;
+			margin-right: 9px;
+		}
+
+		background: none !important;
+		margin-left: 8px;
+		margin-right: 9px;
+	}
+	.item-list__entry {
+		padding-left: 0;
+		padding-right: 0;
+	}
+	.item__details {
+		white-space: nowrap;
+		margin-bottom: -8px;
+		display: inline-block;
+		max-width: 170px;
+		color: var(--color-main-text);
+		text-overflow: ellipsis;
+		overflow: hidden;
+		padding-left: 0;
+		border-radius: var(--border-radius);
+	}
+	h3 {
+		font-weight: 400;
+	}
+}

apps/files/lib/Dashboard/FavoriteWidget.php

@@ -23,22 +23,23 @@
 use OCP\ITagManager;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
+use OCP\Util;
 
 class FavoriteWidget implements IIconWidget, IAPIWidgetV2, IButtonWidget {
 	public function __construct(
-		private readonly IL10N             $l10n,
-		private readonly IURLGenerator     $urlGenerator,
+		private readonly IL10N $l10n,
+		private readonly IURLGenerator $urlGenerator,
 		private readonly IMimeTypeDetector $mimeTypeDetector,
-		private readonly IUserManager      $userManager,
-		private readonly ITagManager       $tagManager,
-		private readonly IRootFolder       $rootFolder,
-		private readonly IPreview          $previewManager,
+		private readonly IUserManager $userManager,
+		private readonly ITagManager $tagManager,
+		private readonly IRootFolder $rootFolder,
+		private readonly IPreview $previewManager,
 	) {
 
 	}
 
 	public function getId(): string {
-		return Application::APP_ID.'-favorites';
+		return Application::APP_ID . '-favorites';
 	}
 
 	public function getTitle(): string {
@@ -60,14 +61,14 @@ public function getIconUrl(): string {
 	}
 
 	public function getUrl(): ?string {
-		return $this->urlGenerator->getAbsoluteURL('index.php/apps/files/favorites');
+		return $this->urlGenerator->linkToRouteAbsolute('files.View.indexView', ['view' => 'favorites']);
 	}
 
 	public function load(): void {
-		return;
+		Util::addStyle('files', 'style');
 	}
 
-	public function getItems(string $userId, ?string $since = null, int $limit = 7): array {
+	public function getItems(string $userId, int $limit = 7): array {
 		$user = $this->userManager->get($userId);
 
 		if (!$user) {
@@ -84,7 +85,7 @@ public function getItems(string $userId, ?string $since = null, int $limit = 7):
 			$node = $userFolder->getFirstNodeById($favorite);
 			if ($node) {
 				$url = $this->urlGenerator->linkToRouteAbsolute(
-					'files.viewcontroller.showFile', ['fileid' => $node->getId()]
+					'files.view.showFile', ['fileid' => $node->getId()]
 				);
 				if ($this->previewManager->isAvailable($node)) {
 					$icon = $this->urlGenerator->linkToRouteAbsolute('core.Preview.getPreviewByFileId', [
@@ -108,11 +109,11 @@ public function getItems(string $userId, ?string $since = null, int $limit = 7):
 			}
 		}
 
-		return $favoriteNodes;
+		return array_slice($favoriteNodes, 0, $limit);
 	}
 
 	public function getItemsV2(string $userId, ?string $since = null, int $limit = 7): WidgetItems {
-		$items = $this->getItems($userId, $since, $limit);
+		$items = $this->getItems($userId, $limit);
 		return new WidgetItems(
 			$items,
 			count($items) === 0 ? $this->l10n->t('No favorites') : '',
@@ -123,7 +124,7 @@ public function getWidgetButtons(string $userId): array {
 		return [
 			new WidgetButton(
 				WidgetButton::TYPE_MORE,
-				$this->urlGenerator->getAbsoluteURL('index.php/apps/files/favorites'),
+				$this->urlGenerator->linkToRouteAbsolute('files.View.indexView', ['view' => 'favorites']),
 				$this->l10n->t('More favorites')
 			),
 		];

lib/composer/composer/autoload_psr4.php

@@ -10,6 +10,5 @@
     'OC\\' => array($baseDir . '/lib/private'),
     'OCP\\' => array($baseDir . '/lib/public'),
     'NCU\\' => array($baseDir . '/lib/unstable'),
-    'Bamarni\\Composer\\Bin\\' => array($vendorDir . '/bamarni/composer-bin-plugin/src'),
     '' => array($baseDir . '/lib/private/legacy'),
 );

lib/composer/composer/autoload_static.php

@@ -21,10 +21,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         array (
             'NCU\\' => 4,
         ),
-        'B' => 
-        array (
-            'Bamarni\\Composer\\Bin\\' => 21,
-        ),
     );
 
     public static $prefixDirsPsr4 = array (
@@ -44,10 +40,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         array (
             0 => __DIR__ . '/../../..' . '/lib/unstable',
         ),
-        'Bamarni\\Composer\\Bin\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/bamarni/composer-bin-plugin/src',
-        ),
     );
 
     public static $fallbackDirsPsr4 = array (