From 2fe56c2d2c2a0d940c819011c55a27f50157c7e9 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Sun, 23 Jan 2022 21:03:32 +0100 Subject: feat: WIP: Import from json --- src/webapp/src/routes/app/_header.svelte | 47 ++------ .../src/routes/app/modals/file-import-modal.svelte | 126 +++++++++++++++++++++ .../app/modals/new-access-token-modal.svelte | 8 +- 3 files changed, 143 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/webapp/src/routes/app/_header.svelte b/src/webapp/src/routes/app/_header.svelte index 04eb405..d96e73c 100644 --- a/src/webapp/src/routes/app/_header.svelte +++ b/src/webapp/src/routes/app/_header.svelte @@ -13,22 +13,20 @@ import {end_session_async} from "@/lib/api/account"; import {clear_entries} from "@/lib/stores/entries"; import AccessTokensModal from "./modals/access-tokens-modal.svelte"; + import FileImportModal from "./modals/file-import-modal.svelte"; let profile_dropdown_is_open = false; let options_dropdown_is_open = false; let enable_dark_theme = get(preferences).theme === ApplicationTheme.DARK; let enable_site_report = get(preferences).enable_site_report; let access_token_modal_is_open = false; + let file_import_modal_is_open = false; preferences.subscribe(e => { enable_site_report = e.enable_site_report; enable_dark_theme = e.theme === ApplicationTheme.DARK; }); - function start_file_import() { - alert("Not implemented"); - } - function download_data() { const anchor = document.createElement("a"); anchor.href = api_base("account/archive"); @@ -36,30 +34,6 @@ anchor.remove(); } - function manage_profile() { - alert("Not implemented"); - } - - function connect_github() { - alert("Not implemented"); - } - - function manage_access_tokens() { - access_token_modal_is_open = true; - } - - function on_access_tokens_modal_close() { - access_token_modal_is_open = false; - } - - function toggle_site_report() { - set_site_report_state(!enable_site_report); - } - - function toggle_dark_theme() { - set_theme(enable_dark_theme ? ApplicationTheme.LIGHT : ApplicationTheme.DARK); - } - async function handle_logout() { await clear_session_async(); await end_session_async(); @@ -69,7 +43,10 @@ + on:close={() => access_token_modal_is_open = false}/> + + file_import_modal_is_open = false}/>
@@ -81,11 +58,11 @@ transition={false}> Actions - Import data from file - Connect github + alert("Not implemented")}>Import data from file + alert("Not implemented")}>Connect github Options set_site_report_state(!enable_site_report)} toggled="{enable_site_report}"> Enable site report set_theme(enable_dark_theme ? ApplicationTheme.LIGHT : ApplicationTheme.DARK)} toggled="{enable_dark_theme}"> Use dark theme @@ -112,8 +89,8 @@ transition={false}> Logged in as {$session?.username} - Manage profile - Manage access tokens + alert("Not implemented")}>Manage profile + access_token_modal_is_open = true}>Manage access tokens Download data Log out diff --git a/src/webapp/src/routes/app/modals/file-import-modal.svelte b/src/webapp/src/routes/app/modals/file-import-modal.svelte index e69de29..b013688 100644 --- a/src/webapp/src/routes/app/modals/file-import-modal.svelte +++ b/src/webapp/src/routes/app/modals/file-import-modal.svelte @@ -0,0 +1,126 @@ + + + + + {#if mappings.can_map} +
+ + + + {#if mappings.tags.available_fields.length > 0} + + {/if} + + +
+ {/if} + +
diff --git a/src/webapp/src/routes/app/modals/new-access-token-modal.svelte b/src/webapp/src/routes/app/modals/new-access-token-modal.svelte index 8999b0b..c130328 100644 --- a/src/webapp/src/routes/app/modals/new-access-token-modal.svelte +++ b/src/webapp/src/routes/app/modals/new-access-token-modal.svelte @@ -6,17 +6,19 @@ import {createEventDispatcher} from "svelte"; export let open = false; - const default_expires = (new Date().setTime(new Date().getTime() + 1)); + const date = new Date(); + date.setDate(date.getDate() + 1); + const default_expiry_date = date; const dispatch = createEventDispatcher(); const form = { error: "", loading: false, expiry_date: { - value: default_expires, + value: default_expiry_date, error: "", warning: "", reset() { - form.expiry_date.value = default_expires; + form.expiry_date.value = default_expiry_date; }, change() { }, -- cgit v1.3