diff --git a/web/src/components/MemoFilter.tsx b/web/src/components/MemoFilter.tsx index e3197cea..fdeadd5c 100644 --- a/web/src/components/MemoFilter.tsx +++ b/web/src/components/MemoFilter.tsx @@ -4,7 +4,6 @@ import { getDateString } from "@/helpers/datetime"; import { useFilterStore } from "@/store/module"; import { useTranslate } from "@/utils/i18n"; import Icon from "./Icon"; -import "@/less/memo-filter.less"; const MemoFilter = () => { const t = useTranslate(); @@ -19,34 +18,44 @@ const MemoFilter = () => { }, [location]); return ( -
+
{t("common.filter")}:
{ filterStore.setTagFilter(undefined); }} > - {tagQuery} + {tagQuery}
{ filterStore.setMemoVisibilityFilter(undefined); }} > - {visibility} + {visibility}
{duration && duration.from < duration.to ? (
{ filterStore.setFromAndToFilter(); }} > - + {t("common.filter-period", { from: getDateString(duration.from), to: getDateString(duration.to), @@ -56,12 +65,15 @@ const MemoFilter = () => {
) : null}
{ filterStore.setTextFilter(undefined); }} > - {textQuery} + {textQuery}
diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsx index 203c5c7b..4cd9fcbe 100644 --- a/web/src/components/MemoList.tsx +++ b/web/src/components/MemoList.tsx @@ -9,7 +9,6 @@ import { useFilterStore, useMemoStore } from "@/store/module"; import { useTranslate } from "@/utils/i18n"; import Empty from "./Empty"; import Memo from "./Memo"; -import "@/less/memo-list.less"; const MemoList: React.FC = () => { const t = useTranslate(); @@ -131,17 +130,17 @@ const MemoList: React.FC = () => { }; return ( -
+
{sortedMemos.map((memo) => ( ))} {isFetching ? ( -
-

{t("memo.fetching-data")}

+
+

{t("memo.fetching-data")}

) : ( -
-
+
+
{isComplete ? ( sortedMemos.length === 0 && (
diff --git a/web/src/components/MemoResourceListView.tsx b/web/src/components/MemoResourceListView.tsx index ebb84ba0..517a860a 100644 --- a/web/src/components/MemoResourceListView.tsx +++ b/web/src/components/MemoResourceListView.tsx @@ -5,7 +5,6 @@ import { getResourceType, getResourceUrl } from "@/utils/resource"; import MemoResource from "./MemoResource"; import showPreviewImageDialog from "./PreviewImageDialog"; import SquareDiv from "./kit/SquareDiv"; -import "@/less/memo-resources.less"; interface Props { resourceList: Resource[]; @@ -77,14 +76,20 @@ const MemoResourceListView: React.FC = (props: Props) => {
))} -
+
{videoResourceList.length > 0 && ( -
+
{videoResourceList.map((resource) => { const url = getResourceUrl(resource); return ( - - + + ); })} diff --git a/web/src/less/archived.less b/web/src/less/archived.less deleted file mode 100644 index 8f696707..00000000 --- a/web/src/less/archived.less +++ /dev/null @@ -1,11 +0,0 @@ -.archived-memo-page { - @apply w-full max-w-3xl min-h-full flex flex-col justify-start items-center pb-8 bg-zinc-100 dark:bg-zinc-800; - - > .tip-text-container { - @apply w-full h-32 flex flex-col justify-center items-center; - } - - > .archived-memos-container { - @apply w-full flex flex-col justify-start items-start; - } -} diff --git a/web/src/less/change-resource-filename-dialog.less b/web/src/less/change-resource-filename-dialog.less deleted file mode 100644 index 56c3d1eb..00000000 --- a/web/src/less/change-resource-filename-dialog.less +++ /dev/null @@ -1,13 +0,0 @@ -.change-resource-filename-dialog { - > .dialog-container { - @apply w-72; - - > .dialog-content-container { - @apply flex flex-col justify-start items-start; - - > .btns-container { - @apply flex flex-row justify-end items-center mt-2 w-full; - } - } - } -} diff --git a/web/src/less/image.less b/web/src/less/image.less deleted file mode 100644 index 7e464e9c..00000000 --- a/web/src/less/image.less +++ /dev/null @@ -1,8 +0,0 @@ -.image-container { - @apply hide-scrollbar; - -webkit-tap-highlight-color: transparent; - - > img { - @apply w-full h-auto; - } -} diff --git a/web/src/less/memo-content.less b/web/src/less/memo-content.less index 20cdbb30..ef21e40d 100644 --- a/web/src/less/memo-content.less +++ b/web/src/less/memo-content.less @@ -105,27 +105,4 @@ @apply my-1 dark:border-zinc-600; } } - - > .expand-btn-container { - @apply w-full relative flex flex-row justify-start items-center z-1; - > .btn { - @apply flex flex-row justify-start items-center pl-2 pr-1 py-1 my-2 text-xs rounded-lg border bg-gray-100 dark:bg-zinc-600 border-gray-200 dark:border-zinc-600 shadow hover:opacity-90 cursor-pointer; - - &.expand-btn { - > .icon-img { - @apply rotate-90; - } - } - - &.fold-btn { - > .icon-img { - @apply -rotate-90; - } - } - - > .icon-img { - @apply w-4 h-auto ml-1 transition-all; - } - } - } } diff --git a/web/src/less/memo-filter.less b/web/src/less/memo-filter.less deleted file mode 100644 index e3003c51..00000000 --- a/web/src/less/memo-filter.less +++ /dev/null @@ -1,12 +0,0 @@ -.filter-query-container { - @apply flex flex-row justify-start items-start w-full flex-wrap px-2 pb-2 text-sm font-mono leading-7 dark:text-gray-300; - - > .filter-item-container { - @apply flex flex-row justify-start items-center px-2 mr-2 cursor-pointer dark:text-gray-300 bg-gray-200 dark:bg-zinc-700 rounded whitespace-nowrap truncate hover:line-through; - max-width: 256px; - - > .icon-text { - @apply w-4 h-auto mr-1 text-gray-500 dark:text-gray-400; - } - } -} diff --git a/web/src/less/memo-list.less b/web/src/less/memo-list.less deleted file mode 100644 index d11a1ff0..00000000 --- a/web/src/less/memo-list.less +++ /dev/null @@ -1,15 +0,0 @@ -.memo-list-container { - @apply flex flex-col justify-start items-start w-full max-w-full overflow-y-scroll pb-28 hide-scrollbar; - - > .status-text-container { - @apply flex flex-col justify-start items-center w-full my-6; - - &.fetching-tip { - @apply mt-2 mb-1; - } - - > .status-text { - @apply text-sm text-gray-400 italic; - } - } -} diff --git a/web/src/less/memo-resources.less b/web/src/less/memo-resources.less deleted file mode 100644 index fab38f2b..00000000 --- a/web/src/less/memo-resources.less +++ /dev/null @@ -1,19 +0,0 @@ -.resource-wrapper { - @apply w-full flex flex-col justify-start items-start; - - > .images-wrapper { - @apply w-full grid grid-cols-2 sm:grid-cols-3 gap-2 mt-2; - - > .memo-resource { - @apply shadow rounded overflow-hidden hide-scrollbar; - - > img { - @apply cursor-pointer min-h-full w-auto min-w-full object-cover; - } - - > video { - @apply cursor-pointer w-full h-full object-contain bg-zinc-100 dark:bg-zinc-800; - } - } - } -} diff --git a/web/src/less/resources-selector-dialog.less b/web/src/less/resources-selector-dialog.less deleted file mode 100644 index 034e08ac..00000000 --- a/web/src/less/resources-selector-dialog.less +++ /dev/null @@ -1,51 +0,0 @@ -.resources-selector-dialog { - @apply px-4; - - > .dialog-container { - @apply w-112 max-w-full mb-8; - - > .dialog-content-container { - @apply flex flex-col justify-start items-start w-full; - - > .loading-text-container { - @apply flex flex-col justify-center items-center w-full h-32; - } - - > .resource-table-container { - @apply flex flex-col justify-start items-start w-full; - - > .fields-container { - @apply px-2 py-2 w-full grid grid-cols-7 border-b dark:border-b-gray-500; - - > .field-text { - @apply font-mono text-gray-400; - } - } - - > .tip-text { - @apply w-full text-center text-base my-6 mt-8; - } - - > .resource-container { - @apply px-2 py-2 w-full grid grid-cols-7 dark:bg-zinc-700; - - > .buttons-container { - @apply w-full flex flex-row justify-end items-center; - } - } - - .field-text { - @apply w-full truncate text-base pr-2 last:pr-0; - - &.name-text { - @apply col-span-4; - } - - &.type-text { - @apply col-span-2; - } - } - } - } - } -} diff --git a/web/src/pages/Archived.tsx b/web/src/pages/Archived.tsx index e3f3cb2a..1a2f0ce8 100644 --- a/web/src/pages/Archived.tsx +++ b/web/src/pages/Archived.tsx @@ -7,7 +7,6 @@ import MobileHeader from "@/components/MobileHeader"; import useLoading from "@/hooks/useLoading"; import { useFilterStore, useMemoStore } from "@/store/module"; import { useTranslate } from "@/utils/i18n"; -import "@/less/archived.less"; const Archived = () => { const t = useTranslate(); @@ -38,25 +37,23 @@ const Archived = () => { return (
-
- - {loadingState.isLoading ? ( -
-

{t("memo.fetching-data")}

-
- ) : archivedMemos.length === 0 ? ( -
- -

{t("message.no-data")}

-
- ) : ( -
- {archivedMemos.map((memo) => ( - - ))} -
- )} -
+ + {loadingState.isLoading ? ( +
+

{t("memo.fetching-data")}

+
+ ) : archivedMemos.length === 0 ? ( +
+ +

{t("message.no-data")}

+
+ ) : ( +
+ {archivedMemos.map((memo) => ( + + ))} +
+ )}
); };