feat: implement more functionality and improve ui/ux

Author: DefinitelyNotSimon13

episko_gui_backend/app-icon.png

@@ -3,5 +3,8 @@
 	"identifier": "default",
 	"description": "enables the default permissions",
 	"windows": ["main"],
-	"permissions": ["core:default", "dialog:default"]
+	"permissions": [
+		"core:default", 
+		"dialog:default"
+	]
 }

episko_gui_backend/capabilities/default.json

@@ -137,6 +137,24 @@ pub async fn create_metadata(
     Ok(metadata.id)
 }
 
+#[tauri::command]
+pub async fn delete_metadata(
+    metadata: MetadataDto,
+    state: tauri::State<'_, Mutex<AppState>>,
+) -> Result<(), Error> {
+    let mut state = state.lock().await;
+
+    let metadata: Metadata = metadata.into();
+
+    state.config_handler.remove_saved_file(&metadata.directory);
+    state.config_handler.save_config()?;
+
+    metadata.remove_from_db(&state.db).await?;
+    Metadata::remove_file(&metadata.directory)?;
+
+    Ok(())
+}
+
 #[tauri::command]
 pub async fn load_from_file(
     path: &Path,

episko_gui_backend/icons/128x128.png

@@ -7,8 +7,8 @@ use tokio::sync::Mutex;
 
 mod commands;
 use commands::{
-    create_metadata, get_all, get_all_categories, get_all_languages, get_statistics, get_with_id,
-    init_cache, load_from_directory, load_from_file, update_metadata,
+    create_metadata, delete_metadata, get_all, get_all_categories, get_all_languages,
+    get_statistics, get_with_id, init_cache, load_from_directory, load_from_file, update_metadata,
 };
 
 pub mod model;
@@ -46,6 +46,7 @@ pub async fn run() -> Result<(), Box<dyn std::error::Error>> {
             get_statistics,
             update_metadata,
             create_metadata,
+            delete_metadata,
             load_from_file,
             load_from_directory,
         ])

episko_gui_backend/icons/[email protected]

@@ -1,8 +1,8 @@
 use episko_lib::{
+    ApplyIf as _,
     metadata::{
-        property::Property, BuildSystem, Category, Ide, Language, Metadata, MetadataBuilder,
+        BuildSystem, Category, Ide, Language, Metadata, MetadataBuilder, property::Property,
     },
-    ApplyIf as _,
 };
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
@@ -66,12 +66,9 @@ impl MetadataDco {
             .categories(self.categories)
             .languages(self.languages)
             .build_systems(self.build_systems)
-            .apply_if(self.preferred_ide, MetadataBuilder::preferred_ide)
-            .apply_if(self.description.as_deref(), MetadataBuilder::description)
-            .apply_if(
-                self.repository_url.as_deref(),
-                MetadataBuilder::repository_url,
-            )
+            .update_ide(self.preferred_ide)
+            .update_description(self.description)
+            .update_repository_url(self.repository_url)
             .build()?)
     }
 }
