refactor: visitor view

api/auth.go

@@ -1,6 +1,6 @@
 package api
 
-type Login struct {
+type Signin struct {
 	Email    string `json:"email"`
 	Password string `json:"password"`
 }

server/auth.go

@@ -13,33 +13,33 @@ import (
 )
 
 func (s *Server) registerAuthRoutes(g *echo.Group) {
-	g.POST("/auth/login", func(c echo.Context) error {
-		login := &api.Login{}
-		if err := json.NewDecoder(c.Request().Body).Decode(login); err != nil {
-			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted login request").SetInternal(err)
+	g.POST("/auth/signin", func(c echo.Context) error {
+		signin := &api.Signin{}
+		if err := json.NewDecoder(c.Request().Body).Decode(signin); err != nil {
+			return echo.NewHTTPError(http.StatusBadRequest, "Malformatted signin request").SetInternal(err)
 		}
 
 		userFind := &api.UserFind{
-			Email: &login.Email,
+			Email: &signin.Email,
 		}
 		user, err := s.Store.FindUser(userFind)
 		if err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by email %s", login.Email)).SetInternal(err)
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("Failed to find user by email %s", signin.Email)).SetInternal(err)
 		}
 		if user == nil {
-			return echo.NewHTTPError(http.StatusUnauthorized, fmt.Sprintf("User not found with email %s", login.Email))
+			return echo.NewHTTPError(http.StatusUnauthorized, fmt.Sprintf("User not found with email %s", signin.Email))
 		} else if user.RowStatus == api.Archived {
-			return echo.NewHTTPError(http.StatusForbidden, fmt.Sprintf("User has been archived with email %s", login.Email))
+			return echo.NewHTTPError(http.StatusForbidden, fmt.Sprintf("User has been archived with email %s", signin.Email))
 		}
 
 		// Compare the stored hashed password, with the hashed version of the password that was received.
-		if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(login.Password)); err != nil {
+		if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(signin.Password)); err != nil {
 			// If the two passwords don't match, return a 401 status.
 			return echo.NewHTTPError(http.StatusUnauthorized, "Incorrect password").SetInternal(err)
 		}
 
 		if err = setUserSession(c, user); err != nil {
-			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to set login session").SetInternal(err)
+			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to set signin session").SetInternal(err)
 		}
 
 		c.Response().Header().Set(echo.HeaderContentType, echo.MIMEApplicationJSONCharsetUTF8)

server/memo.go

@@ -60,31 +60,17 @@ func (s *Server) registerMemoRoutes(g *echo.Group) {
 	})
 
 	g.GET("/memo", func(c echo.Context) error {
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			if c.QueryParam("userID") != "" {
-				var err error
-				userID, err = strconv.Atoi(c.QueryParam("userID"))
-				if err != nil {
-					return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.QueryParam("userID")))
-				}
-			} else {
-				ownerUserType := api.Owner
-				ownerUser, err := s.Store.FindUser(&api.UserFind{
-					Role: &ownerUserType,
-				})
-				if err != nil {
-					return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find owner user").SetInternal(err)
-				}
-				if ownerUser == nil {
-					return echo.NewHTTPError(http.StatusNotFound, "Owner user do not exist")
-				}
-				userID = ownerUser.ID
+		memoFind := &api.MemoFind{}
+
+		if userID, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
+			memoFind.CreatorID = &userID
+		} else {
+			userID, ok := c.Get(getUserIDContextKey()).(int)
+			if !ok {
+				return echo.NewHTTPError(http.StatusBadRequest, "Missing creatorId to find memo")
 			}
-		}
 
-		memoFind := &api.MemoFind{
-			CreatorID: &userID,
+			memoFind.CreatorID = &userID
 		}
 
 		rowStatus := api.RowStatus(c.QueryParam("rowStatus"))

server/server.go

@@ -45,7 +45,7 @@ func NewServer(profile *profile.Profile) *Server {
 		HTML5:   true,
 	}))
 
-	// In dev mode, set the const secret key to make login session persistence.
+	// In dev mode, set the const secret key to make signin session persistence.
 	secret := []byte("usememos")
 	if profile.Mode == "prod" {
 		secret = securecookie.GenerateRandomKey(16)

server/shortcut.go

@@ -59,32 +59,19 @@ func (s *Server) registerShortcutRoutes(g *echo.Group) {
 	})
 
 	g.GET("/shortcut", func(c echo.Context) error {
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			if c.QueryParam("userID") != "" {
-				var err error
-				userID, err = strconv.Atoi(c.QueryParam("userID"))
-				if err != nil {
-					return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.QueryParam("userID")))
-				}
-			} else {
-				ownerUserType := api.Owner
-				ownerUser, err := s.Store.FindUser(&api.UserFind{
-					Role: &ownerUserType,
-				})
-				if err != nil {
-					return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find owner user").SetInternal(err)
-				}
-				if ownerUser == nil {
-					return echo.NewHTTPError(http.StatusNotFound, "Owner user do not exist")
-				}
-				userID = ownerUser.ID
+		shortcutFind := &api.ShortcutFind{}
+
+		if userID, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
+			shortcutFind.CreatorID = &userID
+		} else {
+			userID, ok := c.Get(getUserIDContextKey()).(int)
+			if !ok {
+				return echo.NewHTTPError(http.StatusBadRequest, "Missing creatorId to find shortcut")
 			}
-		}
 
-		shortcutFind := &api.ShortcutFind{
-			CreatorID: &userID,
+			shortcutFind.CreatorID = &userID
 		}
+
 		list, err := s.Store.FindShortcutList(shortcutFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to fetch shortcut list").SetInternal(err)

server/tag.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"regexp"
 	"sort"
@@ -15,37 +14,24 @@ import (
 
 func (s *Server) registerTagRoutes(g *echo.Group) {
 	g.GET("/tag", func(c echo.Context) error {
-		userID, ok := c.Get(getUserIDContextKey()).(int)
-		if !ok {
-			if c.QueryParam("userID") != "" {
-				var err error
-				userID, err = strconv.Atoi(c.QueryParam("userID"))
-				if err != nil {
-					return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("ID is not a number: %s", c.QueryParam("userID")))
-				}
-			} else {
-				ownerUserType := api.Owner
-				ownerUser, err := s.Store.FindUser(&api.UserFind{
-					Role: &ownerUserType,
-				})
-				if err != nil {
-					return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find owner user").SetInternal(err)
-				}
-				if ownerUser == nil {
-					return echo.NewHTTPError(http.StatusNotFound, "Owner user do not exist")
-				}
-				userID = ownerUser.ID
-			}
-		}
-
 		contentSearch := "#"
 		normalRowStatus := api.Normal
 		memoFind := api.MemoFind{
-			CreatorID:     &userID,
 			ContentSearch: &contentSearch,
 			RowStatus:     &normalRowStatus,
 		}
 
+		if userID, err := strconv.Atoi(c.QueryParam("creatorId")); err == nil {
+			memoFind.CreatorID = &userID
+		} else {
+			userID, ok := c.Get(getUserIDContextKey()).(int)
+			if !ok {
+				return echo.NewHTTPError(http.StatusBadRequest, "Missing creatorId to find shortcut")
+			}
+
+			memoFind.CreatorID = &userID
+		}
+
 		memoList, err := s.Store.FindMemoList(&memoFind)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, "Failed to find memo list").SetInternal(err)

store/db/seed/10002__memo.sql

@@ -52,6 +52,24 @@ INSERT INTO
 VALUES
   (
     104,
-    '好好学习，天天向上。🤜🤛', 
+    '#TODO 
+- [x] Take more photos about **🌄 sunset**;
+- [ ] Clean the classroom;
+- [ ] Watch *👦 The Boys*;
+(👆 click to toggle status)
+', 
+    102
+  );
+
+INSERT INTO 
+  memo (
+    `id`,
+    `content`, 
+    `creator_id`
+  )
+VALUES
+  (
+    105,
+    '三人行，必有我师焉！👨‍🏫', 
     102
   );

web/package.json

@@ -11,12 +11,14 @@
     "@reduxjs/toolkit": "^1.8.1",
     "axios": "^0.27.2",
     "lodash-es": "^4.17.21",
+    "qs": "^6.11.0",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
     "react-redux": "^8.0.1"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.5",
+    "@types/qs": "^6.9.7",
     "@types/react": "^18.0.9",
     "@types/react-dom": "^18.0.4",
     "@typescript-eslint/eslint-plugin": "^5.6.0",

web/src/components/Memo.tsx

@@ -112,7 +112,11 @@ const Memo: React.FC<Props> = (props: Props) => {
       } else {
         locationService.setTagQuery(tagName);
       }
-    } else if (targetEl.classList.contains("todo-block") && userService.isNotVisitor()) {
+    } else if (targetEl.classList.contains("todo-block")) {
+      if (userService.isVisitorMode()) {
+        return;
+      }
+
       const status = targetEl.dataset?.value;
       const todoElementList = [...(memoContainerRef.current?.querySelectorAll(`span.todo-block[data-value=${status}]`) ?? [])];
       for (const element of todoElementList) {
@@ -158,40 +162,38 @@ const Memo: React.FC<Props> = (props: Props) => {
             <span className="ml-2">PINNED</span>
           </Only>
         </span>
-        {userService.isNotVisitor() && (
-          <div className="btns-container">
-            <span className="btn more-action-btn">
-              <img className="icon-img" src="/icons/more.svg" />
-            </span>
-            <div className="more-action-btns-wrapper">
-              <div className="more-action-btns-container">
-                <div className="btns-container">
-                  <div className="btn" onClick={handleTogglePinMemoBtnClick}>
-                    <img className="icon-img" src="/icons/pin.svg" alt="" />
-                    <span className="tip-text">{memo.pinned ? "Unpin" : "Pin"}</span>
-                  </div>
-                  <div className="btn" onClick={handleEditMemoClick}>
-                    <img className="icon-img" src="/icons/edit.svg" alt="" />
-                    <span className="tip-text">Edit</span>
-                  </div>
-                  <div className="btn" onClick={handleGenMemoImageBtnClick}>
-                    <img className="icon-img" src="/icons/share.svg" alt="" />
-                    <span className="tip-text">Share</span>
-                  </div>
+        <div className={`btns-container ${userService.isVisitorMode() ? "!hidden" : ""}`}>
+          <span className="btn more-action-btn">
+            <img className="icon-img" src="/icons/more.svg" />
+          </span>
+          <div className="more-action-btns-wrapper">
+            <div className="more-action-btns-container">
+              <div className="btns-container">
+                <div className="btn" onClick={handleTogglePinMemoBtnClick}>
+                  <img className="icon-img" src="/icons/pin.svg" alt="" />
+                  <span className="tip-text">{memo.pinned ? "Unpin" : "Pin"}</span>
+                </div>
+                <div className="btn" onClick={handleEditMemoClick}>
+                  <img className="icon-img" src="/icons/edit.svg" alt="" />
+                  <span className="tip-text">Edit</span>
+                </div>
+                <div className="btn" onClick={handleGenMemoImageBtnClick}>
+                  <img className="icon-img" src="/icons/share.svg" alt="" />
+                  <span className="tip-text">Share</span>
                 </div>
-                <span className="btn" onClick={handleMarkMemoClick}>
-                  Mark
-                </span>
-                <span className="btn" onClick={handleShowMemoStoryDialog}>
-                  View Story
-                </span>
-                <span className="btn archive-btn" onClick={handleArchiveMemoClick}>
-                  Archive
-                </span>
               </div>
+              <span className="btn" onClick={handleMarkMemoClick}>
+                Mark
+              </span>
+              <span className="btn" onClick={handleShowMemoStoryDialog}>
+                View Story
+              </span>
+              <span className="btn archive-btn" onClick={handleArchiveMemoClick}>
+                Archive
+              </span>
             </div>
           </div>
-        )}
+        </div>
       </div>
       <div
         ref={memoContainerRef}

web/src/components/MenuBtnsPopup.tsx

@@ -67,8 +67,8 @@ const MenuBtnsPopup: React.FC<Props> = (props: Props) => {
       <button className="btn action-btn" onClick={handlePingBtnClick}>
         <span className="icon">🎯</span> Ping
       </button>
-      <button className="btn action-btn" onClick={userService.isNotVisitor() ? handleSignOutBtnClick : handleSignInBtnClick}>
-        <span className="icon">👋</span> {userService.isNotVisitor() ? "Sign out" : "Sign in"}
+      <button className="btn action-btn" onClick={!userService.isVisitorMode() ? handleSignOutBtnClick : handleSignInBtnClick}>
+        <span className="icon">👋</span> {!userService.isVisitorMode() ? "Sign out" : "Sign in"}
       </button>
     </div>
   );