src-tauri/Cargo.lock

@@ -73,7 +73,6 @@ dependencies = [
  "aws-sdk-sts",
  "aws-smithy-types",
  "aws-types",
- "dirs 5.0.0",
  "netstat2",
  "once_cell",
  "serde",
@@ -146,7 +145,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5904a4d734f0235edf29aab320a14899f3e090446e594ff96508a6215f76f89c"
 dependencies = [
- "dirs 4.0.0",
+ "dirs",
  "thiserror",
  "winreg",
 ]
@@ -934,16 +933,7 @@ version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
 dependencies = [
- "dirs-sys 0.3.7",
-]
-
-[[package]]
-name = "dirs"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
-dependencies = [
- "dirs-sys 0.4.0",
+ "dirs-sys",
 ]
 
 [[package]]
@@ -967,17 +957,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "dirs-sys"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
-dependencies = [
- "libc",
- "redox_users",
- "windows-sys 0.45.0",
-]
-
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@@ -4702,36 +4681,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
  "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
  "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.2",
+ "windows_x86_64_msvc 0.42.0",
 ]
 
 [[package]]
@@ -4742,9 +4697,9 @@ checksum = "3263d25f1170419995b78ff10c06b949e8a986c35c208dc24333c64753a87169"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4766,9 +4721,9 @@ checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4796,9 +4751,9 @@ checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4826,9 +4781,9 @@ checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4856,15 +4811,15 @@ checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4892,9 +4847,9 @@ checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
 
 [[package]]
 name = "winreg"

src-tauri/Cargo.toml

@@ -32,7 +32,6 @@ once_cell = "1.16.0"
 strum = "0.24"
 strum_macros = "0.24"
 auto-launch = "0.4.0"
-dirs = "5.0"
 
 [features]
 # by default Tauri runs in production mode

src-tauri/src/config.rs

@@ -75,32 +75,35 @@ pub fn set_auto_launch(is_configured: bool) -> Result<(), SetupError> {
     let auto = AutoLaunchBuilder::new()
         .set_app_name("Creddy")
         .set_app_path(&path)
-        .build()?;
+        .build().expect("Failed to build");
 
     let is_enabled = auto.is_enabled()?;
     if is_configured && !is_enabled {
-        auto.enable()?;
+        auto.enable().expect("Failed to enable");
     }
     else if !is_configured && is_enabled {
-        auto.disable()?;
+        auto.disable().expect("Failed to disable");
     }
 
     Ok(())
 }
 
 
