Refactor plugins controller and filter out all archived plugins

Author: bastianallgeier

assets/css/framework/buttons.css

@@ -43,7 +43,3 @@ button {
 .btn--filled svg {
 	color: var(--color-yellow-600);
 }
-.btn--yellow {
-	background: var(--color-yellow-400) !important;
-	color: var(--color-black); !important;
-}

site/controllers/plugins.php

@@ -10,32 +10,26 @@
 	$category   = param('category');
 	$heading    = 'Featured';
 
-	if ($category && array_key_exists($category, $categories) === true) {
-		$plugins = $page
-			->children()
-			->children()
-			->filterBy('recommended', '')
-			->sortBy('title', 'asc');
+	// get all plugins
+	$plugins = $page
+		->grandChildren()
+		->filter('archived', '')
+		->sortBy('title', 'asc');
 
-		$plugins = $plugins->filterBy('category', $category);
-		$heading = $categories[$category]['label'];
 
+	if ($category && array_key_exists($category, $categories) === true) {
+		$heading = $categories[$category]['label'];
+		$plugins = $plugins->filter('recommended', '')->filter('category', $category);
 	} elseif ($category === 'all') {
 		$heading  = 'All plugins';
 		$category = 'all';
-		$plugins  = $page
-			->grandChildren()
-			->sortBy('title', 'asc');
 	} elseif ($filter === 'k4') {
 		$heading  = 'Kirby 4 plugins';
 		$category = 'k4';
-		$plugins  = $page
-			->grandChildren()
-			->filter('versions', '*=', '4')
-			->sortBy('title', 'asc');
+		$plugins  = $plugins->filter('versions', '*=', '4');
 	} elseif ($filter) {
 		$heading = 'Newly added plugins';
-		$plugins = $page->grandChildren()->filterBy('isNew', true);
+		$plugins = $plugins->filter('isNew', true);
 	} else {
 		$category = null;
 		$plugins  = new Pages();

site/snippets/templates/plugins/versions.php

@@ -2,8 +2,4 @@
 	<?php foreach($plugin->versions()->split() as $version): ?>
 	<li class="px-1 rounded bg-<?= $version === '4' ? 'yellow' : $bg ?? 'light' ?>" title="This plugin supports Kirby <?= $version ?>">K<?= $version ?></li>
 	<?php endforeach ?>
-
-	<?php if($plugin->archived()->isNotEmpty()): ?>
-	<li class="px-1 rounded bg-dark color-white" title="This plugin is archived and no longer maintained">Archived</li>
-	<?php endif ?>
 </ul>

site/templates/plugin.php

@@ -114,6 +114,11 @@
 .plugin-links .plugin-paid {
 	background: var(--color-purple-300);
 }
+
+.btn--yellow {
+	background: var(--color-yellow-400) !important;
+	color: var(--color-black);
+}
 </style>
 
 <article>
@@ -245,7 +250,7 @@
 				<?php if($page->archived()->isNotEmpty()): ?>
 				<a class="btn btn--yellow" href="<?= url('releases') ?>" title="This plugin is archived and no longer maintained">
 					<span><?= icon('alert') ?></span>
-					The plugin is archived
+					Archived
 				</a>
 				<?php endif ?>