wip: 2025-02-01T13:48:23+0100 (1738414103)

endpoints/search/GET.php

@@ -1,31 +1,26 @@
 <?php
 
-	use Reflect\Call;
+	use vlw\MySQL\Operators;
 	use Reflect\{Response, Path};
 	use ReflectRules\{Ruleset, Rules, Type};
 
-	use VLW\API\Endpoints;
-
 	use VLW\Database\Database;
-	use VLW\Database\Tables\Work\WorkTable;
+	use VLW\Database\Tables\Search\SearchTable;
 
-	require_once Path::root("src/Endpoints.php");
 	require_once Path::root("src/Database/Database.php");
-	require_once Path::root("src/Database/Tables/Work/Work.php");
+	require_once Path::root("src/Database/Tables/Search/Search.php");
 
 	class GET_Search extends Database {
-		const GET_QUERY = "q";
-
 		protected Ruleset $ruleset;
 
 		public function __construct() {
 			$this->ruleset = new Ruleset(strict: true);
 
 			$this->ruleset->GET([
-				(new Rules(self::GET_QUERY))
+				(new Rules(SearchTable::QUERY->value))
 					->required()
 					->type(Type::STRING)
-					->min(1)
+					->min(2)
 					->max(parent::SIZE_VARCHAR)
 			]);
 
@@ -34,22 +29,23 @@
 			parent::__construct();
 		}
 
-		private function search_work(): Response {
-			return (new Call(Endpoints::WORK->value))->params([
-				WorkTable::TITLE->value      => $_GET[self::GET_QUERY],
-				WorkTable::SUMMARY->value    => $_GET[self::GET_QUERY]
-			])->get();
-		}
-
 		public function main(): Response {
-			$results = [
-				Endpoints::WORK->value => $this->search_work()->output()
-			];
-
-			// Calculate the total number of results from all searched endpoints
-			$num_results = array_sum(array_map(fn(array $result): int => count($result), array_values($results)));
-
-			// Return 404 if no search results
-			return new Response($results, $num_results > 0 ? 200 : 404);
+			$result = $this->db
+				->for(SearchTable::NAME)
+				->where([
+					SearchTable::QUERY->value => [
+						Operators::LIKE->value => "%{$_GET[SearchTable::QUERY->value]}%"
+					]
+				])
+				->select([
+					SearchTable::TITLE->value,
+					SearchTable::SUMMARY->value,
+					SearchTable::CATEGORY->value,
+					SearchTable::HREF->value
+				]);
+			
+			return $result->num_rows > 0
+				? new Response($result->fetch_all(MYSQLI_ASSOC))
+				: new Response([], 404);
 		}
 	}

public/assets/css/pages/search.css

