diff --git a/src/lib/components/atoms/buttons/EntryButton.svelte b/src/lib/components/atoms/buttons/EntryButton.svelte index 22e8a16..51f3a80 100644 --- a/src/lib/components/atoms/buttons/EntryButton.svelte +++ b/src/lib/components/atoms/buttons/EntryButton.svelte @@ -17,8 +17,8 @@ onclick={onclick && (() => setTimeout(onclick, 100))} class={["rounded-xl active:bg-gray-100", props.class]} > -
-
+
+
{@render children?.()}
diff --git a/src/lib/components/molecules/IconEntryButton.svelte b/src/lib/components/molecules/IconEntryButton.svelte new file mode 100644 index 0000000..97b941a --- /dev/null +++ b/src/lib/components/molecules/IconEntryButton.svelte @@ -0,0 +1,23 @@ + + + + + {@render children?.()} + + diff --git a/src/lib/components/molecules/index.ts b/src/lib/components/molecules/index.ts index 8f056a3..2ab4006 100644 --- a/src/lib/components/molecules/index.ts +++ b/src/lib/components/molecules/index.ts @@ -1,3 +1,5 @@ export * from "./ActionModal.svelte"; export { default as ActionModal } from "./ActionModal.svelte"; +export { default as IconEntryButton } from "./IconEntryButton.svelte"; +export * from "./labels"; export { default as TopBar } from "./TopBar.svelte"; diff --git a/src/lib/components/molecules/labels/CategoryLabel.svelte b/src/lib/components/molecules/labels/CategoryLabel.svelte new file mode 100644 index 0000000..eb160cf --- /dev/null +++ b/src/lib/components/molecules/labels/CategoryLabel.svelte @@ -0,0 +1,28 @@ + + +{#snippet subtextSnippet()} + {subtext} +{/snippet} + + + {name} + diff --git a/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte b/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte new file mode 100644 index 0000000..d9bcfb9 --- /dev/null +++ b/src/lib/components/molecules/labels/DirectoryEntryLabel.svelte @@ -0,0 +1,31 @@ + + +{#snippet subtextSnippet()} + {subtext} +{/snippet} + + + {name} + diff --git a/src/lib/components/molecules/labels/IconLabel.svelte b/src/lib/components/molecules/labels/IconLabel.svelte new file mode 100644 index 0000000..c4a982a --- /dev/null +++ b/src/lib/components/molecules/labels/IconLabel.svelte @@ -0,0 +1,31 @@ + + +
+
+ +
+
+

+ {@render children?.()} +

+ {#if subtext} +

+ {@render subtext()} +

+ {/if} +
+
diff --git a/src/lib/components/molecules/labels/index.ts b/src/lib/components/molecules/labels/index.ts new file mode 100644 index 0000000..412a0bb --- /dev/null +++ b/src/lib/components/molecules/labels/index.ts @@ -0,0 +1,3 @@ +export { default as CategoryLabel } from "./CategoryLabel.svelte"; +export { default as DirectoryEntryLabel } from "./DirectoryEntryLabel.svelte"; +export { default as IconLabel } from "./IconLabel.svelte"; diff --git a/src/lib/molecules/SubCategories.svelte b/src/lib/molecules/SubCategories.svelte index 09bbd32..cbad371 100644 --- a/src/lib/molecules/SubCategories.svelte +++ b/src/lib/molecules/SubCategories.svelte @@ -2,7 +2,7 @@ import type { Component } from "svelte"; import type { ClassValue, SvelteHTMLElements } from "svelte/elements"; import type { Writable } from "svelte/store"; - import { EntryButton } from "$lib/components/atoms"; + import { IconEntryButton } from "$lib/components/molecules"; import { getCategoryInfo, type CategoryInfo } from "$lib/modules/filesystem"; import Categories, { type SelectedCategory } from "$lib/molecules/Categories"; import { masterKeyStore } from "$lib/stores"; @@ -40,12 +40,15 @@
{#snippet subCategoryCreate()} - -
- -

카테고리 추가하기

-
-
+ + 카테고리 추가하기 + {/snippet} {#if subCategoryCreatePosition === "top"} diff --git a/src/routes/(fullscreen)/file/[id]/+page.svelte b/src/routes/(fullscreen)/file/[id]/+page.svelte index f99b029..7d7d50e 100644 --- a/src/routes/(fullscreen)/file/[id]/+page.svelte +++ b/src/routes/(fullscreen)/file/[id]/+page.svelte @@ -3,8 +3,8 @@ import { untrack } from "svelte"; import { get, type Writable } from "svelte/store"; import { goto } from "$app/navigation"; - import { EntryButton, FullscreenDiv } from "$lib/components/atoms"; - import { TopBar } from "$lib/components/molecules"; + import { FullscreenDiv } from "$lib/components/atoms"; + import { IconEntryButton, TopBar } from "$lib/components/molecules"; import { getFileInfo, getCategoryInfo, @@ -151,12 +151,15 @@ onCategoryClick={({ id }) => goto(`/category/${id}`)} onCategoryMenuClick={({ id }) => removeFromCategory(id)} /> - (isAddToCategoryBottomSheetOpen = true)} class="w-full"> -
- -

카테고리에 추가하기

-
-
+ (isAddToCategoryBottomSheetOpen = true)} + class="h-12 w-full" + iconClass="text-gray-600" + textClass="text-gray-700" + > + 카테고리에 추가하기 +
diff --git a/src/routes/(main)/category/[[id]]/CategoryMenuBottomSheet.svelte b/src/routes/(main)/category/[[id]]/CategoryMenuBottomSheet.svelte index 9e96fba..6f89a2c 100644 --- a/src/routes/(main)/category/[[id]]/CategoryMenuBottomSheet.svelte +++ b/src/routes/(main)/category/[[id]]/CategoryMenuBottomSheet.svelte @@ -1,9 +1,8 @@ - -
-
- -
-

- {@render children?.()} -

-
-
+ + {@render children?.()} +