Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: use conditional rendering instead of OnlyWhen
Steven6c1cc1d2831a
diff --git a/web/src/components/AboutSiteDialog.tsx b/web/src/components/AboutSiteDialog.tsxindex dacca9021..942fb1297 100644--- a/web/src/components/AboutSiteDialog.tsx+++ b/web/src/components/AboutSiteDialog.tsx@@ -1,7 +1,6 @@import { useEffect, useState } from "react";import { useTranslation } from "react-i18next";import * as api from "../helpers/api";-import Only from "./common/OnlyWhen";import Icon from "./Icon";import { generateDialog } from "./Dialog";import GitHubBadge from "./GitHubBadge";@@ -50,7 +49,7 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {<br /><div className="addtion-info-container"><GitHubBadge />- <Only when={profile !== undefined}>+ {profile !== undefined && (<>{t("common.version")}:<span className="pre-text">@@ -58,7 +57,7 @@ const AboutSiteDialog: React.FC<Props> = ({ destroy }: Props) => {</span>π</>- </Only>+ )}</div></div></>diff --git a/web/src/components/Editor/Editor.tsx b/web/src/components/Editor/Editor.tsxindex ed2d94458..aa29e5004 100644--- a/web/src/components/Editor/Editor.tsx+++ b/web/src/components/Editor/Editor.tsx@@ -1,7 +1,6 @@import { forwardRef, ReactNode, useCallback, useEffect, useImperativeHandle, useRef } from "react";import { useTranslation } from "react-i18next";import useRefresh from "../../hooks/useRefresh";-import Only from "../common/OnlyWhen";import "../../less/editor.less";export interface EditorRefActions {@@ -125,15 +124,13 @@ const Editor = forwardRef((props: EditorProps, ref: React.ForwardedRef<EditorRefonKeyDown={handleEditorKeyDown}></textarea><div className="common-tools-wrapper">- <div className="common-tools-container">- <Only when={props.tools !== undefined}>{props.tools}</Only>- </div>+ <div className="common-tools-container">{props.tools !== undefined && props.tools}</div><div className="btns-container">- <Only when={showConfirmBtn}>+ {showConfirmBtn && (<button className="action-btn confirm-btn" disabled={editorRef.current?.value === ""} onClick={handleCommonConfirmBtnClick}>{t("editor.save")} <span className="icon-text">βοΈ</span></button>- </Only>+ )}</div></div></div>diff --git a/web/src/components/Memo.tsx b/web/src/components/Memo.tsxindex 318b62098..ec990dee7 100644--- a/web/src/components/Memo.tsx+++ b/web/src/components/Memo.tsx@@ -8,7 +8,6 @@ import { UNKNOWN_ID } from "../helpers/consts";import { DONE_BLOCK_REG, TODO_BLOCK_REG } from "../helpers/marked";import { editorStateService, locationService, memoService, userService } from "../services";import Icon from "./Icon";-import Only from "./common/OnlyWhen";import toastHelper from "./Toast";import MemoContent from "./MemoContent";import MemoResources from "./MemoResources";@@ -168,9 +167,9 @@ const Memo: React.FC<Props> = (props: Props) => {<div className="memo-top-wrapper"><div className="status-text-container" onClick={handleShowMemoStoryDialog}><span className="time-text">{createdAtStr}</span>- <Only when={memo.visibility !== "PRIVATE" && !isVisitorMode}>+ {memo.visibility !== "PRIVATE" && !isVisitorMode && (<span className={`status-text ${memo.visibility.toLocaleLowerCase()}`}>{memo.visibility}</span>- </Only>+ )}</div><div className={`btns-container ${userService.isVisitorMode() ? "!hidden" : ""}`}><span className="btn more-action-btn">diff --git a/web/src/components/MemoCardDialog.tsx b/web/src/components/MemoCardDialog.tsxindex 8800b8c39..2dde33c73 100644--- a/web/src/components/MemoCardDialog.tsx+++ b/web/src/components/MemoCardDialog.tsx@@ -5,7 +5,6 @@ import { useAppSelector } from "../store";import { UNKNOWN_ID, VISIBILITY_SELECTOR_ITEMS } from "../helpers/consts";import * as utils from "../helpers/utils";import { formatMemoContent, MEMO_LINK_REG, parseHtmlToRawText } from "../helpers/marked";-import Only from "./common/OnlyWhen";import toastHelper from "./Toast";import { generateDialog } from "./Dialog";import Icon from "./Icon";@@ -146,7 +145,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {return (<>- <Only when={!userService.isVisitorMode()}>+ {!userService.isVisitorMode() && (<div className="card-header-container"><div className="visibility-selector-container"><Icon.Eye className="icon-img" />@@ -158,14 +157,14 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {/></div></div>- </Only>+ )}<div className="memo-card-container"><div className="header-container"><p className="time-text" onClick={handleMemoCreatedAtClick}>{utils.getDateTimeString(memo.createdTs)}</p><div className="btns-container">- <Only when={!userService.isVisitorMode()}>+ {!userService.isVisitorMode() && (<><button className="btn edit-btn" onClick={handleGotoMemoLinkBtnClick}><Icon.ExternalLink className="icon-img" />@@ -175,7 +174,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {</button><span className="split-line">/</span></>- </Only>+ )}<button className="btn close-btn" onClick={props.destroy}><Icon.X className="icon-img" /></button>diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsxindex c0d5e1a36..54b4f1d6d 100644--- a/web/src/components/MemoList.tsx+++ b/web/src/components/MemoList.tsx@@ -6,7 +6,6 @@ import { IMAGE_URL_REG, LINK_URL_REG, MEMO_LINK_REG, TAG_REG } from "../helpers/import * as utils from "../helpers/utils";import { checkShouldShowMemoWithFilters } from "../helpers/filter";import toastHelper from "./Toast";-import Only from "./common/OnlyWhen";import Memo from "./Memo";import "../less/memo-list.less";@@ -98,19 +97,18 @@ const MemoList = () => {return (<div className={`memo-list-container ${isFetching ? "" : "completed"}`} ref={wrapperElement}>- <Only when={isFetching}>- <div className="status-text-container fetching-tip">- <p className="status-text">{t("memo-list.fetching-data")}</p>- </div>- </Only>{sortedMemos.map((memo) => (<Memo key={`${memo.id}-${memo.createdTs}-${memo.updatedTs}`} memo={memo} />))}- <Only when={!isFetching}>+ {isFetching ? (+ <div className="status-text-container fetching-tip">+ <p className="status-text">{t("memo-list.fetching-data")}</p>+ </div>+ ) : (<div className="status-text-container"><p className="status-text">{sortedMemos.length === 0 ? t("message.no-memos") : showMemoFilter ? "" : t("message.memos-ready")}</p></div>- </Only>+ )}</div>);};diff --git a/web/src/components/MemoResources.tsx b/web/src/components/MemoResources.tsxindex 4f4f5a7fa..a94027a19 100644--- a/web/src/components/MemoResources.tsx+++ b/web/src/components/MemoResources.tsx@@ -1,5 +1,4 @@import { IMAGE_URL_REG } from "../helpers/marked";-import Only from "./common/OnlyWhen";import Image from "./Image";import "../less/memo-resources.less";@@ -14,13 +13,13 @@ const MemoResources: React.FC<Props> = (props: Props) => {return (<div className="resource-wrapper">- <Only when={imageUrls.length > 0}>+ {imageUrls.length > 0 && (<div className={`images-wrapper ${className ?? ""}`}>{imageUrls.map((imgUrl, idx) => (<Image className="memo-img" key={idx} imgUrl={imgUrl} />))}</div>- </Only>+ )}</div>);};diff --git a/web/src/components/ShareMemoImageDialog.tsx b/web/src/components/ShareMemoImageDialog.tsxindex 8e063d1cb..78520e1a5 100644--- a/web/src/components/ShareMemoImageDialog.tsx+++ b/web/src/components/ShareMemoImageDialog.tsx@@ -5,7 +5,6 @@ import toImage from "../labs/html2image";import { ANIMATION_DURATION } from "../helpers/consts";import * as utils from "../helpers/utils";import { IMAGE_URL_REG } from "../helpers/marked";-import Only from "./common/OnlyWhen";import Icon from "./Icon";import { generateDialog } from "./Dialog";import toastHelper from "./Toast";@@ -88,18 +87,16 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {<p className="tip-text">{shortcutImgUrl ? "Click to save the image π" : "Generating the screenshot..."}</p></div><div className="memo-container" ref={memoElRef}>- <Only when={shortcutImgUrl !== ""}>- <img className="memo-shortcut-img" onClick={handleDownloadBtnClick} src={shortcutImgUrl} />- </Only>+ {shortcutImgUrl !== "" && <img className="memo-shortcut-img" onClick={handleDownloadBtnClick} src={shortcutImgUrl} />}<span className="time-text">{memo.createdAtStr}</span><MemoContent className="memo-content-wrapper" content={memo.content} displayConfig={{ enableExpand: false }} />- <Only when={imageUrls.length > 0}>+ {imageUrls.length > 0 && (<div className="images-container">{imageUrls.map((imgUrl, idx) => (<img decoding="async" key={idx} src={imgUrl} onLoad={handleImageOnLoad} onError={handleImageOnLoad} />))}</div>- </Only>+ )}<div className="watermark-container"><span className="normal-text"><span className="icon-text">βοΈ</span> by <span className="name-text">{userinfo?.name}</span>diff --git a/web/src/components/Sidebar.tsx b/web/src/components/Sidebar.tsxindex 96f1cbdfc..fbf665c0a 100644--- a/web/src/components/Sidebar.tsx+++ b/web/src/components/Sidebar.tsx@@ -2,7 +2,6 @@ import { Link } from "react-router-dom";import { useTranslation } from "react-i18next";import { userService } from "../services";import Icon from "./Icon";-import Only from "./common/OnlyWhen";import showDailyReviewDialog from "./DailyReviewDialog";import showSettingDialog from "./SettingDialog";import UserBanner from "./UserBanner";@@ -31,18 +30,18 @@ const Sidebar = () => {<button className="btn action-btn" onClick={() => showDailyReviewDialog()}><span className="icon">π </span> {t("sidebar.daily-review")}</button>- <Only when={!userService.isVisitorMode()}>- <Link to="/explore" className="btn action-btn">- <span className="icon">π</span> {t("common.explore")}- </Link>- <button className="btn action-btn" onClick={handleSettingBtnClick}>- <span className="icon">βοΈ</span> {t("sidebar.setting")}- </button>- </Only>+ {!userService.isVisitorMode() && (+ <>+ <Link to="/explore" className="btn action-btn">+ <span className="icon">π</span> {t("common.explore")}+ </Link>+ <button className="btn action-btn" onClick={handleSettingBtnClick}>+ <span className="icon">βοΈ</span> {t("sidebar.setting")}+ </button>+ </>+ )}</div>- <Only when={!userService.isVisitorMode()}>- <ShortcutList />- </Only>+ {!userService.isVisitorMode() && <ShortcutList />}<TagList /></aside>);diff --git a/web/src/components/TagList.tsx b/web/src/components/TagList.tsxindex 689a16fef..564456e2c 100644--- a/web/src/components/TagList.tsx+++ b/web/src/components/TagList.tsx@@ -4,7 +4,6 @@ import { useAppSelector } from "../store";import { locationService, memoService, userService } from "../services";import useToggle from "../hooks/useToggle";import Icon from "./Icon";-import Only from "./common/OnlyWhen";import "../less/tag-list.less";interface Tag {@@ -73,9 +72,7 @@ const TagList = () => {{tags.map((t, idx) => (<TagItemContainer key={t.text + "-" + idx} tag={t} tagQuery={query?.tag} />))}- <Only when={!userService.isVisitorMode() && tags.length === 0}>- <p className="tip-text">{t("tag-list.tip-text")}</p>- </Only>+ {!userService.isVisitorMode() && tags.length === 0 && <p className="tip-text">{t("tag-list.tip-text")}</p>}</div></div>);diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsxindex 6afa0878e..7632007c0 100644--- a/web/src/components/UserBanner.tsx+++ b/web/src/components/UserBanner.tsx@@ -7,7 +7,6 @@ import { locationService } from "../services";import { useAppSelector } from "../store";import Icon from "./Icon";import Dropdown from "./common/Dropdown";-import Only from "./common/OnlyWhen";import showResourcesDialog from "./ResourcesDialog";import showArchivedMemoDialog from "./ArchivedMemoDialog";import showAboutSiteDialog from "./AboutSiteDialog";@@ -74,31 +73,33 @@ const UserBanner = () => {actionsClassName="!w-36"actions={<>- <Only when={!userService.isVisitorMode()}>- <button- className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"- onClick={handleResourcesBtnClick}- >- <span className="mr-1">π</span> {t("sidebar.resources")}- </button>- <button- className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"- onClick={handleArchivedBtnClick}- >- <span className="mr-1">π</span> {t("sidebar.archived")}- </button>- </Only>+ {!userService.isVisitorMode() && (+ <>+ <button+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"+ onClick={handleResourcesBtnClick}+ >+ <span className="mr-1">π</span> {t("sidebar.resources")}+ </button>+ <button+ className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"+ onClick={handleArchivedBtnClick}+ >+ <span className="mr-1">π</span> {t("sidebar.archived")}+ </button>+ </>+ )}<button className="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100" onClick={handleAboutBtnClick}><span className="mr-1">π€ </span> {t("common.about")}</button>- <Only when={!userService.isVisitorMode()}>+ {!userService.isVisitorMode() && (<buttonclassName="w-full px-3 text-left leading-10 cursor-pointer rounded hover:bg-gray-100"onClick={handleSignOutBtnClick}><span className="mr-1">π</span> {t("common.sign-out")}</button>- </Only>+ )}</>}/>diff --git a/web/src/components/common/OnlyWhen.tsx b/web/src/components/common/OnlyWhen.tsxdeleted file mode 100644index c366fbeaa..000000000--- a/web/src/components/common/OnlyWhen.tsx+++ /dev/null@@ -1,15 +0,0 @@-import { ReactNode } from "react";--interface OnlyWhenProps {- children: ReactNode;- when: boolean;-}--const OnlyWhen: React.FC<OnlyWhenProps> = (props: OnlyWhenProps) => {- const { children, when } = props;- return when ? <>{children}</> : null;-};--const Only = OnlyWhen;--export default Only;diff --git a/web/src/pages/Auth.tsx b/web/src/pages/Auth.tsxindex 20ad10911..2899861e8 100644--- a/web/src/pages/Auth.tsx+++ b/web/src/pages/Auth.tsx@@ -6,7 +6,6 @@ import { validate, ValidatorConfig } from "../helpers/validator";import useLoading from "../hooks/useLoading";import { globalService, userService } from "../services";import Icon from "../components/Icon";-import Only from "../components/common/OnlyWhen";import toastHelper from "../components/Toast";import "../less/auth.less";@@ -139,17 +138,15 @@ const Auth = () => {</div></div><div className="action-btns-container">- <Only when={!pageLoadingState.isLoading}>+ {!pageLoadingState.isLoading && (<buttonclassName={`btn signin-btn ${actionBtnLoadingState.isLoading ? "requesting" : ""}`}onClick={() => (siteHost ? handleSigninBtnsClick() : handleSignUpAsHostBtnsClick())}>- <Only when={actionBtnLoadingState.isLoading}>- <Icon.Loader className="img-icon" />- </Only>+ {actionBtnLoadingState.isLoading && <Icon.Loader className="img-icon" />}{siteHost ? t("common.sign-in") : t("auth.signup-as-host")}</button>- </Only>+ )}</div><p className={`tip-text ${siteHost || pageLoadingState.isLoading ? "" : "host-tip"}`}>{siteHost || pageLoadingState.isLoading ? t("auth.not-host-tip") : t("auth.host-tip")}diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsxindex b8f9225a0..08f87868c 100644--- a/web/src/pages/Explore.tsx+++ b/web/src/pages/Explore.tsx@@ -6,7 +6,6 @@ import { memoService, userService } from "../services";import { isNullorUndefined } from "../helpers/utils";import { useAppSelector } from "../store";import useLoading from "../hooks/useLoading";-import Only from "../components/common/OnlyWhen";import MemoContent from "../components/MemoContent";import MemoResources from "../components/MemoResources";import "../less/explore.less";@@ -49,20 +48,18 @@ const Explore = () => {<span className="title-text">Explore</span></div><div className="action-button-container">- <Only when={!loadingState.isLoading}>- {user ? (- <Link to="/" className="btn">- <span className="icon">π </span> {t("common.back-to-home")}- </Link>- ) : (- <Link to="/auth" className="btn">- <span className="icon">π</span> {t("common.sign-in")}- </Link>- )}- </Only>+ {!loadingState.isLoading && user ? (+ <Link to="/" className="btn">+ <span className="icon">π </span> {t("common.back-to-home")}+ </Link>+ ) : (+ <Link to="/auth" className="btn">+ <span className="icon">π</span> {t("common.sign-in")}+ </Link>+ )}</div></div>- <Only when={!loadingState.isLoading}>+ {!loadingState.isLoading && (<main className="memos-wrapper">{state.memos.length > 0 ? (state.memos.map((memo) => {@@ -85,7 +82,7 @@ const Explore = () => {<p className="w-full text-center mt-12 text-gray-600">{t("message.no-memos")}</p>)}</main>- </Only>+ )}</div></section>);diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsxindex f43fdaba0..62ba70eb4 100644--- a/web/src/pages/Home.tsx+++ b/web/src/pages/Home.tsx@@ -4,7 +4,6 @@ import { useLocation, useNavigate } from "react-router-dom";import { globalService, userService } from "../services";import { useAppSelector } from "../store";import { isNullorUndefined } from "../helpers/utils";-import Only from "../components/common/OnlyWhen";import toastHelper from "../components/Toast";import Sidebar from "../components/Sidebar";import MemosHeader from "../components/MemosHeader";@@ -51,13 +50,11 @@ function Home() {<main className="memos-wrapper"><div className="memos-editor-wrapper"><MemosHeader />- <Only when={!userService.isVisitorMode()}>- <MemoEditor />- </Only>+ {!userService.isVisitorMode() && <MemoEditor />}<MemoFilter /></div><MemoList />- <Only when={userService.isVisitorMode()}>+ {userService.isVisitorMode() && (<div className="addtion-btn-container">{user ? (<button className="btn" onClick={() => (window.location.href = "/")}>@@ -69,7 +66,7 @@ function Home() {</button>)}</div>- </Only>+ )}</main></div></section>diff --git a/web/src/pages/MemoDetail.tsx b/web/src/pages/MemoDetail.tsxindex 9778fb663..115172b56 100644--- a/web/src/pages/MemoDetail.tsx+++ b/web/src/pages/MemoDetail.tsx@@ -7,7 +7,6 @@ import { UNKNOWN_ID } from "../helpers/consts";import { isNullorUndefined } from "../helpers/utils";import { useAppSelector } from "../store";import useLoading from "../hooks/useLoading";-import Only from "../components/common/OnlyWhen";import MemoContent from "../components/MemoContent";import MemoResources from "../components/MemoResources";import "../less/explore.less";@@ -55,17 +54,19 @@ const MemoDetail = () => {<img className="logo-img" src="/logo-full.webp" alt="" /></div><div className="action-button-container">- <Only when={!loadingState.isLoading}>- {user ? (- <Link to="/" className="btn">- <span className="icon">π </span> {t("common.back-to-home")}- </Link>- ) : (- <Link to="/auth" className="btn">- <span className="icon">π</span> {t("common.sign-in")}- </Link>- )}- </Only>+ {!loadingState.isLoading && (+ <>+ {user ? (+ <Link to="/" className="btn">+ <span className="icon">π </span> {t("common.back-to-home")}+ </Link>+ ) : (+ <Link to="/auth" className="btn">+ <span className="icon">π</span> {t("common.sign-in")}+ </Link>+ )}+ </>+ )}</div></div>{!loadingState.isLoading && (