Onboarding and website updates

Levminer · Jan 17, 2025 · a67f1e4 · a67f1e4
1 parent 21a702d
commit a67f1e4
Show file tree

Hide file tree

Showing 9 changed files with 189 additions and 128 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "cores",
-	"version": "0.26.0",
+	"version": "0.27.0",
 	"description": "Modern hardware monitor for Windows.",
 	"author": "Levminer",
 	"license": "GPL-3.0",

diff --git a/platforms/core/Cargo.toml b/platforms/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cores"
-version = "0.26.0"
+version = "0.27.0"
 description = "Cores - Modern hardware monitor for Windows"
 authors = ["Lőrik Levente"]
 edition = "2021"

diff --git a/platforms/interface/ui/components/login.svelte b/platforms/interface/ui/components/login.svelte
@@ -1,11 +1,13 @@
-<div class="transparent-900 mx-auto flex w-1/3 sm:w-[95%] flex-col items-center justify-center rounded-2xl p-10 text-center shadow-md backdrop-blur-xl">
+<div
+	class="transparent-900 mx-auto flex w-1/3 flex-col items-center justify-center rounded-2xl p-10 text-center shadow-md backdrop-blur-xl sm:w-[95%]"
+>
 	<div class="mb-10">
 		<h2>Login or create an account</h2>
 		<h3>Continue with your Google account to use Cores for free.</h3>
 	</div>
 	<button
 		on:click={loginFn}
-		class="flex flex-row items-center justify-between gap-3 rounded-xl border-2 hover:bg-gray-200 duration-150 ease-in border-gray-200/50 bg-white px-3 py-2 font-medium text-black shadow-xl"
+		class="flex flex-row items-center justify-between gap-3 rounded-xl border-2 border-gray-200/50 bg-white px-3 py-2 font-medium text-black shadow-xl duration-150 ease-in hover:bg-gray-200"
 	>
 		<svg width="24" height="24"
 			><path
@@ -24,7 +26,9 @@
 		>
 		Continue with Google
 	</button>
-	<!-- <button class="text-sm text-gray-200 mt-1" on:click={withoutLoginFn}>Use without login</button> -->
+	{#if import.meta.env.VITE_CORES_MODE === "host"}
+		<button class="text-sm text-gray-200 mt-1" on:click={withoutLoginFn}>Use without login</button>
+	{/if}
 </div>
 
 <script lang="ts">

diff --git a/platforms/interface/ui/pages/onboarding.svelte b/platforms/interface/ui/pages/onboarding.svelte
@@ -126,10 +126,14 @@
 								>
 									Continue for free
 								</h2>
-								<p class="text-base leading-tight">You can use Cores Pro for 7 days free.</p>
+								<!-- <p class="text-base leading-tight">You can use Cores Pro for 7 days free.</p> -->
+								<p class="text-base leading-tight">
+									You can use the basic features of Cores for free. For remote connections and advanced features please activate
+									Cores.
+								</p>
 							</div>
 							<div>
-								<button on:click={free} class="smallButton w-full">
+								<button on:click={free} class="smallButton mt-3 w-full">
 									<CircleCheck />
 									Continue
 								</button>
@@ -145,14 +149,17 @@
 									Activate license
 								</h2>
 								<p class="text-base leading-tight">If you already purchased Cores, please activate your license key.</p>
+								{#if $settings.licenseKey && $settings.licenseKey !== "" && $settings.licenseKey !== "free"}
+									<p class="text-base leading-tight select-text">Your previous license key: <span class="font-bold">{$settings.licenseKey}</span></p>
+								{/if}
 							</div>
 							<div>
 								<ModularDialog
 									title={"Activate Cores"}
 									description={"Use the license key from your purchase confirmation email to activate Cores. If you don't remember you key, please contact us at support@coresmonitor.com."}
 								>
 									<slot slot="openButton">
-										<Dialog.Trigger class="smallButton w-full">
+										<Dialog.Trigger class="smallButton mt-3 w-full">
 											<CircleCheck />
 											Activate license
 										</Dialog.Trigger>
@@ -348,6 +355,10 @@
 	const activate = async () => {
 		const { data, error } = await supabaseClient.auth.getUser()
 
+		if (error) {
+			return alert("Failed to get user data, please log in.")
+		}
+
 		if (key !== "") {
 			const url = `https://crs-activate.deno.dev?license_key=${key}&user_id=${data.user.id}`
 			const options = {

diff --git a/platforms/interface/web/src/components/appHeader.svelte b/platforms/interface/web/src/components/appHeader.svelte
@@ -1,6 +1,6 @@
 <nav class="start-0 top-0 z-20 w-full border-b border-gray-600 bg-gray-900 px-8 sm:px-0">
 	<div class="mx-auto flex flex-wrap items-center justify-between p-3">
-		<a href="/home" class="flex items-center space-x-3">
+		<a href="/" class="flex items-center space-x-3">
 			<img class="h-8 w-8" src={"/favicon.ico"} alt="Cores logo" />
 			<span class="self-center whitespace-nowrap text-xl font-semibold text-white">Cores</span>
 		</a>