@@ -1,85 +1,57 @@
-/* # Overrides */
-
-[vv-page="/search"]:not(body) {
+vv-shell[vv-page="/search"] {
 	display: flex;
 	flex-direction: column;
-	gap: var(--padding);
 }
 
-/* # Sections */
-
-/* ## Search */
+/* # Search */
 
 section.search {
-	width: 100%;
-	display: none;
-	flex-direction: column;
-	align-items: center;
-	gap: var(--padding);
-	background-color: rgba(255, 255, 255, .05);
-	padding: calc(var(--padding) * 1.5);
-	margin-bottom: calc(var(--padding) * 2);
-}
-
-vv-shell[vv-page="/search"] > section.search {
 	display: flex;
+	gap: var(--padding);
+	border-radius: 6px;
+	padding: var(--padding);
+	background-color: rgba(255, 255, 255, .1);
 }
 
 section.search form {
 	display: contents;
 }
 
-section.search search {
-	width: 100%;
-}
-
 section.search input {
-	width: 100%;
-	border: none;
-	color: black;
-	outline: none;
-	padding: var(--padding);
-	background-color: var(--color-accent);
-}
-
-section.search button[type="submit"] {
-	width: 100%;
-	max-width: 350px;
-}
-
-section.search > svg {
-	width: 100%;
-}
-
-/* # Search results */
-
-section.results .result {
-	display: flex;
-	flex-direction: column;
-	gap: calc(var(--padding) / 2);
-}
-
-/* ## Titles */
-
-section.title a h2 {
-	color: var(--color-accent);
-}
-
-section.title a h2::before {
-	content: "// ";
-	color: white;
-}
-
-/* ## Work */
-
-section.results.work {
-	display: grid;
-	grid-template-columns: 1fr;
-	gap: calc(var(--padding) / 2);
-}
-
-section.results.work .result {
-	padding: var(--padding);
-	background-color: rgba(255, 255, 255, .03);
+	flex: 1 1 auto;
 	border-radius: 6px;
+	padding: 0 var(--padding);
+	border: solid 2px rgba(255, 255, 255, .1);
+	background-color: rgba(255, 255, 255, .1);
+}
+
+section.search input:focus {
+	outline: none;
+	border-color: white;
+}
+
+section.search select {
+	padding: 5px;
+	border: none;
+	background-color: transparent;
+}
+
+section.search select :is(option, optgroup) {
+	color: black;
+}
+
+/* # Start search */
+
+section.start-search {
+	display: flex;
+	flex: 1 1 auto;
+	align-items: center;
+	flex-direction: column;
+	justify-content: center;
+	fill: var(--color-accent);
+	gap: calc(var(--padding) / 2);
+}
+
+section.start-search svg {
+	width: 60px;
 }

public/search.php

@@ -1,95 +1,59 @@
 <?php
 
-	use Vegvisir\Path;
+	use const VLW\ICONS_DIR;
+	use VLW\Database\Models\Search\Search;
+	use VLW\Database\Tables\Search\{SearchTable, SearchCategoryEnum};
 
-	use VLW\Client\API;
-	use VLW\API\Endpoints;
+	require_once VV::root("src/Consts.php");
+	require_once VV::root("src/Database/Tables/Search/Search.php");
+	require_once VV::root("src/Database/Models/Search/Search.php");
 
-	use VLW\Database\Tables\Work\{
-		WorkTable,
-		ActionsTable
-	};
+	$search = new class extends Search {
+		public function __construct() {}
 
-	require_once VV::root("src/client/API.php");
-	require_once VV::root("api/src/Endpoints.php");
+		public static function get_query(): ?string {
+			return $_GET[SearchTable::QUERY->value] ?? null;
+		}
 
-	require_once VV::root("api/src/Database/Tables/Work/Work.php");
-	require_once VV::root("api/src/Database/Tables/Work/WorkActions.php");
+		public static function get_category(): ?SearchCategoryEnum {
+			return SearchCategoryEnum::tryFromName($_GET[SearchTable::CATEGORY->value] ?? "");
+		}
 
-	// Search endpoint query paramter
-	const SEARCH_PARAM = "q";
-
-	// Connect to VLW API
-	$api = new API();
-
-	// Get search results from endpoint
-	$response = $api->call(Endpoints::SEARCH->value)->params([SEARCH_PARAM => $_GET[SEARCH_PARAM]])->get();
+		public function search(): array {
+			$results = parent::all([SearchTable::QUERY->value => self::get_query()]);
+		}
+	}
 
 ?>
 <style><?= VV::css("public/assets/css/pages/search") ?></style>
 <section class="search">
-	<form method="GET">
-		<search>
-			<input name="<? SEARCH_PARAM ?>" type="text" placeholder="search vlw.se..." value="<?= $_GET[SEARCH_PARAM] ?>"></input>
-		</search>
-		<button type="submit" class="inline solid">Search</button>
+	<form>
+		<input name="<?= SearchTable::QUERY->value ?>" type="search" placeholder="search vlw.se..." value="<?= $search::get_query() ?>">
+		<select name="<?= SearchTable::CATEGORY->value ?>">
+
+			<option value="null">All</option>
+			<optgroup label="Categories">
+
+				<?php foreach (SearchCategoryEnum::names() as $category): ?>
+					<?php $category = SearchCategoryEnum::fromName($category); ?>
+					<option value="<?= $category->name ?>" <?= $search::get_category() === $category ? "selected" : "" ?>><?= ucfirst(strtolower($category->name)) ?></option>
+				<?php endforeach; ?>
+
+			</optgroup>
+
+		</select>
+		<button type="submit" class="inline solid"><?= VV::embed(ICONS_DIR . "search.svg") ?></button>
 	</form>
-	<?= VV::embed("public/assets/media/line.svg") ?>
-	<button class="inline">advanced search options</button>
 </section>
 
-<?php if ($response->ok): ?>
-	<?php // Get response body ?>
-	<?php $results = $response->json(); ?>
-
-	<?php // Search contains results from the work endpoint ?>
-	<?php if ($results[Endpoints::WORK->value]): ?>
-		<section class="title work">
-			<a href="<? Endpoints::WORK->value ?>"><h2>Work</h2></a>
-			<p><?= count($results[Endpoints::WORK->value]) ?> search result(s) from my public work</p>
-		</section>
-		<section class="results work">
-
-			<?php // List all work category search results ?>
-			<?php foreach ($results[Endpoints::WORK->value] as $result): ?>
-				<div class="result">
-					<h3><?= $result[WorkTable::TITLE->value] ?></h3>
-					<p><?= $result[WorkTable::SUMMARY->value] ?></p>
-					<p><?= date(API::DATE_FORMAT, $result[WorkTable::DATE_CREATED->value]) ?></p>
-
-					<?php // Get action buttons for work entity by id ?>
-					<?php $actions = $api->call(Endpoints::WORK_ACTIONS->value)->params([ActionsTable::REF_WORK_ID->value => $result[WorkTable::ID->value]])->get(); ?>
-
-					<?php // List each action button for work entity if exists ?>
-					<?php if ($actions->ok): ?>
-						<div class="actions">
-							<?php foreach ($actions->json() as $action): ?>
-								
-								<?php // Bind VV Interactions if link is same origin, else open in new tab ?>
-								<a href="<?= $action[ActionsTable::HREF->value] ?>" target="_blank"><button class="inline <?= $action[ActionsTable::CLASS_LIST->value] ?>"><?= $action[ActionsTable::DISPLAY_TEXT->value] ?></button></a>
-
-							<?php endforeach; ?>
-						</div>
-					<?php endif; ?>
-
-				</div>
-			<?php endforeach; ?>
-		</section>
-	<?php endif; ?>
+<?php if (array_key_exists(SearchTable::QUERY->value, $_GET)): ?>
+	<section class="results">
+		
+	</section>
 <?php else: ?>
-
-	<?php if (!empty($_GET[SEARCH_PARAM])): ?>
-		<section class="info noresults">
-			<img src="/assets/media/travolta.gif" alt="">
-			<p>No results for search term "<?= $_GET[SEARCH_PARAM] ?>"</p>
-		</section>
-	<?php else: ?>
-		<section class="info empty">
-			<?= VV::embed("public/assets/media/icons/search.svg") ?>
-			<p>Start typing to search</p>
-		</section>
-	<?php endif; ?>
-
+	<section class="start-search">
+		<?= VV::embed(ICONS_DIR . "search.svg") ?>
+		<p>Start typing to search</p>
+	</section>
 <?php endif; ?>
-
 <script><?= VV::js("public/assets/js/pages/search") ?></script>

src/Database/Models/Search/Search.php

@@ -0,0 +1,42 @@
+<?php
+
+	namespace VLW\Database\Models\Search;
+
+	use \VV;
+
+	use VLW\API\Endpoints;
+	use VLW\Database\Models\Model;
+	use VLW\Database\Tables\Search\{SearchTable, SearchCategoryEnum};
+
+	require_once VV::root("src/Consts.php");
+	require_once VV::root("src/API/Endpoints.php");
+	require_once VV::root("src/Database/Models/Model.php");
+	require_once VV::root("src/Database/Tables/Search/Search.php");
+
+	class Search extends Model {
+		public function __construct(public readonly string $id) {
+			parent::__construct(Endpoints::SEARCH, [
+				SearchTable::ID->value => $this->id
+			]);
+		}
+
+		public static function all(array $params = []): array {
+			return array_map(fn(array $item): Search => new Search($item[SearchTable::ID->value]), parent::list(Endpoints::SEARCH, $params));
+		}
+
+		public function title(): ?string {
+			return $this->get(Search::TITLE->value);
+		}
+
+		public function summary(): string {
+			return $this->get(Search::SUMMARY->value);
+		}
+
+		public function category(): ?SearchCategoryEnum {
+			return SearchCategoryEnum::tryFromName($this->get(Search::CATEGORY->value));
+		}
+
+		public function href(): ?string {
+			return $this->get(Search::HREF->value);
+		}
+	}

src/Database/Models/Work/Tag.php

@@ -30,6 +30,6 @@
 		}
 
 		public function label(): TagsLabelEnum {
-			return TagsLabelEnum::from($this->get(TagsTable::LABEL->value));
+			return TagsLabelEnum::fromName($this->get(TagsTable::LABEL->value));
 		}
 	}

src/Database/Tables/Search/Search.php

@@ -0,0 +1,24 @@
+<?php
+
+	namespace VLW\Database\Tables\Search;
+
+	use vlw\xEnum;
+
+	enum SearchCategoryEnum {
+		use xEnum;
+
+		case WORK;
+	}
+
+	enum SearchTable: string {
+		use xEnum;
+
+		const NAME = "search";
+
+		case QUERY    = "query";
+		case ID       = "id";
+		case TITLE    = "title";
+		case SUMMARY  = "summary";
+		case CATEGORY = "category";
+		case HREF     = "href";
+	}

src/Database/Tables/Work/Tags.php

@@ -4,13 +4,13 @@
 
 	use vlw\xEnum;
 
-	enum TagsLabelEnum: string {
+	enum TagsLabelEnum {
 		use xEnum;
 
-		case VLW     = "VLW";
-		case RELEASE = "RELEASE";
-		case WEBSITE = "WEBSITE";
-		case REPO    = "REPO";
+		case VLW;
+		case RELEASE;
+		case WEBSITE;
+		case REPO;
 	}
 
 	enum TagsTable: string {