refactor: get rid of remainin wavevision deps

rozsival · f3l1x · commit 92039df7c003 · 2024-09-20T13:01:42.000+02:00
diff --git a/app/model/UI/BasePropsControl.php b/app/model/UI/BasePropsControl.php
diff --git a/app/modules/Front/Addon/AddonPresenter.php b/app/modules/Front/Addon/AddonPresenter.php
@@ -38,6 +38,7 @@ protected function createComponentAddon(): AddonDetail
 
 	private function getAddon(int $id): Addon
 	{
+		bdump($id);
 		if (!($addon = $this->addonFacade->getDetail($id))) {
 			$this->error('Addon not found');
 		}
diff --git a/app/modules/Front/Addon/Controls/AddonDetail/templates/header.latte b/app/modules/Front/Addon/Controls/AddonDetail/templates/header.latte
@@ -1,10 +1,10 @@
 {varType App\Model\Database\ORM\Addon\Addon $addon}
 <div class="w-full flex flex-wrap justify-between">
     <div class="flex items-center w-full px-5 pt-2 md:pt-0 lg:px-8 mb-3 lg:mb-6 lg:w-1/2">
-        {control avatar, [addon => $addon, linkToGithub => true]}
+        {control avatar, $addon, true}
         <div class="flex flex-col flex-1">
-            {control name, [addon => $addon, inverseTag => true, linkToGithub => true]}
-            {control description, [addon => $addon]}
+            {control name, $addon, true, true}
+            {control description, $addon}
         </div>
     </div>
     <div n:if="$addon->isComposer && $addon->github->masterComposer"
diff --git a/app/modules/Front/Addon/Controls/AddonDetail/templates/sidebar.latte b/app/modules/Front/Addon/Controls/AddonDetail/templates/sidebar.latte
@@ -16,7 +16,7 @@
     </div>
 </div>
 <div class="bg-white rounded shadow-md relative z-10 mb-4">
-    {control statistics, [addon => $addon]}
+    {control statistics, $addon}
 </div>
 <div class="bg-white rounded shadow-md relative z-10 mb-4">
     <div class="flex flex-wrap items-center justify-start px-5 pt-3 lg:px-8 lg:pt-4 min-h-16">
diff --git a/app/modules/Front/Addon/Controls/FeaturedAddon/templates/default.latte b/app/modules/Front/Addon/Controls/FeaturedAddon/templates/default.latte
@@ -10,13 +10,13 @@
         </div>
         <div class="flex flex-wrap items-center justify-between px-5 pt-3 border-t lg:px-8 lg:pt-4">
             <div class="flex items-start w-full mb-3 lg:mb-5">
-                {control avatar, [addon => $addon, small => true]}
+                {control avatar, $addon, false, true}
                 <div class="flex flex-col flex-1">
-                    {control name, [addon => $addon]}
-                    {control description, [addon => $addon]}
+                    {control name, $addon}
+                    {control description, $addon}
                 </div>
             </div>
-            {control statistics, [addon => $addon, featured => true, inline => true]}
+            {control statistics, $addon, true, true}
         </div>
     </div>
     {include _shapes.latte}
diff --git a/app/modules/Front/Base/Controls/AddonList/AddonList.php b/app/modules/Front/Base/Controls/AddonList/AddonList.php
@@ -7,19 +7,17 @@
 use App\Model\Database\Query\LatestAddedAddonsQuery;
 use App\Model\Database\Query\QueryObject;
 use App\Model\Database\Query\SearchAddonsQuery;
-use App\Model\UI\BaseControl;
+use App\Model\UI\BaseRenderControl;
 use App\Modules\Front\Base\Controls\AddonList\Avatar\AvatarComponent;
 use App\Modules\Front\Base\Controls\AddonList\Description\DescriptionComponent;
 use App\Modules\Front\Base\Controls\AddonList\Name\NameComponent;
 use App\Modules\Front\Base\Controls\AddonList\Statistics\StatisticsComponent;
 use App\Modules\Front\Base\Controls\AddonMeta\AddonMeta;
 use App\Modules\Front\Base\Controls\Layout\Box\BoxComponent;
-use App\Modules\Front\Base\Controls\Layout\Box\BoxProps;
 use App\Modules\Front\Base\Controls\Layout\Heading\HeadingComponent;
 use Nette\Utils\Html;
-use Wavevision\PropsControl\Helpers\Render;
 
-class AddonList extends BaseControl
+class AddonList extends BaseRenderControl
 {
 
 	use AvatarComponent;
@@ -50,13 +48,13 @@ protected function createComponentMeta(): AddonMeta
 
 	public function render(): void
 	{
-		$this->getBoxComponent()->render(new BoxProps([BoxProps::CONTENT => $this->renderContent()]));
+		$this->getBoxComponent()->render($this->renderContent());
 	}
 
 	private function renderContent(): Html
 	{
 		$addons = $this->addonRepository->fetchEntities($this->queryObject);
-		return Render::toHtml(
+		return Html::el()->setHtml(
 			$this->template
 				->setParameters([
 					'addons' => $addons,
@@ -71,14 +69,11 @@ private function renderTitle(int $addonsCount): ?Html
 		switch ($query) {
 			case LatestActivityAddonsQuery::class:
 				return Html::el()->setText('Latest updated addons');
-
 			case LatestAddedAddonsQuery::class:
 				return Html::el()->setText('Latest indexed addons');
-
 			case SearchAddonsQuery::class:
 				return $this->renderSearchTitle($addonsCount);
 		}
-
 		return null;
 	}
 
@@ -91,19 +86,22 @@ private function renderSearchTitle(int $addonsCount): Html
 				->addHtml(Html::el()->setText('By '))
 				->addHtml(Html::el('strong')->setText($author));
 		}
-
 		if ($tag = $query->getTag()) {
 			return Html::el()
 				->addHtml(Html::el()->setText('Tagged by #'))
 				->addHtml(Html::el('strong')->setText($tag));
 		}
-
 		return Html::el()
 			->addHtml(Html::el()->setText('Searched for $'))
 			->addHtml(Html::el('strong')->setText($query->getQuery()))
-			->addHtml(Html::el('i')
-				->setAttribute('class', 'ml-2 relative inline-block px-2 text-sm font-normal text-blue-700 bg-blue-100 rounded-full align-middle')
-				->setText(sprintf('%d result%s', $addonsCount, $addonsCount > 1 ? 's' : '')));
+			->addHtml(
+				Html::el('i')
+					->setAttribute(
+						'class',
+						'ml-2 relative inline-block px-2 text-sm font-normal text-blue-700 bg-blue-100 rounded-full align-middle'
+					)
+					->setText(sprintf('%d result%s', $addonsCount, $addonsCount > 1 ? 's' : ''))
+			);
 	}
 
 }
diff --git a/app/modules/Front/Base/Controls/AddonList/Avatar/templates/default.latte b/app/modules/Front/Base/Controls/AddonList/Avatar/templates/default.latte
@@ -1,7 +1,7 @@
 {varType App\Model\Database\ORM\Addon\Addon $addon}
-{varType bool $linkToGithub}
+{varType bool $linkToGitHub}
 {varType bool $small}
-<a href="{if $linkToGithub}{$addon->github->linker->getRepoUrl()}{else}{plink Addon:detail, slug => $addon->id}{/if}"
+<a href="{if $linkToGitHub}{$addon->github->linker->getRepoUrl()}{else}{plink Addon:detail, slug => $addon->id}{/if}"
    class="flex-shrink-0 mr-4"
 >
     <img loading="lazy" alt="{$addon->author}"
diff --git a/app/modules/Front/Base/Controls/AddonList/BaseAddonProps.php b/app/modules/Front/Base/Controls/AddonList/BaseAddonProps.php
diff --git a/app/modules/Front/Base/Controls/AddonList/CategorizedAddonList.php b/app/modules/Front/Base/Controls/AddonList/CategorizedAddonList.php
@@ -12,10 +12,8 @@
 use App\Modules\Front\Base\Controls\AddonList\Statistics\StatisticsComponent;
 use App\Modules\Front\Base\Controls\AddonMeta\AddonMeta;
 use App\Modules\Front\Base\Controls\Layout\Box\BoxComponent;
-use App\Modules\Front\Base\Controls\Layout\Box\BoxProps;
 use Nette\Utils\Html;
 use Nextras\Orm\Collection\ICollection;
-use Wavevision\PropsControl\Helpers\Render;
 
 final class CategorizedAddonList extends BaseControl
 {
@@ -77,7 +75,7 @@ protected function getAddons(): ICollection
 
 	public function render(): void
 	{
-		$this->getBoxComponent()->render(new BoxProps([BoxProps::CONTENT => $this->renderContent()]));
+		$this->getBoxComponent()->render($this->renderContent());
 	}
 
 	private function renderContent(): Html
@@ -127,7 +125,7 @@ private function renderContent(): Html
 		$this->template->list = $list;
 		$this->template->title = null;
 		// Render
-		return Render::toHtml($this->template->renderToString(__DIR__ . '/templates/categorized.list.latte'));
+		return Html::el()->setHtml($this->template->renderToString(__DIR__ . '/templates/categorized.list.latte'));
 	}
 
 }
diff --git a/app/modules/Front/Base/Controls/AddonList/Description/templates/default.latte b/app/modules/Front/Base/Controls/AddonList/Description/templates/default.latte
@@ -1,2 +1,2 @@
 {varType App\Model\Database\ORM\Addon\Addon $addon}
-<p class="text-sm text-gray-700">{$addon->github->description|truncate:150|striptags|emojify|noescape}</p>
+<p n:if="$addon->github" class="text-sm text-gray-700">{$addon->github->description|truncate:150|striptags|emojify|noescape}</p>
diff --git a/app/modules/Front/Base/Controls/AddonList/Name/Control.php b/app/modules/Front/Base/Controls/AddonList/Name/Control.php
@@ -17,6 +17,8 @@ public function render(Addon $addon, bool $linkToGitHub = false, bool $inverseTa
 			/** @var GithubRelease|null $release */
 			$release = $github->releases->get()->orderBy(['crawledAt' => ICollection::DESC])->fetch();
 			$this->template->setParameters(['release' => $release]);
+		} else {
+			$this->template->setParameters(['release' => null]);
 		}
 		$this->template->render();
 	}
diff --git a/app/modules/Front/Base/Controls/AddonList/templates/list.latte b/app/modules/Front/Base/Controls/AddonList/templates/list.latte
@@ -3,7 +3,7 @@
 {if count($addons)}
     <div n:if="$title" class="flex flex-wrap items-center justify-between px-5 pt-3 lg:px-8 lg:pt-4">
         <div class="mb-3 lg:mb-5">
-            {control heading, [content => $title]}
+            {control heading, $title}
         </div>
         <a href="{plink :Front:Index:all}"
            class="inline-flex px-4 py-2 mb-3 font-medium text-teal-900 uppercase border rounded lg:mb-4 hover:bg-blue-100 transition duration-150 ease-in-out"
diff --git a/app/modules/Front/Base/Controls/Layout/Box/BoxProps.php b/app/modules/Front/Base/Controls/Layout/Box/BoxProps.php
diff --git a/app/modules/Front/Base/Controls/Layout/Box/Control.php b/app/modules/Front/Base/Controls/Layout/Box/Control.php
@@ -2,14 +2,23 @@
 
 namespace App\Modules\Front\Base\Controls\Layout\Box;
 
-use App\Model\UI\BasePropsControl;
+use App\Model\UI\BaseRenderControl;
+use Nette\Utils\Html;
 
-class Control extends BasePropsControl
+class Control extends BaseRenderControl
 {
 
-	protected function getPropsClass(): string
+	/**
+	 * @param Html $content
+	 * @param string[] $attributes
+	 * @param string[] $classNames
+	 */
+	public function render(Html $content, array $attributes = [], array $classNames = []): void
 	{
-		return BoxProps::class;
+		$this->template->content = $content;
+		$this->template->attributes = $attributes;
+		$this->template->classNames = $classNames;
+		$this->template->render();
 	}
 
 }
diff --git a/app/modules/Front/Base/Controls/Layout/Box/templates/default.latte b/app/modules/Front/Base/Controls/Layout/Box/templates/default.latte
@@ -1,6 +1,8 @@
-{templateType Wavevision\PropsControl\PropsControlTemplate}
-<div n:class="bg-white, rounded, shadow-md, 'z-10', relative, ...$props->get(App\Modules\Front\Base\Controls\Layout\Box\BoxProps::CLASS_NAMES)"
-    n:attr="$props->get(App\Modules\Front\Base\Controls\Layout\Box\BoxProps::ATTRIBUTES)"
+{varType Nette\Utils\Html $content}
+{varType array $attributes}
+{varType array $classNames}
+<div n:class="bg-white, rounded, shadow-md, 'z-10', relative, ...$classNames"
+    n:attr="$attributes"
 >
-    {$props->get(App\Modules\Front\Base\Controls\Layout\Box\BoxProps::CONTENT)}
+    {$content}
 </div>
diff --git a/app/modules/Front/Base/Controls/Layout/Footer/Heading/Control.php b/app/modules/Front/Base/Controls/Layout/Footer/Heading/Control.php
@@ -2,7 +2,6 @@
 
 namespace App\Modules\Front\Base\Controls\Layout\Footer\Heading;
 
-use App\Model\UI\BasePropsControl;
 use App\Model\UI\BaseRenderControl;
 
 class Control extends BaseRenderControl
diff --git a/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/Icon.php b/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/Icon.php
@@ -2,7 +2,6 @@
 
 namespace App\Modules\Front\Base\Controls\Layout\Footer\SocialLinks;
 
-use App\Modules\Front\Base\Controls\Svg\SvgProps;
 use Nette\SmartObject;
 
 final class Icon
diff --git a/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/SocialLinksProps.php b/app/modules/Front/Base/Controls/Layout/Footer/SocialLinks/SocialLinksProps.php
diff --git a/app/modules/Front/Base/Controls/Layout/Footer/templates/default.latte b/app/modules/Front/Base/Controls/Layout/Footer/templates/default.latte
@@ -1,4 +1,4 @@
-{varType App\Modules\Front\Base\Controls\Layout\Footer\SocialLinks\SocialLinksProps $socialLinks}
+{varType App\Modules\Front\Base\Controls\Layout\Footer\SocialLinks\SocialLink[] $socialLinks}
 <footer class="bg-white px-2 md:px-4 py-12 lg:py-16 relative overflow-hidden">
     <div class="container mx-auto">
         <div class="xl:grid xl:grid-cols-3 px-5 lg:px-8 xl:gap-8">
diff --git a/app/modules/Front/Base/Controls/Layout/Heading/Control.php b/app/modules/Front/Base/Controls/Layout/Heading/Control.php
@@ -7,12 +7,10 @@
 class Control extends BaseRenderControl
 {
 
-	/**
-	 * @param array<string, mixed> $props
-	 */
-	public function render(array $props): void
+
+	public function render(string $content, string $type = 'h2'): void
 	{
-		$this->template->setParameters(['props' => $props])->render();
+		$this->template->setParameters(['content' => $content, 'type' => $type])->render();
 	}
 
 }
diff --git a/app/modules/Front/Base/Controls/Layout/Heading/templates/default.latte b/app/modules/Front/Base/Controls/Layout/Heading/templates/default.latte
@@ -1,4 +1,5 @@
-{varType array $props}
-<{$props['type']} class="text-xl font-bold text-gray-800 lg:text-3xl font-headers">
-{$props['content']}
-</{$props['type']}>
+{varType string $content}
+{varType string $type}
+<{$type} class="text-xl font-bold text-gray-800 lg:text-3xl font-headers">
+{$content}
+</{$type}>
diff --git a/app/modules/Front/Base/Controls/Search/Search.php b/app/modules/Front/Base/Controls/Search/Search.php
@@ -5,7 +5,6 @@
 use App\Model\Services\Search\Search as Searching;
 use App\Model\UI\BaseControl;
 use App\Modules\Front\Base\Controls\Svg\SvgComponent;
-use App\Modules\Front\Base\Controls\Svg\SvgProps;
 use Nette\Application\UI\Form;
 
 final class Search extends BaseControl
diff --git a/app/modules/Front/Base/Controls/Search/templates/search.latte b/app/modules/Front/Base/Controls/Search/templates/search.latte
@@ -1,4 +1,4 @@
-{varType App\Modules\Front\Base\Controls\Svg\SvgProps $searchIcon}
+{varType array $searchIcon}
 <div class="px-2 -mb-4 md:px-4 md:-mb-1 lg:-mb-0">
     <form n:name="form" class="container flex mx-auto bg-white rounded shadow-xl transform -translate-y-1/2">
         <input n:name="q"
diff --git a/app/modules/Front/Base/Controls/Svg/SvgProps.php b/app/modules/Front/Base/Controls/Svg/SvgProps.php
diff --git a/app/modules/Front/Index/templates/all.latte b/app/modules/Front/Index/templates/all.latte
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ protected function createComponentAddon(): AddonDetail`
`38`	`38`
`39`	`39`	`private function getAddon(int $id): Addon`
`40`	`40`	`{`
	`41`	`+ bdump($id);`
`41`	`42`	`if (!($addon = $this->addonFacade->getDetail($id))) {`
`42`	`43`	`$this->error('Addon not found');`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,8 @@`
`12`	`12`	`use App\Modules\Front\Base\Controls\AddonList\Statistics\StatisticsComponent;`
`13`	`13`	`use App\Modules\Front\Base\Controls\AddonMeta\AddonMeta;`
`14`	`14`	`use App\Modules\Front\Base\Controls\Layout\Box\BoxComponent;`
`15`		`-use App\Modules\Front\Base\Controls\Layout\Box\BoxProps;`
`16`	`15`	`use Nette\Utils\Html;`
`17`	`16`	`use Nextras\Orm\Collection\ICollection;`
`18`		`-use Wavevision\PropsControl\Helpers\Render;`
`19`	`17`
`20`	`18`	`final class CategorizedAddonList extends BaseControl`
`21`	`19`	`{`
`@@ -77,7 +75,7 @@ protected function getAddons(): ICollection`
`77`	`75`
`78`	`76`	`public function render(): void`
`79`	`77`	`{`
`80`		`- $this->getBoxComponent()->render(new BoxProps([BoxProps::CONTENT => $this->renderContent()]));`
	`78`	`+ $this->getBoxComponent()->render($this->renderContent());`
`81`	`79`	`}`
`82`	`80`
`83`	`81`	`private function renderContent(): Html`
`@@ -127,7 +125,7 @@ private function renderContent(): Html`
`127`	`125`	`$this->template->list = $list;`
`128`	`126`	`$this->template->title = null;`
`129`	`127`	`// Render`
`130`		`- return Render::toHtml($this->template->renderToString(__DIR__ . '/templates/categorized.list.latte'));`
	`128`	`+ return Html::el()->setHtml($this->template->renderToString(__DIR__ . '/templates/categorized.list.latte'));`
`131`	`129`	`}`
`132`	`130`
`133`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`{varType App\Model\Database\ORM\Addon\Addon $addon}`
`2`		`-<p class="text-sm text-gray-700">{$addon->github->description\|truncate:150\|striptags\|emojify\|noescape}</p>`
	`2`	`+<p n:if="$addon->github" class="text-sm text-gray-700">{$addon->github->description\|truncate:150\|striptags\|emojify\|noescape}</p>`