From 85284da7007b1dfcfd4cd207c904b84acb5990d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C5=91rik=20Levente?= <33373714+Levminer@users.noreply.github.com> Date: Sat, 11 Jan 2025 16:52:24 +0100 Subject: [PATCH] onboarding and settings fixes --- .../ui/components/feedbackDialog.svelte | 56 ++++++++++++++ platforms/interface/ui/pages/home.svelte | 10 +-- .../interface/ui/pages/onboarding.svelte | 27 +++---- platforms/interface/ui/pages/settings.svelte | 76 ++++++++++++++----- .../web/src/components/appHeader.svelte | 6 +- 5 files changed, 126 insertions(+), 49 deletions(-) create mode 100644 platforms/interface/ui/components/feedbackDialog.svelte diff --git a/platforms/interface/ui/components/feedbackDialog.svelte b/platforms/interface/ui/components/feedbackDialog.svelte new file mode 100644 index 0000000..6b4ffcd --- /dev/null +++ b/platforms/interface/ui/components/feedbackDialog.svelte @@ -0,0 +1,56 @@ + + + + + Feedback + + +
+ + + + GitHub + + + Email + + + +
+
Report Issues or Request Features
+ +
+ + +
+
Send an email to support@coresmonitor.com
+ +
+ + +
+ + + diff --git a/platforms/interface/ui/pages/home.svelte b/platforms/interface/ui/pages/home.svelte index 397ac2f..ead666d 100644 --- a/platforms/interface/ui/pages/home.svelte +++ b/platforms/interface/ui/pages/home.svelte @@ -31,14 +31,10 @@
{/if} - + diff --git a/platforms/interface/ui/pages/onboarding.svelte b/platforms/interface/ui/pages/onboarding.svelte index 0362574..dd802a0 100644 --- a/platforms/interface/ui/pages/onboarding.svelte +++ b/platforms/interface/ui/pages/onboarding.svelte @@ -258,21 +258,6 @@ } }) - /* - onMount(() => { - // Check if trial is over - if ($settings.licenseActivated) { - let dateActivated = new Date($settings.licenseActivated) - let dateNow = new Date() - let diff = dateNow.getTime() - dateActivated.getTime() - let days = Math.ceil(diff / (1000 * 3600 * 24)) - - if (days > 7) { - stepPricing() - } - } - }) */ - const stepLogin = () => { step = "login" } @@ -299,6 +284,7 @@ // Start server const port = await start({ response: `

Authentication Completed

You can now close this page and return to the app.

`, + ports: [5380, 5385], }) // Listen for OAuth result @@ -316,7 +302,7 @@ if (error || userError) { alert( - `Failed to login, please try again or send an email to support@coresmonitor.com if you need help.\nError: ${ + `Failed to login, please restart the app and try again or send an email to support@coresmonitor.com if you need help.\nError: ${ error || userError }`, ) @@ -324,6 +310,7 @@ if (userData.plan === "personal" || userData.plan === "business") { // User is on a paid plan + $state.plan = userData.plan $state.showMenu = true router.goto("/home") } @@ -342,7 +329,9 @@ }) if (error) { - alert(`Failed to login, please try again or send an email to support@coresmonitor.com if you need help.\nError: ${error}`) + alert( + `Failed to login, please restart the app and try again or send an email to support@coresmonitor.com if you need help.\nError: ${error}`, + ) } if (data) { @@ -350,7 +339,9 @@ open(data.url) } } catch (error) { - alert(`Failed to login, please try again or send an email to support@coresmonitor.com if you need help.\nError: ${error}`) + alert( + `Failed to login, please restart the app and try again or send an email to support@coresmonitor.com if you need help.\nError: ${error}`, + ) } } diff --git a/platforms/interface/ui/pages/settings.svelte b/platforms/interface/ui/pages/settings.svelte index 5a870c1..1e15c77 100644 --- a/platforms/interface/ui/pages/settings.svelte +++ b/platforms/interface/ui/pages/settings.svelte @@ -41,52 +41,70 @@ />
+ + +
+
+
+
+ +
+

Account

+
+

{user?.email ?? "Loading..."}

+
+ +
+ +
+
- +
- +
-

Debug report

+

Feedback

-

Debug information about your computer. Include this report with your feedback.

+

Feedback is always welcome! Report issues or request features.

- +
- +
- +
-

Feedback

+

Debug report

-

Thank you for providing feedback! Please report issues or feature requests on GitHub or by Email (feedback@coresmonitor.com).

+

Debug information about your computer. Include this report with your feedback.

-
@@ -119,10 +137,26 @@ import build from "../../../../build.json" import Select from "ui/components/select.svelte" import Toggle from "ui/components/toggle.svelte" - import { Minimize2, RefreshCcw, Bug, Megaphone, Info, Cable, Github, FileCog } from "lucide-svelte" + import { Minimize2, RefreshCcw, Bug, Megaphone, Info, Cable, Github, FileCog, User, LogOut } from "lucide-svelte" import { open } from "@tauri-apps/plugin-shell" import { message, save } from "@tauri-apps/plugin-dialog" import { invoke } from "@tauri-apps/api/core" + import FeedbackDialog from "ui/components/feedbackDialog.svelte" + import { supabaseClient } from "../utils/supabase.ts" + import { onMount } from "svelte" + + $: user = null + + + + onMount(async () => { + const { data, error } = await supabaseClient.auth.getUser() + + if (!error && data.user) { + user = data.user + } + }) + const launchOnStartup = () => { // @ts-ignore diff --git a/platforms/interface/web/src/components/appHeader.svelte b/platforms/interface/web/src/components/appHeader.svelte index 23bc79e..a79bf72 100644 --- a/platforms/interface/web/src/components/appHeader.svelte +++ b/platforms/interface/web/src/components/appHeader.svelte @@ -5,9 +5,6 @@ Cores
- {#if $state.state === "connected"} - - {/if} + {#if $state.state === "connected"} + + {/if}