From 54271c1598bb3d27c4575ef6efda86d34ef72a17 Mon Sep 17 00:00:00 2001 From: Zeng1998 <1129142694@qq.com> Date: Sat, 26 Nov 2022 14:23:29 +0800 Subject: [PATCH] chore: fix some typos (#587) --- api/memo.go | 6 +++--- api/user_setting.go | 4 ++-- server/memo.go | 20 ++++++++++---------- server/resource.go | 4 ++-- store/store.go | 2 +- web/src/components/AboutSiteDialog.tsx | 2 +- web/src/components/CreateShortcutDialog.tsx | 2 +- web/src/components/MemoEditor.tsx | 8 ++++---- web/src/components/MemoResources.tsx | 4 ++-- web/src/components/MemosHeader.tsx | 4 ++-- web/src/components/ResourcesDialog.tsx | 6 +++--- web/src/components/Sidebar.tsx | 6 +++--- web/src/components/Toast.tsx | 14 +++++++------- web/src/components/UsageHeatMap.tsx | 12 ++++++------ web/src/components/common/DatePicker.tsx | 2 +- web/src/components/common/Selector.tsx | 6 +++--- web/src/hooks/useToggle.ts | 2 +- web/src/labs/marked/parser/Blockquote.ts | 2 +- web/src/less/about-site-dialog.less | 2 +- web/src/less/home.less | 2 +- web/src/pages/Home.tsx | 2 +- web/src/services/userService.ts | 4 ++-- web/src/types/filter.d.ts | 4 ++-- 23 files changed, 60 insertions(+), 60 deletions(-) diff --git a/api/memo.go b/api/memo.go index cd76e1f3..29d0ebe6 100644 --- a/api/memo.go +++ b/api/memo.go @@ -8,8 +8,8 @@ const ( Public Visibility = "PUBLIC" // Protected is the PROTECTED visibility. Protected Visibility = "PROTECTED" - // Privite is the PRIVATE visibility. - Privite Visibility = "PRIVATE" + // Private is the PRIVATE visibility. + Private Visibility = "PRIVATE" ) func (e Visibility) String() string { @@ -18,7 +18,7 @@ func (e Visibility) String() string { return "PUBLIC" case Protected: return "PROTECTED" - case Privite: + case Private: return "PRIVATE" } return "PRIVATE" diff --git a/api/user_setting.go b/api/user_setting.go index 072cf00a..eb0ddfca 100644 --- a/api/user_setting.go +++ b/api/user_setting.go @@ -31,7 +31,7 @@ func (key UserSettingKey) String() string { var ( UserSettingLocaleValue = []string{"en", "zh", "vi", "fr"} - UserSettingMemoVisibilityValue = []Visibility{Privite, Protected, Public} + UserSettingMemoVisibilityValue = []Visibility{Private, Protected, Public} UserSettingEditorFontStyleValue = []string{"normal", "mono"} UserSettingMemoDisplayTsOptionKeyValue = []string{"created_ts", "updated_ts"} ) @@ -68,7 +68,7 @@ func (upsert UserSettingUpsert) Validate() error { return fmt.Errorf("invalid user setting locale value") } } else if upsert.Key == UserSettingMemoVisibilityKey { - memoVisibilityValue := Privite + memoVisibilityValue := Private err := json.Unmarshal([]byte(upsert.Value), &memoVisibilityValue) if err != nil { return fmt.Errorf("failed to unmarshal user setting memo visibility value") diff --git a/server/memo.go b/server/memo.go index de9e82f2..a435d654 100644 --- a/server/memo.go +++ b/server/memo.go @@ -45,7 +45,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { } if userMemoVisibilitySetting != nil { - memoVisibility := api.Privite + memoVisibility := api.Private err := json.Unmarshal([]byte(userMemoVisibilitySetting.Value), &memoVisibility) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to unmarshal user setting value").SetInternal(err) @@ -53,7 +53,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { memoCreate.Visibility = memoVisibility } else { // Private is the default memo visibility. - memoCreate.Visibility = api.Privite + memoCreate.Visibility = api.Private } } @@ -176,10 +176,10 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { contentSearch := "#" + tag + " " memoFind.ContentSearch = &contentSearch } - visibilitListStr := c.QueryParam("visibility") - if visibilitListStr != "" { + visibilityListStr := c.QueryParam("visibility") + if visibilityListStr != "" { visibilityList := []api.Visibility{} - for _, visibility := range strings.Split(visibilitListStr, ",") { + for _, visibility := range strings.Split(visibilityListStr, ",") { visibilityList = append(visibilityList, api.Visibility(visibility)) } memoFind.VisibilityList = visibilityList @@ -271,7 +271,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { if *memoFind.CreatorID != currentUserID { memoFind.VisibilityList = []api.Visibility{api.Public, api.Protected} } else { - memoFind.VisibilityList = []api.Visibility{api.Public, api.Protected, api.Privite} + memoFind.VisibilityList = []api.Visibility{api.Public, api.Protected, api.Private} } } @@ -313,10 +313,10 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { contentSearch := "#" + tag + " " memoFind.ContentSearch = &contentSearch } - visibilitListStr := c.QueryParam("visibility") - if visibilitListStr != "" { + visibilityListStr := c.QueryParam("visibility") + if visibilityListStr != "" { visibilityList := []api.Visibility{} - for _, visibility := range strings.Split(visibilitListStr, ",") { + for _, visibility := range strings.Split(visibilityListStr, ",") { visibilityList = append(visibilityList, api.Visibility(visibility)) } memoFind.VisibilityList = visibilityList @@ -372,7 +372,7 @@ func (s *Server) registerMemoRoutes(g *echo.Group) { } userID, ok := c.Get(getUserIDContextKey()).(int) - if memo.Visibility == api.Privite { + if memo.Visibility == api.Private { if !ok || memo.CreatorID != userID { return echo.NewHTTPError(http.StatusForbidden, "this memo is private only") } diff --git a/server/resource.go b/server/resource.go index b7778edc..e2c77995 100644 --- a/server/resource.go +++ b/server/resource.go @@ -93,13 +93,13 @@ func (s *Server) registerResourceRoutes(g *echo.Group) { } for _, resource := range list { - memoResoureceList, err := s.Store.FindMemoResourceList(ctx, &api.MemoResourceFind{ + memoResourceList, err := s.Store.FindMemoResourceList(ctx, &api.MemoResourceFind{ ResourceID: &resource.ID, }) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo resource list").SetInternal(err) } - resource.LinkedMemoAmount = len(memoResoureceList) + resource.LinkedMemoAmount = len(memoResourceList) } c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8) diff --git a/store/store.go b/store/store.go index b3d6d585..04580b3f 100644 --- a/store/store.go +++ b/store/store.go @@ -49,7 +49,7 @@ func (s *Store) Vacuum(ctx context.Context) error { return nil } -// Exec vacuum records in a transcation. +// Exec vacuum records in a transaction. func vacuum(ctx context.Context, tx *sql.Tx) error { if err := vacuumMemo(ctx, tx); err != nil { return err diff --git a/web/src/components/AboutSiteDialog.tsx b/web/src/components/AboutSiteDialog.tsx index ef82775f..f3e48ca1 100644 --- a/web/src/components/AboutSiteDialog.tsx +++ b/web/src/components/AboutSiteDialog.tsx @@ -30,7 +30,7 @@ const AboutSiteDialog: React.FC = ({ destroy }: Props) => {

{t("slogan")}


-
+
<> {t("common.version")}: diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsx index 89528390..dc851253 100644 --- a/web/src/components/CreateShortcutDialog.tsx +++ b/web/src/components/CreateShortcutDialog.tsx @@ -192,7 +192,7 @@ const MemoFilterInputer: React.FC = (props: MemoFilterIn if (["AND", "OR"].includes(value)) { handleFilterChange(index, { ...filter, - relation: value as MemoFilterRalation, + relation: value as MemoFilterRelation, }); } }; diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsx index d9678c26..370ccda6 100644 --- a/web/src/components/MemoEditor.tsx +++ b/web/src/components/MemoEditor.tsx @@ -53,7 +53,7 @@ const MemoEditor = () => { const [allowSave, setAllowSave] = useState(false); const prevGlobalStateRef = useRef(editorState); const editorRef = useRef(null); - const tagSeletorRef = useRef(null); + const tagSelectorRef = useRef(null); const memoVisibilityOptionSelectorItems = VISIBILITY_SELECTOR_ITEMS.map((item) => { return { value: item.value, @@ -337,8 +337,8 @@ const MemoEditor = () => { }); }; - const handleTagSeletorClick = useCallback((event: React.MouseEvent) => { - if (tagSeletorRef.current !== event.target && tagSeletorRef.current?.contains(event.target as Node)) { + const handleTagSelectorClick = useCallback((event: React.MouseEvent) => { + if (tagSelectorRef.current !== event.target && tagSelectorRef.current?.contains(event.target as Node)) { editorRef.current?.insertText(`#${(event.target as HTMLElement).textContent} ` ?? ""); handleEditorFocus(); } @@ -415,7 +415,7 @@ const MemoEditor = () => {
-
+
{tags.length > 0 ? ( tags.map((tag) => { return ( diff --git a/web/src/components/MemoResources.tsx b/web/src/components/MemoResources.tsx index 4ce6d51e..5c340e3f 100644 --- a/web/src/components/MemoResources.tsx +++ b/web/src/components/MemoResources.tsx @@ -24,7 +24,7 @@ const MemoResources: React.FC = (props: Props) => { const availableResourceList = resourceList.filter((resource) => resource.type.startsWith("image") || resource.type.startsWith("video")); const otherResourceList = resourceList.filter((resource) => !availableResourceList.includes(resource)); - const handlPreviewBtnClick = (resource: Resource) => { + const handlePreviewBtnClick = (resource: Resource) => { const resourceUrl = `${window.location.origin}/o/r/${resource.id}/${resource.filename}`; window.open(resourceUrl); }; @@ -54,7 +54,7 @@ const MemoResources: React.FC = (props: Props) => {
{otherResourceList.map((resource) => { return ( -
handlPreviewBtnClick(resource)}> +
handlePreviewBtnClick(resource)}> {resource.filename}
diff --git a/web/src/components/MemosHeader.tsx b/web/src/components/MemosHeader.tsx index 8ab56abc..124e84bb 100644 --- a/web/src/components/MemosHeader.tsx +++ b/web/src/components/MemosHeader.tsx @@ -3,7 +3,7 @@ import { memoService, shortcutService } from "../services"; import { useAppSelector } from "../store"; import Icon from "./Icon"; import SearchBar from "./SearchBar"; -import { toggleSiderbar } from "./Sidebar"; +import { toggleSidebar } from "./Sidebar"; import "../less/memos-header.less"; let prevRequestTimestamp = Date.now(); @@ -38,7 +38,7 @@ const MemosHeader = () => { return (
-
toggleSiderbar(true)}> +
toggleSidebar(true)}>
diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsx index 3f404ef4..efabfe9c 100644 --- a/web/src/components/ResourcesDialog.tsx +++ b/web/src/components/ResourcesDialog.tsx @@ -83,15 +83,15 @@ const ResourcesDialog: React.FC = (props: Props) => { inputEl.click(); }; - const getResouceUrl = useCallback((resource: Resource) => { + const getResourceUrl = useCallback((resource: Resource) => { return `${window.location.origin}/o/r/${resource.id}/${resource.filename}`; }, []); const handlePreviewBtnClick = (resource: Resource) => { - const resourceUrl = getResouceUrl(resource); + const resourceUrl = getResourceUrl(resource); if (resource.type.startsWith("image")) { showPreviewImageDialog( - resources.filter((r) => r.type.startsWith("image")).map((r) => getResouceUrl(r)), + resources.filter((r) => r.type.startsWith("image")).map((r) => getResourceUrl(r)), resources.findIndex((r) => r.id === resource.id) ); } else { diff --git a/web/src/components/Sidebar.tsx b/web/src/components/Sidebar.tsx index 460712c4..7ecfeef4 100644 --- a/web/src/components/Sidebar.tsx +++ b/web/src/components/Sidebar.tsx @@ -17,7 +17,7 @@ const Sidebar = () => { const location = useAppSelector((state) => state.location); useEffect(() => { - toggleSiderbar(false); + toggleSidebar(false); }, [location.query]); const handleSettingBtnClick = () => { @@ -26,7 +26,7 @@ const Sidebar = () => { return ( <> -
toggleSiderbar(false)}>
+
toggleSidebar(false)}>