- {allStat.map((v, i) => {
- const count = v.count;
- const colorLevel =
- count <= 0
- ? ""
- : count <= 1
- ? "stat-day-l1-bg"
- : count <= 2
- ? "stat-day-l2-bg"
- : count <= 4
- ? "stat-day-l3-bg"
- : "stat-day-l4-bg";
+ <>
+
+
+ {allStat.map((v, i) => {
+ const count = v.count;
+ const colorLevel =
+ count <= 0
+ ? ""
+ : count <= 1
+ ? "stat-day-l1-bg"
+ : count <= 2
+ ? "stat-day-l2-bg"
+ : count <= 4
+ ? "stat-day-l3-bg"
+ : "stat-day-l4-bg";
- return (
-
handleUsageStatItemMouseEnter(e, v)}
- onMouseLeave={handleUsageStatItemMouseLeave}
- onClick={() => handleUsageStatItemClick(v)}
- >
-
+ return (
+
handleUsageStatItemMouseEnter(e, v)}
+ onMouseLeave={handleUsageStatItemMouseLeave}
+ onClick={() => handleUsageStatItemClick(v)}
+ >
+
+
+ );
+ })}
+ {nullCell.map((_, i) => (
+
+
- );
- })}
- {nullCell.map((_, i) => (
-
-
-
- ))}
+ ))}
+
+
+ {t("days.sun")}
+
+ {t("days.tue")}
+
+ {t("days.thu")}
+
+ {t("days.sat")}
+
-
- {t("days.sun")}
-
- {t("days.tue")}
-
- {t("days.thu")}
-
- {t("days.sat")}
-
-
+
+ {memoAmount} memos in{" "}
+ {createdDays} days
+
+ >
);
};
diff --git a/web/src/less/share-memo-dialog.less b/web/src/less/share-memo-dialog.less
index f7c1be5d..7b20dfca 100644
--- a/web/src/less/share-memo-dialog.less
+++ b/web/src/less/share-memo-dialog.less
@@ -56,7 +56,7 @@
}
> .watermark-container {
- @apply flex flex-row justify-between items-center w-full bg-gray-100 dark:bg-zinc-700 py-2 px-6;
+ @apply flex flex-row justify-between items-center w-full bg-gray-100 dark:bg-zinc-700 py-3 px-6;
> .userinfo-container {
@apply w-auto grow truncate flex mr-2 flex-col justify-center items-start;
@@ -70,7 +70,7 @@
}
}
- > .logo-container{
+ > .logo-container {
@apply mr-2;
> .logo-img {
diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsx
index 1b08c8fd..8cf68b4e 100644
--- a/web/src/pages/MemoDetail.tsx
+++ b/web/src/pages/MemoDetail.tsx
@@ -53,7 +53,7 @@ const MemoDetail = () => {
-
+
{customizedProfile.name}
diff --git a/web/src/pages/ResourcesDashboard.tsx b/web/src/pages/ResourcesDashboard.tsx
index 0a00d431..ef75294c 100644
--- a/web/src/pages/ResourcesDashboard.tsx
+++ b/web/src/pages/ResourcesDashboard.tsx
@@ -346,20 +346,12 @@ const ResourcesDashboard = () => {
)}
-
+
- {isComplete ? (
- resources.length === 0 ? (
- t("message.no-resource")
- ) : (
- t("message.resource-ready")
- )
- ) : (
- <>
-
- {t("memo-list.fetch-more")}
-
- >
+ {!isComplete && (
+
+ {t("memo-list.fetch-more")}
+
)}