Add path to bookmarks, add logout button

svelte/src/filesystem/Toolbar.svelte

@@ -4,8 +4,9 @@ import { copy_text } from "util/Util.svelte";
 import FileStats from "./FileStats.svelte";
 import type { FSNavigator } from "./FSNavigator";
 import EditWindow from "./edit_window/EditWindow.svelte";
-import { fs_share_url } from "lib/FilesystemAPI";
+import { fs_share_url, path_is_shared } from "lib/FilesystemAPI";
 import ShareDialog from "./ShareDialog.svelte";
+import { bookmark_add, bookmark_del, bookmarks_store, is_bookmark } from "lib/Bookmarks";
 
 let dispatch = createEventDispatcher()
 
@@ -14,10 +15,9 @@ export let details_visible = false
 export let edit_window: EditWindow
 export let edit_visible = false
 let share_dialog: ShareDialog
-
-$: share_url = fs_share_url($nav.path)
 let link_copied = false
 export const copy_link = () => {
+	const share_url = fs_share_url($nav.path)
 	if (share_url === "") {
 		edit_window.edit(nav.base, true, "share")
 		return
@@ -50,7 +50,19 @@ export const copy_link = () => {
 			<span>Download</span>
 		</button>
 
-		{#if share_url !== ""}
+		{#if is_bookmark($bookmarks_store, $nav.base.id)}
+			<button on:click={() => bookmark_del($nav.base.id)}>
+				<i class="icon">bookmark_remove</i>
+				<span>Bookmark</span>
+			</button>
+		{:else}
+			<button on:click={() => bookmark_add($nav.base)}>
+				<i class="icon">bookmark_add</i>
+				<span>Bookmark</span>
+			</button>
+		{/if}
+
+		{#if path_is_shared($nav.path)}
 			<button on:click={copy_link} class:button_highlight={link_copied}>
 				<i class="icon">content_copy</i>
 				<span><u>C</u>opy link</span>
@@ -58,7 +70,7 @@ export const copy_link = () => {
 		{/if}
 
 		<!-- Share button is enabled when: The browser has a sharing API, or the user can edit the file (to enable sharing)-->
-		{#if $nav.base.id !== "me" && (navigator.share !== undefined || $nav.permissions.write === true)}
+		{#if navigator.share !== undefined || $nav.permissions.write === true}
 			<button on:click={(e) => share_dialog.open(e, nav.path)}>
 				<i class="icon">share</i>
 				<span>Share</span>

svelte/src/filesystem/edit_window/EditWindow.svelte

@@ -7,6 +7,7 @@ import FileOptions from "./FileOptions.svelte";
 import SharingOptions from "./SharingOptions.svelte";
 import AccessControl from "./AccessControl.svelte";
 import type { FSNavigator } from "filesystem/FSNavigator";
+import { loading_finish, loading_start } from "lib/Loading";
 
 export let nav: FSNavigator
 let file: FSNode = {} as FSNode
@@ -64,7 +65,7 @@ const save = async (keep_editing = false) => {
 
 	let new_file: FSNode
 	try {
-		nav.set_loading(true)
+		loading_start()
 		options.branding_enabled = JSON.stringify(branding_enabled)
 
 		new_file = await fs_update(file.path, options)
@@ -88,7 +89,7 @@ const save = async (keep_editing = false) => {
 		}
 		return
 	} finally {
-		nav.set_loading(false)
+		loading_finish()
 	}
 
 	if (open_after_edit) {

svelte/src/filesystem/edit_window/FileOptions.svelte

@@ -3,6 +3,7 @@ import Button from "layout/Button.svelte";
 import { fs_delete_all, type FSNode } from "lib/FilesystemAPI";
 import PathLink from "filesystem/util/PathLink.svelte";
 import type { FSNavigator } from "filesystem/FSNavigator";
+import { loading_finish, loading_start } from "lib/Loading";
 
 export let nav: FSNavigator
 export let file: FSNode = {} as FSNode
@@ -16,14 +17,14 @@ const delete_file = async (e: MouseEvent) => {
 	e.preventDefault()
 
 	try {
-		nav.set_loading(true)
+		loading_start()
 		await fs_delete_all(file.path)
 	} catch (err) {
 		console.error(err)
 		alert(err)
 		return
 	} finally {
-		nav.set_loading(false)
+		loading_finish()
 	}
 
 	if (open_after_edit) {

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"/>