Add path to bookmarks, add logout button

svelte/src/filesystem/filemanager/FileManager.svelte

@@ -14,6 +14,7 @@ import FsUploadWidget from "filesystem/upload_widget/FSUploadWidget.svelte";
 import EditWindow from "filesystem/edit_window/EditWindow.svelte";
 import { FileAction, type FileEvent } from "./FileManagerLib";
 import FileMenu from "./FileMenu.svelte";
+import { loading_finish, loading_start } from "lib/Loading";
 
 export let nav: FSNavigator
 export let upload_widget: FsUploadWidget
@@ -117,9 +118,9 @@ const delete_selected = async () => {
 		return
 	}
 
-	nav.set_loading(true)
-
 	try {
+		loading_start()
+
 		// Save all promises with deletion requests in an array
 		let promises = []
 		nav.children.forEach(child => {
@@ -136,7 +137,7 @@ const delete_selected = async () => {
 		alert("Delete failed: " + err.message + " ("+err.value+")")
 	} finally {
 		viewing_mode()
-		nav.reload()
+		loading_finish()
 	}
 }
 
@@ -264,11 +265,10 @@ const move_start = () => {
 }
 
 const move_here = async () => {
-	nav.set_loading(true)
-
-	let target_dir = nav.base.path + "/"
-
+	const target_dir = nav.base.path + "/"
 	try {
+		loading_start()
+
 		let promises = []
 		moving_items.forEach(item => {
 			console.log("moving", item.path, "to", target_dir + item.name)
@@ -283,6 +283,7 @@ const move_here = async () => {
 	} finally {
 		viewing_mode()
 		nav.reload()
+		loading_finish()
 	}
 }
 
@@ -424,6 +425,7 @@ onMount(() => {
 	padding: 0;
 	overflow: auto;
 	display: block;
+	height: 100%; /* Used for drop target */
 }
 .width_container {
 	position: sticky;

svelte/src/filesystem/filemanager/FileMenu.svelte

@@ -3,49 +3,31 @@ import EditWindow from "filesystem/edit_window/EditWindow.svelte";
 import type { FSNavigator } from "filesystem/FSNavigator";
 import Button from "layout/Button.svelte";
 import Dialog from "layout/Dialog.svelte";
-import { bookmark_add, bookmark_del, bookmarks_store } from "lib/Bookmarks";
+import { bookmark_add, bookmark_del, bookmarks_store, is_bookmark } from "lib/Bookmarks";
 import { fs_download, type FSNode } from "lib/FilesystemAPI";
 import { tick } from "svelte";
 
 export let nav: FSNavigator
 export let edit_window: EditWindow
 let dialog: Dialog
-let node: FSNode
-let is_bookmark: boolean = false
+let node: FSNode = null
 
 export const open = async (n: FSNode, target: EventTarget) => {
 	node = n
 
-	is_bookmark = false
-	for (const bm of $bookmarks_store) {
-		console.log(bm)
-		if (bm.id === n.id) {
-			is_bookmark = true
-			break
-		}
-	}
-
 	// Wait for the view to update, so the dialog gets the proper measurements
 	await tick()
 	dialog.open((target as Element).closest("button").getBoundingClientRect())
 }
-
-const bookmark = () => {
-	bookmark_add({
-		id: node.id,
-		icon: "folder_shared",
-		label: node.name,
-	})
-}
 </script>
 
 <Dialog bind:this={dialog}>
 	<div class="menu">
 		<Button click={() => {dialog.close(); fs_download(node)}} icon="save" label="Download"/>
-		{#if is_bookmark}
+		{#if node !== null && is_bookmark($bookmarks_store, node.id)}
 			<Button click={() => {dialog.close(); bookmark_del(node.id)}} icon="bookmark_remove" label="Remove bookmark"/>
 		{:else}
-			<Button click={() => {dialog.close(); bookmark()}} icon="bookmark_add" label="Add bookmark"/>
+			<Button click={() => {dialog.close(); bookmark_add(node)}} icon="bookmark_add" label="Add bookmark"/>
 		{/if}
 		{#if $nav.permissions.write}
 			<Button click={() => {dialog.close(); edit_window.edit(node, false, "file")}} icon="edit" label="Edit"/>