Merge pull request #211 from decaf-dev/dev

1.26.0
decaf-dev · Jul 16, 2024 · e05a3e1 · e05a3e1
2 parents cb71be7 + b4e55fb
commit e05a3e1
Show file tree

Hide file tree

Showing 31 changed files with 1,003 additions and 209 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "vault-explorer",
 	"name": "Vault Explorer",
-	"version": "1.25.2",
+	"version": "1.26.0",
 	"minAppVersion": "1.4.13",
 	"description": "Explore your vault in visual format",
 	"author": "DecafDev",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-vault-explorer",
-	"version": "1.25.2",
+	"version": "1.26.0",
 	"description": "Explore your vault in visual format",
 	"main": "main.js",
 	"scripts": {

diff --git a/src/constants.ts b/src/constants.ts
@@ -6,7 +6,6 @@ export const VAULT_EXPLORER_VIEW = "vault-explorer";
 export const HOVER_LINK_SOURCE_ID = "vault-explorer-preview";
 
 export const DEFAULT_SETTINGS: VaultExplorerPluginSettings = {
-	logLevel: LOG_LEVEL_WARN,
 	properties: {
 		favorite: "",
 		url: "",
@@ -75,5 +74,7 @@ export const DEFAULT_SETTINGS: VaultExplorerPluginSettings = {
 	filterGroupsWrapping: "nowrap",
 	pageSize: 25,
 	viewOrder: [TExplorerView.GRID, TExplorerView.LIST, TExplorerView.FEED],
+	configDir: ".vaultexplorer",
 	pluginVersion: null,
+	logLevel: LOG_LEVEL_WARN,
 };
diff --git a/src/main.ts b/src/main.ts
@@ -170,6 +170,7 @@ export default class VaultExplorerPlugin extends Plugin {
 			//This will be undefined if the settings are from a version before 0.3.0
 			const loadedVersion =
 				(loadedData["pluginVersion"] as string) ?? null;
+
 			if (loadedVersion !== null) {
 				const newData = preformMigrations(loadedVersion, loadedData);
 				currentData = newData;

diff --git a/src/migrations/index.ts b/src/migrations/index.ts
@@ -1,4 +1,3 @@
-import { TMigration } from "./types";
 import Migrate_0_4_0 from "./migrate_0_4_0";
 import Migrate_1_1_0 from "./migrate_1_1_0";
 import Migrate_1_0_0 from "./migrate_1_0_0";
@@ -12,13 +11,16 @@ import Migrate_1_15_0 from "./migrate_1_15_0";
 import Migrate_1_17_0 from "./migrate_1_17_0";
 import Migrate_1_13_0 from "./migrate_1_13_0";
 import Migrate_1_10_0 from "./migrate_1_10_0";
-import { isVersionLessThan } from "src/utils";
 import Migrate_1_21_0 from "./migrate_1_21_0";
 import Migrate_1_22_0 from "./migrate_1_22_0";
 import Migrate_1_23_0 from "./migrate_1_23_0";
 import Migrate_1_23_1 from "./migrate_1_23_1";
 import Migrate_1_24_0 from "./migrate_1_24_0";
 import Migrate_1_25_0 from "./migrate_1_25_0";
+import Migrate_1_26_0 from "./migrate_1_26_0";
+
+import { TMigration } from "./types";
+import { isVersionLessThan } from "src/utils";
 
 const migrations: TMigration[] = [
 	{
@@ -116,6 +118,11 @@ const migrations: TMigration[] = [
 		to: "1.25.0",
 		migrate: Migrate_1_25_0,
 	},
+	{
+		from: "1.25.2",
+		to: "1.26.0",
+		migrate: Migrate_1_26_0,
+	},
 ];
 
 export const preformMigrations = (

diff --git a/src/migrations/migrate_1_25_0.ts b/src/migrations/migrate_1_25_0.ts
@@ -1,11 +1,11 @@
-import { VaultExplorerPluginSettings } from "src/types";
 import MigrationInterface from "./migration_interface";
 import { VaultExplorerPluginSettings_1_24_2 } from "src/types/types-1.24.2";
+import { VaultExplorerPluginSettings_1_25_2 } from "src/types/types-1.25.2";
 
 export default class Migrate_1_25_0 implements MigrationInterface {
 	migrate(data: Record<string, unknown>) {
 		const typedData = data as unknown as VaultExplorerPluginSettings_1_24_2;
-		const newData: VaultExplorerPluginSettings = {
+		const newData: VaultExplorerPluginSettings_1_25_2 = {
 			...typedData,
 			fileInteractionStyle: "content",
 		};

diff --git a/src/migrations/migrate_1_26_0.ts b/src/migrations/migrate_1_26_0.ts
@@ -0,0 +1,15 @@
+import { VaultExplorerPluginSettings } from "src/types";
+import MigrationInterface from "./migration_interface";
+import { VaultExplorerPluginSettings_1_25_2 } from "src/types/types-1.25.2";
+
+export default class Migrate_1_26_0 implements MigrationInterface {
+	migrate(data: Record<string, unknown>) {
+		const typedData = data as unknown as VaultExplorerPluginSettings_1_25_2;
+		const newData: VaultExplorerPluginSettings = {
+			...typedData,
+			configDir: ".vaultexplorer",
+		};
+
+		return newData as unknown as Record<string, unknown>;
+	}
+}
diff --git a/src/svelte/app/components/feed-card.svelte b/src/svelte/app/components/feed-card.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onMount } from "svelte";
+	import { createEventDispatcher, onMount } from "svelte";
 	import { FileInteractionStyle, WordBreak } from "src/types";
 	import EventManager from "src/event/event-manager";
 	import VaultExplorerPlugin from "src/main";
@@ -26,6 +26,7 @@
 	export let tags: string[] | null;
 	export let createdMillis: number;
 	export let content: string | null;
+	export let isFavorite: boolean | null;
 
 	let ref: HTMLElement | null = null;
 	let wordBreak: WordBreak = "normal";
@@ -34,6 +35,8 @@
 	let contentModifierClassName = "";
 	let fileInteractionStyle: FileInteractionStyle = "content";
 
+	const dispatch = createEventDispatcher();
+
 	let plugin: VaultExplorerPlugin;
 	store.plugin.subscribe((value) => {
 		plugin = value;
@@ -153,9 +156,16 @@
 		openInCurrentTab(plugin, path);
 	}
 
+	function handleFavoriteChange(filePath: string, value: boolean) {
+		dispatch("favoritePropertyChange", { filePath, value });
+	}
+
 	function handleCardContextMenu(e: CustomEvent) {
 		const { nativeEvent } = e.detail;
-		openContextMenu(plugin, nativeEvent, path);
+		openContextMenu(plugin, path, nativeEvent, {
+			isFavorite,
+			onFavoriteChange: handleFavoriteChange,
+		});
 	}
 
 	function handleTitleContextMenu(e: CustomEvent) {

diff --git a/src/svelte/app/components/feed-view.svelte b/src/svelte/app/components/feed-view.svelte
@@ -47,6 +47,8 @@
 				tags={fileRenderData.tags}
 				content={fileRenderData.content}
 				createdMillis={fileRenderData.createdMillis}
+				isFavorite={fileRenderData.isFavorite}
+				on:favoritePropertyChange
 			/>
 		{/each}
 	{/if}

diff --git a/src/svelte/app/components/grid-card.svelte b/src/svelte/app/components/grid-card.svelte
@@ -1,19 +1,17 @@
 <script lang="ts">
-	import { MarkdownView } from "obsidian";
 	import IconButton from "../../shared/components/icon-button.svelte";
 	import Tag from "../../shared/components/tag.svelte";
 	import Property from "../../shared/components/property.svelte";
 	import VaultExplorerPlugin from "src/main";
 	import store from "../../shared/services/store";
 	import Wrap from "src/svelte/shared/components/wrap.svelte";
 	import Stack from "src/svelte/shared/components/stack.svelte";
-	import { onMount } from "svelte";
+	import { createEventDispatcher, onMount } from "svelte";
 	import { FileInteractionStyle, WordBreak } from "src/types";
 	import { HOVER_LINK_SOURCE_ID } from "src/constants";
 	import EventManager from "src/event/event-manager";
 	import Icon from "src/svelte/shared/components/icon.svelte";
 	import { getIconIdForFile } from "../services/file-icon";
-	import Spacer from "src/svelte/shared/components/spacer.svelte";
 	import License from "src/svelte/shared/services/license";
 	import { fetchSocialMediaImage } from "../services/social-media-image";
 	import { PluginEvent } from "src/event/types";
@@ -32,6 +30,7 @@
 	export let custom1: string | null;
 	export let custom2: string | null;
 	export let custom3: string | null;
+	export let isFavorite: boolean | null;
 
 	let plugin: VaultExplorerPlugin;
 	let wordBreak: WordBreak = "normal";
@@ -48,6 +47,8 @@
 		loadSocialMediaImage = plugin.settings.views.grid.loadSocialMediaImage;
 	});
 
+	const dispatch = createEventDispatcher();
+
 	License.getInstance()
 		.getIsDeviceRegisteredStore()
 		.subscribe((isRegistered) => {
@@ -148,9 +149,17 @@
 		openInCurrentTab(plugin, path);
 	}
 
+	function handleFavoriteChange(filePath: string, value: boolean) {
+		console.log("favoritePropertyChange", { filePath, value });
+		dispatch("favoritePropertyChange", { filePath, value });
+	}
+
 	function handleCardContextMenu(e: CustomEvent) {
 		const { nativeEvent } = e.detail;
-		openContextMenu(plugin, nativeEvent, path);
+		openContextMenu(plugin, path, nativeEvent, {
+			isFavorite,
+			onFavoriteChange: handleFavoriteChange,
+		});
 	}
 
 	function handleCardMouseOver(e: MouseEvent) {
@@ -177,6 +186,9 @@
 	}
 
 	$: loadSocialMediaImage, getSocialImageUrl();
+
+	$: hasBodyContent =
+		tags != null || custom1 != null || custom2 != null || custom3 != null;
 </script>
 
 <GridCardContainer
@@ -190,61 +202,69 @@
 			<!-- svelte-ignore a11y-missing-attribute -->
 			<img class="vault-explorer-grid-card__image" src={imageUrl} />
 		{/if}
-	</div>
-	<div class="vault-explorer-grid-card__header">
-		<GridCardTitle
-			{fileInteractionStyle}
-			on:click={handleTitleClick}
-			on:contextmenu={handleTitleContextMenu}
-			on:mouseover={handleTitleMouseOver}
-		>
-			<Stack spacing="xs">
-				{#if enableFileIcons}
-					<Icon iconId={getIconIdForFile(baseName, extension)} />
-				{/if}
-				<div class="vault-explorer-grid-card__title-text">
-					{displayName}
-				</div>
-			</Stack>
-		</GridCardTitle>
-		{#if url !== null}
-			<IconButton
-				iconId="external-link"
-				noPadding
-				on:click={handleUrlClick}
-			/>
+		{#if isFavorite === true}
+			<div class="vault-explorer-grid-card__favorite">
+				<Icon iconId="star" ariaLabel="Favorite" />
+			</div>
 		{/if}
 	</div>
 	<div class="vault-explorer-grid-card__content">
-		{#if tags !== null}
-			<div class="vault-explorer-grid-card__tags">
-				<Wrap spacingX="sm" spacingY="sm">
-					{#each tags as tag}
-						<Tag name={tag} />
-					{/each}
-				</Wrap>
+		<Stack spacing={hasBodyContent ? "sm" : "none"} direction="column">
+			<div class="vault-explorer-grid-card__head">
+				<GridCardTitle
+					{fileInteractionStyle}
+					on:click={handleTitleClick}
+					on:contextmenu={handleTitleContextMenu}
+					on:mouseover={handleTitleMouseOver}
+				>
+					<Stack spacing="xs">
+						{#if enableFileIcons}
+							<Icon
+								iconId={getIconIdForFile(baseName, extension)}
+							/>
+						{/if}
+						<div class="vault-explorer-grid-card__title-text">
+							{displayName}
+						</div>
+					</Stack>
+				</GridCardTitle>
+				{#if url !== null}
+					<IconButton
+						iconId="external-link"
+						ariaLabel="Open in browser"
+						noPadding
+						on:click={handleUrlClick}
+					/>
+				{/if}
 			</div>
-		{/if}
-		{#if custom1 !== null || custom2 !== null || custom3 !== null}
-			<Spacer size="sm" direction="vertical" />
-		{/if}
-		<Wrap spacingX="xs" spacingY="xs"
-			>{#if custom1 !== null}<Property
-					name={plugin.settings.properties.custom1}
-					value={custom1}
-				/>{/if}
-			{#if custom2 !== null}<Property
-					name={plugin.settings.properties.custom2}
-					value={custom2}
-				/>{/if}
-			{#if custom3 !== null}<Property
-					name={plugin.settings.properties.custom3}
-					value={custom3}
-				/>{/if}
-		</Wrap>
-		{#if tags != null || custom1 !== null || custom2 !== null || custom3 !== null}
-			<Spacer size="sm" direction="vertical" />
-		{/if}
+			{#if tags !== null}
+				<div class="vault-explorer-grid-card__tags">
+					<Wrap spacingX="sm" spacingY="sm">
+						{#each tags as tag}
+							<Tag name={tag} />
+						{/each}
+					</Wrap>
+				</div>
+			{/if}
+			{#if custom1 !== null || custom2 !== null || custom3 !== null}
+				<div class="vault-explorer-grid-card__properties">
+					<Wrap spacingX="xs" spacingY="xs"
+						>{#if custom1 !== null}<Property
+								name={plugin.settings.properties.custom1}
+								value={custom1}
+							/>{/if}
+						{#if custom2 !== null}<Property
+								name={plugin.settings.properties.custom2}
+								value={custom2}
+							/>{/if}
+						{#if custom3 !== null}<Property
+								name={plugin.settings.properties.custom3}
+								value={custom3}
+							/>{/if}
+					</Wrap>
+				</div>
+			{/if}
+		</Stack>
 	</div>
 </GridCardContainer>
 
@@ -255,6 +275,13 @@
 		background-color: var(--background-modifier-border);
 		border-top-left-radius: var(--radius-m);
 		border-top-right-radius: var(--radius-m);
+		position: relative;
+	}
+
+	.vault-explorer-grid-card__favorite {
+		position: absolute;
+		top: 8px;
+		right: 8px;
 	}
 
 	.vault-explorer-grid-card__image {
@@ -265,17 +292,15 @@
 		border-top-right-radius: var(--radius-m);
 	}
 
-	.vault-explorer-grid-card__header {
+	.vault-explorer-grid-card__content {
+		padding: 8px 16px;
+	}
+
+	.vault-explorer-grid-card__head {
 		display: flex;
 		justify-content: space-between;
 		align-items: flex-start;
 		column-gap: 0.5rem;
-		padding: 8px 16px;
-	}
-
-	.vault-explorer-grid-card__content {
-		padding: 0px 16px;
-		position: relative;
 	}
 
 	.vault-explorer-grid-card__title-text {

diff --git a/src/svelte/app/components/grid-view.svelte b/src/svelte/app/components/grid-view.svelte
@@ -34,6 +34,8 @@
 				custom1={fileRenderData.custom1}
 				custom2={fileRenderData.custom2}
 				custom3={fileRenderData.custom3}
+				isFavorite={fileRenderData.isFavorite}
+				on:favoritePropertyChange
 			/>
 		{/each}
 	</div>

diff --git a/src/svelte/app/components/group-tag.svelte b/src/svelte/app/components/group-tag.svelte
@@ -44,7 +44,7 @@
 >
 	{#if isSticky}
 		<Stack spacing="xs" align="center">
-			<Icon iconId="pin" xs />
+			<Icon iconId="pin" size="xs" />
 			<div>{name}</div>
 		</Stack>
 	{/if}