@@ -80,7 +77,7 @@ impl MetadataDco {
 mod tests {
     use super::*;
     use episko_lib::metadata::{
-        property::Property as _, BuildSystem, Category, Ide, Language, Metadata,
+        BuildSystem, Category, Ide, Language, Metadata, property::Property as _,
     };
     use std::path::PathBuf;
 

episko_gui_backend/icons/32x32.png

@@ -42,12 +42,30 @@ impl From<Metadata> for MetadataDto {
     }
 }
 
+impl Into<Metadata> for MetadataDto {
+    fn into(self) -> Metadata {
+        Metadata {
+            id: self.id,
+            directory: self.directory,
+            title: self.title,
+            description: self.description,
+            categories: self.categories,
+            languages: self.languages,
+            build_systems: self.build_systems,
+            preferred_ide: self.preferred_ide,
+            repository_url: self.repository_url,
+            created: self.created,
+            updated: self.updated,
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
     use chrono::Utc;
     use episko_lib::metadata::{
-        property::Property as _, BuildSystem, Category, Ide, Language, Metadata,
+        BuildSystem, Category, Ide, Language, Metadata, property::Property as _,
     };
     use uuid::Uuid;
 

episko_gui_backend/icons/64x64.png

@@ -1,5 +1,8 @@
-use crate::metadata::property::Property;
+use log::info;
+use log::trace;
+
 use crate::metadata::Metadata;
+use crate::metadata::property::Property;
 
 use super::DatabaseHandler;
 use super::DatabaseObject;
@@ -17,6 +20,15 @@ impl Metadata {
     pub async fn update_in_db(&self, db: &DatabaseHandler) -> Result<()> {
         let mut transaction = db.conn().begin().await?;
 
+        info!("Updating: {self:#?}");
+
+        match &self.preferred_ide {
+            Some(ide) => {
+                ide.write_to_db(&mut *transaction).await?;
+            }
+            None => (),
+        }
+
         let ide_id = self
             .preferred_ide
             .as_ref()

episko_gui_backend/icons/Square107x107Logo.png

@@ -187,6 +187,9 @@ pub enum Error {
     #[error("unable to save metadata: {0}")]
     Save(String),
 
+    #[error("unable to delete metadata: {0}")]
+    Delete(String),
+
     #[error("unable to find manifests in directory: {0}")]
     Directory(String),
 }

episko_gui_backend/icons/Square142x142Logo.png

@@ -14,7 +14,7 @@ use uuid::Uuid;
 // Temporary for compatibility reasons.
 pub use crate::ApplyIf;
 
-use super::{property::Property, BuildSystem, Category, Ide, Language, Metadata};
+use super::{BuildSystem, Category, Ide, Language, Metadata, property::Property};
 
 /// To allow for flexible building all fields
 /// can start of as `None` or an empty `Vec`.
@@ -216,6 +216,13 @@ impl MetadataBuilder {
         self
     }
 
+    /// Update the preferred [`Ide`]
+    #[must_use]
+    pub fn update_ide(mut self, ide: Option<Ide>) -> Self {
+        self.preferred_ide = ide;
+        self
+    }
+
     /// Set the description
     #[must_use]
     pub fn description(mut self, description: &str) -> Self {
@@ -226,6 +233,13 @@ impl MetadataBuilder {
         self
     }
 
+    /// Update the description
+    #[must_use]
+    pub fn update_description(mut self, description: Option<String>) -> Self {
+        self.description = description;
+        self
+    }
+
     /// Set the repository url
     #[must_use]
     pub fn repository_url(mut self, url: &str) -> Self {
@@ -236,6 +250,13 @@ impl MetadataBuilder {
         self
     }
 
+    /// Update the repository url
+    #[must_use]
+    pub fn update_repository_url(mut self, url: Option<String>) -> Self {
+        self.repository_url = url;
+        self
+    }
+
     /// Set the creation [`DateTime`]
     #[must_use]
     pub fn created(mut self, created: DateTime<Utc>) -> Self {

episko_gui_backend/icons/Square150x150Logo.png

@@ -58,6 +58,23 @@ impl MetadataHandler {
         Ok(())
     }
 
+    pub async fn delete_metadata(
+        metadata: &Metadata,
+        db: &DatabaseHandler,
+        config_handler: &mut ConfigHandler,
+    ) -> Result<()> {
+        // if part of dir, returns false but can be ignored
+        let _ = config_handler.remove_saved_file(&metadata.directory);
+
+        metadata
+            .remove_from_db(&db)
+            .await
+            .map_err(|err| Error::Delete(err.to_string()))?;
+        Metadata::remove_file(&metadata.directory).map_err(|err| Error::Delete(err.to_string()))?;
+
+        Ok(())
+    }
+
     /// Get paths to locations of manifests
     ///
     /// Loading should be done using tauri and events and stuff

episko_gui_backend/icons/Square284x284Logo.png

@@ -78,7 +78,7 @@
 
 @plugin "daisyui/theme" {
 	name: 'forest';
-	default: true;
+	default: false;
 	prefersdark: true;
 	color-scheme: 'dark';
 	--color-base-100: oklch(20.84% 0.008 17.911);
@@ -110,3 +110,39 @@
 	--depth: 0;
 	--noise: 0;
 }
+
+
+@plugin "daisyui/theme" {
+	name: "lofi";
+	default: true;
+	prefersdark: false;
+	color-scheme: "light";
+	--color-base-100: oklch(100% 0 0);
+	--color-base-200: oklch(97% 0 0);
+	--color-base-300: oklch(94% 0 0);
+	--color-base-content: oklch(0% 0 0);
+	--color-primary: oklch(15.906% 0 0);
+	--color-primary-content: oklch(100% 0 0);
+	--color-secondary: oklch(21.455% 0.001 17.278);
+	--color-secondary-content: oklch(100% 0 0);
+	--color-accent: oklch(26.861% 0 0);
+	--color-accent-content: oklch(100% 0 0);
+	--color-neutral: oklch(0% 0 0);
+	--color-neutral-content: oklch(100% 0 0);
+	--color-info: oklch(79.54% 0.103 205.9);
+	--color-info-content: oklch(15.908% 0.02 205.9);
+	--color-success: oklch(90.13% 0.153 164.14);
+	--color-success-content: oklch(18.026% 0.03 164.14);
+	--color-warning: oklch(88.37% 0.135 79.94);
+	--color-warning-content: oklch(17.674% 0.027 79.94);
+	--color-error: oklch(78.66% 0.15 28.47);
+	--color-error-content: oklch(15.732% 0.03 28.47);
+	--radius-selector: 2rem;
+	--radius-field: 0.25rem;
+	--radius-box: 0.5rem;
+	--size-selector: 0.25rem;
+	--size-field: 0.25rem;
+	--border: 1px;
+	--depth: 0;
+	--noise: 0;
+}

episko_gui_backend/icons/Square30x30Logo.png

@@ -10,7 +10,7 @@ import type {
 	Statistic,
 	Uuid
 } from './types';
-import { parseMetadata, parseMetadataDco, parseMetadataPreviewArray } from './schemas/metadata';
+import { MetadataDtoSchema, parseMetadata, parseMetadataDco, parseMetadataPreviewArray } from './schemas/metadata';
 import { PagedMetadataPreviewSchema } from './schemas/pagedData';
 import { parseCategoryArray } from './schemas/category';
 import { parseLanguageArray } from './schemas/language';
@@ -59,6 +59,18 @@ export default {
 		);
 	},
 
+	async delete_metadata(metadata: Metadata): Promise<void> {
+		// as this is the only place where this transformation is needed
+		// it can reside here for now
+		let metadataDto = {
+			build_systems: metadata.buildSystems,
+			preferred_ide: metadata.preferredIde,
+			repository_url: metadata.repositoryUrl,
+			...metadata
+		}
+		return invoke('delete_metadata', { metadata: metadataDto })
+	},
+
 	async load_from_file(path: string): Promise<Uuid> {
 		return invoke('load_from_file', { path: path });
 	},

episko_gui_backend/icons/Square310x310Logo.png

@@ -8,6 +8,7 @@
 		SettingsIcon,
 		SquarePen
 	} from 'lucide-svelte';
+	import logo from '$lib/assets/logo.png';
 
 	const data = {
 		user: {
@@ -70,12 +71,12 @@
 					{#snippet child({ props })}
 						<a {...props}>
 							<div
-								class="bg-sidebar-primary text-sidebar-primary-foreground flex aspect-square size-8 items-center justify-center rounded-lg"
+								class="text-sidebar-primary-foreground flex aspect-square size-8 items-center justify-center rounded-lg"
 							>
-								<Command class="size-4" />
+								<img alt="episko logo" class="size-8 dark:invert dark:grayscale" src={logo} />
 							</div>
 							<div class="grid flex-1 text-left text-sm leading-tight">
-								<span class="truncate font-semibold">Episko</span>
+								<span class="truncate font-semibold">episko</span>
 							</div>
 						</a>
 					{/snippet}

episko_gui_backend/icons/Square44x44Logo.png

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import * as Sidebar from '$lib/components/ui/sidebar/index.js';
 	import type { ComponentProps } from 'svelte';
+	import { toast } from 'svelte-sonner';
 
 	let {
 		ref = $bindable(null),
@@ -15,6 +16,10 @@
 			icon: any;
 		}[];
 	} & ComponentProps<typeof Sidebar.Group> = $props();
+
+	function disabledClick() {
+		toast.warning('This function is not implemented yet!');
+	}
 </script>
 
 <Sidebar.Group bind:ref {...restProps}>
@@ -24,10 +29,10 @@
 				<Sidebar.MenuItem>
 					<Sidebar.MenuButton size="sm">
 						{#snippet child({ props })}
-							<a href={item.url} {...props}>
+							<button onclick={disabledClick} {...props}>
 								<item.icon />
 								<span>{item.title}</span>
-							</a>
+							</button>
 						{/snippet}
 					</Sidebar.MenuButton>
 				</Sidebar.MenuItem>