Fixes desktop cards

desktop/app/components/settings/settings-profile-settings.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useUserPreferenceStore } from "~/stores/user-preference";
+import { useUserPreferenceStore } from "~/stores/workspace-preferences";
 import AppInput from "../forms/app-input.vue";
 const store = useUserPreferenceStore();
 

desktop/app/components/walkthrough/user-setup-modal.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useUserPreferenceStore } from "~/stores/user-preference";
+import { useUserPreferenceStore } from "~/stores/workspace-preferences";
 
 const store = useUserPreferenceStore();
 

desktop/app/composables/useUserSetup.ts

@@ -1,4 +1,4 @@
-import { useUserPreferenceStore } from "~/stores/user-preference";
+import { useUserPreferenceStore } from "~/stores/workspace-preferences";
 
 export function useUserSetup() {
   const store = useUserPreferenceStore();

desktop/app/layouts/default.vue

@@ -2,7 +2,7 @@
 import _ from "lodash";
 
 import { primaryRoutes, secondaryRoutes } from "~/data/routes";
-import { useUserPreferenceStore } from "~/stores/user-preference";
+import { useUserPreferenceStore } from "~/stores/workspace-preferences";
 import { useWorkspacesStore } from "~/stores/workspaces";
 
 const preferenceStore = useUserPreferenceStore();

desktop/app/pages/index.vue

@@ -2,7 +2,7 @@
 import { useNoteStore } from "~/stores/notes";
 import { useBookmarkStore } from "~/stores/bookmarks";
 import { useTodoStore } from "~/stores/todo";
-import { useUserPreferenceStore } from "~/stores/user-preference";
+import { useUserPreferenceStore } from "~/stores/workspace-preferences";
 import { useReminderStore } from "~/stores/reminder";
 import { useSnippetStore } from "~/stores/snippets";
 import { openUrl } from "@tauri-apps/plugin-opener";

desktop/app/stores/sync-queue.ts

@@ -6,7 +6,7 @@ import { useNoteStore } from "~/stores/notes";
 import { useTodoStore } from "~/stores/todo";
 import { useWorkspacesStore } from "~/stores/workspaces";
 import { useReminderStore } from "~/stores/reminder";
-import { useUserPreferenceStore } from "~/stores/user-preference";
+import { useUserPreferenceStore } from "~/stores/workspace-preferences";
 import { useSnippetStore } from "~/stores/snippets";
 import { useRecycleBinStore } from "~/stores/recycle-bin";
 

desktop/app/stores/user-preference.ts → desktop/app/stores/workspace-preferences.ts

@@ -42,7 +42,7 @@ export const useUserPreferenceStore = defineStore("user_preference_store", {
       this.loading = true;
       try {
         this.preference = await invoke<UserPreference | null>(
-          "get_user_preference",
+          "get_workspace_preference",
           {
             meta: await getWorkspaceMeta(),
           },
@@ -55,30 +55,36 @@ export const useUserPreferenceStore = defineStore("user_preference_store", {
     async createPreference(
       payload: CreateUserPreferencePayload,
     ): Promise<UserPreference> {
-      const created = await invoke<UserPreference>("create_user_preference", {
-        preference: payload,
-        meta: await getWorkspaceMeta(),
-      });
+      const created = await invoke<UserPreference>(
+        "create_workspace_preference",
+        {
+          preference: payload,
+          meta: await getWorkspaceMeta(),
+        },
+      );
       this.preference = created;
       return created;
     },
 
     async updatePreference(
       payload: UpdateUserPreferencePayload,
     ): Promise<UserPreference> {
-      const updated = await invoke<UserPreference>("update_user_preference", {
-        identifier: this.preference!.identifier,
-        preference: payload,
-        meta: await getWorkspaceMeta(),
-      });
+      const updated = await invoke<UserPreference>(
+        "update_workspace_preference",
+        {
+          identifier: this.preference!.identifier,
+          preference: payload,
+          meta: await getWorkspaceMeta(),
+        },
+      );
       this.preference = updated;
       return updated;
     },
 
     async fetchUnsynced() {
       try {
         const userPreferences = await invoke<UserPreference[]>(
-          "get_unsynced_user_preferences",
+          "get_unsynced_workspace_preferences",
         );
         return userPreferences;
       } catch (error) {
@@ -124,7 +130,7 @@ export const useUserPreferenceStore = defineStore("user_preference_store", {
     },
 
     async clearQueue(identifiers: string[]) {
-      await invoke("clear_synced_user_preferences", { identifiers });
+      await invoke("clear_synced_workspace_preferences", { identifiers });
     },
   },
   persist: true,

desktop/src-tauri/Cargo.toml

@@ -48,4 +48,4 @@ tauri-plugin-single-instance = "2"
 tauri-build = { version = "2.5.4", features = [] }
 
 [profile.dev.package.scrypt]
-opt-level = 3
+opt-level = 3

desktop/src-tauri/src/commands/mod.rs

@@ -7,5 +7,5 @@ pub mod reminder;
 pub mod snippets;
 pub mod sync_queue;
 pub mod todo;
-pub mod user_preference;
+pub mod workspace_preferences;
 pub mod workspaces;

desktop/src-tauri/src/commands/user_preference.rs → desktop/src-tauri/src/commands/workspace_preferences.rs

@@ -1,8 +1,8 @@
 use almond_kernel::{
     adapters::meta::RequestMeta,
-    entities::user_preference,
-    repositories::user_preference::UserPreferenceRepositoryExt,
+    entities::workspace_preferences,
     repositories::workspace_manager::{DuplicateRecord, TransferRecord},
+    repositories::workspace_preferences::WorkspacePreferenceRepositoryExt,
 };
 use tauri::State;
 use uuid::Uuid;
@@ -14,54 +14,54 @@ use crate::{
 };
 
 #[tauri::command]
-pub async fn get_user_preference(
+pub async fn get_workspace_preference(
     state: State<'_, AppState>,
     meta: Option<RequestMeta>,
-) -> Result<Option<user_preference::Model>, AppError> {
+) -> Result<Option<workspace_preferences::Model>, AppError> {
     state
-        .user_preference_repository
+        .workspace_preference_repository
         .get(&meta)
         .await
         .map_err(Into::into)
 }
 
 #[tauri::command]
-pub async fn create_user_preference(
+pub async fn create_workspace_preference(
     state: State<'_, AppState>,
     preference: CreateUserPreference,
     meta: Option<RequestMeta>,
-) -> Result<user_preference::Model, AppError> {
+) -> Result<workspace_preferences::Model, AppError> {
     let created = state
-        .user_preference_repository
+        .workspace_preference_repository
         .create(&preference.into(), &meta)
         .await?;
     Ok(created)
 }
 
 #[tauri::command]
-pub async fn update_user_preference(
+pub async fn update_workspace_preference(
     state: State<'_, AppState>,
     identifier: Uuid,
     preference: UpdateUserPreference,
     meta: Option<RequestMeta>,
-) -> Result<user_preference::Model, AppError> {
+) -> Result<workspace_preferences::Model, AppError> {
     let updated = state
-        .user_preference_repository
+        .workspace_preference_repository
         .update(&identifier, &preference.into(), &meta)
         .await?;
     Ok(updated)
 }
 
 #[tauri::command]
-pub async fn duplicate_user_preference(
+pub async fn duplicate_workspace_preference(
     state: State<'_, AppState>,
     record_identifier: Uuid,
     previous_workspace_identifier: Uuid,
     target_workspace_identifier: Uuid,
     _meta: Option<RequestMeta>,
 ) -> Result<(), AppError> {
     state
-        .user_preference_repository
+        .workspace_preference_repository
         .duplicate_record(
             &record_identifier,
             &previous_workspace_identifier,
@@ -72,15 +72,15 @@ pub async fn duplicate_user_preference(
 }
 
 #[tauri::command]
-pub async fn transfer_user_preference(
+pub async fn transfer_workspace_preference(
     state: State<'_, AppState>,
     record_identifier: Uuid,
     previous_workspace_identifier: Uuid,
     target_workspace_identifier: Uuid,
     _meta: Option<RequestMeta>,
 ) -> Result<(), AppError> {
     state
-        .user_preference_repository
+        .workspace_preference_repository
         .transfer_record(
             &record_identifier,
             &previous_workspace_identifier,
@@ -91,23 +91,23 @@ pub async fn transfer_user_preference(
 }
 
 #[tauri::command]
-pub async fn get_unsynced_user_preferences(
+pub async fn get_unsynced_workspace_preferences(
     state: State<'_, AppState>,
-) -> Result<Vec<user_preference::Model>, AppError> {
+) -> Result<Vec<workspace_preferences::Model>, AppError> {
     state
-        .user_preference_repository
+        .workspace_preference_repository
         .extract_unsynced()
         .await
         .map_err(Into::into)
 }
 
 #[tauri::command]
-pub async fn clear_synced_user_preferences(
+pub async fn clear_synced_workspace_preferences(
     state: State<'_, AppState>,
     identifiers: Vec<String>,
 ) -> Result<(), AppError> {
     state
-        .user_preference_repository
+        .workspace_preference_repository
         .clear_synced(identifiers)
         .await
         .map_err(Into::into)

desktop/src-tauri/src/lib.rs

@@ -178,13 +178,13 @@ pub async fn run() {
             commands::todo::transfer_todo,
             commands::todo::update_todo,
             commands::todo::update_todo_due_date,
-            commands::user_preference::create_user_preference,
-            commands::user_preference::duplicate_user_preference,
-            commands::user_preference::get_unsynced_user_preferences,
-            commands::user_preference::clear_synced_user_preferences,
-            commands::user_preference::get_user_preference,
-            commands::user_preference::transfer_user_preference,
-            commands::user_preference::update_user_preference,
+            commands::workspace_preferences::create_workspace_preference,
+            commands::workspace_preferences::duplicate_workspace_preference,
+            commands::workspace_preferences::get_unsynced_workspace_preferences,
+            commands::workspace_preferences::clear_synced_workspace_preferences,
+            commands::workspace_preferences::get_workspace_preference,
+            commands::workspace_preferences::transfer_workspace_preference,
+            commands::workspace_preferences::update_workspace_preference,
             commands::workspaces::create_workspace,
             commands::workspaces::delete_workspace,
             commands::workspaces::get_unsynced_workspaces,

desktop/src-tauri/src/state/app.rs

@@ -5,7 +5,9 @@ use almond_kernel::{
         bookmarks::BookmarkRepository, notes::NotesRepository, prelude::*,
         recycle_bin::RecycleBinRepository, reminder::ReminderRepository,
         snippets::SnippetRepository, sync_queue::SyncQueueRepository, todo::TodoRepository,
-        user_preference::UserPreferenceRepository, workspace::WorkspaceRepository,
+        user_preferences::UserPreferencesRepository,
+        user_preferences::UserPreferencesRepositoryExt, workspace::WorkspaceRepository,
+        workspace_preferences::WorkspacePreferenceRepository,
     },
     sea_orm::DatabaseConnection,
 };
@@ -19,7 +21,8 @@ pub struct AppState {
     pub snippet_repository: SnippetRepository,
     pub sync_queue_repository: SyncQueueRepository,
     pub todo_repository: TodoRepository,
-    pub user_preference_repository: UserPreferenceRepository,
+    pub user_preference_repository: UserPreferencesRepository,
+    pub workspace_preference_repository: WorkspacePreferenceRepository,
     pub workspace_repository: WorkspaceRepository,
 }
 
@@ -32,8 +35,9 @@ impl AppState {
         let snippet_repository = SnippetRepository::new(conn.clone());
         let sync_queue_repository = SyncQueueRepository::new(conn.clone());
         let todo_repository = TodoRepository::new(conn.clone());
-        let user_preference_repository = UserPreferenceRepository::new(conn.clone());
+        let user_preference_repository = UserPreferencesRepository::new(conn.clone());
         let workspace_repository = WorkspaceRepository::new(conn.clone());
+        let workspace_preference_repository = WorkspacePreferenceRepository::new(conn.clone());
 
         AppState {
             bookmark_repository,
@@ -45,6 +49,7 @@ impl AppState {
             todo_repository,
             user_preference_repository,
             workspace_repository,
+            workspace_preference_repository,
         }
     }
 }