From 44fc5b4b82d25af711264b99a3d25999dfb224f5 Mon Sep 17 00:00:00 2001
From: Fornax <wim@fornaxian.tech>
Date: Wed, 29 Nov 2023 12:43:33 +0100
Subject: [PATCH] Reorder user home tab menu

---
 svelte/src/user_home/DepositCredit.svelte | 13 ++++---
 svelte/src/user_home/Home.svelte          |  4 ++-
 svelte/src/user_home/Router.svelte        | 44 +++++++++++------------
 3 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/svelte/src/user_home/DepositCredit.svelte b/svelte/src/user_home/DepositCredit.svelte
index 8da0b10..1103e22 100644
--- a/svelte/src/user_home/DepositCredit.svelte
+++ b/svelte/src/user_home/DepositCredit.svelte
@@ -79,12 +79,15 @@ onMount(() => {
 <LoadingIndicator loading={loading}/>
 
 <section>
-	<h2 id="deposit">Deposit credits</h2>
+	<h2 id="deposit">Deposit credit</h2>
 	<p>
-		Pixeldrain credits can be used for our prepaid plans, which are
-		different from the Patreon plans. With prepaid you only pay for what you
-		use, at a rate of €4 per TB per month for storage and €2 per TB for data
-		transfer.
+		Pixeldrain credit can be used for our prepaid plans, which are different
+		from the Patreon plans. With prepaid you only pay for what you use, at a
+		rate of €4 per TB per month for storage and €2 per TB for data transfer.
+		See the Subscriptions tab for more information about the perks.
+	</p>
+	<p>
+		Current account balance: <Euro amount={window.user.balance_micro_eur}></Euro>
 	</p>
 
 	<div class="tab_bar">
diff --git a/svelte/src/user_home/Home.svelte b/svelte/src/user_home/Home.svelte
index e2f2994..e3fec9e 100644
--- a/svelte/src/user_home/Home.svelte
+++ b/svelte/src/user_home/Home.svelte
@@ -225,7 +225,8 @@ onDestroy(() => {
 			{#if window.user.subscription.type === "patreon"}
 				(<a href="https://www.patreon.com/join/pixeldrain/checkout?edit=1">Manage subscription</a>)
 			{:else if window.user.subscription.id === ""}
-				(<a href="/api/patreon_auth/start" class="button">Link Patreon subscription</a>)
+				(<a href="/api/patreon_auth/start">Link Patreon subscription</a> /
+				<a href="/user/prepaid/deposit">deposit account credit</a>)
 			{/if}
 			<ul>
 				<li>
@@ -241,6 +242,7 @@ onDestroy(() => {
 		{#if window.user.balance_micro_eur !== 0}
 			<li>
 				Current account balance: <Euro amount={window.user.balance_micro_eur}></Euro>
+				(<a href="/user/prepaid/deposit">deposit credit</a>)
 				{#if window.user.subscription.id === ""}
 					<br/>
 					You have account credit but no active subscription. Activate
diff --git a/svelte/src/user_home/Router.svelte b/svelte/src/user_home/Router.svelte
index 94f360a..9ea6d08 100644
--- a/svelte/src/user_home/Router.svelte
+++ b/svelte/src/user_home/Router.svelte
@@ -23,6 +23,28 @@ let pages = [
 		title: "Settings",
 		icon: "settings",
 		component: AccountSettings,
+	}, {
+		path: "/user/prepaid",
+		title: "Prepaid",
+		icon: "receipt_long",
+		subpages: [
+			{
+				path: "/user/prepaid/deposit",
+				title: "Deposit credit",
+				icon: "account_balance_wallet",
+				component: DepositCredit,
+			}, {
+				path: "/user/prepaid/subscriptions",
+				title: "Subscriptions",
+				icon: "shopping_cart",
+				component: Subscription,
+			}, {
+				path: "/user/prepaid/transactions",
+				title: "Transactions",
+				icon: "receipt",
+				component: Transactions,
+			},
+		],
 	}, {
 		path: "/user/sharing",
 		title: "Sharing",
@@ -60,28 +82,6 @@ let pages = [
 		title: "Activity Log",
 		icon: "list",
 		component: ActivityLog,
-	}, {
-		path: "/user/prepaid",
-		title: "Prepaid",
-		icon: "receipt_long",
-		subpages: [
-			{
-				path: "/user/prepaid/deposit",
-				title: "Deposit credit",
-				icon: "account_balance_wallet",
-				component: DepositCredit,
-			}, {
-				path: "/user/prepaid/subscriptions",
-				title: "Subscriptions",
-				icon: "shopping_cart",
-				component: Subscription,
-			}, {
-				path: "/user/prepaid/transactions",
-				title: "Transactions",
-				icon: "receipt",
-				component: Transactions,
-			},
-		],
 	},
 ]
 </script>