-pub fn get_or_create_db_path() -> Result<PathBuf, DataDirError> {
+pub fn get_or_create_db_path() -> PathBuf {
     if cfg!(debug_assertions) {
-        return Ok(PathBuf::from("./creddy.db"));
+        return PathBuf::from("./creddy.db");
     }
 
-    let mut path = dirs::data_dir()
-        .ok_or(DataDirError::NotFound)?;
+    let mut parent = std::env::var("HOME")
+        .map(|h| {
+            let mut p = PathBuf::from(h);
+            p.push(".config");
+            p
+        })
+        .unwrap_or(PathBuf::from("."));
 
-    std::fs::create_dir_all(&path)?;
-    path.push("creddy.db");
-
-    Ok(path)
+    parent.push("creddy.db");
+    parent
 }
 
 

src-tauri/src/errors.rs

@@ -91,17 +91,6 @@ pub enum SetupError {
     AutoLaunchError(#[from] auto_launch::Error),
     #[error("Failed to start listener: {0}")]
     ServerSetupError(#[from] std::io::Error),
-    #[error("Failed to resolve data directory: {0}")]
-    DataDir(#[from] DataDirError),
-}
-
-
-#[derive(Debug, ThisError, AsRefStr)]
-pub enum DataDirError {
-    #[error("Could not determine data directory")]
-    NotFound,
-    #[error("Failed to create data directory: {0}")]
-    Io(#[from] std::io::Error),
 }
 
 

src-tauri/src/main.rs

@@ -38,7 +38,7 @@ async fn setup(app: &mut App) -> Result<(), Box<dyn Error>> {
     APP.set(app.handle()).unwrap();
 
     let conn_opts = SqliteConnectOptions::new()
-        .filename(config::get_or_create_db_path()?)
+        .filename(config::get_or_create_db_path())
         .create_if_missing(true);
     let pool_opts = SqlitePoolOptions::new();
     let pool: SqlitePool = pool_opts.connect_with(conn_opts).await?;

src/ui/Link.svelte

@@ -7,9 +7,6 @@
     export let alt = false;
     export let shift = false;
 
-    let classes = "";
-    export {classes as class};
-
     function click() {
         if (typeof target === 'string') {
             navigate(target);
@@ -41,6 +38,6 @@
 
 <svelte:window on:keydown={handleHotkey} />
 
-<a href="#" on:click="{click}" class={classes}>
+<a href="#" on:click="{click}">
     <slot></slot>
 </a>

src/ui/Nav.svelte

@@ -1,12 +1,10 @@
 <script>
     import Link from './Link.svelte';
     import Icon from './Icon.svelte';
-
-    export let position = "sticky";
 </script>
 
 
-<nav class="{position} top-0 bg-base-100 w-full flex justify-between items-center p-2">
+<nav class="fixed top-0 grid grid-cols-2 w-full p-2">
     <div>
         <Link target="Home">
             <button class="btn btn-square btn-ghost align-middle">
@@ -15,11 +13,7 @@
         </Link>
     </div>
 
-    {#if $$slots.title}
-        <slot name="title"></slot>
-    {/if}
-
-    <div>
+    <div class="justify-self-end">
         <Link target="Settings">
             <button class="btn btn-square btn-ghost align-middle ">
                 <Icon name="cog-8-tooth" class="w-8 h-8 stroke-2" />

src/views/Home.svelte

@@ -8,8 +8,6 @@
     import Icon from '../ui/Icon.svelte';
     import Link from '../ui/Link.svelte';
 
-    import vaultDoorSvg from '../assets/vault_door.svg?raw';
-
 
     onMount(async () => {
         // will block until a request comes in
@@ -20,31 +18,24 @@
 </script>
 
 
-<Nav position="fixed">
-    <h2 slot="title" class="text-3xl font-bold">Creddy</h2>
-</Nav>
+<Nav />
 
 <div class="flex flex-col h-screen items-center justify-center p-4 space-y-4">
     {#await invoke('get_session_status') then status}
         {#if status === 'locked'}
-            <!-- <img src={closedPadlockUrl} alt="A locked padlock" class="w-32" /> -->
-
-            {@html vaultDoorSvg}
-
+            <img src="/static/padlock-closed.svg" alt="A locked padlock" class="w-32" />
             <h2 class="text-2xl font-bold">Creddy is locked</h2>
-            <Link target="Unlock" class="w-64">
-                <button class="btn btn-primary w-full">Unlock</button>
+            <Link target="Unlock">
+                <button class="btn btn-primary">Unlock</button>
             </Link>
 
         {:else if status === 'unlocked'}
-            {@html vaultDoorSvg}
+            <img src="/static/padlock-open.svg" alt="An unlocked padlock" class="w-24" />
             <h2 class="text-2xl font-bold">Waiting for requests</h2>
 
         {:else if status === 'empty'}
-            {@html vaultDoorSvg}
-            <h2 class="text-2xl font-bold">No credentials found</h2>
-            <Link target="EnterCredentials" class="w-64">
-                <button class="btn btn-primary w-full">Enter Credentials</button>
+            <Link target="EnterCredentials">
+                <button class="btn btn-primary">Enter Credentials</button>
             </Link>
         {/if}
     {/await}

src/views/Settings.svelte

@@ -7,9 +7,6 @@
     import ErrorAlert from '../ui/ErrorAlert.svelte';
     import { Setting, ToggleSetting, NumericSetting } from '../ui/settings';
 
-    import { fly } from 'svelte/transition';
-    import { backInOut } from 'svelte/easing';
-
 
     let error = null;
     async function save() {
@@ -24,13 +21,11 @@
 </script>
 
 
-<Nav>
-    <h2 slot="title" class="text-2xl font-bold">Settings</h2>
-</Nav>
+<Nav />
 
 {#await invoke('get_config') then config}
     <div class="max-w-md mx-auto mt-1.5 p-4">
-        <!-- <h2 class="text-2xl font-bold text-center">Settings</h2> -->
+        <h2 class="text-2xl font-bold text-center">Settings</h2>
 
         <ToggleSetting title="Start on login" bind:value={$appState.config.start_on_login} on:update={save}>
             <svelte:fragment slot="description">
@@ -71,8 +66,8 @@
 {/await}
 
 {#if error}
-    <div transition:fly={{y: 100, easing: backInOut, duration: 400}} class="toast">
-        <div class="alert alert-error no-animation">
+    <div class="toast">
+        <div class="alert alert-error">
             <div>
                 <span>{error}</span>
             </div>