Add path to bookmarks, add logout button

svelte/src/user_home/dashboard/CardAccount.svelte

@@ -1,3 +1,7 @@
+<script>
+import Button from "layout/Button.svelte";
+import { logout_user } from "lib/PixeldrainAPI";
+</script>
 <ul>
 	<li>Username: {window.user.username}</li>
 	{#if window.user.email === ""}
@@ -26,10 +30,10 @@
 			Filesystem
 		</a>
 	{/if}
-	<a href="/logout" class="button">
+	<button on:click={()=> logout_user("/")}>
 		<i class="icon">logout</i>
 		Log out
-	</a>
+	</button>
 </div>
 
 <style>
@@ -37,7 +41,7 @@
 	display: flex;
 	flex-wrap: wrap;
 }
-.button_row > a {
+.button_row > * {
 	flex: 1 1 auto;
 }
 ul {

svelte/src/user_home/dashboard/CardFSHome.svelte

@@ -1,150 +0,0 @@
-<script>
-import { onMount } from "svelte";
-import { FSNavigator } from "filesystem/FSNavigator.ts"
-import { fs_encode_path, fs_node_icon, node_is_shared } from "lib/FilesystemAPI";
-import Button from "layout/Button.svelte";
-import CreateDirectory from "filesystem/filemanager/CreateDirectory.svelte";
-import FSUploadWidget from "filesystem/upload_widget/FSUploadWidget.svelte";
-import { drop_target } from "lib/DropTarget.ts"
-
-const nav = new FSNavigator(false)
-let upload_widget
-var show_hidden = false
-var creating_dir = false
-
-onMount(() => nav.navigate("/me", false))
-</script>
-
-<div class="wrapper" use:drop_target={{upload: (files) => upload_widget.upload_files(files)}}>
-	<div class="toolbar">
-		{#if $nav.permissions.write}
-			<Button
-				click={() => upload_widget.pick_files()}
-				icon="cloud_upload"
-				title="Upload files to this directory"
-				label="Upload files"
-			/>
-			<Button
-				click={() => {creating_dir = !creating_dir}}
-				highlight={creating_dir}
-				icon="create_new_folder"
-				title="Create folder"
-				label="Create folder"
-			/>
-		{/if}
-
-		<div class="toolbar_spacer"></div>
-
-		<Button
-			click={() => {show_hidden = !show_hidden}}
-			highlight={show_hidden}
-			icon={show_hidden ? "visibility_off" : "visibility"}
-			title="Show hidden files and directories"
-		/>
-		<Button
-			click={() => nav.reload()}
-			icon="refresh"
-			title="Refresh directory listing"
-		/>
-	</div>
-
-	{#if creating_dir}
-		<CreateDirectory nav={nav} />
-	{/if}
-
-	<div class="directory">
-		{#each $nav.children as child (child.path)}
-			<a
-				href={"/d"+fs_encode_path(child.path)}
-				class="node"
-				class:node_selected={child.fm_selected}
-				class:hidden={child.name.startsWith(".") && show_hidden === false}
-			>
-				<img src={fs_node_icon(child, 64, 64)} class="node_icon" alt="icon"/>
-
-				<div class="node_name">
-					{child.name}
-				</div>
-
-				{#if node_is_shared(child)}
-					<a href="/d/{child.id}" class="button action_button">
-						<i class="icon" title="This file / directory is shared. Click to open public link">share</i>
-					</a>
-				{/if}
-			</a>
-		{/each}
-	</div>
-</div>
-
-<FSUploadWidget nav={nav} bind:this={upload_widget} />
-
-<style>
-.wrapper {
-	border-radius: 4px;
-}
-.toolbar {
-	display: flex;
-	flex-direction: row;
-	width: 100%;
-	justify-content: center;
-	align-items: center;
-}
-.toolbar > * { flex: 0 0 auto; }
-.toolbar_spacer {
-	flex: 1 1 auto;
-	text-align: center;
-}
-.directory {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	gap: 6px;
-	margin-top: 6px;
-}
-.node {
-	display: flex;
-	flex: 1 1 auto;
-	flex-direction: row;
-	align-content: center;
-	align-items: center;
-	justify-content: center;
-	text-decoration: none;
-	color: var(--body_text-color);
-	gap: 2px;
-	padding: 2px;
-	border-radius: 8px;
-	width: 250px;
-	max-width: 100%;
-	border: 1px solid var(--input_background);
-}
-.node:hover {
-	background: var(--input_hover_background);
-	color: var(--input_text);
-	text-decoration: none;
-}
-.node > * {
-	flex: 0 0 auto;
-}
-.node_icon {
-	height: 32px;
-	width: 32px;
-	vertical-align: middle;
-	border-radius: 4px;
-}
-.node_name {
-	flex: 1 1 auto;
-	display: flex;
-	align-items: center;
-	word-break: break-all;
-	line-height: 1.2em;
-}
-.action_button {
-	margin: 0;
-	background: none;
-	color: var(--body_text_color);
-	box-shadow: none;
-}
-.hidden {
-	display: none;
-}
-</style>

svelte/src/user_home/dashboard/Dashboard.svelte

@@ -7,7 +7,6 @@ import CardSubscription from "./CardSubscription.svelte";
 import CardUsage from "./CardUsage.svelte";
 import CardActivity from "./CardActivity.svelte";
 import CardPrepaidTransactions from "./CardPrepaidTransactions.svelte";
-import CardFsHome from "./CardFSHome.svelte";
 import AddressReputation from "home_page/AddressReputation.svelte";
 import { flip } from "svelte/animate";
 
@@ -60,51 +59,37 @@ const swap_card = (idx1, idx2) => {
 }
 
 onMount(() => {
-	cards = []
-	if (window.user.subscription.filesystem_access === true) {
-		cards.push({
-			id: "filesystem_home",
-			elem: CardFsHome,
-			title: "Filesystem home",
-			link: "/d/me",
-		})
-	}
-	cards.push({
-		id: "account",
-		elem: CardAccount,
-		title: "Account",
-		link: "/user/settings",
-	})
-	cards.push({
-		id: "subscription",
-		elem: CardSubscription,
-		title: "Subscription",
-		link: "/user/subscription",
-	})
-	if (window.user.subscription.type === "prepaid") {
-		cards.push({
+	cards = [
+		{
+			id: "account",
+			elem: CardAccount,
+			title: "Account",
+			link: "/user/settings",
+		},{
+			id: "subscription",
+			elem: CardSubscription,
+			title: "Subscription",
+			link: "/user/subscription",
+		}, {
 			id: "prepaid_transactions",
 			elem: CardPrepaidTransactions,
 			title: "Prepaid transactions",
 			link: "/user/prepaid/transactions",
-		})
-	}
-	cards.push({
-		id: "usage",
-		elem: CardUsage,
-		title: "Usage",
-	})
-	cards.push({
-		id: "statistics",
-		elem: CardStatistics,
-		title: "Statistics",
-	})
-	cards.push({
-		id: "activity",
-		elem: CardActivity,
-		title: "Activity",
-		link: "/user/activity",
-	})
+		}, {
+			id: "usage",
+			elem: CardUsage,
+			title: "Usage",
+		}, {
+			id: "statistics",
+			elem: CardStatistics,
+			title: "Statistics",
+		}, {
+			id: "activity",
+			elem: CardActivity,
+			title: "Activity",
+			link: "/user/activity",
+		}
+	]
 
 	// Apply the view settings from localstorage
 	try {