From 35271049dd5358025d5d5c0366a92dd90c60c8a8 Mon Sep 17 00:00:00 2001 From: Joseph Montanaro Date: Tue, 25 Apr 2023 22:10:14 -0700 Subject: [PATCH] settings page --- .../migrations/20221201002355_initial.sql | 3 +- src-tauri/src/ipc.rs | 7 +++ src-tauri/src/main.rs | 1 + src-tauri/src/state.rs | 12 ++-- src/App.svelte | 14 +++-- src/lib/routing.js | 9 +-- src/ui/ErrorAlert.svelte | 4 +- src/ui/Link.svelte | 12 ++-- src/ui/settings/NumericSetting.svelte | 62 +++++++++++++++++++ src/ui/settings/Setting.svelte | 18 ++++++ src/ui/settings/ToggleSetting.svelte | 22 +++++++ src/ui/settings/index.js | 3 + src/views/Home.svelte | 41 ++++++------ src/views/Settings.svelte | 62 ++++++++++--------- src/views/ShowApproved.svelte | 15 +++-- src/views/ShowDenied.svelte | 15 +++-- 16 files changed, 210 insertions(+), 90 deletions(-) create mode 100644 src/ui/settings/NumericSetting.svelte create mode 100644 src/ui/settings/Setting.svelte create mode 100644 src/ui/settings/ToggleSetting.svelte create mode 100644 src/ui/settings/index.js diff --git a/src-tauri/migrations/20221201002355_initial.sql b/src-tauri/migrations/20221201002355_initial.sql index 86de386..0052a6c 100644 --- a/src-tauri/migrations/20221201002355_initial.sql +++ b/src-tauri/migrations/20221201002355_initial.sql @@ -3,7 +3,8 @@ CREATE TABLE credentials ( access_key_id TEXT NOT NULL, secret_key_enc BLOB NOT NULL, salt BLOB NOT NULL, - nonce BLOB NOT NULL + nonce BLOB NOT NULL, + created_at INTEGER NOT NULL ); CREATE TABLE config ( diff --git a/src-tauri/src/ipc.rs b/src-tauri/src/ipc.rs index e06cfd2..a5e91de 100644 --- a/src-tauri/src/ipc.rs +++ b/src-tauri/src/ipc.rs @@ -67,3 +67,10 @@ pub fn get_config(app_state: State<'_, AppState>) -> AppConfig { let config = app_state.config.read().unwrap(); config.clone() } + + +#[tauri::command] +pub fn save_config(config: AppConfig, app_state: State<'_, AppState>) { + let mut prev_config = app_state.config.write().unwrap(); + *prev_config = config; +} diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index f35bd39..7854d2b 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -36,6 +36,7 @@ fn main() { ipc::get_session_status, ipc::save_credentials, ipc::get_config, + ipc::save_config, ]) .setup(|app| { APP.set(app.handle()).unwrap(); diff --git a/src-tauri/src/state.rs b/src-tauri/src/state.rs index 093a876..c9daed9 100644 --- a/src-tauri/src/state.rs +++ b/src-tauri/src/state.rs @@ -91,7 +91,7 @@ impl AppState { } async fn load_creds(pool: &SqlitePool) -> Result { - let res = sqlx::query!("SELECT * FROM credentials") + let res = sqlx::query!("SELECT * FROM credentials ORDER BY created_at desc") .fetch_optional(pool) .await?; let row = match res { @@ -122,6 +122,10 @@ impl AppState { }, _ => unreachable!(), }; + + // do this first so that if it fails we don't save bad credentials + self.new_session(&key_id, &secret_key).await?; + let salt = pwhash::gen_salt(); let mut key_buf = [0; secretbox::KEYBYTES]; pwhash::derive_key_interactive(&mut key_buf, passphrase.as_bytes(), &salt).unwrap(); @@ -133,8 +137,8 @@ impl AppState { sqlx::query( - "INSERT INTO credentials (access_key_id, secret_key_enc, salt, nonce) - VALUES (?, ?, ?, ?)" + "INSERT INTO credentials (access_key_id, secret_key_enc, salt, nonce, created_at) + VALUES (?, ?, ?, ?, strftime('%s'))" ) .bind(&key_id) .bind(&secret_key_enc) @@ -143,8 +147,6 @@ impl AppState { .execute(&self.pool) .await?; - self.new_session(&key_id, &secret_key).await?; - Ok(()) } diff --git a/src/App.svelte b/src/App.svelte index e236184..2e5d835 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -3,16 +3,20 @@ import { emit, listen } from '@tauri-apps/api/event'; import { invoke } from '@tauri-apps/api/tauri'; import { appState } from './lib/state.js'; -import { currentView } from './lib/routing.js'; +import { navigate, currentView } from './lib/routing.js'; +invoke('get_config').then(config => $appState.config = config); + listen('credentials-request', (tauriEvent) => { $appState.pendingRequests.put(tauriEvent.payload); }); + +// can't set this in routing.js directly for some reason +if (!$currentView) { + navigate('Home'); +} - - + diff --git a/src/lib/routing.js b/src/lib/routing.js index 5526bbd..5ad9eb6 100644 --- a/src/lib/routing.js +++ b/src/lib/routing.js @@ -1,8 +1,7 @@ -import { writable, derived } from 'svelte/store'; +import { writable } from 'svelte/store'; + const VIEWS = import.meta.glob('../views/*.svelte', {eager: true}); - - export let currentView = writable(); export function navigate(viewName) { @@ -10,4 +9,6 @@ export function navigate(viewName) { currentView.set(view); } -navigate('Home'); +export function getView(viewName) { + return VIEWS[`../views/${viewName}.svelte`].default; +} diff --git a/src/ui/ErrorAlert.svelte b/src/ui/ErrorAlert.svelte index 4602c8f..220ce04 100644 --- a/src/ui/ErrorAlert.svelte +++ b/src/ui/ErrorAlert.svelte @@ -2,6 +2,8 @@ import { onMount } from 'svelte'; import { slide } from 'svelte/transition'; + let extraClasses; + export {extraClasses as class}; export let slideDuration = 150; let animationClass = ""; @@ -49,7 +51,7 @@ -
+
diff --git a/src/ui/Link.svelte b/src/ui/Link.svelte index 2e3deef..1bab349 100644 --- a/src/ui/Link.svelte +++ b/src/ui/Link.svelte @@ -1,7 +1,5 @@ diff --git a/src/ui/settings/NumericSetting.svelte b/src/ui/settings/NumericSetting.svelte new file mode 100644 index 0000000..45d13f3 --- /dev/null +++ b/src/ui/settings/NumericSetting.svelte @@ -0,0 +1,62 @@ + + + + +
+ {#if unit} + {unit}: + {/if} +
+ +
+
+ + + diff --git a/src/ui/settings/Setting.svelte b/src/ui/settings/Setting.svelte new file mode 100644 index 0000000..2b37bfb --- /dev/null +++ b/src/ui/settings/Setting.svelte @@ -0,0 +1,18 @@ + + + +
+
+

{title}

+ +
+ +

+ +

diff --git a/src/ui/settings/ToggleSetting.svelte b/src/ui/settings/ToggleSetting.svelte new file mode 100644 index 0000000..989bbd6 --- /dev/null +++ b/src/ui/settings/ToggleSetting.svelte @@ -0,0 +1,22 @@ + + + + + dispatch('update', {value: e.target.checked})} + /> + + \ No newline at end of file diff --git a/src/ui/settings/index.js b/src/ui/settings/index.js new file mode 100644 index 0000000..1c93b8b --- /dev/null +++ b/src/ui/settings/index.js @@ -0,0 +1,3 @@ +export { default as Setting } from './Setting.svelte'; +export { default as ToggleSetting } from './ToggleSetting.svelte'; +export { default as NumericSetting } from './NumericSetting.svelte'; diff --git a/src/views/Home.svelte b/src/views/Home.svelte index 723fa8c..9fc5508 100644 --- a/src/views/Home.svelte +++ b/src/views/Home.svelte @@ -15,33 +15,28 @@ $appState.currentRequest = req; navigate('Approve'); }); - - let status = 'unknown'; - onMount(async() => { - status = await invoke('get_session_status'); - })