Merge branch 'main' into release/0.5.0

.golangci.yaml

@@ -29,7 +29,7 @@ issues:
 linters-settings:
   goimports:
     # Put imports beginning with prefix after 3rd-party packages.
-    local-prefixes: github.com/yourselfhosted/slash
+    local-prefixes: github.com/boojack/slash
   revive:
     # Default to run all linters so that new rules in the future could automatically be added to the static check.
     enable-all-rules: true
@@ -65,10 +65,6 @@ linters-settings:
         disabled: true
       - name: early-return
         disabled: true
-      - name: use-any
-        disabled: true
-      - name: var-naming
-        disabled: true
       - name: exported
         arguments:
           - "disableStutteringCheck"

Dockerfile

@@ -15,6 +15,7 @@ FROM golang:1.21-alpine AS backend
 WORKDIR /backend-build
 
 COPY . .
+COPY --from=frontend /frontend-build/frontend/web/dist ./server/dist
 
 RUN CGO_ENABLED=0 go build -o slash ./bin/slash/main.go
 
@@ -25,7 +26,6 @@ WORKDIR /usr/local/slash
 RUN apk add --no-cache tzdata
 ENV TZ="UTC"
 
-COPY --from=frontend /frontend-build/frontend/web/dist /usr/local/slash/dist
 COPY --from=backend /backend-build/slash /usr/local/slash/
 
 EXPOSE 5231

README.md

@@ -1,21 +1,19 @@
 # Slash
 
-<img align="right" src="./docs/assets/logo.png" height="64px" alt="logo">
+<img align="right" src="./resources/logo.png" height="64px" alt="logo">
 
 **Slash** is an open source, self-hosted bookmarks and link sharing platform. It allows you to organize your links with tags, and share them with custom shortened URLs. Slash also supports team sharing of link libraries for easy collaboration.
 
 🧩 Browser extension(v1.0.0) now available! - [Chrome Web Store](https://chrome.google.com/webstore/detail/slash/ebaiehmkammnacjadffpicipfckgeobg), [Firefox Add-on](https://addons.mozilla.org/firefox/addon/your-slash/)
 
-Getting started with Slash's [Shortcuts](https://github.com/yourselfhosted/slash/blob/main/docs/getting-started/shortcuts.md) and [Collections](https://github.com/yourselfhosted/slash/blob/main/docs/getting-started/collections.md).
-
 <a href="https://demo.slash.yourselfhosted.com">Live Demo</a> • <a href="https://discord.gg/QZqUuUAhDV">Discord</a>
 
 <p>
   <a href="https://hub.docker.com/r/yourselfhosted/slash"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/yourselfhosted/slash.svg"/></a>
-  <a href="https://github.com/yourselfhosted/slash/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/yourselfhosted/slash?logo=github"/></a>
+  <a href="https://github.com/boojack/slash/stargazers"><img alt="GitHub stars" src="https://img.shields.io/github/stars/boojack/slash?logo=github"/></a>
 </p>
 
-![demo](./docs/assets/demo.png)
+![demo](./resources/demo.png)
 
 ## Background
 
@@ -25,11 +23,10 @@ That's why we developed Slash, a solution that transforms these links into easil
 
 ## Features
 
-- Create customizable `s/` short links for any URL.
+- Create customizable `/s/` short links for any URL.
 - Share short links public or only with your teammates.
 - View analytics on link traffic and sources.
 - Easy access to your shortcuts with browser extension.
-- Share your shortcuts with Collection to anyone, on any browser.
 - Open source self-hosted solution.
 
 ## Deploy with Docker in seconds
@@ -38,15 +35,15 @@ That's why we developed Slash, a solution that transforms these links into easil
 docker run -d --name slash -p 5231:5231 -v ~/.slash/:/var/opt/slash yourselfhosted/slash:latest
 ```
 
-Learn more in [Self-hosting Slash with Docker](https://github.com/yourselfhosted/slash/blob/main/docs/install.md).
+Learn more in [Self-hosting Slash with Docker](https://github.com/boojack/slash/blob/main/docs/install.md).
 
 ## Browser Extension
 
 Slash provides a browser extension to help you use your shortcuts in the search bar to go to the corresponding URL.
 
-![browser-extension-example](./docs/assets/browser-extension-example.png)
+![browser-extension-example](./resources/browser-extension-example.png)
 
-Learn more in [The Browser Extension of Slash](https://github.com/yourselfhosted/slash/blob/main/docs/install-browser-extension.md).
+Learn more in [The Browser Extension of Slash](https://github.com/boojack/slash/blob/main/docs/install-browser-extension.md).
 
 ### Chromium based browsers
 

api/v1/README.md

@@ -1 +0,0 @@
-> The v1 API has been deprecated. Please use the v2 API instead.

api/v1/analytics.go

@@ -4,14 +4,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strconv"
 
 	"github.com/labstack/echo/v4"
 	"github.com/mssola/useragent"
 	"golang.org/x/exp/slices"
 
-	"github.com/yourselfhosted/slash/internal/util"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/store"
+	"github.com/boojack/slash/server/metric"
+	"github.com/boojack/slash/store"
 )
 
 type ReferenceInfo struct {
@@ -38,13 +38,13 @@ type AnalysisData struct {
 func (s *APIV1Service) registerAnalyticsRoutes(g *echo.Group) {
 	g.GET("/shortcut/:shortcutId/analytics", func(c echo.Context) error {
 		ctx := c.Request().Context()
-		shortcutID, err := util.ConvertStringToInt32(c.Param("shortcutId"))
+		shortcutID, err := strconv.Atoi(c.Param("shortcutId"))
 		if err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("shortcut id is not a number: %s", c.Param("shortcutId"))).SetInternal(err)
 		}
 		activities, err := s.Store.ListActivities(ctx, &store.FindActivity{
 			Type:  store.ActivityShortcutView,
-			PayloadShortcutID: &shortcutID,
+			Where: []string{fmt.Sprintf("json_extract(payload, '$.shortcutId') = %d", shortcutID)},
 		})
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("failed to get activities, err: %s", err)).SetInternal(err)

api/v1/auth.go

@@ -11,11 +11,11 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/yourselfhosted/slash/api/auth"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/server/service/license"
-	"github.com/yourselfhosted/slash/store"
+	"github.com/boojack/slash/api/auth"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/server/metric"
+	"github.com/boojack/slash/server/service/license"
+	"github.com/boojack/slash/store"
 )
 
 type SignInRequest struct {

api/v1/jwt.go

@@ -9,10 +9,10 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 
-	"github.com/yourselfhosted/slash/api/auth"
-	"github.com/yourselfhosted/slash/internal/util"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/store"
+	"github.com/boojack/slash/api/auth"
+	"github.com/boojack/slash/internal/util"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/store"
 )
 
 const (

api/v1/redirector.go

@@ -0,0 +1,118 @@
+package v1
+
+import (
+	"encoding/json"
+	"fmt"
+	"html"
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/labstack/echo/v4"
+	"github.com/pkg/errors"
+
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/server/metric"
+	"github.com/boojack/slash/store"
+)
+
+func (s *APIV1Service) registerRedirectorRoutes(g *echo.Group) {
+	g.GET("/*", func(c echo.Context) error {
+		ctx := c.Request().Context()
+		if len(c.ParamValues()) == 0 {
+			return echo.NewHTTPError(http.StatusBadRequest, "invalid shortcut name")
+		}
+
+		shortcutName := c.ParamValues()[0]
+		shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{
+			Name: &shortcutName,
+		})
+		if err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("failed to get shortcut, err: %s", err)).SetInternal(err)
+		}
+		if shortcut == nil {
+			return c.Redirect(http.StatusSeeOther, fmt.Sprintf("/404?shortcut=%s", shortcutName))
+		}
+		if shortcut.Visibility != storepb.Visibility_PUBLIC {
+			userID, ok := c.Get(userIDContextKey).(int32)
+			if !ok {
+				return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+			}
+			if shortcut.Visibility == storepb.Visibility_PRIVATE && shortcut.CreatorId != userID {
+				return echo.NewHTTPError(http.StatusUnauthorized, "Unauthorized")
+			}
+		}
+
+		if err := s.createShortcutViewActivity(c, shortcut); err != nil {
+			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("failed to create activity, err: %s", err)).SetInternal(err)
+		}
+
+		metric.Enqueue("shortcut redirect")
+		return redirectToShortcut(c, shortcut)
+	})
+}
+
+func redirectToShortcut(c echo.Context, shortcut *storepb.Shortcut) error {
+	isValidURL := isValidURLString(shortcut.Link)
+	if shortcut.OgMetadata == nil || (shortcut.OgMetadata.Title == "" && shortcut.OgMetadata.Description == "" && shortcut.OgMetadata.Image == "") {
+		if isValidURL {
+			return c.Redirect(http.StatusSeeOther, shortcut.Link)
+		}
+		return c.String(http.StatusOK, shortcut.Link)
+	}
+
+	htmlTemplate := `<html><head>%s</head><body>%s</body></html>`
+	metadataList := []string{
+		fmt.Sprintf(`<title>%s</title>`, shortcut.OgMetadata.Title),
+		fmt.Sprintf(`<meta name="description" content="%s" />`, shortcut.OgMetadata.Description),
+		fmt.Sprintf(`<meta property="og:title" content="%s" />`, shortcut.OgMetadata.Title),
+		fmt.Sprintf(`<meta property="og:description" content="%s" />`, shortcut.OgMetadata.Description),
+		fmt.Sprintf(`<meta property="og:image" content="%s" />`, shortcut.OgMetadata.Image),
+		`<meta property="og:type" content="website" />`,
+		// Twitter related metadata.
+		fmt.Sprintf(`<meta name="twitter:title" content="%s" />`, shortcut.OgMetadata.Title),
+		fmt.Sprintf(`<meta name="twitter:description" content="%s" />`, shortcut.OgMetadata.Description),
+		fmt.Sprintf(`<meta name="twitter:image" content="%s" />`, shortcut.OgMetadata.Image),
+		`<meta name="twitter:card" content="summary_large_image" />`,
+	}
+	if isValidURL {
+		metadataList = append(metadataList, fmt.Sprintf(`<meta property="og:url" content="%s" />`, shortcut.Link))
+	}
+	body := ""
+	if isValidURL {
+		body = fmt.Sprintf(`<script>window.location.href = "%s";</script>`, shortcut.Link)
+	} else {
+		body = html.EscapeString(shortcut.Link)
+	}
+	htmlString := fmt.Sprintf(htmlTemplate, strings.Join(metadataList, ""), body)
+	return c.HTML(http.StatusOK, htmlString)
+}
+
+func (s *APIV1Service) createShortcutViewActivity(c echo.Context, shortcut *storepb.Shortcut) error {
+	payload := &ActivityShorcutViewPayload{
+		ShortcutID: shortcut.Id,
+		IP:         c.RealIP(),
+		Referer:    c.Request().Referer(),
+		UserAgent:  c.Request().UserAgent(),
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "Failed to marshal activity payload")
+	}
+	activity := &store.Activity{
+		CreatorID: BotID,
+		Type:      store.ActivityShortcutView,
+		Level:     store.ActivityInfo,
+		Payload:   string(payloadStr),
+	}
+	_, err = s.Store.CreateActivity(c.Request().Context(), activity)
+	if err != nil {
+		return errors.Wrap(err, "Failed to create activity")
+	}
+	return nil
+}
+
+func isValidURLString(s string) bool {
+	_, err := url.ParseRequestURI(s)
+	return err == nil
+}

api/v1/redirector_test.go

@@ -0,0 +1,33 @@
+package v1
+
+import "testing"
+
+func TestIsValidURLString(t *testing.T) {
+	tests := []struct {
+		link     string
+		expected bool
+	}{
+		{
+			link:     "https://google.com",
+			expected: true,
+		},
+		{
+			link:     "http://google.com",
+			expected: true,
+		},
+		{
+			link:     "google.com",
+			expected: false,
+		},
+		{
+			link:     "mailto:email@example.com",
+			expected: true,
+		},
+	}
+
+	for _, test := range tests {
+		if isValidURLString(test.link) != test.expected {
+			t.Errorf("isValidURLString(%s) = %v, expected %v", test.link, !test.expected, test.expected)
+		}
+	}
+}

api/v1/shortcut.go

@@ -10,10 +10,10 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 
-	"github.com/yourselfhosted/slash/internal/util"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/store"
+	"github.com/boojack/slash/internal/util"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/server/metric"
+	"github.com/boojack/slash/store"
 )
 
 // Visibility is the type of a shortcut visibility.
@@ -102,9 +102,6 @@ func (s *APIV1Service) registerShortcutRoutes(g *echo.Group) {
 			Tags:        create.Tags,
 			OgMetadata:  &storepb.OpenGraphMetadata{},
 		}
-		if create.Name == "" {
-			return echo.NewHTTPError(http.StatusBadRequest, "name is required")
-		}
 		if create.OpenGraphMetadata != nil {
 			shortcut.OgMetadata = &storepb.OpenGraphMetadata{
 				Title:       create.OpenGraphMetadata.Title,
@@ -182,7 +179,7 @@ func (s *APIV1Service) registerShortcutRoutes(g *echo.Group) {
 			shortcutUpdate.Tag = &tag
 		}
 		if patch.OpenGraphMetadata != nil {
-			shortcutUpdate.OpenGraphMetadata = &storepb.OpenGraphMetadata{
+			shortcutUpdate.OpenGraphMetadata = &store.OpenGraphMetadata{
 				Title:       patch.OpenGraphMetadata.Title,
 				Description: patch.OpenGraphMetadata.Description,
 				Image:       patch.OpenGraphMetadata.Image,
@@ -320,7 +317,7 @@ func (s *APIV1Service) composeShortcut(ctx context.Context, shortcut *Shortcut)
 	activityList, err := s.Store.ListActivities(ctx, &store.FindActivity{
 		Type:  store.ActivityShortcutView,
 		Level: store.ActivityInfo,
-		PayloadShortcutID: &shortcut.ID,
+		Where: []string{fmt.Sprintf("json_extract(payload, '$.shortcutId') = %d", shortcut.ID)},
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to list activities")

api/v1/user.go

@@ -10,10 +10,10 @@ import (
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/yourselfhosted/slash/internal/util"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/server/service/license"
-	"github.com/yourselfhosted/slash/store"
+	"github.com/boojack/slash/internal/util"
+	"github.com/boojack/slash/server/metric"
+	"github.com/boojack/slash/server/service/license"
+	"github.com/boojack/slash/store"
 )
 
 const (

api/v1/v1.go

@@ -3,9 +3,9 @@ package v1
 import (
 	"github.com/labstack/echo/v4"
 
-	"github.com/yourselfhosted/slash/server/profile"
-	"github.com/yourselfhosted/slash/server/service/license"
-	"github.com/yourselfhosted/slash/store"
+	"github.com/boojack/slash/server/profile"
+	"github.com/boojack/slash/server/service/license"
+	"github.com/boojack/slash/store"
 )
 
 type APIV1Service struct {
@@ -32,4 +32,10 @@ func (s *APIV1Service) Start(apiGroup *echo.Group, secret string) {
 	s.registerUserRoutes(apiV1Group)
 	s.registerShortcutRoutes(apiV1Group)
 	s.registerAnalyticsRoutes(apiV1Group)
+
+	redirectorGroup := apiGroup.Group("/s")
+	redirectorGroup.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
+		return JWTMiddleware(s, next, secret)
+	})
+	s.registerRedirectorRoutes(redirectorGroup)
 }

api/v1/workspace.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/labstack/echo/v4"
 
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/server/profile"
-	"github.com/yourselfhosted/slash/store"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/server/profile"
+	"github.com/boojack/slash/store"
 )
 
 type WorkspaceProfile struct {

api/v2/acl.go

@@ -12,10 +12,10 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
-	"github.com/yourselfhosted/slash/api/auth"
-	"github.com/yourselfhosted/slash/internal/util"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/store"
+	"github.com/boojack/slash/api/auth"
+	"github.com/boojack/slash/internal/util"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/store"
 )
 
 // ContextKey is the key type of context value.

api/v2/acl_config.go

@@ -5,11 +5,7 @@ import "strings"
 var allowedMethodsWhenUnauthorized = map[string]bool{
 	"/slash.api.v2.WorkspaceService/GetWorkspaceProfile":  true,
 	"/slash.api.v2.WorkspaceService/GetWorkspaceSetting":  true,
-	"/slash.api.v2.AuthService/SignIn":                    true,
-	"/slash.api.v2.AuthService/SignUp":                    true,
-	"/slash.api.v2.AuthService/SignOut":                   true,
-	"/memos.api.v2.AuthService/GetAuthStatus":             true,
-	"/slash.api.v2.ShortcutService/GetShortcutByName":     true,
+	"/slash.api.v2.ShortcutService/GetShortcut":           true,
 	"/slash.api.v2.CollectionService/GetCollectionByName": true,
 }
 
@@ -25,7 +21,6 @@ var allowedMethodsOnlyForAdmin = map[string]bool{
 	"/slash.api.v2.UserService/CreateUser":                  true,
 	"/slash.api.v2.UserService/DeleteUser":                  true,
 	"/slash.api.v2.WorkspaceService/UpdateWorkspaceSetting": true,
-	"/slash.api.v2.SubscriptionService/UpdateSubscription":  true,
 }
 
 // isOnlyForAdminAllowedMethod returns true if the method is allowed to be called only by admin.

api/v2/auth_service.go

@@ -1,149 +0,0 @@
-package v2
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"golang.org/x/crypto/bcrypt"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-
-	"github.com/yourselfhosted/slash/api/auth"
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/server/service/license"
-	"github.com/yourselfhosted/slash/store"
-)
-
-func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv2pb.GetAuthStatusRequest) (*apiv2pb.GetAuthStatusResponse, error) {
-	user, err := getCurrentUser(ctx, s.Store)
-	if err != nil {
-		return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
-	}
-	if user == nil {
-		return nil, status.Errorf(codes.Unauthenticated, "user not found")
-	}
-	return &apiv2pb.GetAuthStatusResponse{
-		User: convertUserFromStore(user),
-	}, nil
-}
-
-func (s *APIV2Service) SignIn(ctx context.Context, request *apiv2pb.SignInRequest) (*apiv2pb.SignInResponse, error) {
-	user, err := s.Store.GetUser(ctx, &store.FindUser{
-		Email: &request.Email,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to find user by email %s", request.Email))
-	}
-	if user == nil {
-		return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("user not found with email %s", request.Email))
-	} else if user.RowStatus == store.Archived {
-		return nil, status.Errorf(codes.PermissionDenied, fmt.Sprintf("user has been archived with email %s", request.Email))
-	}
-
-	// Compare the stored hashed password, with the hashed version of the password that was received.
-	if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(request.Password)); err != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "unmatched email and password")
-	}
-
-	accessToken, err := auth.GenerateAccessToken(user.Email, user.ID, time.Now().Add(auth.AccessTokenDuration), []byte(s.Secret))
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to generate tokens, err: %s", err))
-	}
-	if err := s.UpsertAccessTokenToStore(ctx, user, accessToken, "user login"); err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to upsert access token to store, err: %s", err))
-	}
-
-	if err := grpc.SetHeader(ctx, metadata.New(map[string]string{
-		"Set-Cookie": fmt.Sprintf("%s=%s; Path=/; Expires=%s; HttpOnly; SameSite=Strict", auth.AccessTokenCookieName, accessToken, time.Now().Add(auth.AccessTokenDuration).Format(time.RFC1123)),
-	})); err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to set grpc header, error: %v", err)
-	}
-
-	metric.Enqueue("user sign in")
-	return &apiv2pb.SignInResponse{
-		User: convertUserFromStore(user),
-	}, nil
-}
-
-func (s *APIV2Service) SignUp(ctx context.Context, request *apiv2pb.SignUpRequest) (*apiv2pb.SignUpResponse, error) {
-	enableSignUpSetting, err := s.Store.GetWorkspaceSetting(ctx, &store.FindWorkspaceSetting{
-		Key: storepb.WorkspaceSettingKey_WORKSAPCE_SETTING_ENABLE_SIGNUP,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to get workspace setting, err: %s", err))
-	}
-	if enableSignUpSetting != nil && !enableSignUpSetting.GetEnableSignup() {
-		return nil, status.Errorf(codes.PermissionDenied, "sign up is not allowed")
-	}
-
-	if !s.LicenseService.IsFeatureEnabled(license.FeatureTypeUnlimitedAccounts) {
-		userList, err := s.Store.ListUsers(ctx, &store.FindUser{})
-		if err != nil {
-			return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to list users, err: %s", err))
-		}
-		if len(userList) >= 5 {
-			return nil, status.Errorf(codes.InvalidArgument, "maximum number of users reached")
-		}
-	}
-
-	passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.Password), bcrypt.DefaultCost)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to generate password hash, err: %s", err))
-	}
-
-	create := &store.User{
-		Email:        request.Email,
-		Nickname:     request.Nickname,
-		PasswordHash: string(passwordHash),
-	}
-	existingUsers, err := s.Store.ListUsers(ctx, &store.FindUser{})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to list users, err: %s", err))
-	}
-	// The first user to sign up is an admin by default.
-	if len(existingUsers) == 0 {
-		create.Role = store.RoleAdmin
-	} else {
-		create.Role = store.RoleUser
-	}
-
-	user, err := s.Store.CreateUser(ctx, create)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to create user, err: %s", err))
-	}
-
-	accessToken, err := auth.GenerateAccessToken(user.Email, user.ID, time.Now().Add(auth.AccessTokenDuration), []byte(s.Secret))
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to generate tokens, err: %s", err))
-	}
-	if err := s.UpsertAccessTokenToStore(ctx, user, accessToken, "user login"); err != nil {
-		return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to upsert access token to store, err: %s", err))
-	}
-
-	if err := grpc.SetHeader(ctx, metadata.New(map[string]string{
-		"Set-Cookie": fmt.Sprintf("%s=%s; Path=/; Expires=%s; HttpOnly; SameSite=Strict", auth.AccessTokenCookieName, accessToken, time.Now().Add(auth.AccessTokenDuration).Format(time.RFC1123)),
-	})); err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to set grpc header, error: %v", err)
-	}
-
-	metric.Enqueue("user sign up")
-	return &apiv2pb.SignUpResponse{
-		User: convertUserFromStore(user),
-	}, nil
-}
-
-func (*APIV2Service) SignOut(ctx context.Context, _ *apiv2pb.SignOutRequest) (*apiv2pb.SignOutResponse, error) {
-	// Set the cookie header to expire access token.
-	if err := grpc.SetHeader(ctx, metadata.New(map[string]string{
-		"Set-Cookie": fmt.Sprintf("%s=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly; SameSite=Strict", auth.AccessTokenCookieName),
-	})); err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to set grpc header, error: %v", err)
-	}
-
-	return &apiv2pb.SignOutResponse{}, nil
-}

api/v2/collection_service.go

@@ -8,36 +8,21 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/server/service/license"
-	"github.com/yourselfhosted/slash/store"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/server/metric"
+	"github.com/boojack/slash/store"
 )
 
 func (s *APIV2Service) ListCollections(ctx context.Context, _ *apiv2pb.ListCollectionsRequest) (*apiv2pb.ListCollectionsResponse, error) {
 	userID := ctx.Value(userIDContextKey).(int32)
-	collections, err := s.Store.ListCollections(ctx, &store.FindCollection{
-		CreatorID: &userID,
-		VisibilityList: []store.Visibility{
-			store.VisibilityPrivate,
-		},
-	})
+	find := &store.FindCollection{}
+	find.CreatorID = &userID
+	collections, err := s.Store.ListCollections(ctx, find)
 	if err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to get collection list, err: %v", err)
 	}
 
-	sharedCollections, err := s.Store.ListCollections(ctx, &store.FindCollection{
-		VisibilityList: []store.Visibility{
-			store.VisibilityWorkspace,
-			store.VisibilityPublic,
-		},
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get collection list, err: %v", err)
-	}
-	collections = append(collections, sharedCollections...)
-
 	convertedCollections := []*apiv2pb.Collection{}
 	for _, collection := range collections {
 		convertedCollections = append(convertedCollections, convertCollectionFromStore(collection))
@@ -99,22 +84,6 @@ func (s *APIV2Service) GetCollectionByName(ctx context.Context, request *apiv2pb
 }
 
 func (s *APIV2Service) CreateCollection(ctx context.Context, request *apiv2pb.CreateCollectionRequest) (*apiv2pb.CreateCollectionResponse, error) {
-	if request.Collection.Name == "" || request.Collection.Title == "" {
-		return nil, status.Errorf(codes.InvalidArgument, "name and title are required")
-	}
-
-	if !s.LicenseService.IsFeatureEnabled(license.FeatureTypeUnlimitedAccounts) {
-		collections, err := s.Store.ListCollections(ctx, &store.FindCollection{
-			VisibilityList: []store.Visibility{store.VisibilityWorkspace, store.VisibilityPublic},
-		})
-		if err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to get collection list, err: %v", err)
-		}
-		if len(collections) >= 5 {
-			return nil, status.Errorf(codes.PermissionDenied, "Maximum number of collections reached")
-		}
-	}
-
 	userID := ctx.Value(userIDContextKey).(int32)
 	collection := &storepb.Collection{
 		CreatorId:   userID,

api/v2/common.go

@@ -1,10 +1,8 @@
 package v2
 
 import (
-	"context"
-
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	"github.com/yourselfhosted/slash/store"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
+	"github.com/boojack/slash/store"
 )
 
 func convertRowStatusFromStore(rowStatus store.RowStatus) apiv2pb.RowStatus {
@@ -17,17 +15,3 @@ func convertRowStatusFromStore(rowStatus store.RowStatus) apiv2pb.RowStatus {
 		return apiv2pb.RowStatus_ROW_STATUS_UNSPECIFIED
 	}
 }
-
-func getCurrentUser(ctx context.Context, s *store.Store) (*store.User, error) {
-	userID, ok := ctx.Value(userIDContextKey).(int32)
-	if !ok {
-		return nil, nil
-	}
-	user, err := s.GetUser(ctx, &store.FindUser{
-		ID: &userID,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return user, nil
-}

api/v2/memo_service.go

@@ -1,187 +0,0 @@
-package v2
-
-import (
-	"context"
-	"strings"
-	"time"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/types/known/timestamppb"
-
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/store"
-)
-
-func (s *APIV2Service) ListMemos(ctx context.Context, _ *apiv2pb.ListMemosRequest) (*apiv2pb.ListMemosResponse, error) {
-	find := &store.FindMemo{}
-	memos, err := s.Store.ListMemos(ctx, find)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to fetch memo list, err: %v", err)
-	}
-
-	composedMemos := []*apiv2pb.Memo{}
-	for _, memo := range memos {
-		composedMemo, err := s.convertMemoFromStorepb(ctx, memo)
-		if err != nil {
-			return nil, status.Errorf(codes.Internal, "failed to convert memo, err: %v", err)
-		}
-		composedMemos = append(composedMemos, composedMemo)
-	}
-
-	response := &apiv2pb.ListMemosResponse{
-		Memos: composedMemos,
-	}
-	return response, nil
-}
-
-func (s *APIV2Service) GetMemo(ctx context.Context, request *apiv2pb.GetMemoRequest) (*apiv2pb.GetMemoResponse, error) {
-	memo, err := s.Store.GetMemo(ctx, &store.FindMemo{
-		ID: &request.Id,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get memo by ID: %v", err)
-	}
-	if memo == nil {
-		return nil, status.Errorf(codes.NotFound, "memo not found")
-	}
-
-	composedMemo, err := s.convertMemoFromStorepb(ctx, memo)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to convert memo, err: %v", err)
-	}
-	response := &apiv2pb.GetMemoResponse{
-		Memo: composedMemo,
-	}
-	return response, nil
-}
-
-func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMemoRequest) (*apiv2pb.CreateMemoResponse, error) {
-	userID := ctx.Value(userIDContextKey).(int32)
-	memo := &storepb.Memo{
-		CreatorId:  userID,
-		Name:       request.Memo.Name,
-		Title:      request.Memo.Title,
-		Content:    request.Memo.Content,
-		Tags:       request.Memo.Tags,
-		Visibility: storepb.Visibility(request.Memo.Visibility),
-	}
-	memo, err := s.Store.CreateMemo(ctx, memo)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to create memo, err: %v", err)
-	}
-
-	composedMemo, err := s.convertMemoFromStorepb(ctx, memo)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to convert memo, err: %v", err)
-	}
-	response := &apiv2pb.CreateMemoResponse{
-		Memo: composedMemo,
-	}
-	return response, nil
-}
-
-func (s *APIV2Service) UpdateMemo(ctx context.Context, request *apiv2pb.UpdateMemoRequest) (*apiv2pb.UpdateMemoResponse, error) {
-	if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
-		return nil, status.Errorf(codes.InvalidArgument, "updateMask is required")
-	}
-
-	userID := ctx.Value(userIDContextKey).(int32)
-	currentUser, err := s.Store.GetUser(ctx, &store.FindUser{
-		ID: &userID,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get current user, err: %v", err)
-	}
-	memo, err := s.Store.GetMemo(ctx, &store.FindMemo{
-		ID: &request.Memo.Id,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get memo by ID: %v", err)
-	}
-	if memo == nil {
-		return nil, status.Errorf(codes.NotFound, "memo not found")
-	}
-	if memo.CreatorId != userID && currentUser.Role != store.RoleAdmin {
-		return nil, status.Errorf(codes.PermissionDenied, "Permission denied")
-	}
-
-	update := &store.UpdateMemo{
-		ID: memo.Id,
-	}
-	for _, path := range request.UpdateMask.Paths {
-		switch path {
-		case "name":
-			update.Name = &request.Memo.Name
-		case "title":
-			update.Title = &request.Memo.Title
-		case "content":
-			update.Content = &request.Memo.Content
-		case "tags":
-			tag := strings.Join(request.Memo.Tags, " ")
-			update.Tag = &tag
-		case "visibility":
-			visibility := store.Visibility(request.Memo.Visibility.String())
-			update.Visibility = &visibility
-		}
-	}
-	memo, err = s.Store.UpdateMemo(ctx, update)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to update memo, err: %v", err)
-	}
-
-	composedMemo, err := s.convertMemoFromStorepb(ctx, memo)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to convert memo, err: %v", err)
-	}
-	response := &apiv2pb.UpdateMemoResponse{
-		Memo: composedMemo,
-	}
-	return response, nil
-}
-
-func (s *APIV2Service) DeleteMemo(ctx context.Context, request *apiv2pb.DeleteMemoRequest) (*apiv2pb.DeleteMemoResponse, error) {
-	userID := ctx.Value(userIDContextKey).(int32)
-	currentUser, err := s.Store.GetUser(ctx, &store.FindUser{
-		ID: &userID,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get current user, err: %v", err)
-	}
-	memo, err := s.Store.GetMemo(ctx, &store.FindMemo{
-		ID: &request.Id,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get memo by ID: %v", err)
-	}
-	if memo == nil {
-		return nil, status.Errorf(codes.NotFound, "memo not found")
-	}
-	if memo.CreatorId != userID && currentUser.Role != store.RoleAdmin {
-		return nil, status.Errorf(codes.PermissionDenied, "Permission denied")
-	}
-
-	err = s.Store.DeleteMemo(ctx, &store.DeleteMemo{
-		ID: memo.Id,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to delete memo, err: %v", err)
-	}
-	response := &apiv2pb.DeleteMemoResponse{}
-	return response, nil
-}
-
-func (*APIV2Service) convertMemoFromStorepb(_ context.Context, memo *storepb.Memo) (*apiv2pb.Memo, error) {
-	return &apiv2pb.Memo{
-		Id:          memo.Id,
-		CreatedTime: timestamppb.New(time.Unix(memo.CreatedTs, 0)),
-		UpdatedTime: timestamppb.New(time.Unix(memo.UpdatedTs, 0)),
-		CreatorId:   memo.CreatorId,
-		Name:        memo.Name,
-		Title:       memo.Title,
-		Content:     memo.Content,
-		Tags:        memo.Tags,
-		Visibility:  apiv2pb.Visibility(memo.Visibility),
-	}, nil
-}

api/v2/shortcut_service.go

@@ -6,20 +6,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mssola/useragent"
 	"github.com/pkg/errors"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/peer"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/store"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/store"
 )
 
 func (s *APIV2Service) ListShortcuts(ctx context.Context, _ *apiv2pb.ListShortcutsRequest) (*apiv2pb.ListShortcutsResponse, error) {
@@ -59,7 +54,7 @@ func (s *APIV2Service) GetShortcut(ctx context.Context, request *apiv2pb.GetShor
 		ID: &request.Id,
 	})
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get shortcut by id: %v", err)
+		return nil, status.Errorf(codes.Internal, "failed to get shortcut by name: %v", err)
 	}
 	if shortcut == nil {
 		return nil, status.Errorf(codes.NotFound, "shortcut not found")
@@ -86,48 +81,7 @@ func (s *APIV2Service) GetShortcut(ctx context.Context, request *apiv2pb.GetShor
 	return response, nil
 }
 
-func (s *APIV2Service) GetShortcutByName(ctx context.Context, request *apiv2pb.GetShortcutByNameRequest) (*apiv2pb.GetShortcutByNameResponse, error) {
-	shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{
-		Name: &request.Name,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get shortcut by name: %v", err)
-	}
-	if shortcut == nil {
-		return nil, status.Errorf(codes.NotFound, "shortcut not found")
-	}
-
-	userID, ok := ctx.Value(userIDContextKey).(int32)
-	if ok {
-		if shortcut.Visibility == storepb.Visibility_PRIVATE && shortcut.CreatorId != userID {
-			return nil, status.Errorf(codes.PermissionDenied, "Permission denied")
-		}
-	} else {
-		if shortcut.Visibility != storepb.Visibility_PUBLIC {
-			return nil, status.Errorf(codes.PermissionDenied, "Permission denied")
-		}
-	}
-
-	// Create shortcut view activity.
-	if err := s.createShortcutViewActivity(ctx, shortcut); err != nil {
-		fmt.Printf("failed to create activity, err: %v", err)
-	}
-
-	composedShortcut, err := s.convertShortcutFromStorepb(ctx, shortcut)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to convert shortcut, err: %v", err)
-	}
-	response := &apiv2pb.GetShortcutByNameResponse{
-		Shortcut: composedShortcut,
-	}
-	return response, nil
-}
-
 func (s *APIV2Service) CreateShortcut(ctx context.Context, request *apiv2pb.CreateShortcutRequest) (*apiv2pb.CreateShortcutResponse, error) {
-	if request.Shortcut.Name == "" || request.Shortcut.Link == "" {
-		return nil, status.Errorf(codes.InvalidArgument, "name and link are required")
-	}
-
 	userID := ctx.Value(userIDContextKey).(int32)
 	shortcut := &storepb.Shortcut{
 		CreatorId:   userID,
@@ -180,7 +134,7 @@ func (s *APIV2Service) UpdateShortcut(ctx context.Context, request *apiv2pb.Upda
 		ID: &request.Shortcut.Id,
 	})
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get shortcut by id: %v", err)
+		return nil, status.Errorf(codes.Internal, "failed to get shortcut by name: %v", err)
 	}
 	if shortcut == nil {
 		return nil, status.Errorf(codes.NotFound, "shortcut not found")
@@ -189,28 +143,24 @@ func (s *APIV2Service) UpdateShortcut(ctx context.Context, request *apiv2pb.Upda
 		return nil, status.Errorf(codes.PermissionDenied, "Permission denied")
 	}
 
-	update := &store.UpdateShortcut{
-		ID: shortcut.Id,
-	}
+	update := &store.UpdateShortcut{}
 	for _, path := range request.UpdateMask.Paths {
 		switch path {
-		case "name":
-			update.Name = &request.Shortcut.Name
 		case "link":
 			update.Link = &request.Shortcut.Link
 		case "title":
 			update.Title = &request.Shortcut.Title
-		case "description":
-			update.Description = &request.Shortcut.Description
 		case "tags":
 			tag := strings.Join(request.Shortcut.Tags, " ")
 			update.Tag = &tag
+		case "description":
+			update.Description = &request.Shortcut.Description
 		case "visibility":
 			visibility := store.Visibility(request.Shortcut.Visibility.String())
 			update.Visibility = &visibility
 		case "og_metadata":
 			if request.Shortcut.OgMetadata != nil {
-				update.OpenGraphMetadata = &storepb.OpenGraphMetadata{
+				update.OpenGraphMetadata = &store.OpenGraphMetadata{
 					Title:       request.Shortcut.OgMetadata.Title,
 					Description: request.Shortcut.OgMetadata.Description,
 					Image:       request.Shortcut.OgMetadata.Image,
@@ -245,7 +195,7 @@ func (s *APIV2Service) DeleteShortcut(ctx context.Context, request *apiv2pb.Dele
 		ID: &request.Id,
 	})
 	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get shortcut by id: %v", err)
+		return nil, status.Errorf(codes.Internal, "failed to get shortcut by name: %v", err)
 	}
 	if shortcut == nil {
 		return nil, status.Errorf(codes.NotFound, "shortcut not found")
@@ -264,106 +214,6 @@ func (s *APIV2Service) DeleteShortcut(ctx context.Context, request *apiv2pb.Dele
 	return response, nil
 }
 
-func (s *APIV2Service) GetShortcutAnalytics(ctx context.Context, request *apiv2pb.GetShortcutAnalyticsRequest) (*apiv2pb.GetShortcutAnalyticsResponse, error) {
-	shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{
-		ID: &request.Id,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get shortcut by id: %v", err)
-	}
-	if shortcut == nil {
-		return nil, status.Errorf(codes.NotFound, "shortcut not found")
-	}
-
-	activities, err := s.Store.ListActivities(ctx, &store.FindActivity{
-		Type:              store.ActivityShortcutView,
-		PayloadShortcutID: &shortcut.Id,
-	})
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to get activities, err: %v", err)
-	}
-
-	referenceMap := make(map[string]int32)
-	deviceMap := make(map[string]int32)
-	browserMap := make(map[string]int32)
-	for _, activity := range activities {
-		payload := &storepb.ActivityShorcutViewPayload{}
-		if err := protojson.Unmarshal([]byte(activity.Payload), payload); err != nil {
-			return nil, status.Error(codes.Internal, fmt.Sprintf("failed to unmarshal payload, err: %v", err))
-		}
-
-		if _, ok := referenceMap[payload.Referer]; !ok {
-			referenceMap[payload.Referer] = 0
-		}
-		referenceMap[payload.Referer]++
-
-		ua := useragent.New(payload.UserAgent)
-		deviceName := ua.OSInfo().Name
-		browserName, _ := ua.Browser()
-
-		if _, ok := deviceMap[deviceName]; !ok {
-			deviceMap[deviceName] = 0
-		}
-		deviceMap[deviceName]++
-
-		if _, ok := browserMap[browserName]; !ok {
-			browserMap[browserName] = 0
-		}
-		browserMap[browserName]++
-	}
-
-	metric.Enqueue("shortcut analytics")
-	response := &apiv2pb.GetShortcutAnalyticsResponse{
-		References: mapToAnalyticsSlice(referenceMap),
-		Devices:    mapToAnalyticsSlice(deviceMap),
-		Browsers:   mapToAnalyticsSlice(browserMap),
-	}
-	return response, nil
-}
-
-func mapToAnalyticsSlice(m map[string]int32) []*apiv2pb.GetShortcutAnalyticsResponse_AnalyticsItem {
-	analyticsSlice := make([]*apiv2pb.GetShortcutAnalyticsResponse_AnalyticsItem, 0)
-	for key, value := range m {
-		analyticsSlice = append(analyticsSlice, &apiv2pb.GetShortcutAnalyticsResponse_AnalyticsItem{
-			Name:  key,
-			Count: value,
-		})
-	}
-	slices.SortFunc(analyticsSlice, func(i, j *apiv2pb.GetShortcutAnalyticsResponse_AnalyticsItem) int {
-		return int(i.Count - j.Count)
-	})
-	return analyticsSlice
-}
-
-func (s *APIV2Service) createShortcutViewActivity(ctx context.Context, shortcut *storepb.Shortcut) error {
-	p, _ := peer.FromContext(ctx)
-	headers, ok := metadata.FromIncomingContext(ctx)
-	if !ok {
-		return errors.New("Failed to get metadata from context")
-	}
-	payload := &storepb.ActivityShorcutViewPayload{
-		ShortcutId: shortcut.Id,
-		Ip:         p.Addr.String(),
-		Referer:    headers.Get("referer")[0],
-		UserAgent:  headers.Get("user-agent")[0],
-	}
-	payloadStr, err := protojson.Marshal(payload)
-	if err != nil {
-		return errors.Wrap(err, "Failed to marshal activity payload")
-	}
-	activity := &store.Activity{
-		CreatorID: BotID,
-		Type:      store.ActivityShortcutView,
-		Level:     store.ActivityInfo,
-		Payload:   string(payloadStr),
-	}
-	_, err = s.Store.CreateActivity(ctx, activity)
-	if err != nil {
-		return errors.Wrap(err, "Failed to create activity")
-	}
-	return nil
-}
-
 func (s *APIV2Service) createShortcutCreateActivity(ctx context.Context, shortcut *storepb.Shortcut) error {
 	payload := &storepb.ActivityShorcutCreatePayload{
 		ShortcutId: shortcut.Id,
@@ -408,7 +258,7 @@ func (s *APIV2Service) convertShortcutFromStorepb(ctx context.Context, shortcut
 	activityList, err := s.Store.ListActivities(ctx, &store.FindActivity{
 		Type:  store.ActivityShortcutView,
 		Level: store.ActivityInfo,
-		PayloadShortcutID: &composedShortcut.Id,
+		Where: []string{fmt.Sprintf("json_extract(payload, '$.shortcutId') = %d", composedShortcut.Id)},
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to list activities")

api/v2/subscription_service.go

@@ -6,7 +6,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
 )
 
 func (s *APIV2Service) GetSubscription(ctx context.Context, _ *apiv2pb.GetSubscriptionRequest) (*apiv2pb.GetSubscriptionResponse, error) {

api/v2/user_service.go

@@ -12,16 +12,11 @@ import (
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/yourselfhosted/slash/api/auth"
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/server/service/license"
-	"github.com/yourselfhosted/slash/store"
-)
-
-const (
-	// BotID is the id of bot.
-	BotID = 0
+	"github.com/boojack/slash/api/auth"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/server/service/license"
+	"github.com/boojack/slash/store"
 )
 
 func (s *APIV2Service) ListUsers(ctx context.Context, _ *apiv2pb.ListUsersRequest) (*apiv2pb.ListUsersResponse, error) {

api/v2/user_setting_service.go

@@ -7,9 +7,9 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/store"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/store"
 )
 
 func (s *APIV2Service) GetUserSetting(ctx context.Context, request *apiv2pb.GetUserSettingRequest) (*apiv2pb.GetUserSettingResponse, error) {

api/v2/v2.go

@@ -11,21 +11,19 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/grpc/reflection"
 
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	"github.com/yourselfhosted/slash/server/profile"
-	"github.com/yourselfhosted/slash/server/service/license"
-	"github.com/yourselfhosted/slash/store"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
+	"github.com/boojack/slash/server/profile"
+	"github.com/boojack/slash/server/service/license"
+	"github.com/boojack/slash/store"
 )
 
 type APIV2Service struct {
 	apiv2pb.UnimplementedWorkspaceServiceServer
 	apiv2pb.UnimplementedSubscriptionServiceServer
-	apiv2pb.UnimplementedAuthServiceServer
 	apiv2pb.UnimplementedUserServiceServer
 	apiv2pb.UnimplementedUserSettingServiceServer
 	apiv2pb.UnimplementedShortcutServiceServer
 	apiv2pb.UnimplementedCollectionServiceServer
-	apiv2pb.UnimplementedMemoServiceServer
 
 	Secret         string
 	Profile        *profile.Profile
@@ -54,12 +52,10 @@ func NewAPIV2Service(secret string, profile *profile.Profile, store *store.Store
 
 	apiv2pb.RegisterSubscriptionServiceServer(grpcServer, apiV2Service)
 	apiv2pb.RegisterWorkspaceServiceServer(grpcServer, apiV2Service)
-	apiv2pb.RegisterAuthServiceServer(grpcServer, apiV2Service)
 	apiv2pb.RegisterUserServiceServer(grpcServer, apiV2Service)
 	apiv2pb.RegisterUserSettingServiceServer(grpcServer, apiV2Service)
 	apiv2pb.RegisterShortcutServiceServer(grpcServer, apiV2Service)
 	apiv2pb.RegisterCollectionServiceServer(grpcServer, apiV2Service)
-	apiv2pb.RegisterMemoServiceServer(grpcServer, apiV2Service)
 	reflection.Register(grpcServer)
 
 	return apiV2Service
@@ -89,9 +85,6 @@ func (s *APIV2Service) RegisterGateway(ctx context.Context, e *echo.Echo) error
 	if err := apiv2pb.RegisterWorkspaceServiceHandler(context.Background(), gwMux, conn); err != nil {
 		return err
 	}
-	if err := apiv2pb.RegisterAuthServiceHandler(context.Background(), gwMux, conn); err != nil {
-		return err
-	}
 	if err := apiv2pb.RegisterUserServiceHandler(context.Background(), gwMux, conn); err != nil {
 		return err
 	}
@@ -104,9 +97,6 @@ func (s *APIV2Service) RegisterGateway(ctx context.Context, e *echo.Echo) error
 	if err := apiv2pb.RegisterCollectionServiceHandler(context.Background(), gwMux, conn); err != nil {
 		return err
 	}
-	if err := apiv2pb.RegisterMemoServiceHandler(context.Background(), gwMux, conn); err != nil {
-		return err
-	}
 	e.Any("/api/v2/*", echo.WrapHandler(gwMux))
 
 	// GRPC web proxy.

api/v2/workspace_service.go

@@ -6,15 +6,14 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	apiv2pb "github.com/yourselfhosted/slash/proto/gen/api/v2"
-	storepb "github.com/yourselfhosted/slash/proto/gen/store"
-	"github.com/yourselfhosted/slash/store"
+	apiv2pb "github.com/boojack/slash/proto/gen/api/v2"
+	storepb "github.com/boojack/slash/proto/gen/store"
+	"github.com/boojack/slash/store"
 )
 
 func (s *APIV2Service) GetWorkspaceProfile(ctx context.Context, _ *apiv2pb.GetWorkspaceProfileRequest) (*apiv2pb.GetWorkspaceProfileResponse, error) {
 	profile := &apiv2pb.WorkspaceProfile{
 		Mode: s.Profile.Mode,
-		Version: s.Profile.Version,
 		Plan: apiv2pb.PlanType_FREE,
 	}
 
@@ -62,8 +61,6 @@ func (s *APIV2Service) GetWorkspaceSetting(ctx context.Context, _ *apiv2pb.GetWo
 	for _, v := range workspaceSettings {
 		if v.Key == storepb.WorkspaceSettingKey_WORKSAPCE_SETTING_ENABLE_SIGNUP {
 			workspaceSetting.EnableSignup = v.GetEnableSignup()
-		} else if v.Key == storepb.WorkspaceSettingKey_WORKSPACE_SETTING_INSTANCE_URL {
-			workspaceSetting.InstanceUrl = v.GetInstanceUrl()
 		} else if v.Key == storepb.WorkspaceSettingKey_WORKSPACE_SETTING_CUSTOM_STYLE {
 			workspaceSetting.CustomStyle = v.GetCustomStyle()
 		} else if v.Key == storepb.WorkspaceSettingKey_WORKSPACE_SETTING_CUSTOM_SCRIPT {
@@ -104,15 +101,6 @@ func (s *APIV2Service) UpdateWorkspaceSetting(ctx context.Context, request *apiv
 			}); err != nil {
 				return nil, status.Errorf(codes.Internal, "failed to update workspace setting: %v", err)
 			}
-		} else if path == "instance_url" {
-			if _, err := s.Store.UpsertWorkspaceSetting(ctx, &storepb.WorkspaceSetting{
-				Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_INSTANCE_URL,
-				Value: &storepb.WorkspaceSetting_InstanceUrl{
-					InstanceUrl: request.Setting.InstanceUrl,
-				},
-			}); err != nil {
-				return nil, status.Errorf(codes.Internal, "failed to update workspace setting: %v", err)
-			}
 		} else if path == "custom_style" {
 			if _, err := s.Store.UpsertWorkspaceSetting(ctx, &storepb.WorkspaceSetting{
 				Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_CUSTOM_STYLE,

bin/slash/main.go

@@ -13,12 +13,12 @@ import (
 	"go.uber.org/zap"
 	_ "modernc.org/sqlite"
 
-	"github.com/yourselfhosted/slash/internal/log"
-	"github.com/yourselfhosted/slash/server"
-	"github.com/yourselfhosted/slash/server/metric"
-	"github.com/yourselfhosted/slash/server/profile"
-	"github.com/yourselfhosted/slash/store"
-	"github.com/yourselfhosted/slash/store/db"
+	"github.com/boojack/slash/internal/log"
+	"github.com/boojack/slash/server"
+	"github.com/boojack/slash/server/metric"
+	"github.com/boojack/slash/server/profile"
+	"github.com/boojack/slash/store"
+	"github.com/boojack/slash/store/db"
 )
 
 const (
@@ -30,27 +30,20 @@ var (
 	mode          string
 	port          int
 	data          string
-	driver        string
-	dsn           string
 
 	rootCmd = &cobra.Command{
 		Use:   "slash",
 		Short: `An open source, self-hosted bookmarks and link sharing platform.`,
 		Run: func(_cmd *cobra.Command, _args []string) {
 			ctx, cancel := context.WithCancel(context.Background())
-			dbDriver, err := db.NewDBDriver(serverProfile)
-			if err != nil {
+			db := db.NewDB(serverProfile)
+			if err := db.Open(ctx); err != nil {
 				cancel()
-				log.Error("failed to create db driver", zap.Error(err))
-				return
-			}
-			if err := dbDriver.Migrate(ctx); err != nil {
-				cancel()
-				log.Error("failed to migrate db", zap.Error(err))
+				log.Error("failed to open database", zap.Error(err))
 				return
 			}
 
-			storeInstance := store.New(dbDriver, serverProfile)
+			storeInstance := store.New(db.DBInstance, serverProfile)
 			s, err := server.NewServer(ctx, serverProfile, storeInstance)
 			if err != nil {
 				cancel()
@@ -99,8 +92,6 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&mode, "mode", "m", "demo", `mode of server, can be "prod" or "dev" or "demo"`)
 	rootCmd.PersistentFlags().IntVarP(&port, "port", "p", 8082, "port of server")
 	rootCmd.PersistentFlags().StringVarP(&data, "data", "d", "", "data directory")
-	rootCmd.PersistentFlags().StringVarP(&driver, "driver", "", "", "database driver")
-	rootCmd.PersistentFlags().StringVarP(&dsn, "dsn", "", "", "database source name(aka. DSN)")
 
 	err := viper.BindPFlag("mode", rootCmd.PersistentFlags().Lookup("mode"))
 	if err != nil {
@@ -114,18 +105,9 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("driver", rootCmd.PersistentFlags().Lookup("driver"))
-	if err != nil {
-		panic(err)
-	}
-	err = viper.BindPFlag("dsn", rootCmd.PersistentFlags().Lookup("dsn"))
-	if err != nil {
-		panic(err)
-	}
 
 	viper.SetDefault("mode", "demo")
 	viper.SetDefault("port", 8082)
-	viper.SetDefault("driver", "sqlite")
 	viper.SetEnvPrefix("slash")
 }
 
@@ -152,7 +134,7 @@ func printGreetings() {
 	fmt.Printf("Version %s has been started on port %d\n", serverProfile.Version, serverProfile.Port)
 	println("---")
 	println("See more in:")
-	fmt.Printf("👉GitHub: %s\n", "https://github.com/yourselfhosted/slash")
+	fmt.Printf("👉GitHub: %s\n", "https://github.com/boojack/slash")
 	println("---")
 }
 

docs/getting-started/collections.md

@@ -1,6 +1,6 @@
 # Slash Collections
 
-**Slash Collections** introduces a feature to help you better organize and manage related Shortcuts.
+**Slash Collections** introduces a feature to help you better organize and manage related Shortcuts within the Slash Shortcuts platform.
 
 ## What is a Collection?
 

docs/install.md

@@ -44,7 +44,7 @@ Assume that docker compose is deployed in the `/opt/slash` directory.
 
 ```bash
 mkdir -p /opt/slash && cd /opt/slash
-curl -#LO https://github.com/yourselfhosted/slash/raw/main/docker-compose.yml
+curl -#LO https://github.com/boojack/slash/raw/main/docker-compose.yml
 docker compose up -d
 ```
 

frontend/extension/package.json

@@ -1,7 +1,7 @@
 {
   "name": "slash-extension",
   "displayName": "Slash",
-  "version": "1.0.3",
+  "version": "1.0.1",
   "description": "An open source, self-hosted bookmarks and link sharing platform. Save and share your links very easily.",
   "scripts": {
     "dev": "plasmo dev",
@@ -14,41 +14,44 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/joy": "5.0.0-beta.19",
-    "@plasmohq/storage": "^1.9.0",
-    "axios": "^1.6.2",
+    "@mui/joy": "5.0.0-beta.14",
+    "@plasmohq/storage": "^1.8.1",
+    "axios": "^1.6.1",
     "classnames": "^2.3.2",
     "lodash-es": "^4.17.21",
     "lucide-react": "^0.264.0",
-    "plasmo": "^0.83.1",
+    "plasmo": "^0.83.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.4.1",
-    "zustand": "^4.4.7"
+    "zustand": "^4.4.6"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.28.1",
-    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
+    "@bufbuild/buf": "^1.27.2",
+    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
     "@types/chrome": "^0.0.241",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.10.5",
-    "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.2.18",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@types/lodash-es": "^4.17.11",
+    "@types/node": "^20.9.0",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.15",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
     "autoprefixer": "^10.4.16",
-    "eslint": "^8.56.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.33.2",
     "long": "^5.2.3",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.31",
     "prettier": "^2.8.8",
     "protobufjs": "^7.2.5",
-    "tailwindcss": "^3.4.0",
-    "typescript": "^5.3.3"
+    "tailwindcss": "^3.3.5",
+    "typescript": "^5.2.2"
   },
   "manifest": {
+    "omnibox": {
+      "keyword": "s/"
+    },
     "permissions": [
       "activeTab",
       "storage",

frontend/extension/src/background.ts

@@ -1,4 +1,5 @@
 import { Storage } from "@plasmohq/storage";
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 
 const storage = new Storage();
 const urlRegex = /https?:\/\/s\/(.+)/;
@@ -12,14 +13,33 @@ chrome.webRequest.onBeforeRequest.addListener(
 
       const shortcutName = getShortcutNameFromUrl(param.url);
       if (shortcutName) {
-        const instanceUrl = (await storage.getItem<string>("domain")) || "";
-        return chrome.tabs.update({ url: `${instanceUrl}/s/${shortcutName}` });
+        const shortcuts = (await storage.getItem<Shortcut[]>("shortcuts")) || [];
+        const shortcut = shortcuts.find((shortcut) => shortcut.name === shortcutName);
+        if (!shortcut) {
+          return;
+        }
+        return chrome.tabs.update({ url: shortcut.link });
       }
     })();
   },
   { urls: ["*://s/*", "*://*/search*"] }
 );
 
+chrome.omnibox.onInputEntered.addListener(async (text, disposition) => {
+  const shortcuts = (await storage.getItem<Shortcut[]>("shortcuts")) || [];
+  const shortcut = shortcuts.find((shortcut) => shortcut.name === text);
+  if (!shortcut) {
+    return;
+  }
+  if (disposition === "currentTab") {
+    chrome.tabs.update({ url: shortcut.link });
+  } else if (disposition === "newForegroundTab") {
+    chrome.tabs.create({ url: shortcut.link });
+  } else if (disposition === "newBackgroundTab") {
+    chrome.tabs.create({ url: shortcut.link, active: false });
+  }
+});
+
 const getShortcutNameFromUrl = (urlString: string) => {
   const matchResult = urlRegex.exec(urlString);
   if (matchResult === null) {

frontend/extension/src/components/CreateShortcutsButton.tsx

@@ -1,22 +1,34 @@
 import { Button, IconButton, Input, Modal, ModalDialog } from "@mui/joy";
 import { useStorage } from "@plasmohq/storage/hook";
+import axios from "axios";
 import { useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
-import useShortcutStore from "@/store/shortcut";
 import { Visibility } from "@/types/proto/api/v2/common";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
+import { CreateShortcutResponse, OpenGraphMetadata } from "@/types/proto/api/v2/shortcut_service";
 import Icon from "./Icon";
 
+const generateTempName = (length = 6) => {
+  let result = "";
+  const characters = "abcdefghijklmnopqrstuvwxyz0123456789";
+  const charactersLength = characters.length;
+  let counter = 0;
+  while (counter < length) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+    counter += 1;
+  }
+  return result;
+};
+
 interface State {
   name: string;
   title: string;
   link: string;
 }
 
-const CreateShortcutButton = () => {
-  const [instanceUrl] = useStorage("domain");
+const CreateShortcutsButton = () => {
+  const [domain] = useStorage("domain");
   const [accessToken] = useStorage("access_token");
-  const shortcutStore = useShortcutStore();
+  const [shortcuts, setShortcuts] = useStorage("shortcuts");
   const [state, setState] = useState<State>({
     name: "",
     title: "",
@@ -42,7 +54,7 @@ const CreateShortcutButton = () => {
       const tab = tabs[0];
       setState((state) => ({
         ...state,
-        name: "",
+        name: generateTempName() + "-temp",
         title: tab.title || "",
         link: tab.url || "",
       }));
@@ -82,21 +94,30 @@ const CreateShortcutButton = () => {
 
     setIsLoading(true);
     try {
-      await shortcutStore.createShortcut(
-        instanceUrl,
-        accessToken,
-        Shortcut.fromPartial({
+      const {
+        data: { shortcut },
+      } = await axios.post<CreateShortcutResponse>(
+        `${domain}/api/v2/shortcuts`,
+        {
           name: state.name,
           title: state.title,
           link: state.link,
-          visibility: Visibility.PUBLIC,
-        })
+          visibility: Visibility.PRIVATE,
+          ogMetadata: OpenGraphMetadata.fromPartial({}),
+        },
+        {
+          headers: {
+            Authorization: `Bearer ${accessToken}`,
+          },
+        }
       );
+
+      setShortcuts([shortcut, ...shortcuts]);
       toast.success("Shortcut created successfully");
       setShowModal(false);
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
     setIsLoading(false);
   };
@@ -129,7 +150,7 @@ const CreateShortcutButton = () => {
               <Input
                 className="grow"
                 type="text"
-                placeholder="e.g., https://github.com/yourselfhosted/slash"
+                placeholder="https://github.com/boojack/slash"
                 value={state.link}
                 onChange={handleLinkInputChange}
               />
@@ -150,4 +171,4 @@ const CreateShortcutButton = () => {
   );
 };
 
-export default CreateShortcutButton;
+export default CreateShortcutsButton;

frontend/extension/src/components/Logo.tsx

@@ -6,7 +6,7 @@ interface Props {
 }
 
 const Logo = ({ className }: Props) => {
-  return <img className={classNames("rounded-full", className)} src={LogoBase64} alt="" />;
+  return <img className={classNames(className)} src={LogoBase64} alt="" />;
 };
 
 export default Logo;

frontend/extension/src/components/PullShortcutsButton.tsx

@@ -1,24 +1,32 @@
 import { IconButton } from "@mui/joy";
 import { useStorage } from "@plasmohq/storage/hook";
+import axios from "axios";
 import { useEffect } from "react";
 import { toast } from "react-hot-toast";
-import useShortcutStore from "@/store/shortcut";
+import { ListShortcutsResponse } from "@/types/proto/api/v2/shortcut_service";
 import Icon from "./Icon";
 
 const PullShortcutsButton = () => {
-  const [instanceUrl] = useStorage("domain");
+  const [domain] = useStorage("domain");
   const [accessToken] = useStorage("access_token");
-  const shortcutStore = useShortcutStore();
+  const [, setShortcuts] = useStorage("shortcuts");
 
   useEffect(() => {
-    if (instanceUrl && accessToken) {
+    if (domain && accessToken) {
       handlePullShortcuts(true);
     }
-  }, [instanceUrl, accessToken]);
+  }, [domain, accessToken]);
 
   const handlePullShortcuts = async (silence = false) => {
     try {
-      await shortcutStore.fetchShortcutList(instanceUrl, accessToken);
+      const {
+        data: { shortcuts },
+      } = await axios.get<ListShortcutsResponse>(`${domain}/api/v2/shortcuts`, {
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+        },
+      });
+      setShortcuts(shortcuts);
       if (!silence) {
         toast.success("Shortcuts pulled");
       }

frontend/extension/src/components/ShortcutView.tsx

@@ -28,7 +28,7 @@ const ShortcutView = (props: Props) => {
         <div className="w-full flex flex-row justify-start items-center">
           <span className={classNames("w-5 h-5 flex justify-center items-center overflow-clip shrink-0")}>
             {favicon ? (
-              <img className="w-full h-auto rounded" src={favicon} decoding="async" loading="lazy" />
+              <img className="w-full h-auto rounded-lg" src={favicon} decoding="async" loading="lazy" />
             ) : (
               <Icon.CircleSlash className="w-full h-auto text-gray-400" />
             )}
@@ -44,9 +44,10 @@ const ShortcutView = (props: Props) => {
                 <div className="truncate">
                   <span className="dark:text-gray-400">{shortcut.title}</span>
                   {shortcut.title ? (
-                    <span className="text-gray-500">({shortcut.name})</span>
+                    <span className="text-gray-500">(s/{shortcut.name})</span>
                   ) : (
                     <>
+                      <span className="text-gray-400 dark:text-gray-500">s/</span>
                       <span className="truncate dark:text-gray-400">{shortcut.name}</span>
                     </>
                   )}

frontend/extension/src/components/ShortcutsContainer.tsx

@@ -1,25 +1,17 @@
+import { useStorage } from "@plasmohq/storage/hook";
 import classNames from "classnames";
-import useShortcutStore from "@/store/shortcut";
-import Icon from "./Icon";
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import ShortcutView from "./ShortcutView";
 
 const ShortcutsContainer = () => {
-  const shortcuts = useShortcutStore().getShortcutList();
+  const [shortcuts] = useStorage<Shortcut[]>("shortcuts", (v) => (v ? v : []));
 
   return (
-    <div>
-      <div className="w-full flex flex-row justify-start items-center mb-4">
-        <a className="bg-blue-100 dark:bg-blue-500 dark:opacity-70 py-2 px-3 rounded-full border dark:border-blue-600 flex flex-row justify-start items-center cursor-pointer shadow">
-          <Icon.AlertCircle className="w-4 h-auto" />
-          <span className="mx-1 text-sm">Please make sure you have signed in your instance.</span>
-        </a>
-      </div>
     <div className={classNames("w-full grid grid-cols-2 gap-2")}>
       {shortcuts.map((shortcut) => {
         return <ShortcutView key={shortcut.id} shortcut={shortcut} />;
       })}
     </div>
-    </div>
   );
 };
 

frontend/extension/src/options.tsx

@@ -2,12 +2,12 @@ import { Button, CssVarsProvider, Divider, Input, Select, Option } from "@mui/jo
 import { useStorage } from "@plasmohq/storage/hook";
 import { useEffect, useState } from "react";
 import { Toaster, toast } from "react-hot-toast";
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import Icon from "./components/Icon";
 import Logo from "./components/Logo";
 import PullShortcutsButton from "./components/PullShortcutsButton";
 import ShortcutsContainer from "./components/ShortcutsContainer";
 import useColorTheme from "./hooks/useColorTheme";
-import useShortcutStore from "./store/shortcut";
 import "./style.css";
 
 interface SettingState {
@@ -38,8 +38,7 @@ const IndexOptions = () => {
     domain,
     accessToken,
   });
-  const shortcutStore = useShortcutStore();
-  const shortcuts = shortcutStore.getShortcutList();
+  const [shortcuts] = useStorage<Shortcut[]>("shortcuts", []);
   const isInitialized = domain && accessToken;
 
   useEffect(() => {
@@ -67,11 +66,11 @@ const IndexOptions = () => {
   };
 
   return (
-    <div className="w-full px-4">
+    <div className="w-full">
       <div className="w-full flex flex-row justify-center items-center">
         <a
           className="bg-yellow-100 dark:bg-yellow-500 dark:opacity-70 mt-12 py-2 px-3 rounded-full border dark:border-yellow-600 flex flex-row justify-start items-center cursor-pointer shadow hover:underline hover:text-blue-600"
-          href="https://github.com/yourselfhosted/slash#browser-extension"
+          href="https://github.com/boojack/slash#browser-extension"
           target="_blank"
         >
           <Icon.HelpCircle className="w-4 h-auto" />
@@ -80,7 +79,7 @@ const IndexOptions = () => {
         </a>
       </div>
 
-      <div className="w-full max-w-lg mx-auto flex flex-col justify-start items-start py-12">
+      <div className="w-full max-w-lg mx-auto flex flex-col justify-start items-start mt-12">
         <h2 className="flex flex-row justify-start items-center mb-6 text-2xl dark:text-gray-400">
           <Logo className="w-10 h-auto mr-2" />
           <span>Slash</span>
@@ -91,10 +90,10 @@ const IndexOptions = () => {
         <div className="w-full flex flex-col justify-start items-start">
           <div className="w-full flex flex-col justify-start items-start mb-4">
             <div className="mb-2 text-base w-full flex flex-row justify-between items-center">
-              <span className="dark:text-gray-400">Instance URL</span>
+              <span className="dark:text-gray-400">Domain</span>
               {domain !== "" && (
                 <a
-                  className="text-sm flex flex-row justify-start items-center underline text-blue-600 hover:opacity-80"
+                  className="text-sm flex flex-row justify-start items-center dark:text-gray-400 hover:underline hover:text-blue-600"
                   href={domain}
                   target="_blank"
                 >
@@ -107,7 +106,7 @@ const IndexOptions = () => {
               <Input
                 className="w-full"
                 type="text"
-                placeholder="The url of your Slash instance. e.g., https://slash.example.com"
+                placeholder="The domain of your Slash instance"
                 value={settingState.domain}
                 onChange={(e) => setPartialSettingState({ domain: e.target.value })}
               />
@@ -120,7 +119,7 @@ const IndexOptions = () => {
               <Input
                 className="w-full"
                 type="text"
-                placeholder="An available access token of your account."
+                placeholder="The access token of your Slash instance"
                 value={settingState.accessToken}
                 onChange={(e) => setPartialSettingState({ accessToken: e.target.value })}
               />
@@ -172,7 +171,7 @@ const Options = () => {
   return (
     <CssVarsProvider>
       <IndexOptions />
-      <Toaster position="top-center" />
+      <Toaster position="top-right" />
     </CssVarsProvider>
   );
 };

frontend/extension/src/popup.tsx

@@ -1,31 +1,21 @@
 import { Button, CssVarsProvider, Divider, IconButton } from "@mui/joy";
 import { useStorage } from "@plasmohq/storage/hook";
-import { useEffect } from "react";
 import { Toaster } from "react-hot-toast";
-import CreateShortcutButton from "@/components/CreateShortcutButton";
+import CreateShortcutsButton from "@/components/CreateShortcutsButton";
 import Icon from "@/components/Icon";
 import Logo from "@/components/Logo";
 import PullShortcutsButton from "@/components/PullShortcutsButton";
 import ShortcutsContainer from "@/components/ShortcutsContainer";
+import type { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import useColorTheme from "./hooks/useColorTheme";
-import useShortcutStore from "./store/shortcut";
 import "./style.css";
 
 const IndexPopup = () => {
   useColorTheme();
-  const [instanceUrl] = useStorage<string>("domain", "");
+  const [domain] = useStorage<string>("domain", "");
   const [accessToken] = useStorage<string>("access_token", "");
-  const shortcutStore = useShortcutStore();
-  const shortcuts = shortcutStore.getShortcutList();
-  const isInitialized = instanceUrl && accessToken;
-
-  useEffect(() => {
-    if (!isInitialized) {
-      return;
-    }
-
-    shortcutStore.fetchShortcutList(instanceUrl, accessToken);
-  }, [isInitialized]);
+  const [shortcuts] = useStorage<Shortcut[]>("shortcuts", []);
+  const isInitialized = domain && accessToken;
 
   const handleSettingButtonClick = () => {
     chrome.runtime.openOptionsPage();
@@ -40,7 +30,7 @@ const IndexPopup = () => {
     <div className="w-full min-w-[512px] px-4 pt-4">
       <div className="w-full flex flex-row justify-between items-center">
         <div className="flex flex-row justify-start items-center dark:text-gray-400">
-          <Logo className="w-6 h-auto mr-1" />
+          <Logo className="w-6 h-auto mr-2" />
           <span className="">Slash</span>
           {isInitialized && (
             <>
@@ -51,7 +41,7 @@ const IndexPopup = () => {
             </>
           )}
         </div>
-        <div>{isInitialized && <CreateShortcutButton />}</div>
+        <div>{isInitialized && <CreateShortcutsButton />}</div>
       </div>
 
       <div className="w-full mt-4">
@@ -72,21 +62,14 @@ const IndexPopup = () => {
                 <IconButton size="sm" variant="plain" color="neutral" onClick={handleSettingButtonClick}>
                   <Icon.Settings className="w-5 h-auto text-gray-500 dark:text-gray-400" />
                 </IconButton>
-                <IconButton
-                  size="sm"
-                  variant="plain"
-                  color="neutral"
-                  component="a"
-                  href="https://github.com/yourselfhosted/slash"
-                  target="_blank"
-                >
+                <IconButton size="sm" variant="plain" color="neutral" component="a" href="https://github.com/boojack/slash" target="_blank">
                   <Icon.Github className="w-5 h-auto text-gray-500 dark:text-gray-400" />
                 </IconButton>
               </div>
               <div className="flex flex-row justify-end items-center">
                 <a
-                  className="text-sm flex flex-row justify-start items-center underline text-blue-600 hover:opacity-80"
-                  href={instanceUrl}
+                  className="text-sm flex flex-row justify-start items-center text-gray-500 dark:text-gray-400 hover:underline hover:text-blue-600"
+                  href={domain}
                   target="_blank"
                 >
                   <span className="mr-1">Go to my Slash</span>
@@ -98,10 +81,10 @@ const IndexPopup = () => {
         ) : (
           <div className="w-full flex flex-col justify-start items-center">
             <Icon.Cookie strokeWidth={1} className="w-20 h-auto mb-4 text-gray-400" />
-            <p className="dark:text-gray-400">Please set your instance URL and access token first.</p>
+            <p className="dark:text-gray-400">Please set your domain and access token first.</p>
             <div className="w-full flex flex-row justify-center items-center py-4">
               <Button size="sm" color="primary" onClick={handleSettingButtonClick}>
-                <Icon.Settings className="w-5 h-auto mr-1" /> Go to Setting
+                <Icon.Settings className="w-5 h-auto mr-1" /> Setting
               </Button>
               <span className="mx-2 dark:text-gray-400">Or</span>
               <Button size="sm" variant="outlined" color="neutral" onClick={handleRefreshButtonClick}>
@@ -119,7 +102,7 @@ const Popup = () => {
   return (
     <CssVarsProvider>
       <IndexPopup />
-      <Toaster position="top-center" />
+      <Toaster position="top-right" />
     </CssVarsProvider>
   );
 };

frontend/extension/src/store/shortcut.ts

@@ -1,55 +0,0 @@
-import axios from "axios";
-import { create } from "zustand";
-import { combine } from "zustand/middleware";
-import { CreateShortcutResponse, ListShortcutsResponse, Shortcut } from "@/types/proto/api/v2/shortcut_service";
-
-interface State {
-  shortcutMapById: Record<number, Shortcut>;
-}
-
-const getDefaultState = (): State => {
-  return {
-    shortcutMapById: {},
-  };
-};
-
-const useShortcutStore = create(
-  combine(getDefaultState(), (set, get) => ({
-    fetchShortcutList: async (instanceUrl: string, accessToken: string) => {
-      const {
-        data: { shortcuts },
-      } = await axios.get<ListShortcutsResponse>(`${instanceUrl}/api/v2/shortcuts`, {
-        headers: {
-          Authorization: `Bearer ${accessToken}`,
-        },
-      });
-      const shortcutMap = get().shortcutMapById;
-      shortcuts.forEach((shortcut) => {
-        shortcutMap[shortcut.id] = shortcut;
-      });
-      set({ shortcutMapById: shortcutMap });
-      return shortcuts;
-    },
-    getShortcutList: () => {
-      return Object.values(get().shortcutMapById);
-    },
-    createShortcut: async (instanceUrl: string, accessToken: string, create: Shortcut) => {
-      const {
-        data: { shortcut },
-      } = await axios.post<CreateShortcutResponse>(`${instanceUrl}/api/v2/shortcuts`, create, {
-        headers: {
-          Authorization: `Bearer ${accessToken}`,
-        },
-      });
-      if (!shortcut) {
-        throw new Error(`Failed to create shortcut`);
-      }
-      const shortcutMap = get().shortcutMapById;
-      shortcutMap[shortcut.id] = shortcut;
-      set({ shortcutMapById: shortcutMap });
-      return shortcut;
-    },
-  }))
-);
-
-export default useShortcutStore;

frontend/web/index.html

@@ -6,7 +6,6 @@
     <meta name="theme-color" content="#FFFFFF" />
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
     <title>Slash</title>
-    <!-- slash.metadata -->
   </head>
   <body>
     <div id="root"></div>

frontend/web/package.json

@@ -11,12 +11,13 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/joy": "5.0.0-beta.19",
+    "@mui/joy": "5.0.0-beta.14",
     "@reduxjs/toolkit": "^1.9.7",
+    "axios": "^1.6.0",
     "classnames": "^2.3.2",
     "copy-to-clipboard": "^3.3.3",
     "dayjs": "^1.11.10",
-    "i18next": "^23.7.11",
+    "i18next": "^23.6.0",
     "lodash-es": "^4.17.21",
     "lucide-react": "^0.292.0",
     "nice-grpc-web": "^3.3.2",
@@ -24,34 +25,32 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.4.1",
-    "react-i18next": "^13.5.0",
-    "react-router-dom": "^6.21.1",
-    "react-use": "^17.4.2",
-    "tailwindcss": "^3.4.0",
-    "zustand": "^4.4.7"
+    "react-i18next": "^13.3.1",
+    "react-redux": "^8.1.3",
+    "react-router-dom": "^6.18.0",
+    "react-use": "^17.4.0",
+    "tailwindcss": "^3.3.5",
+    "zustand": "^4.4.6"
   },
   "devDependencies": {
-    "@bufbuild/buf": "^1.28.1",
-    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
-    "@types/lodash-es": "^4.17.12",
-    "@types/react": "^18.2.45",
-    "@types/react-dom": "^18.2.18",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
-    "@vitejs/plugin-react-swc": "^3.5.0",
+    "@bufbuild/buf": "^1.27.2",
+    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
+    "@types/lodash-es": "^4.17.11",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.15",
+    "@typescript-eslint/eslint-plugin": "^6.10.0",
+    "@typescript-eslint/parser": "^6.10.0",
+    "@vitejs/plugin-react-swc": "^3.4.1",
     "autoprefixer": "^10.4.16",
-    "eslint": "^8.56.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^8.10.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.33.2",
     "long": "^5.2.3",
-    "postcss": "^8.4.32",
+    "postcss": "^8.4.31",
     "prettier": "2.6.2",
     "protobufjs": "^7.2.5",
-    "typescript": "^5.3.3",
-    "vite": "^5.0.10"
-  },
-  "resolutions": {
-    "csstype": "3.1.2"
+    "typescript": "^5.2.2",
+    "vite": "^4.5.0"
   }
 }

frontend/web/src/App.tsx

@@ -16,7 +16,7 @@ function App() {
       try {
         await Promise.all([workspaceStore.fetchWorkspaceProfile(), workspaceStore.fetchWorkspaceSetting(), userStore.fetchCurrentUser()]);
       } catch (error) {
-        // Do nothing.
+        // do nth
       }
       setLoading(false);
     })();

frontend/web/src/components/AboutDialog.tsx

@@ -25,7 +25,7 @@ const AboutDialog: React.FC<Props> = (props: Props) => {
           </p>
           <div className="mt-1">
             <span className="mr-2">See more in</span>
-            <Link variant="plain" href="https://github.com/yourselfhosted/slash" target="_blank">
+            <Link variant="plain" href="https://github.com/boojack/slash" target="_blank">
               GitHub
             </Link>
           </div>

frontend/web/src/components/Alert.tsx

@@ -45,7 +45,7 @@ const Alert: React.FC<Props> = (props: Props) => {
   return (
     <Modal open={true}>
       <ModalDialog>
-        <div className="flex flex-row justify-between items-center w-80">
+        <div className="flex flex-row justify-between items-center w-80 mb-4">
           <span className="text-lg font-medium">{title}</span>
           <Button variant="plain" onClick={handleCloseBtnClick}>
             <Icon.X className="w-5 h-auto text-gray-600" />

frontend/web/src/components/AnalyticsView.tsx

@@ -1,24 +1,23 @@
 import classNames from "classnames";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { shortcutServiceClient } from "@/grpcweb";
-import { GetShortcutAnalyticsResponse } from "@/types/proto/api/v2/shortcut_service";
+import * as api from "../helpers/api";
 import Icon from "./Icon";
 
 interface Props {
-  shortcutId: number;
+  shortcutId: ShortcutId;
   className?: string;
 }
 
 const AnalyticsView: React.FC<Props> = (props: Props) => {
   const { shortcutId, className } = props;
   const { t } = useTranslation();
-  const [analytics, setAnalytics] = useState<GetShortcutAnalyticsResponse | null>(null);
+  const [analytics, setAnalytics] = useState<AnalysisData | null>(null);
   const [selectedDeviceTab, setSelectedDeviceTab] = useState<"os" | "browser">("browser");
 
   useEffect(() => {
-    shortcutServiceClient.getShortcutAnalytics({ id: shortcutId }).then((response) => {
-      setAnalytics(response);
+    api.getShortcutAnalytics(shortcutId).then(({ data }) => {
+      setAnalytics(data);
     });
   }, []);
 
@@ -35,13 +34,13 @@ const AnalyticsView: React.FC<Props> = (props: Props) => {
                   <span className="py-2 pr-2 text-right font-semibold text-sm text-gray-500">{t("analytics.visitors")}</span>
                 </div>
                 <div className="w-full divide-y divide-gray-200 dark:divide-zinc-800">
-                  {analytics.references.length === 0 && (
+                  {analytics.referenceData.length === 0 && (
                     <div className="w-full flex flex-row justify-center items-center py-6 text-gray-400">
                       <Icon.PackageOpen className="w-6 h-auto" />
                       <p className="ml-2">No data found.</p>
                     </div>
                   )}
-                  {analytics.references.map((reference) => (
+                  {analytics.referenceData.map((reference) => (
                     <div key={reference.name} className="w-full flex flex-row justify-between items-center">
                       <span className="whitespace-nowrap py-2 px-2 text-sm truncate text-gray-900 dark:text-gray-500">
                         {reference.name ? (
@@ -96,13 +95,13 @@ const AnalyticsView: React.FC<Props> = (props: Props) => {
                     <span className="py-2 pr-2 text-right text-sm font-semibold text-gray-500">{t("analytics.visitors")}</span>
                   </div>
                   <div className="w-full divide-y divide-gray-200 dark:divide-zinc-800">
-                    {analytics.browsers.length === 0 && (
+                    {analytics.browserData.length === 0 && (
                       <div className="w-full flex flex-row justify-center items-center py-6 text-gray-400">
                         <Icon.PackageOpen className="w-6 h-auto" />
                         <p className="ml-2">No data found.</p>
                       </div>
                     )}
-                    {analytics.browsers.map((reference) => (
+                    {analytics.browserData.map((reference) => (
                       <div key={reference.name} className="w-full flex flex-row justify-between items-center">
                         <span className="whitespace-nowrap py-2 px-2 text-sm text-gray-900 truncate dark:text-gray-500">
                           {reference.name || "Unknown"}
@@ -119,13 +118,13 @@ const AnalyticsView: React.FC<Props> = (props: Props) => {
                     <span className="py-2 pr-2 text-right text-sm font-semibold text-gray-500">{t("analytics.visitors")}</span>
                   </div>
                   <div className="w-full divide-y divide-gray-200">
-                    {analytics.devices.length === 0 && (
+                    {analytics.deviceData.length === 0 && (
                       <div className="w-full flex flex-row justify-center items-center py-6 text-gray-400">
                         <Icon.PackageOpen className="w-6 h-auto" />
                         <p className="ml-2">No data found.</p>
                       </div>
                     )}
-                    {analytics.devices.map((device) => (
+                    {analytics.deviceData.map((device) => (
                       <div key={device.name} className="w-full flex flex-row justify-between items-center">
                         <span className="whitespace-nowrap py-2 px-2 text-sm text-gray-900 truncate">{device.name || "Unknown"}</span>
                         <span className="whitespace-nowrap py-2 pr-2 text-sm text-gray-500 text-right shrink-0">{device.count}</span>

frontend/web/src/components/ChangePasswordDialog.tsx

@@ -54,7 +54,7 @@ const ChangePasswordDialog: React.FC<Props> = (props: Props) => {
       toast("Password changed");
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
     requestState.setFinish();
   };
@@ -62,7 +62,7 @@ const ChangePasswordDialog: React.FC<Props> = (props: Props) => {
   return (
     <Modal open={true}>
       <ModalDialog>
-        <div className="flex flex-row justify-between items-center w-80">
+        <div className="flex flex-row justify-between items-center w-80 mb-4">
           <span className="text-lg font-medium">Change Password</span>
           <Button variant="plain" onClick={handleCloseBtnClick}>
             <Icon.X className="w-5 h-auto text-gray-600" />

frontend/web/src/components/CollectionView.tsx

@@ -7,13 +7,11 @@ import { Link } from "react-router-dom";
 import { absolutifyLink } from "@/helpers/utils";
 import useNavigateTo from "@/hooks/useNavigateTo";
 import useResponsiveWidth from "@/hooks/useResponsiveWidth";
+import { useAppSelector } from "@/stores";
 import useCollectionStore from "@/stores/v1/collection";
-import useShortcutStore from "@/stores/v1/shortcut";
-import useUserStore from "@/stores/v1/user";
 import { Collection } from "@/types/proto/api/v2/collection_service";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import { showCommonDialog } from "./Alert";
-import CreateCollectionDialog from "./CreateCollectionDrawer";
+import CreateCollectionDialog from "./CreateCollectionDialog";
 import Icon from "./Icon";
 import ShortcutView from "./ShortcutView";
 import Dropdown from "./common/Dropdown";
@@ -27,15 +25,12 @@ const CollectionView = (props: Props) => {
   const { t } = useTranslation();
   const { sm } = useResponsiveWidth();
   const navigateTo = useNavigateTo();
-  const userStore = useUserStore();
-  const currentUser = userStore.getCurrentUser();
   const collectionStore = useCollectionStore();
-  const shortcutList = useShortcutStore().getShortcutList();
+  const { shortcutList } = useAppSelector((state) => state.shortcut);
   const [showEditDialog, setShowEditDialog] = useState<boolean>(false);
   const shortcuts = collection.shortcutIds
     .map((shortcutId) => shortcutList.find((shortcut) => shortcut?.id === shortcutId))
     .filter(Boolean) as any as Shortcut[];
-  const showAdminActions = currentUser.id === collection.creatorId;
 
   const handleCopyCollectionLink = () => {
     copy(absolutifyLink(`/c/${collection.name}`));
@@ -62,38 +57,28 @@ const CollectionView = (props: Props) => {
       <div className={classNames("w-full flex flex-col justify-start items-start border rounded-lg hover:shadow dark:border-zinc-800")}>
         <div className="bg-gray-100 dark:bg-zinc-800 px-3 py-2 w-full flex flex-row justify-between items-center rounded-t-lg">
           <div className="w-auto flex flex-col justify-start items-start mr-2">
-            <div className="w-full truncate">
-              <Link className="leading-6 font-medium dark:text-gray-400" to={`/c/${collection.name}`} unstable_viewTransition>
-                {collection.title}
-              </Link>
-              <span className="ml-1 leading-6 text-gray-500 dark:text-gray-400" onClick={handleCopyCollectionLink}>
-                (c/{collection.name})
-              </span>
+            <div className="w-full truncate" onClick={handleCopyCollectionLink}>
+              <span className="leading-6 font-medium dark:text-gray-400">{collection.title}</span>
+              <span className="ml-1 leading-6 text-gray-500 dark:text-gray-400">(c/{collection.name})</span>
             </div>
             <p className="text-sm text-gray-500">{collection.description}</p>
           </div>
-          <div className="flex flex-row justify-end items-center shrink-0 gap-2">
-            <Link className="w-full text-gray-400 cursor-pointer hover:text-gray-500" to={`/c/${collection.name}`} target="_blank">
-              <Icon.Share className="w-4 h-auto" />
+          <div className="flex flex-row justify-end items-center shrink-0">
+            <Link className="w-full text-gray-400 cursor-pointer hover:text-gray-500" to={`/c/${collection.name}`}>
+              <Icon.Share className="w-4 h-auto mr-2" />
             </Link>
-            {showAdminActions && (
             <Dropdown
-                trigger={
-                  <button className="flex flex-row justify-center items-center rounded text-gray-400 cursor-pointer hover:text-gray-500">
-                    <Icon.MoreVertical className="w-4 h-auto" />
-                  </button>
-                }
-                actionsClassName="!w-28 text-sm"
+              actionsClassName="!w-28 dark:text-gray-500"
               actions={
                 <>
                   <button
-                      className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
+                    className="w-full px-2 flex flex-row justify-start items-center text-left leading-8 cursor-pointer rounded hover:bg-gray-100 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60 dark:hover:bg-zinc-800"
                     onClick={() => setShowEditDialog(true)}
                   >
                     <Icon.Edit className="w-4 h-auto mr-2" /> {t("common.edit")}
                   </button>
                   <button
-                      className="w-full px-2 flex flex-row justify-start items-center text-left text-red-600 dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
+                    className="w-full px-2 flex flex-row justify-start items-center text-left leading-8 cursor-pointer rounded text-red-600 hover:bg-gray-100 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60 dark:hover:bg-zinc-800"
                     onClick={() => {
                       handleDeleteCollectionButtonClick();
                     }}
@@ -103,7 +88,6 @@ const CollectionView = (props: Props) => {
                 </>
               }
             ></Dropdown>
-            )}
           </div>
         </div>
         <div className="w-full p-3 flex flex-row justify-start items-start flex-wrap gap-3">

frontend/web/src/components/CreateAccessTokenDialog.tsx

@@ -80,14 +80,14 @@ const CreateAccessTokenDialog: React.FC<Props> = (props: Props) => {
       onClose();
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
   };
 
   return (
     <Modal open={true}>
       <ModalDialog>
-        <div className="flex flex-row justify-between items-center w-80">
+        <div className="flex flex-row justify-between items-center w-80 sm:w-96 mb-4">
           <span className="text-lg font-medium">Create Access Token</span>
           <Button variant="plain" onClick={onClose}>
             <Icon.X className="w-5 h-auto text-gray-600" />

frontend/web/src/components/CreateCollectionDialog.tsx

@@ -1,13 +1,12 @@
-import { Button, DialogActions, DialogContent, DialogTitle, Drawer, Input, ModalClose, Radio, RadioGroup } from "@mui/joy";
+import { Button, Input, Modal, ModalDialog, Radio, RadioGroup } from "@mui/joy";
 import { isUndefined } from "lodash-es";
 import { useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
+import { useAppSelector } from "@/stores";
 import useCollectionStore from "@/stores/v1/collection";
-import useShortcutStore from "@/stores/v1/shortcut";
 import { Collection } from "@/types/proto/api/v2/collection_service";
 import { Visibility } from "@/types/proto/api/v2/common";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import { convertVisibilityFromPb } from "@/utils/visibility";
 import useLoading from "../hooks/useLoading";
 import Icon from "./Icon";
@@ -23,30 +22,21 @@ interface State {
   collectionCreate: Collection;
 }
 
-const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
+const CreateCollectionDialog: React.FC<Props> = (props: Props) => {
   const { onClose, onConfirm, collectionId } = props;
   const { t } = useTranslation();
   const collectionStore = useCollectionStore();
-  const shortcutList = useShortcutStore().getShortcutList();
+  const { shortcutList } = useAppSelector((state) => state.shortcut);
   const [state, setState] = useState<State>({
     collectionCreate: Collection.fromPartial({
       visibility: Visibility.PRIVATE,
     }),
   });
   const [selectedShortcuts, setSelectedShortcuts] = useState<Shortcut[]>([]);
-  const isCreating = isUndefined(collectionId);
-  const loadingState = useLoading(!isCreating);
   const requestState = useLoading(false);
+  const isCreating = isUndefined(collectionId);
   const unselectedShortcuts = shortcutList
-    .filter((shortcut) => {
-      if (state.collectionCreate.visibility === Visibility.PUBLIC) {
-        return shortcut.visibility === Visibility.PUBLIC;
-      } else if (state.collectionCreate.visibility === Visibility.WORKSPACE) {
-        return shortcut.visibility === Visibility.PUBLIC || shortcut.visibility === Visibility.WORKSPACE;
-      } else {
-        return true;
-      }
-    })
+    .filter((shortcut) => (state.collectionCreate.visibility === Visibility.PUBLIC ? shortcut.visibility === "PUBLIC" : true))
     .filter((shortcut) => !selectedShortcuts.find((selectedShortcut) => selectedShortcut.id === shortcut.id));
 
   useEffect(() => {
@@ -65,16 +55,11 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
               .map((shortcutId) => shortcutList.find((shortcut) => shortcut.id === shortcutId))
               .filter(Boolean) as Shortcut[]
           );
-          loadingState.setFinish();
         }
       }
     })();
   }, [collectionId]);
 
-  if (loadingState.isLoading) {
-    return null;
-  }
-
   const setPartialState = (partialState: Partial<State>) => {
     setState({
       ...state,
@@ -156,23 +141,29 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
   };
 
   return (
-    <Drawer anchor="right" open={true} onClose={onClose}>
-      <DialogTitle>{isCreating ? "Create Collection" : "Edit Collection"}</DialogTitle>
-      <ModalClose />
-      <DialogContent className="w-full max-w-full sm:max-w-[24rem]">
-        <div className="overflow-y-auto w-full mt-2 px-3 pb-4">
+    <Modal open={true}>
+      <ModalDialog>
+        <div className="w-full flex flex-row justify-between items-center">
+          <span className="text-lg font-medium">{isCreating ? "Create Collection" : "Edit Collection"}</span>
+          <Button variant="plain" onClick={onClose}>
+            <Icon.X className="w-5 h-auto text-gray-600" />
+          </Button>
+        </div>
+        <div className="overflow-y-auto overflow-x-hidden w-80 sm:w-96 max-w-full">
           <div className="w-full flex flex-col justify-start items-start mb-3">
             <span className="mb-2">
               Name <span className="text-red-600">*</span>
             </span>
+            <div className="relative w-full">
               <Input
                 className="w-full"
                 type="text"
-              placeholder="The memorable name of the collection"
+                placeholder="Should be an unique name and will be put in url"
                 value={state.collectionCreate.name}
                 onChange={handleNameInputChange}
               />
             </div>
+          </div>
           <div className="w-full flex flex-col justify-start items-start mb-3">
             <span className="mb-2">
               Title <span className="text-red-600">*</span>
@@ -204,7 +195,6 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
             <div className="w-full flex flex-row justify-start items-center text-base">
               <RadioGroup orientation="horizontal" value={state.collectionCreate.visibility} onChange={handleVisibilityInputChange}>
                 <Radio value={Visibility.PRIVATE} label={t(`shortcut.visibility.private.self`)} />
-                <Radio value={Visibility.WORKSPACE} label={t(`shortcut.visibility.workspace.self`)} />
                 <Radio value={Visibility.PUBLIC} label={t(`shortcut.visibility.public.self`)} />
               </RadioGroup>
             </div>
@@ -216,7 +206,7 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
             <p className="mb-2">
               <span>Shortcuts</span>
               <span className="opacity-60">({selectedShortcuts.length})</span>
-              {selectedShortcuts.length === 0 && <span className="ml-2 italic opacity-80 text-sm">(Select a shortcut first)</span>}
+              {selectedShortcuts.length === 0 && <span className="ml-2 italic opacity-80 text-sm">Select a shortcut first</span>}
             </p>
             <div className="w-full py-1 px-px flex flex-row justify-start items-start flex-wrap overflow-hidden gap-2">
               {selectedShortcuts.map((shortcut) => {
@@ -251,10 +241,8 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
               )}
             </div>
           </div>
-        </div>
-      </DialogContent>
-      <DialogActions>
-        <div className="w-full flex flex-row justify-end items-center px-3 py-4 space-x-2">
+
+          <div className="w-full flex flex-row justify-end items-center mt-4 space-x-2">
             <Button color="neutral" variant="plain" disabled={requestState.isLoading} loading={requestState.isLoading} onClick={onClose}>
               {t("common.cancel")}
             </Button>
@@ -262,9 +250,10 @@ const CreateCollectionDrawer: React.FC<Props> = (props: Props) => {
               {t("common.save")}
             </Button>
           </div>
-      </DialogActions>
-    </Drawer>
+        </div>
+      </ModalDialog>
+    </Modal>
   );
 };
 
-export default CreateCollectionDrawer;
+export default CreateCollectionDialog;

frontend/web/src/components/CreateShortcutDialog.tsx

@@ -1,65 +1,57 @@
-import {
-  Button,
-  DialogActions,
-  DialogContent,
-  DialogTitle,
-  Divider,
-  Drawer,
-  Input,
-  ModalClose,
-  Radio,
-  RadioGroup,
-  Textarea,
-} from "@mui/joy";
+import { Button, Divider, Input, Modal, ModalDialog, Radio, RadioGroup, Textarea } from "@mui/joy";
 import classnames from "classnames";
 import { isUndefined, uniq } from "lodash-es";
 import { useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import useShortcutStore, { getShortcutUpdateMask } from "@/stores/v1/shortcut";
-import { Visibility } from "@/types/proto/api/v2/common";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
-import { convertVisibilityFromPb } from "@/utils/visibility";
+import { useAppSelector } from "@/stores";
 import useLoading from "../hooks/useLoading";
+import { shortcutService } from "../services";
 import Icon from "./Icon";
 
 interface Props {
-  shortcutId?: number;
+  shortcutId?: ShortcutId;
   initialShortcut?: Partial<Shortcut>;
   onClose: () => void;
   onConfirm?: () => void;
 }
 
 interface State {
-  shortcutCreate: Shortcut;
+  shortcutCreate: ShortcutCreate;
 }
 
-const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
+const visibilities: Visibility[] = ["PRIVATE", "WORKSPACE", "PUBLIC"];
+
+const CreateShortcutDialog: React.FC<Props> = (props: Props) => {
   const { onClose, onConfirm, shortcutId, initialShortcut } = props;
   const { t } = useTranslation();
+  const { shortcutList } = useAppSelector((state) => state.shortcut);
   const [state, setState] = useState<State>({
-    shortcutCreate: Shortcut.fromPartial({
-      visibility: Visibility.PRIVATE,
-      ogMetadata: {
+    shortcutCreate: {
+      name: "",
+      link: "",
+      title: "",
+      description: "",
+      visibility: "PRIVATE",
+      tags: [],
+      openGraphMetadata: {
         title: "",
         description: "",
         image: "",
       },
       ...initialShortcut,
-    }),
+    },
   });
-  const shortcutStore = useShortcutStore();
+  const [showAdditionalFields, setShowAdditionalFields] = useState<boolean>(false);
   const [showOpenGraphMetadata, setShowOpenGraphMetadata] = useState<boolean>(false);
-  const shortcutList = shortcutStore.getShortcutList();
   const [tag, setTag] = useState<string>("");
   const tagSuggestions = uniq(shortcutList.map((shortcut) => shortcut.tags).flat());
-  const isCreating = isUndefined(shortcutId);
-  const loadingState = useLoading(!isCreating);
   const requestState = useLoading(false);
+  const isCreating = isUndefined(shortcutId);
 
   useEffect(() => {
     if (shortcutId) {
-      const shortcut = shortcutStore.getShortcutById(shortcutId);
+      const shortcut = shortcutService.getShortcutById(shortcutId);
       if (shortcut) {
         setState({
           ...state,
@@ -69,19 +61,14 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
             title: shortcut.title,
             description: shortcut.description,
             visibility: shortcut.visibility,
-            ogMetadata: shortcut.ogMetadata,
+            openGraphMetadata: shortcut.openGraphMetadata,
           }),
         });
         setTag(shortcut.tags.join(" "));
-        loadingState.setFinish();
       }
     }
   }, [shortcutId]);
 
-  if (loadingState.isLoading) {
-    return null;
-  }
-
   const setPartialState = (partialState: Partial<State>) => {
     setState({
       ...state,
@@ -116,7 +103,7 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
   const handleVisibilityInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setPartialState({
       shortcutCreate: Object.assign(state.shortcutCreate, {
-        visibility: Number(e.target.value),
+        visibility: e.target.value,
       }),
     });
   };
@@ -137,8 +124,8 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
   const handleOpenGraphMetadataImageChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setPartialState({
       shortcutCreate: Object.assign(state.shortcutCreate, {
-        ogMetadata: {
-          ...state.shortcutCreate.ogMetadata,
+        openGraphMetadata: {
+          ...state.shortcutCreate.openGraphMetadata,
           image: e.target.value,
         },
       }),
@@ -148,8 +135,8 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
   const handleOpenGraphMetadataTitleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setPartialState({
       shortcutCreate: Object.assign(state.shortcutCreate, {
-        ogMetadata: {
-          ...state.shortcutCreate.ogMetadata,
+        openGraphMetadata: {
+          ...state.shortcutCreate.openGraphMetadata,
           title: e.target.value,
         },
       }),
@@ -159,8 +146,8 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
   const handleOpenGraphMetadataDescriptionChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
     setPartialState({
       shortcutCreate: Object.assign(state.shortcutCreate, {
-        ogMetadata: {
-          ...state.shortcutCreate.ogMetadata,
+        openGraphMetadata: {
+          ...state.shortcutCreate.openGraphMetadata,
           description: e.target.value,
         },
       }),
@@ -182,19 +169,21 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
     }
 
     try {
-      const tags = tag.split(" ").filter(Boolean);
       if (shortcutId) {
-        const originShortcut = shortcutStore.getShortcutById(shortcutId);
-        const updatingShortcut = {
-          ...state.shortcutCreate,
+        await shortcutService.patchShortcut({
           id: shortcutId,
-          tags,
-        };
-        await shortcutStore.updateShortcut(updatingShortcut, getShortcutUpdateMask(originShortcut, updatingShortcut));
+          name: state.shortcutCreate.name,
+          link: state.shortcutCreate.link,
+          title: state.shortcutCreate.title,
+          description: state.shortcutCreate.description,
+          visibility: state.shortcutCreate.visibility,
+          tags: tag.split(" ").filter(Boolean),
+          openGraphMetadata: state.shortcutCreate.openGraphMetadata,
+        });
       } else {
-        await shortcutStore.createShortcut({
+        await shortcutService.createShortcut({
           ...state.shortcutCreate,
-          tags,
+          tags: tag.split(" ").filter(Boolean),
         });
       }
 
@@ -205,63 +194,49 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
       }
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
   };
 
   return (
-    <Drawer anchor="right" open={true} onClose={onClose}>
-      <DialogTitle>{isCreating ? "Create Shortcut" : "Edit Shortcut"}</DialogTitle>
-      <ModalClose />
-      <DialogContent className="w-full max-w-full sm:max-w-[24rem]">
-        <div className="overflow-y-auto w-full mt-2 px-3 pb-4">
+    <Modal open={true}>
+      <ModalDialog>
+        <div className="flex flex-row justify-between items-center w-80 sm:w-96">
+          <span className="text-lg font-medium">{isCreating ? "Create Shortcut" : "Edit Shortcut"}</span>
+          <Button variant="plain" onClick={onClose}>
+            <Icon.X className="w-5 h-auto text-gray-600" />
+          </Button>
+        </div>
+        <div className="overflow-y-auto overflow-x-hidden">
           <div className="w-full flex flex-col justify-start items-start mb-3">
             <span className="mb-2">
               Name <span className="text-red-600">*</span>
             </span>
+            <div className="relative w-full">
               <Input
                 className="w-full"
                 type="text"
-              placeholder="The memorable name of the shortcut"
+                placeholder="Should be an unique name and will be put in url"
                 value={state.shortcutCreate.name}
                 onChange={handleNameInputChange}
               />
             </div>
+          </div>
           <div className="w-full flex flex-col justify-start items-start mb-3">
             <span className="mb-2">
-              Link <span className="text-red-600">*</span>
+              Destination URL <span className="text-red-600">*</span>
             </span>
             <Input
               className="w-full"
               type="text"
-              placeholder="The destination link of the shortcut"
+              placeholder="https://github.com/boojack/slash"
               value={state.shortcutCreate.link}
               onChange={handleLinkInputChange}
             />
           </div>
-          <div className="w-full flex flex-col justify-start items-start mb-3">
-            <span className="mb-2">Title</span>
-            <Input
-              className="w-full"
-              type="text"
-              placeholder="The title of the shortcut"
-              value={state.shortcutCreate.title}
-              onChange={handleTitleInputChange}
-            />
-          </div>
-          <div className="w-full flex flex-col justify-start items-start mb-3">
-            <span className="mb-2">Description</span>
-            <Input
-              className="w-full"
-              type="text"
-              placeholder="A short description of the shortcut"
-              value={state.shortcutCreate.description}
-              onChange={handleDescriptionInputChange}
-            />
-          </div>
           <div className="w-full flex flex-col justify-start items-start mb-3">
             <span className="mb-2">Tags</span>
-            <Input className="w-full" type="text" placeholder="The tags of shortcut" value={tag} onChange={handleTagsInputChange} />
+            <Input className="w-full" type="text" placeholder="github slash" value={tag} onChange={handleTagsInputChange} />
             {tagSuggestions.length > 0 && (
               <div className="w-full flex flex-row justify-start items-start mt-2">
                 <Icon.Asterisk className="w-4 h-auto shrink-0 mx-1 text-gray-400 dark:text-gray-500" />
@@ -283,17 +258,57 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
             <span className="mb-2">Visibility</span>
             <div className="w-full flex flex-row justify-start items-center text-base">
               <RadioGroup orientation="horizontal" value={state.shortcutCreate.visibility} onChange={handleVisibilityInputChange}>
-                <Radio value={Visibility.PRIVATE} label={t(`shortcut.visibility.private.self`)} />
-                <Radio value={Visibility.WORKSPACE} label={t(`shortcut.visibility.workspace.self`)} />
-                <Radio value={Visibility.PUBLIC} label={t(`shortcut.visibility.public.self`)} />
+                {visibilities.map((visibility) => (
+                  <Radio key={visibility} value={visibility} label={t(`shortcut.visibility.${visibility.toLowerCase()}.self`)} />
+                ))}
               </RadioGroup>
             </div>
             <p className="mt-3 text-sm text-gray-500 w-full bg-gray-100 border border-gray-200 dark:bg-zinc-800 dark:border-zinc-700 dark:text-gray-400 px-2 py-1 rounded-md">
-              {t(`shortcut.visibility.${convertVisibilityFromPb(state.shortcutCreate.visibility).toLowerCase()}.description`)}
+              {t(`shortcut.visibility.${state.shortcutCreate.visibility.toLowerCase()}.description`)}
             </p>
           </div>
           <Divider className="text-gray-500">More</Divider>
-          <div className="w-full flex flex-col justify-start items-start border rounded-md mt-3 overflow-hidden dark:border-zinc-800">
+          <div className="w-full flex flex-col justify-start items-start border rounded-md overflow-hidden my-3 dark:border-zinc-800">
+            <div
+              className={classnames(
+                "w-full flex flex-row justify-between items-center px-2 py-1 cursor-pointer hover:bg-gray-100 dark:hover:bg-zinc-800",
+                showAdditionalFields ? "bg-gray-100 border-b dark:bg-zinc-800 dark:border-b-zinc-700" : ""
+              )}
+              onClick={() => setShowAdditionalFields(!showAdditionalFields)}
+            >
+              <span className="text-sm">Additional fields</span>
+              <button className="w-7 h-7 p-1 rounded-md">
+                <Icon.ChevronDown className={classnames("w-4 h-auto text-gray-500", showAdditionalFields ? "transform rotate-180" : "")} />
+              </button>
+            </div>
+            {showAdditionalFields && (
+              <div className="w-full px-2 py-1">
+                <div className="w-full flex flex-col justify-start items-start mb-3">
+                  <span className="mb-2 text-sm">Title</span>
+                  <Input
+                    className="w-full"
+                    type="text"
+                    placeholder="Title"
+                    size="sm"
+                    value={state.shortcutCreate.title}
+                    onChange={handleTitleInputChange}
+                  />
+                </div>
+                <div className="w-full flex flex-col justify-start items-start mb-3">
+                  <span className="mb-2 text-sm">Description</span>
+                  <Input
+                    className="w-full"
+                    type="text"
+                    placeholder="Github repo for slash"
+                    size="sm"
+                    value={state.shortcutCreate.description}
+                    onChange={handleDescriptionInputChange}
+                  />
+                </div>
+              </div>
+            )}
+          </div>
+          <div className="w-full flex flex-col justify-start items-start border rounded-md overflow-hidden dark:border-zinc-800">
             <div
               className={classnames(
                 "w-full flex flex-row justify-between items-center px-2 py-1 cursor-pointer hover:bg-gray-100 dark:hover:bg-zinc-800",
@@ -318,7 +333,7 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
                     type="text"
                     placeholder="https://the.link.to/the/image.png"
                     size="sm"
-                    value={state.shortcutCreate.ogMetadata?.image}
+                    value={state.shortcutCreate.openGraphMetadata.image}
                     onChange={handleOpenGraphMetadataImageChange}
                   />
                 </div>
@@ -329,7 +344,7 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
                     type="text"
                     placeholder="Slash - An open source, self-hosted bookmarks and link sharing platform"
                     size="sm"
-                    value={state.shortcutCreate.ogMetadata?.title}
+                    value={state.shortcutCreate.openGraphMetadata.title}
                     onChange={handleOpenGraphMetadataTitleChange}
                   />
                 </div>
@@ -340,17 +355,15 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
                     placeholder="An open source, self-hosted bookmarks and link sharing platform."
                     size="sm"
                     maxRows={3}
-                    value={state.shortcutCreate.ogMetadata?.description}
+                    value={state.shortcutCreate.openGraphMetadata.description}
                     onChange={handleOpenGraphMetadataDescriptionChange}
                   />
                 </div>
               </div>
             )}
           </div>
-        </div>
-      </DialogContent>
-      <DialogActions>
-        <div className="w-full flex flex-row justify-end items-center px-3 py-4 space-x-2">
+
+          <div className="w-full flex flex-row justify-end items-center mt-4 space-x-2">
             <Button color="neutral" variant="plain" disabled={requestState.isLoading} loading={requestState.isLoading} onClick={onClose}>
               {t("common.cancel")}
             </Button>
@@ -358,9 +371,10 @@ const CreateShortcutDrawer: React.FC<Props> = (props: Props) => {
               {t("common.save")}
             </Button>
           </div>
-      </DialogActions>
-    </Drawer>
+        </div>
+      </ModalDialog>
+    </Modal>
   );
 };
 
-export default CreateShortcutDrawer;
+export default CreateShortcutDialog;

frontend/web/src/components/CreateUserDialog.tsx

@@ -3,7 +3,6 @@ import { isUndefined } from "lodash-es";
 import { useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { Role, User } from "@/types/proto/api/v2/user_service";
 import useLoading from "../hooks/useLoading";
 import useUserStore from "../stores/v1/user";
 import Icon from "./Icon";
@@ -15,9 +14,11 @@ interface Props {
 }
 
 interface State {
-  userCreate: Pick<User, "email" | "nickname" | "password" | "role">;
+  userCreate: UserCreate;
 }
 
+const roles: Role[] = ["USER", "ADMIN"];
+
 const CreateUserDialog: React.FC<Props> = (props: Props) => {
   const { onClose, onConfirm, user } = props;
   const { t } = useTranslation();
@@ -27,7 +28,7 @@ const CreateUserDialog: React.FC<Props> = (props: Props) => {
       email: "",
       nickname: "",
       password: "",
-      role: Role.USER,
+      role: "USER",
     },
   });
   const requestState = useLoading(false);
@@ -94,7 +95,7 @@ const CreateUserDialog: React.FC<Props> = (props: Props) => {
 
     try {
       if (user) {
-        const userPatch: Partial<User> = {
+        const userPatch: UserPatch = {
           id: user.id,
         };
         if (user.email !== state.userCreate.email) {
@@ -118,14 +119,14 @@ const CreateUserDialog: React.FC<Props> = (props: Props) => {
       }
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
   };
 
   return (
     <Modal open={true}>
       <ModalDialog>
-        <div className="flex flex-row justify-between items-center w-80 sm:w-96">
+        <div className="flex flex-row justify-between items-center w-80 sm:w-96 mb-4">
           <span className="text-lg font-medium">{isCreating ? "Create User" : "Edit User"}</span>
           <Button variant="plain" onClick={onClose}>
             <Icon.X className="w-5 h-auto text-gray-600" />
@@ -178,8 +179,9 @@ const CreateUserDialog: React.FC<Props> = (props: Props) => {
             </span>
             <div className="w-full flex flex-row justify-start items-center text-base">
               <RadioGroup orientation="horizontal" value={state.userCreate.role} onChange={handleRoleInputChange}>
-                <Radio value={Role.USER} label={"User"} />
-                <Radio value={Role.ADMIN} label={"Admin"} />
+                {roles.map((role) => (
+                  <Radio key={role} value={role} label={role} />
+                ))}
               </RadioGroup>
             </div>
           </div>

frontend/web/src/components/DemoBanner.tsx

@@ -13,7 +13,7 @@ const DemoBanner: React.FC = () => {
         <span>✨🔗 Slash - An open source, self-hosted bookmarks and link sharing platform</span>
         <a
           className="shadow flex flex-row justify-center items-center px-2 py-1 rounded-md text-sm sm:text-base text-white bg-blue-600 hover:bg-blue-700"
-          href="https://github.com/yourselfhosted/slash#deploy-with-docker-in-seconds"
+          href="https://github.com/boojack/slash#deploy-with-docker-in-seconds"
           target="_blank"
         >
           Install

frontend/web/src/components/EditUserinfoDialog.tsx

@@ -50,7 +50,7 @@ const EditUserinfoDialog: React.FC<Props> = (props: Props) => {
       toast("User information updated");
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
     requestState.setFinish();
   };
@@ -58,7 +58,7 @@ const EditUserinfoDialog: React.FC<Props> = (props: Props) => {
   return (
     <Modal open={true}>
       <ModalDialog>
-        <div className="flex flex-row justify-between items-center w-80">
+        <div className="flex flex-row justify-between items-center w-80 mb-4">
           <span className="text-lg font-medium">Edit Userinfo</span>
           <Button variant="plain" onClick={handleCloseBtnClick}>
             <Icon.X className="w-5 h-auto text-gray-600" />

frontend/web/src/components/FilterView.tsx

@@ -1,5 +1,4 @@
 import { useTranslation } from "react-i18next";
-import { convertVisibilityFromPb } from "@/utils/visibility";
 import useViewStore from "../stores/v1/view";
 import Icon from "./Icon";
 import VisibilityIcon from "./VisibilityIcon";
@@ -33,7 +32,7 @@ const FilterView = () => {
           onClick={() => viewStore.setFilter({ visibility: undefined })}
         >
           <VisibilityIcon className="w-4 h-auto mr-1" visibility={filter.visibility} />
-          {t(`shortcut.visibility.${convertVisibilityFromPb(filter.visibility).toLowerCase()}.self`)}
+          {t(`shortcut.visibility.${filter.visibility.toLowerCase()}.self`)}
           <Icon.X className="w-4 h-auto ml-1" />
         </button>
       )}

frontend/web/src/components/GenerateQRCodeDialog.tsx

@@ -3,7 +3,6 @@ import { QRCodeCanvas } from "qrcode.react";
 import { useRef } from "react";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import { absolutifyLink } from "../helpers/utils";
 import Icon from "./Icon";
 
@@ -39,7 +38,7 @@ const GenerateQRCodeDialog: React.FC<Props> = (props: Props) => {
   return (
     <Modal open={true}>
       <ModalDialog>
-        <div className="flex flex-row justify-between items-center w-64">
+        <div className="flex flex-row justify-between items-center w-64 mb-4">
           <span className="text-lg font-medium">QR Code</span>
           <Button variant="plain" onClick={handleCloseBtnClick}>
             <Icon.X className="w-5 h-auto text-gray-600" />

frontend/web/src/components/Header.tsx

@@ -2,10 +2,9 @@ import { Avatar } from "@mui/joy";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useLocation } from "react-router-dom";
-import { authServiceClient } from "@/grpcweb";
 import useWorkspaceStore from "@/stores/v1/workspace";
 import { PlanType } from "@/types/proto/api/v2/subscription_service";
-import { Role } from "@/types/proto/api/v2/user_service";
+import * as api from "../helpers/api";
 import useUserStore from "../stores/v1/user";
 import AboutDialog from "./AboutDialog";
 import Icon from "./Icon";
@@ -18,12 +17,11 @@ const Header: React.FC = () => {
   const currentUser = useUserStore().getCurrentUser();
   const [showAboutDialog, setShowAboutDialog] = useState<boolean>(false);
   const profile = workspaceStore.profile;
-  const isAdmin = currentUser.role === Role.ADMIN;
-  const shouldShowRouterSwitch = location.pathname === "/" || location.pathname === "/collections" || location.pathname === "/memos";
-  const selectedSection = location.pathname === "/" ? "Shortcuts" : location.pathname === "/collections" ? "Collections" : "Memos";
+  const isAdmin = currentUser.role === "ADMIN";
+  const shouldShowRouterSwitch = location.pathname === "/" || location.pathname === "/collections";
 
   const handleSignOutButtonClick = async () => {
-    await authServiceClient.signOut({});
+    await api.signout();
     window.location.href = "/auth";
   };
 
@@ -32,7 +30,7 @@ const Header: React.FC = () => {
       <div className="w-full bg-gray-50 dark:bg-zinc-800 border-b border-b-gray-200 dark:border-b-zinc-800">
         <div className="w-full max-w-8xl mx-auto px-3 md:px-12 py-3 flex flex-row justify-between items-center">
           <div className="flex flex-row justify-start items-center shrink mr-2">
-            <Link to="/" className="cursor-pointer flex flex-row justify-start items-center dark:text-gray-400" unstable_viewTransition>
+            <Link to="/" className="cursor-pointer flex flex-row justify-start items-center dark:text-gray-400">
               <img id="logo-img" src="/logo.png" className="w-7 h-auto mr-2 -mt-0.5 dark:opacity-80 rounded-full shadow" alt="" />
               Slash
             </Link>
@@ -43,30 +41,28 @@ const Header: React.FC = () => {
             )}
             {shouldShowRouterSwitch && (
               <>
-                <span className="font-mono opacity-60 mx-1 dark:text-gray-400">/</span>
+                <span className="font-mono opacity-60 mx-1">/</span>
                 <Dropdown
                   trigger={
                     <button className="flex flex-row justify-end items-center cursor-pointer">
-                      <span className="dark:text-gray-400">{selectedSection}</span>
+                      <span className="dark:text-gray-400">{location.pathname === "/" ? "Shortcuts" : "Collections"}</span>
                       <Icon.ChevronsUpDown className="ml-1 w-4 h-auto text-gray-600 dark:text-gray-400" />
                     </button>
                   }
-                  actionsClassName="!w-32 -left-4 text-sm"
+                  actionsClassName="!w-36 -left-4"
                   actions={
                     <>
                       <Link
-                        className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                         to="/"
-                        unstable_viewTransition
+                        className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                       >
-                        <Icon.SquareSlash className="w-4 h-auto mr-2 opacity-70" /> Shortcuts
+                        <Icon.SquareSlash className="w-5 h-auto mr-2 opacity-70" /> Shortcuts
                       </Link>
                       <Link
-                        className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                         to="/collections"
-                        unstable_viewTransition
+                        className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                       >
-                        <Icon.LibrarySquare className="w-4 h-auto mr-2 opacity-70" /> Collections
+                        <Icon.LibrarySquare className="w-5 h-auto mr-2 opacity-70" /> Collections
                       </Link>
                     </>
                   }
@@ -83,36 +79,34 @@ const Header: React.FC = () => {
                   <Icon.ChevronDown className="ml-2 w-5 h-auto text-gray-600 dark:text-gray-400" />
                 </button>
               }
-              actionsClassName="!w-32 text-sm"
+              actionsClassName="!w-32"
               actions={
                 <>
                   <Link
-                    className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                     to="/setting/general"
-                    unstable_viewTransition
+                    className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                   >
-                    <Icon.User className="w-4 h-auto mr-2 opacity-70" /> {t("user.profile")}
+                    <Icon.User className="w-4 h-auto mr-2" /> {t("user.profile")}
                   </Link>
                   {isAdmin && (
                     <Link
-                      className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                       to="/setting/workspace"
-                      unstable_viewTransition
+                      className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                     >
-                      <Icon.Settings className="w-4 h-auto mr-2 opacity-70" /> {t("settings.self")}
+                      <Icon.Settings className="w-4 h-auto mr-2" /> {t("settings.self")}
                     </Link>
                   )}
                   <button
                     className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                     onClick={() => setShowAboutDialog(true)}
                   >
-                    <Icon.Info className="w-4 h-auto mr-2 opacity-70" /> {t("common.about")}
+                    <Icon.Info className="w-4 h-auto mr-2" /> {t("common.about")}
                   </button>
                   <button
                     className="w-full px-2 flex flex-row justify-start items-center text-left dark:text-gray-400 leading-8 cursor-pointer rounded hover:bg-gray-100 dark:hover:bg-zinc-800 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60"
                     onClick={() => handleSignOutButtonClick()}
                   >
-                    <Icon.LogOut className="w-4 h-auto mr-2 opacity-70" /> {t("auth.sign-out")}
+                    <Icon.LogOut className="w-4 h-auto mr-2" /> {t("auth.sign-out")}
                   </button>
                 </>
               }

frontend/web/src/components/ResourceNameInput.tsx

@@ -1,59 +0,0 @@
-import { IconButton, Input } from "@mui/joy";
-import classNames from "classnames";
-import { useEffect, useState } from "react";
-import { generateRandomString } from "@/helpers/utils";
-import Icon from "./Icon";
-
-interface Props {
-  name: string;
-  onChange: (name: string) => void;
-}
-
-const ResourceNameInput = (props: Props) => {
-  const { name, onChange } = props;
-  const [modified, setModified] = useState(false);
-  const [editingName, setEditingName] = useState(name || generateRandomString().toLowerCase());
-
-  useEffect(() => {
-    onChange(editingName);
-  }, [editingName]);
-
-  const handleNameInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    if (!modified) {
-      return;
-    }
-
-    setEditingName(e.target.value);
-  };
-
-  return (
-    <div className="w-full flex flex-col justify-start items-start mb-3">
-      <div className={classNames("", modified ? "mb-2" : "flex flex-row justify-start items-center")}>
-        <span>Name</span>
-        {modified ? (
-          <span className="text-red-600"> *</span>
-        ) : (
-          <>
-            <span>:</span>
-            <span className="ml-1 font-mono font-medium">{editingName}</span>
-            <div className="ml-1 flex flex-row justify-start items-center">
-              <IconButton size="sm" variant="plain" color="neutral" onClick={() => setModified(true)}>
-                <Icon.Edit className="w-4 h-auto text-gray-500 dark:text-gray-400" />
-              </IconButton>
-              <IconButton size="sm" variant="plain" color="neutral" onClick={() => setEditingName(generateRandomString().toLowerCase())}>
-                <Icon.RefreshCcw className="w-4 h-auto text-gray-500 dark:text-gray-400" />
-              </IconButton>
-            </div>
-          </>
-        )}
-      </div>
-      {modified && (
-        <div className="relative w-full">
-          <Input className="w-full" type="text" placeholder="An unique name" value={editingName} onChange={handleNameInputChange} />
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default ResourceNameInput;

frontend/web/src/components/ShortcutActionsDropdown.tsx

@@ -1,12 +1,10 @@
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import useNavigateTo from "@/hooks/useNavigateTo";
-import useShortcutStore from "@/stores/v1/shortcut";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
-import { Role } from "@/types/proto/api/v2/user_service";
+import { shortcutService } from "../services";
 import useUserStore from "../stores/v1/user";
 import { showCommonDialog } from "./Alert";
-import CreateShortcutDrawer from "./CreateShortcutDrawer";
+import CreateShortcutDialog from "./CreateShortcutDialog";
 import GenerateQRCodeDialog from "./GenerateQRCodeDialog";
 import Icon from "./Icon";
 import Dropdown from "./common/Dropdown";
@@ -19,11 +17,10 @@ const ShortcutActionsDropdown = (props: Props) => {
   const { shortcut } = props;
   const { t } = useTranslation();
   const navigateTo = useNavigateTo();
-  const shortcutStore = useShortcutStore();
   const currentUser = useUserStore().getCurrentUser();
-  const [showEditDrawer, setShowEditDrawer] = useState<boolean>(false);
+  const [showEditDialog, setShowEditDialog] = useState<boolean>(false);
   const [showQRCodeDialog, setShowQRCodeDialog] = useState<boolean>(false);
-  const havePermission = currentUser.role === Role.ADMIN || shortcut.creatorId === currentUser.id;
+  const havePermission = currentUser.role === "ADMIN" || shortcut.creatorId === currentUser.id;
 
   const handleDeleteShortcutButtonClick = (shortcut: Shortcut) => {
     showCommonDialog({
@@ -31,7 +28,7 @@ const ShortcutActionsDropdown = (props: Props) => {
       content: `Are you sure to delete shortcut \`${shortcut.name}\`? You cannot undo this action.`,
       style: "danger",
       onConfirm: async () => {
-        await shortcutStore.deleteShortcut(shortcut.id);
+        await shortcutService.deleteShortcutById(shortcut.id);
       },
     });
   };
@@ -43,28 +40,28 @@ const ShortcutActionsDropdown = (props: Props) => {
   return (
     <>
       <Dropdown
-        actionsClassName="!w-32 dark:text-gray-500 text-sm"
+        actionsClassName="!w-32 dark:text-gray-500"
         actions={
           <>
             {havePermission && (
               <button
                 className="w-full px-2 flex flex-row justify-start items-center text-left leading-8 cursor-pointer rounded hover:bg-gray-100 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60 dark:hover:bg-zinc-800"
-                onClick={() => setShowEditDrawer(true)}
+                onClick={() => setShowEditDialog(true)}
               >
-                <Icon.Edit className="w-4 h-auto mr-2 opacity-70" /> {t("common.edit")}
+                <Icon.Edit className="w-4 h-auto mr-2" /> {t("common.edit")}
               </button>
             )}
             <button
               className="w-full px-2 flex flex-row justify-start items-center text-left leading-8 cursor-pointer rounded hover:bg-gray-100 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60 dark:hover:bg-zinc-800"
               onClick={() => setShowQRCodeDialog(true)}
             >
-              <Icon.QrCode className="w-4 h-auto mr-2 opacity-70" /> QR Code
+              <Icon.QrCode className="w-4 h-auto mr-2" /> QR Code
             </button>
             <button
               className="w-full px-2 flex flex-row justify-start items-center text-left leading-8 cursor-pointer rounded hover:bg-gray-100 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:opacity-60 dark:hover:bg-zinc-800"
               onClick={gotoAnalytics}
             >
-              <Icon.BarChart2 className="w-4 h-auto mr-2 opacity-70" /> {t("analytics.self")}
+              <Icon.BarChart2 className="w-4 h-auto mr-2" /> {t("analytics.self")}
             </button>
             {havePermission && (
               <button
@@ -73,18 +70,18 @@ const ShortcutActionsDropdown = (props: Props) => {
                   handleDeleteShortcutButtonClick(shortcut);
                 }}
               >
-                <Icon.Trash className="w-4 h-auto mr-2 opacity-70" /> {t("common.delete")}
+                <Icon.Trash className="w-4 h-auto mr-2" /> {t("common.delete")}
               </button>
             )}
           </>
         }
       ></Dropdown>
 
-      {showEditDrawer && (
-        <CreateShortcutDrawer
+      {showEditDialog && (
+        <CreateShortcutDialog
           shortcutId={shortcut.id}
-          onClose={() => setShowEditDrawer(false)}
-          onConfirm={() => setShowEditDrawer(false)}
+          onClose={() => setShowEditDialog(false)}
+          onConfirm={() => setShowEditDialog(false)}
         />
       )}
 

frontend/web/src/components/ShortcutCard.tsx

@@ -1,13 +1,9 @@
-import { Avatar, Tooltip } from "@mui/joy";
+import { Tooltip } from "@mui/joy";
 import classNames from "classnames";
 import copy from "copy-to-clipboard";
-import { useEffect } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import useUserStore from "@/stores/v1/user";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
-import { convertVisibilityFromPb } from "@/utils/visibility";
 import { absolutifyLink, getFaviconWithGoogleS2 } from "../helpers/utils";
 import useViewStore from "../stores/v1/view";
 import Icon from "./Icon";
@@ -21,22 +17,17 @@ interface Props {
 const ShortcutCard = (props: Props) => {
   const { shortcut } = props;
   const { t } = useTranslation();
-  const userStore = useUserStore();
   const viewStore = useViewStore();
-  const creator = userStore.getUserById(shortcut.creatorId);
   const shortcutLink = absolutifyLink(`/s/${shortcut.name}`);
   const favicon = getFaviconWithGoogleS2(shortcut.link);
 
-  useEffect(() => {
-    userStore.getOrFetchUserById(shortcut.creatorId);
-  }, []);
-
   const handleCopyButtonClick = () => {
     copy(shortcutLink);
     toast.success("Shortcut link copied to clipboard.");
   };
 
   return (
+    <>
       <div
         className={classNames(
           "group px-4 py-3 w-full flex flex-col justify-start items-start border rounded-lg hover:shadow dark:border-zinc-700"
@@ -44,13 +35,9 @@ const ShortcutCard = (props: Props) => {
       >
         <div className="w-full flex flex-row justify-between items-center">
           <div className="w-[calc(100%-16px)] flex flex-row justify-start items-center mr-1 shrink-0">
-          <Link
-            className={classNames("w-8 h-8 flex justify-center items-center overflow-clip shrink-0")}
-            to={`/shortcut/${shortcut.id}`}
-            unstable_viewTransition
-          >
+            <Link to={`/shortcut/${shortcut.id}`} className={classNames("w-8 h-8 flex justify-center items-center overflow-clip shrink-0")}>
               {favicon ? (
-              <img className="w-full h-auto rounded" src={favicon} decoding="async" loading="lazy" />
+                <img className="w-full h-auto rounded-lg" src={favicon} decoding="async" loading="lazy" />
               ) : (
                 <Icon.CircleSlash className="w-full h-auto text-gray-400" />
               )}
@@ -67,9 +54,10 @@ const ShortcutCard = (props: Props) => {
                   <div className="truncate">
                     <span className="dark:text-gray-400">{shortcut.title}</span>
                     {shortcut.title ? (
-                    <span className="text-gray-500">({shortcut.name})</span>
+                      <span className="text-gray-500">(s/{shortcut.name})</span>
                     ) : (
                       <>
+                        <span className="text-gray-400 dark:text-gray-500">s/</span>
                         <span className="truncate dark:text-gray-400">{shortcut.name}</span>
                       </>
                     )}
@@ -114,42 +102,28 @@ const ShortcutCard = (props: Props) => {
           })}
           {shortcut.tags.length === 0 && <span className="text-gray-400 text-sm leading-4 italic">No tags</span>}
         </div>
-      <div className="w-full mt-2 flex gap-2 overflow-x-auto">
-        <Tooltip title={creator.nickname} variant="solid" placement="top" arrow>
-          <Avatar
-            className="dark:bg-zinc-800"
-            sx={{
-              "--Avatar-size": "24px",
-            }}
-            alt={creator.nickname.toUpperCase()}
-          ></Avatar>
-        </Tooltip>
-        <Tooltip
-          title={t(`shortcut.visibility.${convertVisibilityFromPb(shortcut.visibility).toLowerCase()}.description`)}
-          variant="solid"
-          placement="top"
-          arrow
-        >
+        <div className="w-full flex mt-2 gap-2 overflow-x-auto">
+          <Tooltip title={t(`shortcut.visibility.${shortcut.visibility.toLowerCase()}.description`)} variant="solid" placement="top" arrow>
             <div
-            className="w-auto leading-5 flex flex-row justify-start items-center flex-nowrap whitespace-nowrap cursor-pointer text-gray-400 text-sm"
+              className="w-auto px-2 leading-6 flex flex-row justify-start items-center flex-nowrap whitespace-nowrap border rounded-full cursor-pointer text-gray-500 dark:text-gray-400 text-sm dark:border-zinc-700"
               onClick={() => viewStore.setFilter({ visibility: shortcut.visibility })}
             >
-            <VisibilityIcon className="w-4 h-auto mr-1 opacity-70" visibility={shortcut.visibility} />
-            {t(`shortcut.visibility.${convertVisibilityFromPb(shortcut.visibility).toLowerCase()}.self`)}
+              <VisibilityIcon className="w-4 h-auto mr-1 opacity-60" visibility={shortcut.visibility} />
+              {t(`shortcut.visibility.${shortcut.visibility.toLowerCase()}.self`)}
             </div>
           </Tooltip>
           <Tooltip title="View count" variant="solid" placement="top" arrow>
             <Link
-            className="w-auto leading-5 flex flex-row justify-start items-center flex-nowrap whitespace-nowrap cursor-pointer text-gray-400 text-sm"
               to={`/shortcut/${shortcut.id}#analytics`}
-            unstable_viewTransition
+              className="w-auto px-2 leading-6 flex flex-row justify-start items-center flex-nowrap whitespace-nowrap border rounded-full cursor-pointer text-gray-500 dark:text-gray-400 text-sm dark:border-zinc-700"
             >
-            <Icon.BarChart2 className="w-4 h-auto mr-1 opacity-70" />
-            {t("shortcut.visits", { count: shortcut.viewCount })}
+              <Icon.BarChart2 className="w-4 h-auto mr-1 opacity-80" />
+              {t("shortcut.visits", { count: shortcut.view })}
             </Link>
           </Tooltip>
         </div>
       </div>
+    </>
   );
 };
 

frontend/web/src/components/ShortcutFrame.tsx

@@ -1,41 +0,0 @@
-import { Divider } from "@mui/joy";
-import classNames from "classnames";
-import { Link } from "react-router-dom";
-import { getFaviconWithGoogleS2 } from "@/helpers/utils";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
-import Icon from "./Icon";
-
-interface Props {
-  shortcut: Shortcut;
-}
-
-const ShortcutFrame = ({ shortcut }: Props) => {
-  const favicon = getFaviconWithGoogleS2(shortcut.link);
-
-  return (
-    <div className="w-full h-full flex flex-col justify-center items-center p-8">
-      <Link
-        className="w-72 max-w-full border dark:border-zinc-900 dark:bg-zinc-900 p-6 pb-4 rounded-2xl shadow-xl dark:text-gray-400 hover:opacity-80"
-        to={`/s/${shortcut.name}`}
-        target="_blank"
-      >
-        <div className={classNames("w-12 h-12 flex justify-center items-center overflow-clip rounded-lg shrink-0")}>
-          {favicon ? (
-            <img className="w-full h-auto" src={favicon} decoding="async" loading="lazy" />
-          ) : (
-            <Icon.Globe2Icon className="w-full h-auto opacity-70" strokeWidth={1} />
-          )}
-        </div>
-        <p className="text-lg font-medium leading-8 mt-2 truncate">{shortcut.title || shortcut.name}</p>
-        <p className="text-gray-500 truncate">{shortcut.description}</p>
-        <Divider className="!my-2" />
-        <p className="text-gray-400 dark:text-gray-600 text-sm mt-2">
-          <span className="leading-4">Open this site in a new tab</span>
-          <Icon.ArrowUpRight className="inline-block ml-1 -mt-0.5 w-4 h-auto" />
-        </p>
-      </Link>
-    </div>
-  );
-};
-
-export default ShortcutFrame;

frontend/web/src/components/ShortcutView.tsx

@@ -1,6 +1,5 @@
 import classNames from "classnames";
 import { Link } from "react-router-dom";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 import { getFaviconWithGoogleS2 } from "../helpers/utils";
 import Icon from "./Icon";
 import ShortcutActionsDropdown from "./ShortcutActionsDropdown";
@@ -27,7 +26,7 @@ const ShortcutView = (props: Props) => {
     >
       <div className={classNames("w-5 h-5 flex justify-center items-center overflow-clip shrink-0")}>
         {favicon ? (
-          <img className="w-full h-auto rounded" src={favicon} decoding="async" loading="lazy" />
+          <img className="w-full h-auto rounded-lg" src={favicon} decoding="async" loading="lazy" />
         ) : (
           <Icon.CircleSlash className="w-full h-auto text-gray-400" />
         )}
@@ -36,10 +35,11 @@ const ShortcutView = (props: Props) => {
         {shortcut.title ? (
           <>
             <span className="dark:text-gray-400">{shortcut.title}</span>
-            <span className="text-gray-500">({shortcut.name})</span>
+            <span className="text-gray-500">(s/{shortcut.name})</span>
           </>
         ) : (
           <>
+            <span className="text-gray-400 dark:text-gray-500">s/</span>
             <span className="dark:text-gray-400">{shortcut.name}</span>
           </>
         )}

frontend/web/src/components/ShortcutsContainer.tsx

@@ -1,6 +1,5 @@
 import classNames from "classnames";
-import useNavigateTo from "@/hooks/useNavigateTo";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
+import { absolutifyLink } from "@/helpers/utils";
 import useViewStore from "../stores/v1/view";
 import ShortcutCard from "./ShortcutCard";
 import ShortcutView from "./ShortcutView";
@@ -11,13 +10,12 @@ interface Props {
 
 const ShortcutsContainer: React.FC<Props> = (props: Props) => {
   const { shortcutList } = props;
-  const navigateTo = useNavigateTo();
   const viewStore = useViewStore();
   const displayStyle = viewStore.displayStyle || "full";
   const ShortcutItemView = viewStore.displayStyle === "compact" ? ShortcutView : ShortcutCard;
 
   const handleShortcutClick = (shortcut: Shortcut) => {
-    navigateTo(`/shortcut/${shortcut.id}`);
+    window.open(absolutifyLink(`/s/${shortcut.name}`));
   };
 
   return (

frontend/web/src/components/ShortcutsNavigator.tsx

@@ -1,13 +1,13 @@
 import classNames from "classnames";
 import { useTranslation } from "react-i18next";
-import useShortcutStore from "@/stores/v1/shortcut";
+import { useAppSelector } from "../stores";
 import useViewStore from "../stores/v1/view";
 import Icon from "./Icon";
 
 const ShortcutsNavigator = () => {
   const { t } = useTranslation();
   const viewStore = useViewStore();
-  const shortcutList = useShortcutStore().getShortcutList();
+  const { shortcutList } = useAppSelector((state) => state.shortcut);
   const tags = shortcutList.map((shortcut) => shortcut.tags).flat();
   const currentTab = viewStore.filter.tab || `tab:all`;
   const sortedTagMap = sortTags(tags);
@@ -18,7 +18,7 @@ const ShortcutsNavigator = () => {
         className={classNames(
           "flex flex-row justify-center items-center px-2 leading-7 text-sm dark:text-gray-400 rounded-md",
           currentTab === "tab:all"
-            ? "bg-blue-700 dark:bg-blue-800 text-white dark:text-gray-400 shadow"
+            ? "bg-gray-600 dark:bg-zinc-700 text-white dark:text-gray-400 shadow"
             : "hover:bg-gray-200 dark:hover:bg-zinc-700"
         )}
         onClick={() => viewStore.setFilter({ tab: "tab:all" })}
@@ -30,7 +30,7 @@ const ShortcutsNavigator = () => {
         className={classNames(
           "flex flex-row justify-center items-center px-2 leading-7 text-sm dark:text-gray-400 rounded-md",
           currentTab === "tab:mine"
-            ? "bg-blue-700 dark:bg-blue-800 text-white dark:text-gray-400 shadow"
+            ? "bg-gray-600 dark:bg-zinc-700 text-white dark:text-gray-400 shadow"
             : "hover:bg-gray-200 dark:hover:bg-zinc-700"
         )}
         onClick={() => viewStore.setFilter({ tab: "tab:mine" })}
@@ -44,7 +44,7 @@ const ShortcutsNavigator = () => {
           className={classNames(
             "flex flex-row justify-center items-center px-2 leading-7 text-sm dark:text-gray-400 rounded-md",
             currentTab === `tag:${tag}`
-              ? "bg-blue-700 dark:bg-blue-800 text-white dark:text-gray-400 shadow"
+              ? "bg-gray-600 dark:bg-zinc-700 text-white dark:text-gray-400 shadow"
               : "hover:bg-gray-200 dark:hover:bg-zinc-700"
           )}
           onClick={() => viewStore.setFilter({ tab: `tag:${tag}`, tag: undefined })}

frontend/web/src/components/SubscriptionFAQ.tsx

@@ -11,25 +11,18 @@ const SubscriptionFAQ = () => {
         <Accordion>
           <AccordionSummary>Can I use the Free plan in my team?</AccordionSummary>
           <AccordionDetails>
-            Of course you can. In the free plan, you can invite up to 5 members to your team. If you need more, you should upgrade to the
-            Pro plan.
+            Of course you can. In the free plan, you can invite up to 5 members to your team. If you need more, you can upgrade to the Pro
+            plan.
           </AccordionDetails>
         </Accordion>
         <Accordion>
           <AccordionSummary>How many devices can the license key be used on?</AccordionSummary>
-          <AccordionDetails>{`It's unlimited for now, but please do not abuse it.`}</AccordionDetails>
+          <AccordionDetails>{`It's unlimited for now, but please don't abuse it.`}</AccordionDetails>
         </Accordion>
         <Accordion>
           <AccordionSummary>{`Can I get a refund if Slash doesn't meet my needs?`}</AccordionSummary>
           <AccordionDetails>
-            Yes, absolutely! You can contact us with `yourselfhosted@gmail.com`. I will refund you as soon as possible.
-          </AccordionDetails>
-        </Accordion>
-        <Accordion>
-          <AccordionSummary>Is there a Lifetime license?</AccordionSummary>
-          <AccordionDetails>
-            {`As software requires someone to maintain it, so we won't sell a lifetime service, since humans are not immortal yet. But if you
-            really want it, please contact us "yourselfhosted@gmail.com".`}
+            Yes, absolutely! You can send a email to me at `yourselfhosted@gmail.com`. I will refund you as soon as possible.
           </AccordionDetails>
         </Accordion>
       </AccordionGroup>

frontend/web/src/components/ViewSetting.tsx

@@ -18,7 +18,7 @@ const ViewSetting = () => {
           <Icon.Settings2 className="w-4 h-auto text-gray-500" />
         </button>
       }
-      actionsClassName="!mt-3 !right-[unset] -left-24 -ml-2"
+      actionsClassName="!mt-3 !-right-2"
       actions={
         <div className="w-52 p-2 gap-2 flex flex-col justify-start items-start" onClick={(e) => e.stopPropagation()}>
           <div className="w-full flex flex-row justify-between items-center">

frontend/web/src/components/VisibilityIcon.tsx

@@ -1,4 +1,3 @@
-import { Visibility } from "@/types/proto/api/v2/common";
 import Icon from "./Icon";
 
 interface Props {
@@ -8,11 +7,11 @@ interface Props {
 
 const VisibilityIcon = (props: Props) => {
   const { visibility, className } = props;
-  if (visibility === Visibility.PRIVATE) {
+  if (visibility === "PRIVATE") {
     return <Icon.Lock className={className || ""} />;
-  } else if (visibility === Visibility.WORKSPACE) {
+  } else if (visibility === "WORKSPACE") {
     return <Icon.Building2 className={className || ""} />;
-  } else if (visibility === Visibility.PUBLIC) {
+  } else if (visibility === "PUBLIC") {
     return <Icon.Globe2 className={className || ""} />;
   }
   return null;

frontend/web/src/components/setting/AccountSection.tsx

@@ -1,7 +1,6 @@
 import { Button } from "@mui/joy";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { Role } from "@/types/proto/api/v2/user_service";
 import useUserStore from "../../stores/v1/user";
 import ChangePasswordDialog from "../ChangePasswordDialog";
 import EditUserinfoDialog from "../EditUserinfoDialog";
@@ -11,7 +10,7 @@ const AccountSection: React.FC = () => {
   const currentUser = useUserStore().getCurrentUser();
   const [showEditUserinfoDialog, setShowEditUserinfoDialog] = useState<boolean>(false);
   const [showChangePasswordDialog, setShowChangePasswordDialog] = useState<boolean>(false);
-  const isAdmin = currentUser.role === Role.ADMIN;
+  const isAdmin = currentUser.role === "ADMIN";
 
   return (
     <>

frontend/web/src/components/setting/MemberSection.tsx

@@ -2,8 +2,6 @@ import { Button, IconButton } from "@mui/joy";
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { User } from "@/types/proto/api/v2/user_service";
-import { convertRoleFromPb } from "@/utils/user";
 import useUserStore from "../../stores/v1/user";
 import { showCommonDialog } from "../Alert";
 import CreateUserDialog from "../CreateUserDialog";
@@ -35,7 +33,7 @@ const MemberSection = () => {
           await userStore.deleteUser(user.id);
           toast.success(`User \`${user.nickname}\` deleted successfully`);
         } catch (error: any) {
-          toast.error(`Failed to delete user \`${user.nickname}\`: ${error.details}`);
+          toast.error(`Failed to delete user \`${user.nickname}\`: ${error.response.data.message}`);
         }
       },
     });
@@ -90,7 +88,7 @@ const MemberSection = () => {
                       <tr key={user.email}>
                         <td className="whitespace-nowrap py-4 pl-4 pr-3 text-sm text-gray-900 dark:text-gray-500">{user.nickname}</td>
                         <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{user.email}</td>
-                        <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{convertRoleFromPb(user.role)}</td>
+                        <td className="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{user.role}</td>
                         <td className="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm">
                           <IconButton
                             size="sm"

frontend/web/src/components/setting/WorkspaceSection.tsx

@@ -1,4 +1,4 @@
-import { Button, Checkbox, Input, Textarea } from "@mui/joy";
+import { Button, Checkbox, Textarea } from "@mui/joy";
 import { isEqual } from "lodash-es";
 import { useRef, useState } from "react";
 import toast from "react-hot-toast";
@@ -21,13 +21,6 @@ const WorkspaceSection: React.FC = () => {
     });
   };
 
-  const handleInstanceUrlChange = async (value: string) => {
-    setWorkspaceSetting({
-      ...workspaceSetting,
-      instanceUrl: value,
-    });
-  };
-
   const handleCustomStyleChange = async (value: string) => {
     setWorkspaceSetting({
       ...workspaceSetting,
@@ -40,9 +33,6 @@ const WorkspaceSection: React.FC = () => {
     if (!isEqual(originalWorkspaceSetting.current.enableSignup, workspaceSetting.enableSignup)) {
       updateMask.push("enable_signup");
     }
-    if (!isEqual(originalWorkspaceSetting.current.instanceUrl, workspaceSetting.instanceUrl)) {
-      updateMask.push("instance_url");
-    }
     if (!isEqual(originalWorkspaceSetting.current.customStyle, workspaceSetting.customStyle)) {
       updateMask.push("custom_style");
     }
@@ -69,15 +59,6 @@ const WorkspaceSection: React.FC = () => {
   return (
     <div className="w-full flex flex-col justify-start items-start space-y-4">
       <p className="text-base font-semibold leading-6 text-gray-900 dark:text-gray-500">{t("settings.workspace.self")}</p>
-      <div className="w-full flex flex-col justify-start items-start">
-        <p className="mt-2 dark:text-gray-400">Instance URL</p>
-        <Input
-          className="w-full mt-2"
-          placeholder="Your instance URL. Using for website SEO. Leave it empty if you don't want cawler to index your website."
-          value={workspaceSetting.instanceUrl}
-          onChange={(event) => handleInstanceUrlChange(event.target.value)}
-        />
-      </div>
       <div className="w-full flex flex-col justify-start items-start">
         <p className="mt-2 dark:text-gray-400">{t("settings.workspace.custom-style")}</p>
         <Textarea

frontend/web/src/css/joy-ui.css

@@ -1,3 +0,0 @@
-.MuiDrawer-content {
-  @apply !w-auto;
-}

frontend/web/src/grpcweb.ts

@@ -1,5 +1,4 @@
 import { createChannel, createClientFactory, FetchTransport } from "nice-grpc-web";
-import { AuthServiceDefinition } from "./types/proto/api/v2/auth_service";
 import { CollectionServiceDefinition } from "./types/proto/api/v2/collection_service";
 import { ShortcutServiceDefinition } from "./types/proto/api/v2/shortcut_service";
 import { SubscriptionServiceDefinition } from "./types/proto/api/v2/subscription_service";
@@ -18,11 +17,9 @@ const channel = createChannel(
 
 const clientFactory = createClientFactory();
 
-export const workspaceServiceClient = clientFactory.create(WorkspaceServiceDefinition, channel);
-
 export const subscriptionServiceClient = clientFactory.create(SubscriptionServiceDefinition, channel);
 
-export const authServiceClient = clientFactory.create(AuthServiceDefinition, channel);
+export const workspaceServiceClient = clientFactory.create(WorkspaceServiceDefinition, channel);
 
 export const userServiceClient = clientFactory.create(UserServiceDefinition, channel);
 

frontend/web/src/helpers/api.ts

@@ -0,0 +1,73 @@
+import axios from "axios";
+import { userServiceClient } from "@/grpcweb";
+
+export function signin(email: string, password: string) {
+  return axios.post<User>("/api/v1/auth/signin", {
+    email,
+    password,
+  });
+}
+
+export function signup(email: string, nickname: string, password: string) {
+  return axios.post<User>("/api/v1/auth/signup", {
+    email,
+    nickname,
+    password,
+  });
+}
+
+export function signout() {
+  return axios.post("/api/v1/auth/logout");
+}
+
+export function getMyselfUser() {
+  return axios.get<User>("/api/v1/user/me");
+}
+
+export function getUserList() {
+  return axios.get<User[]>("/api/v1/user");
+}
+
+export function getUserById(id: number) {
+  return axios.get<User>(`/api/v1/user/${id}`);
+}
+
+export function createUser(userCreate: UserCreate) {
+  return axios.post<User>("/api/v1/user", userCreate);
+}
+
+export function patchUser(userPatch: UserPatch) {
+  return axios.patch<User>(`/api/v1/user/${userPatch.id}`, userPatch);
+}
+
+export function deleteUser(userId: UserId) {
+  return userServiceClient.deleteUser({ id: userId });
+}
+
+export function getShortcutList(shortcutFind?: ShortcutFind) {
+  const queryList = [];
+  if (shortcutFind?.tag) {
+    queryList.push(`tag=${shortcutFind.tag}`);
+  }
+  return axios.get<Shortcut[]>(`/api/v1/shortcut?${queryList.join("&")}`);
+}
+
+export function getShortcutById(id: number) {
+  return axios.get<Shortcut>(`/api/v1/shortcut/${id}`);
+}
+
+export function createShortcut(shortcutCreate: ShortcutCreate) {
+  return axios.post<Shortcut>("/api/v1/shortcut", shortcutCreate);
+}
+
+export function getShortcutAnalytics(shortcutId: ShortcutId) {
+  return axios.get<AnalysisData>(`/api/v1/shortcut/${shortcutId}/analytics`);
+}
+
+export function patchShortcut(shortcutPatch: ShortcutPatch) {
+  return axios.patch<Shortcut>(`/api/v1/shortcut/${shortcutPatch.id}`, shortcutPatch);
+}
+
+export function deleteShortcutById(shortcutId: ShortcutId) {
+  return axios.delete(`/api/v1/shortcut/${shortcutId}`);
+}

frontend/web/src/helpers/utils.ts

@@ -10,11 +10,6 @@ export const absolutifyLink = (rel: string): string => {
   return anchor.href;
 };
 
-export const isURL = (str: string): boolean => {
-  const urlRegex = /^(https?|ftp):\/\/[^\s/$.?#].[^\s]*$/i;
-  return urlRegex.test(str);
-};
-
 export const releaseGuard = () => {
   return import.meta.env.MODE === "development";
 };
@@ -27,13 +22,3 @@ export const getFaviconWithGoogleS2 = (url: string) => {
     return undefined;
   }
 };
-
-export const generateRandomString = () => {
-  const characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-  let randomString = "";
-  for (let i = 0; i < 6; i++) {
-    const randomIndex = Math.floor(Math.random() * characters.length);
-    randomString += characters.charAt(randomIndex);
-  }
-  return randomString;
-};

frontend/web/src/layouts/Root.tsx

@@ -51,13 +51,15 @@ const Root: React.FC = () => {
   }, [currentUserSetting]);
 
   return (
-    isInitialized && (
+    <>
+      {isInitialized && (
         <div className="w-full h-auto flex flex-col justify-start items-start dark:bg-zinc-900">
           <Header />
           <Navigator />
           <Outlet />
         </div>
-    )
+      )}
+    </>
   );
 };
 

frontend/web/src/main.tsx

@@ -1,18 +1,21 @@
 import { CssVarsProvider } from "@mui/joy";
 import { createRoot } from "react-dom/client";
 import { Toaster } from "react-hot-toast";
+import { Provider } from "react-redux";
 import { RouterProvider } from "react-router-dom";
 import "./css/index.css";
-import "./css/joy-ui.css";
 import "./i18n";
 import router from "./routers";
+import store from "./stores";
 
 const container = document.getElementById("root");
 const root = createRoot(container as HTMLElement);
 
 root.render(
+  <Provider store={store}>
     <CssVarsProvider>
       <RouterProvider router={router} />
       <Toaster position="top-center" />
     </CssVarsProvider>
+  </Provider>
 );

frontend/web/src/pages/CollectionDashboard.tsx

@@ -1,65 +1,59 @@
-import { Button, Input } from "@mui/joy";
+import { Button } from "@mui/joy";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import CollectionView from "@/components/CollectionView";
-import CreateCollectionDrawer from "@/components/CreateCollectionDrawer";
+import CreateCollectionDialog from "@/components/CreateCollectionDialog";
+import { shortcutService } from "@/services";
 import useCollectionStore from "@/stores/v1/collection";
-import useShortcutStore from "@/stores/v1/shortcut";
 import FilterView from "../components/FilterView";
 import Icon from "../components/Icon";
 import useLoading from "../hooks/useLoading";
 
 interface State {
-  showCreateCollectionDrawer: boolean;
+  showCreateCollectionDialog: boolean;
 }
 
 const CollectionDashboard: React.FC = () => {
   const { t } = useTranslation();
   const loadingState = useLoading();
-  const shortcutStore = useShortcutStore();
   const collectionStore = useCollectionStore();
+  const collections = collectionStore.getCollectionList();
   const [state, setState] = useState<State>({
-    showCreateCollectionDrawer: false,
-  });
-  const [search, setSearch] = useState<string>("");
-  const filteredCollections = collectionStore.getCollectionList().filter((collection) => {
-    return (
-      collection.name.toLowerCase().includes(search.toLowerCase()) ||
-      collection.title.toLowerCase().includes(search.toLowerCase()) ||
-      collection.description.toLowerCase().includes(search.toLowerCase())
-    );
+    showCreateCollectionDialog: false,
   });
 
   useEffect(() => {
-    Promise.all([shortcutStore.fetchShortcutList(), collectionStore.fetchCollectionList()]).finally(() => {
+    Promise.all([shortcutService.getMyAllShortcuts(), collectionStore.fetchCollectionList()]).finally(() => {
       loadingState.setFinish();
     });
   }, []);
 
-  const setShowCreateCollectionDrawer = (show: boolean) => {
+  const setShowCreateCollectionDialog = (show: boolean) => {
     setState({
       ...state,
-      showCreateCollectionDrawer: show,
+      showCreateCollectionDialog: show,
     });
   };
 
   return (
     <>
       <div className="mx-auto max-w-8xl w-full px-3 md:px-12 pt-4 pb-6 flex flex-col justify-start items-start">
-        <div className="w-full flex flex-row justify-between items-center mb-4">
-          <div>
-            <Input
-              className="w-32 mr-2"
-              type="text"
-              size="sm"
-              placeholder={t("common.search")}
-              startDecorator={<Icon.Search className="w-4 h-auto" />}
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-            />
+        <div className="w-full flex flex-row justify-start items-start mb-4">
+          <div className="bg-yellow-100 dark:bg-yellow-500 dark:opacity-70 py-2 px-3 rounded-full border dark:border-yellow-600 flex flex-row justify-start items-center cursor-pointer shadow">
+            <Icon.LibrarySquare className="w-5 h-auto opacity-60" />
+            <a
+              className="hover:underline hover:text-blue-600"
+              href="https://github.com/boojack/slash/blob/main/docs/getting-started/collections.md"
+              target="_blank"
+            >
+              <span className="mx-1 text-sm">Collection is in Beta. Learn more in docs</span>
+              <Icon.ExternalLink className="w-4 h-auto inline-block" />
+            </a>
           </div>
+        </div>
+        <div className="w-full flex flex-row justify-between items-center mb-4">
           <div className="flex flex-row justify-start items-center">
-            <Button className="hover:shadow" variant="soft" size="sm" onClick={() => setShowCreateCollectionDrawer(true)}>
+            <Button className="hover:shadow" variant="soft" size="sm" onClick={() => setShowCreateCollectionDialog(true)}>
               <Icon.Plus className="w-5 h-auto" />
               <span className="ml-0.5">{t("common.create")}</span>
             </Button>
@@ -71,24 +65,24 @@ const CollectionDashboard: React.FC = () => {
             <Icon.Loader className="mr-2 w-5 h-auto animate-spin" />
             {t("common.loading")}
           </div>
-        ) : filteredCollections.length === 0 ? (
+        ) : collections.length === 0 ? (
           <div className="py-16 w-full flex flex-col justify-center items-center text-gray-400">
             <Icon.PackageOpen className="w-16 h-auto" strokeWidth="1" />
             <p className="mt-4">No collections found.</p>
           </div>
         ) : (
           <div className="w-full flex flex-col justify-start items-start gap-3">
-            {filteredCollections.map((collection) => {
+            {collections.map((collection) => {
               return <CollectionView key={collection.id} collection={collection} />;
             })}
           </div>
         )}
       </div>
 
-      {state.showCreateCollectionDrawer && (
-        <CreateCollectionDrawer
-          onClose={() => setShowCreateCollectionDrawer(false)}
-          onConfirm={() => setShowCreateCollectionDrawer(false)}
+      {state.showCreateCollectionDialog && (
+        <CreateCollectionDialog
+          onClose={() => setShowCreateCollectionDialog(false)}
+          onConfirm={() => setShowCreateCollectionDialog(false)}
         />
       )}
     </>

frontend/web/src/pages/CollectionSpace.tsx

@@ -2,9 +2,8 @@ import { Divider } from "@mui/joy";
 import classNames from "classnames";
 import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
-import { useParams } from "react-router-dom";
+import { Link, useParams } from "react-router-dom";
 import Icon from "@/components/Icon";
-import ShortcutFrame from "@/components/ShortcutFrame";
 import ShortcutView from "@/components/ShortcutView";
 import useResponsiveWidth from "@/hooks/useResponsiveWidth";
 import useCollectionStore from "@/stores/v1/collection";
@@ -12,10 +11,10 @@ import useShortcutStore from "@/stores/v1/shortcut";
 import useUserStore from "@/stores/v1/user";
 import { Collection } from "@/types/proto/api/v2/collection_service";
 import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
+import { convertShortcutFromPb } from "@/utils/shortcut";
 
 const CollectionSpace = () => {
-  const params = useParams();
-  const collectionName = params["*"];
+  const { collectionName } = useParams();
   const { sm } = useResponsiveWidth();
   const userStore = useUserStore();
   const collectionStore = useCollectionStore();
@@ -32,6 +31,7 @@ const CollectionSpace = () => {
     (async () => {
       try {
         const collection = await collectionStore.fetchCollectionByName(collectionName);
+        await userStore.getOrFetchUserById(collection.creatorId);
         setCollection(collection);
         setShortcuts([]);
         for (const shortcutId of collection.shortcutIds) {
@@ -41,7 +41,7 @@ const CollectionSpace = () => {
               return [...shortcuts, shortcut];
             });
           } catch (error) {
-            // Do nothing.
+            // do nth
           }
         }
         document.title = `${collection.title} - Slash`;
@@ -70,26 +70,26 @@ const CollectionSpace = () => {
     <div className="w-full h-full sm:px-12 sm:py-10 sm:h-screen sm:bg-gray-100 dark:sm:bg-zinc-800">
       <div className="w-full h-full flex flex-row sm:border dark:sm:border-zinc-800 p-4 rounded-2xl bg-gray-50 dark:bg-zinc-900">
         <div className="w-full sm:w-56 sm:pr-4 flex flex-col justify-start items-start overflow-auto shrink-0">
-          <div className="w-full sticky top-0 px-2">
+          <div className="w-full sticky top-0 bg-gray-50 dark:bg-zinc-900">
             <div className="w-full flex flex-row justify-start items-center text-gray-800 dark:text-gray-300">
-              <Icon.LibrarySquare className="w-5 h-auto mr-1 opacity-70 shrink-0" />
-              <span className="text-lg truncate">{collection.title}</span>
-            </div>
-            <p className="text-gray-500 text-sm truncate">{collection.description}</p>
+              <Icon.LibrarySquare className="w-5 h-auto mr-2 opacity-70" />
+              <span className="text-lg">{collection.title}</span>
             </div>
+            <p className="text-gray-500 text-sm">{collection.description}</p>
             <Divider className="!my-2" />
+          </div>
           <div className="w-full flex flex-col justify-start items-start gap-2 sm:gap-1 px-px">
             {shortcuts.map((shortcut) => {
               return (
                 <ShortcutView
                   className={classNames(
-                    "w-full py-2 cursor-pointer sm:!px-2",
+                    "w-full py-2 cursor-pointer",
                     selectedShortcut?.id === shortcut.id
                       ? "bg-gray-100 dark:bg-zinc-800"
                       : "sm:border-transparent dark:sm:border-transparent"
                   )}
                   key={shortcut.name}
-                  shortcut={shortcut}
+                  shortcut={convertShortcutFromPb(shortcut)}
                   alwaysShowLink={!sm}
                   onClick={() => handleShortcutClick(shortcut)}
                 />
@@ -100,15 +100,30 @@ const CollectionSpace = () => {
         {sm && (
           <div className="w-full h-full overflow-clip rounded-lg border dark:border-zinc-800 bg-white dark:bg-zinc-800">
             {selectedShortcut ? (
-              <ShortcutFrame key={selectedShortcut.id} shortcut={selectedShortcut} />
+              <div className="w-full h-full flex flex-col justify-center items-center p-8">
+                <Link
+                  className="w-72 max-w-full border dark:border-zinc-900 dark:bg-zinc-900 p-6 rounded-2xl shadow-xl dark:text-gray-400 hover:opacity-80"
+                  to={`/s/${selectedShortcut.name}`}
+                  target="_blank"
+                >
+                  <Icon.Globe2Icon className="w-12 h-auto mb-1" strokeWidth={1} />
+                  <p className="text-lg font-medium leading-8">{selectedShortcut.title || selectedShortcut.name}</p>
+                  <p className="text-gray-500">{selectedShortcut.description}</p>
+                  <Divider className="!my-2" />
+                  <p className="text-gray-400 dark:text-gray-600 text-sm mt-2">
+                    <span className="leading-4">Open this site in a new tab</span>
+                    <Icon.ArrowUpRight className="inline-block ml-1 -mt-0.5 w-4 h-auto" />
+                  </p>
+                </Link>
+              </div>
             ) : (
               <div className="w-full h-full flex flex-col justify-center items-center p-8">
-                <div className="w-72 max-w-full border dark:border-zinc-900 dark:bg-zinc-900 dark:text-gray-400 p-6 pb-4 rounded-2xl shadow-xl">
-                  <Icon.AppWindow className="w-12 h-auto mb-2 opacity-60" strokeWidth={1} />
+                <div className="w-72 max-w-full border dark:border-zinc-900 dark:bg-zinc-900 dark:text-gray-400 p-6 rounded-2xl shadow-xl">
+                  <Icon.AppWindow className="w-12 h-auto mb-2" strokeWidth={1} />
                   <p className="text-lg font-medium">Click on a tab in the Sidebar to get started.</p>
                   <Divider className="!my-2" />
-                  <p className="text-gray-400 dark:text-gray-600 text-sm mt-2 italic">
-                    Shared by <span className="font-medium not-italic">{creator.nickname}</span>
+                  <p className="text-gray-400 dark:text-gray-600 text-sm mt-2">
+                    Shared by <span className="italic font-medium">{creator.nickname}</span>
                   </p>
                 </div>
               </div>

frontend/web/src/pages/Home.tsx

@@ -1,45 +1,45 @@
 import { Button, Input } from "@mui/joy";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import useShortcutStore from "@/stores/v1/shortcut";
-import CreateShortcutDrawer from "../components/CreateShortcutDrawer";
+import CreateShortcutDialog from "../components/CreateShortcutDialog";
 import FilterView from "../components/FilterView";
 import Icon from "../components/Icon";
 import ShortcutsContainer from "../components/ShortcutsContainer";
 import ShortcutsNavigator from "../components/ShortcutsNavigator";
 import ViewSetting from "../components/ViewSetting";
 import useLoading from "../hooks/useLoading";
+import { shortcutService } from "../services";
+import { useAppSelector } from "../stores";
 import useUserStore from "../stores/v1/user";
 import useViewStore, { getFilteredShortcutList, getOrderedShortcutList } from "../stores/v1/view";
 
 interface State {
-  showCreateShortcutDrawer: boolean;
+  showCreateShortcutDialog: boolean;
 }
 
 const Home: React.FC = () => {
   const { t } = useTranslation();
   const loadingState = useLoading();
   const currentUser = useUserStore().getCurrentUser();
-  const shortcutStore = useShortcutStore();
   const viewStore = useViewStore();
-  const shortcutList = shortcutStore.getShortcutList();
+  const { shortcutList } = useAppSelector((state) => state.shortcut);
   const [state, setState] = useState<State>({
-    showCreateShortcutDrawer: false,
+    showCreateShortcutDialog: false,
   });
   const filter = viewStore.filter;
   const filteredShortcutList = getFilteredShortcutList(shortcutList, filter, currentUser);
   const orderedShortcutList = getOrderedShortcutList(filteredShortcutList, viewStore.order);
 
   useEffect(() => {
-    Promise.all([shortcutStore.fetchShortcutList()]).finally(() => {
+    Promise.all([shortcutService.getMyAllShortcuts()]).finally(() => {
       loadingState.setFinish();
     });
   }, []);
 
-  const setShowCreateShortcutDrawer = (show: boolean) => {
+  const setShowCreateShortcutDialog = (show: boolean) => {
     setState({
       ...state,
-      showCreateShortcutDrawer: show,
+      showCreateShortcutDialog: show,
     });
   };
 
@@ -49,8 +49,14 @@ const Home: React.FC = () => {
         <ShortcutsNavigator />
         <div className="w-full flex flex-row justify-between items-center mb-4">
           <div className="flex flex-row justify-start items-center">
+            <Button className="hover:shadow" variant="soft" size="sm" onClick={() => setShowCreateShortcutDialog(true)}>
+              <Icon.Plus className="w-5 h-auto" />
+              <span className="hidden sm:block ml-0.5">{t("common.create")}</span>
+            </Button>
+          </div>
+          <div className="flex flex-row justify-end items-center">
             <Input
-              className="w-32 mr-2"
+              className="w-32 ml-2"
               type="text"
               size="sm"
               placeholder={t("common.search")}
@@ -60,12 +66,6 @@ const Home: React.FC = () => {
               onChange={(e) => viewStore.setFilter({ search: e.target.value })}
             />
           </div>
-          <div className="flex flex-row justify-end items-center">
-            <Button className="hover:shadow" variant="soft" size="sm" onClick={() => setShowCreateShortcutDrawer(true)}>
-              <Icon.Plus className="w-5 h-auto" />
-              <span className="ml-0.5">{t("common.create")}</span>
-            </Button>
-          </div>
         </div>
         <FilterView />
         {loadingState.isLoading ? (
@@ -83,8 +83,8 @@ const Home: React.FC = () => {
         )}
       </div>
 
-      {state.showCreateShortcutDrawer && (
-        <CreateShortcutDrawer onClose={() => setShowCreateShortcutDrawer(false)} onConfirm={() => setShowCreateShortcutDrawer(false)} />
+      {state.showCreateShortcutDialog && (
+        <CreateShortcutDialog onClose={() => setShowCreateShortcutDialog(false)} onConfirm={() => setShowCreateShortcutDialog(false)} />
       )}
     </>
   );

frontend/web/src/pages/MemoDashboard.tsx

@@ -1,96 +0,0 @@
-import { Button, Input } from "@mui/joy";
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import CollectionView from "@/components/CollectionView";
-import CreateCollectionDrawer from "@/components/CreateCollectionDrawer";
-import useCollectionStore from "@/stores/v1/collection";
-import FilterView from "../components/FilterView";
-import Icon from "../components/Icon";
-import useLoading from "../hooks/useLoading";
-
-interface State {
-  showCreateCollectionDrawer: boolean;
-}
-
-const MemoDashboard: React.FC = () => {
-  const { t } = useTranslation();
-  const loadingState = useLoading();
-  const collectionStore = useCollectionStore();
-  const [state, setState] = useState<State>({
-    showCreateCollectionDrawer: false,
-  });
-  const [search, setSearch] = useState<string>("");
-  const filteredCollections = collectionStore.getCollectionList().filter((collection) => {
-    return (
-      collection.name.toLowerCase().includes(search.toLowerCase()) ||
-      collection.title.toLowerCase().includes(search.toLowerCase()) ||
-      collection.description.toLowerCase().includes(search.toLowerCase())
-    );
-  });
-
-  useEffect(() => {
-    Promise.all([collectionStore.fetchCollectionList()]).finally(() => {
-      loadingState.setFinish();
-    });
-  }, []);
-
-  const setShowCreateCollectionDrawer = (show: boolean) => {
-    setState({
-      ...state,
-      showCreateCollectionDrawer: show,
-    });
-  };
-
-  return (
-    <>
-      <div className="mx-auto max-w-8xl w-full px-3 md:px-12 pt-4 pb-6 flex flex-col justify-start items-start">
-        <div className="w-full flex flex-row justify-between items-center mb-4">
-          <div>
-            <Input
-              className="w-32 mr-2"
-              type="text"
-              size="sm"
-              placeholder={t("common.search")}
-              startDecorator={<Icon.Search className="w-4 h-auto" />}
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-            />
-          </div>
-          <div className="flex flex-row justify-start items-center">
-            <Button className="hover:shadow" variant="soft" size="sm" onClick={() => setShowCreateCollectionDrawer(true)}>
-              <Icon.Plus className="w-5 h-auto" />
-              <span className="ml-0.5">{t("common.create")}</span>
-            </Button>
-          </div>
-        </div>
-        <FilterView />
-        {loadingState.isLoading ? (
-          <div className="py-12 w-full flex flex-row justify-center items-center opacity-80 dark:text-gray-500">
-            <Icon.Loader className="mr-2 w-5 h-auto animate-spin" />
-            {t("common.loading")}
-          </div>
-        ) : filteredCollections.length === 0 ? (
-          <div className="py-16 w-full flex flex-col justify-center items-center text-gray-400">
-            <Icon.PackageOpen className="w-16 h-auto" strokeWidth="1" />
-            <p className="mt-4">No collections found.</p>
-          </div>
-        ) : (
-          <div className="w-full flex flex-col justify-start items-start gap-3">
-            {filteredCollections.map((collection) => {
-              return <CollectionView key={collection.id} collection={collection} />;
-            })}
-          </div>
-        )}
-      </div>
-
-      {state.showCreateCollectionDrawer && (
-        <CreateCollectionDrawer
-          onClose={() => setShowCreateCollectionDrawer(false)}
-          onConfirm={() => setShowCreateCollectionDrawer(false)}
-        />
-      )}
-    </>
-  );
-};
-
-export default MemoDashboard;

frontend/web/src/pages/NotFound.tsx

@@ -1,13 +1,61 @@
+import { Button } from "@mui/joy";
+import { useEffect, useState } from "react";
+import { useLocation } from "react-router-dom";
+import CreateShortcutDialog from "@/components/CreateShortcutDialog";
 import Icon from "@/components/Icon";
+import useNavigateTo from "@/hooks/useNavigateTo";
+import useUserStore from "@/stores/v1/user";
+
+interface State {
+  showCreateShortcutButton: boolean;
+}
 
 const NotFound = () => {
+  const location = useLocation();
+  const navigateTo = useNavigateTo();
+  const currentUser = useUserStore().getCurrentUser();
+  const [state, setState] = useState<State>({
+    showCreateShortcutButton: false,
+  });
+  const [showCreateShortcutDialog, setShowCreateShortcutDialog] = useState(false);
+  const params = new URLSearchParams(location.search);
+
+  useEffect(() => {
+    const shortcut = params.get("shortcut");
+    if (currentUser && shortcut) {
+      setState({
+        ...state,
+        showCreateShortcutButton: true,
+      });
+    }
+  }, []);
+
   return (
+    <>
       <div className="w-full h-full overflow-y-auto overflow-x-hidden bg-zinc-100 dark:bg-zinc-800">
         <div className="w-full h-full flex flex-col justify-center items-center">
           <Icon.Meh strokeWidth={1} className="w-20 h-auto opacity-80 dark:text-gray-300" />
           <p className="mt-4 mb-8 text-4xl font-mono dark:text-gray-300">404</p>
+          {state.showCreateShortcutButton && (
+            <Button
+              variant="outlined"
+              startDecorator={<Icon.Plus className="w-5 h-auto" />}
+              onClick={() => setShowCreateShortcutDialog(true)}
+            >
+              Create shortcut
+            </Button>
+          )}
         </div>
       </div>
+
+      {showCreateShortcutDialog && (
+        <CreateShortcutDialog
+          initialShortcut={{ name: params.get("shortcut") || "" }}
+          onClose={() => setShowCreateShortcutDialog(false)}
+          onConfirm={() => navigateTo("/")}
+        />
+      )}
+    </>
   );
 };
 

frontend/web/src/pages/ShortcutDetail.tsx

@@ -1,61 +1,40 @@
 import { Tooltip } from "@mui/joy";
 import classNames from "classnames";
 import copy from "copy-to-clipboard";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import toast from "react-hot-toast";
 import { useTranslation } from "react-i18next";
-import { useParams } from "react-router-dom";
-import useLoading from "@/hooks/useLoading";
+import { useLoaderData } from "react-router-dom";
 import useNavigateTo from "@/hooks/useNavigateTo";
-import useShortcutStore from "@/stores/v1/shortcut";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
-import { Role } from "@/types/proto/api/v2/user_service";
-import { convertVisibilityFromPb } from "@/utils/visibility";
 import { showCommonDialog } from "../components/Alert";
 import AnalyticsView from "../components/AnalyticsView";
-import CreateShortcutDrawer from "../components/CreateShortcutDrawer";
+import CreateShortcutDialog from "../components/CreateShortcutDialog";
 import GenerateQRCodeDialog from "../components/GenerateQRCodeDialog";
 import Icon from "../components/Icon";
 import VisibilityIcon from "../components/VisibilityIcon";
 import Dropdown from "../components/common/Dropdown";
 import { absolutifyLink, getFaviconWithGoogleS2 } from "../helpers/utils";
+import { shortcutService } from "../services";
 import useUserStore from "../stores/v1/user";
 
 interface State {
-  showEditDrawer: boolean;
+  showEditModal: boolean;
 }
 
 const ShortcutDetail = () => {
   const { t } = useTranslation();
-  const params = useParams();
-  const shortcutId = Number(params["shortcutId"]);
   const navigateTo = useNavigateTo();
-  const shortcutStore = useShortcutStore();
-  const userStore = useUserStore();
-  const shortcut = shortcutStore.getShortcutById(shortcutId);
+  const shortcutId = (useLoaderData() as Shortcut).id;
+  const shortcut = shortcutService.getShortcutById(shortcutId) as Shortcut;
   const currentUser = useUserStore().getCurrentUser();
   const [state, setState] = useState<State>({
-    showEditDrawer: false,
+    showEditModal: false,
   });
   const [showQRCodeDialog, setShowQRCodeDialog] = useState<boolean>(false);
-  const loadingState = useLoading(true);
-  const creator = userStore.getUserById(shortcut.creatorId);
-  const havePermission = currentUser.role === Role.ADMIN || shortcut.creatorId === currentUser.id;
+  const havePermission = currentUser.role === "ADMIN" || shortcut.creatorId === currentUser.id;
   const shortcutLink = absolutifyLink(`/s/${shortcut.name}`);
   const favicon = getFaviconWithGoogleS2(shortcut.link);
 
-  useEffect(() => {
-    (async () => {
-      const shortcut = await shortcutStore.getOrFetchShortcutById(shortcutId);
-      await userStore.getOrFetchUserById(shortcut.creatorId);
-      loadingState.setFinish();
-    })();
-  }, [shortcutId]);
-
-  if (loadingState.isLoading) {
-    return null;
-  }
-
   const handleCopyButtonClick = () => {
     copy(shortcutLink);
     toast.success("Shortcut link copied to clipboard.");
@@ -67,7 +46,7 @@ const ShortcutDetail = () => {
       content: `Are you sure to delete shortcut \`${shortcut.name}\`? You cannot undo this action.`,
       style: "danger",
       onConfirm: async () => {
-        await shortcutStore.deleteShortcut(shortcut.id);
+        await shortcutService.deleteShortcutById(shortcut.id);
         navigateTo("/", {
           replace: true,
         });
@@ -78,7 +57,7 @@ const ShortcutDetail = () => {
   return (
     <>
       <div className="mx-auto max-w-8xl w-full px-3 md:px-12 pt-4 pb-6 flex flex-col justify-start items-start">
-        <div className="mt-4 sm:mt-8 w-12 h-12 flex justify-center items-center overflow-clip">
+        <div className="mt-8 w-12 h-12 flex justify-center items-center overflow-clip">
           {favicon ? (
             <img className="w-full h-auto rounded-lg" src={favicon} decoding="async" loading="lazy" />
           ) : (
@@ -137,7 +116,7 @@ const ShortcutDetail = () => {
                     onClick={() => {
                       setState({
                         ...state,
-                        showEditDrawer: true,
+                        showEditModal: true,
                       });
                     }}
                   >
@@ -156,8 +135,8 @@ const ShortcutDetail = () => {
             ></Dropdown>
           )}
         </div>
-        {shortcut.description && <p className="w-full break-all mt-4 text-gray-500 dark:text-gray-400">{shortcut.description}</p>}
-        <div className="mt-2 flex flex-row justify-start items-start flex-wrap gap-2">
+        {shortcut.description && <p className="w-full break-all mt-2 text-gray-400 text-sm dark:text-gray-500">{shortcut.description}</p>}
+        <div className="mt-4 ml-1 flex flex-row justify-start items-start flex-wrap gap-2">
           {shortcut.tags.map((tag) => {
             return (
               <span key={tag} className="max-w-[8rem] truncate text-gray-400 text leading-4 dark:text-gray-500">
@@ -171,24 +150,19 @@ const ShortcutDetail = () => {
           <Tooltip title="Creator" variant="solid" placement="top" arrow>
             <div className="w-auto px-2 leading-6 flex flex-row justify-start items-center border rounded-full text-gray-500 text-sm dark:border-zinc-800">
               <Icon.User className="w-4 h-auto mr-1" />
-              <span className="max-w-[4rem] sm:max-w-[6rem] truncate">{creator.nickname}</span>
+              <span className="max-w-[4rem] sm:max-w-[6rem] truncate">{shortcut.creator.nickname}</span>
             </div>
           </Tooltip>
-          <Tooltip
-            title={t(`shortcut.visibility.${convertVisibilityFromPb(shortcut.visibility).toLowerCase()}.description`)}
-            variant="solid"
-            placement="top"
-            arrow
-          >
+          <Tooltip title={t(`shortcut.visibility.${shortcut.visibility.toLowerCase()}.description`)} variant="solid" placement="top" arrow>
             <div className="w-auto px-2 leading-6 flex flex-row justify-start items-center border rounded-full text-gray-500 text-sm dark:border-zinc-800">
               <VisibilityIcon className="w-4 h-auto mr-1" visibility={shortcut.visibility} />
-              {t(`shortcut.visibility.${convertVisibilityFromPb(shortcut.visibility).toLowerCase()}.self`)}
+              {t(`shortcut.visibility.${shortcut.visibility.toLowerCase()}.self`)}
             </div>
           </Tooltip>
           <Tooltip title="View count" variant="solid" placement="top" arrow>
             <div className="w-auto px-2 leading-6 flex flex-row justify-start items-center border rounded-full text-gray-500 text-sm dark:border-zinc-800">
               <Icon.BarChart2 className="w-4 h-auto mr-1" />
-              {shortcut.viewCount} visits
+              {shortcut.view} visits
             </div>
           </Tooltip>
         </div>
@@ -204,13 +178,13 @@ const ShortcutDetail = () => {
 
       {showQRCodeDialog && <GenerateQRCodeDialog shortcut={shortcut} onClose={() => setShowQRCodeDialog(false)} />}
 
-      {state.showEditDrawer && (
-        <CreateShortcutDrawer
+      {state.showEditModal && (
+        <CreateShortcutDialog
           shortcutId={shortcut.id}
           onClose={() =>
             setState({
               ...state,
-              showEditDrawer: false,
+              showEditModal: false,
             })
           }
         />

frontend/web/src/pages/ShortcutSpace.tsx

@@ -1,39 +0,0 @@
-import { useEffect, useState } from "react";
-import toast from "react-hot-toast";
-import { useParams } from "react-router-dom";
-import { isURL } from "@/helpers/utils";
-import useShortcutStore from "@/stores/v1/shortcut";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
-
-const ShortcutSpace = () => {
-  const params = useParams();
-  const shortcutName = params["*"] || "";
-  const shortcutStore = useShortcutStore();
-  const [shortcut, setShortcut] = useState<Shortcut>();
-
-  useEffect(() => {
-    (async () => {
-      try {
-        const shortcut = await shortcutStore.fetchShortcutByName(shortcutName);
-        setShortcut(shortcut);
-      } catch (error: any) {
-        console.error(error);
-        toast.error(error.details);
-      }
-    })();
-  }, [shortcutName]);
-
-  if (!shortcut) {
-    return null;
-  }
-
-  if (isURL(shortcut.link)) {
-    window.document.title = "Redirecting...";
-    window.location.href = shortcut.link;
-    return null;
-  }
-
-  return <div>{shortcut.link}</div>;
-};
-
-export default ShortcutSpace;

frontend/web/src/pages/SignIn.tsx

@@ -3,23 +3,29 @@ import React, { FormEvent, useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import { authServiceClient } from "@/grpcweb";
 import useNavigateTo from "@/hooks/useNavigateTo";
-import useUserStore from "@/stores/v1/user";
 import useWorkspaceStore from "@/stores/v1/workspace";
+import * as api from "../helpers/api";
 import useLoading from "../hooks/useLoading";
+import useUserStore from "../stores/v1/user";
 
 const SignIn: React.FC = () => {
   const { t } = useTranslation();
   const navigateTo = useNavigateTo();
-  const workspaceStore = useWorkspaceStore();
   const userStore = useUserStore();
+  const workspaceStore = useWorkspaceStore();
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
   const actionBtnLoadingState = useLoading(false);
   const allowConfirm = email.length > 0 && password.length > 0;
 
   useEffect(() => {
+    if (userStore.getCurrentUser()) {
+      return navigateTo("/", {
+        replace: true,
+      });
+    }
+
     if (workspaceStore.profile.mode === "demo") {
       setEmail("steven@yourselfhosted.com");
       setPassword("secret");
@@ -44,17 +50,18 @@ const SignIn: React.FC = () => {
 
     try {
       actionBtnLoadingState.setLoading();
-      const { user } = await authServiceClient.signIn({ email, password });
+      await api.signin(email, password);
+      const user = await userStore.fetchCurrentUser();
       if (user) {
-        userStore.setCurrentUserId(user.id);
-        await userStore.fetchCurrentUser();
-        navigateTo("/");
+        navigateTo("/", {
+          replace: true,
+        });
       } else {
         toast.error("Signin failed");
       }
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
     actionBtnLoadingState.setFinish();
   };
@@ -100,7 +107,7 @@ const SignIn: React.FC = () => {
           {workspaceStore.profile.enableSignup && (
             <p className="w-full mt-4 text-sm">
               <span className="dark:text-gray-500">{"Don't have an account yet?"}</span>
-              <Link className="cursor-pointer ml-2 text-blue-600 hover:underline" to="/auth/signup" unstable_viewTransition>
+              <Link to="/auth/signup" className="cursor-pointer ml-2 text-blue-600 hover:underline">
                 {t("auth.sign-up")}
               </Link>
             </p>

frontend/web/src/pages/SignUp.tsx

@@ -3,17 +3,17 @@ import React, { FormEvent, useEffect, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import { authServiceClient } from "@/grpcweb";
 import useNavigateTo from "@/hooks/useNavigateTo";
-import useUserStore from "@/stores/v1/user";
 import useWorkspaceStore from "@/stores/v1/workspace";
+import * as api from "../helpers/api";
 import useLoading from "../hooks/useLoading";
+import useUserStore from "../stores/v1/user";
 
 const SignUp: React.FC = () => {
   const { t } = useTranslation();
   const navigateTo = useNavigateTo();
-  const workspaceStore = useWorkspaceStore();
   const userStore = useUserStore();
+  const workspaceStore = useWorkspaceStore();
   const [email, setEmail] = useState("");
   const [nickname, setNickname] = useState("");
   const [password, setPassword] = useState("");
@@ -21,6 +21,12 @@ const SignUp: React.FC = () => {
   const allowConfirm = email.length > 0 && nickname.length > 0 && password.length > 0;
 
   useEffect(() => {
+    if (userStore.getCurrentUser()) {
+      return navigateTo("/", {
+        replace: true,
+      });
+    }
+
     if (!workspaceStore.profile.enableSignup) {
       return navigateTo("/auth", {
         replace: true,
@@ -51,21 +57,18 @@ const SignUp: React.FC = () => {
 
     try {
       actionBtnLoadingState.setLoading();
-      const { user } = await authServiceClient.signUp({
-        email,
-        nickname,
-        password,
-      });
+      await api.signup(email, nickname, password);
+      const user = await userStore.fetchCurrentUser();
       if (user) {
-        userStore.setCurrentUserId(user.id);
-        await userStore.fetchCurrentUser();
-        navigateTo("/");
+        navigateTo("/", {
+          replace: true,
+        });
       } else {
         toast.error("Signup failed");
       }
     } catch (error: any) {
       console.error(error);
-      toast.error(error.details);
+      toast.error(error.response.data.message);
     }
     actionBtnLoadingState.setFinish();
   };
@@ -115,7 +118,7 @@ const SignUp: React.FC = () => {
           </form>
           <p className="w-full mt-4 text-sm">
             <span className="dark:text-gray-500">{"Already has an account?"}</span>
-            <Link className="cursor-pointer ml-2 text-blue-600 hover:underline" to="/auth" unstable_viewTransition>
+            <Link to="/auth" className="cursor-pointer ml-2 text-blue-600 hover:underline">
               {t("auth.sign-in")}
             </Link>
           </p>

frontend/web/src/pages/SubscriptionSetting.tsx

@@ -7,14 +7,13 @@ import { subscriptionServiceClient } from "@/grpcweb";
 import { stringifyPlanType } from "@/stores/v1/subscription";
 import useWorkspaceStore from "@/stores/v1/workspace";
 import { PlanType } from "@/types/proto/api/v2/subscription_service";
-import { Role } from "@/types/proto/api/v2/user_service";
 import useUserStore from "../stores/v1/user";
 
 const SubscriptionSetting: React.FC = () => {
   const workspaceStore = useWorkspaceStore();
   const currentUser = useUserStore().getCurrentUser();
   const [licenseKey, setLicenseKey] = useState<string>("");
-  const isAdmin = currentUser.role === Role.ADMIN;
+  const isAdmin = currentUser.role === "ADMIN";
   const profile = workspaceStore.profile;
 
   const handleUpdateLicenseKey = async () => {
@@ -56,7 +55,7 @@ const SubscriptionSetting: React.FC = () => {
         <div className="w-full flex justify-between items-center mt-4">
           <div>
             {profile.plan === PlanType.FREE && (
-              <Link href="https://yourselfhosted.lemonsqueezy.com/checkout/buy/947e9a56-c93a-4294-8d71-2ea4b0f3ec51" target="_blank">
+              <Link href="https://yourselfhosted.lemonsqueezy.com/checkout/buy/d03a2696-8a8b-49c9-9e19-d425e3884fd7" target="_blank">
                 Buy a license key
                 <Icon.ExternalLink className="w-4 h-auto ml-1" />
               </Link>
@@ -70,16 +69,11 @@ const SubscriptionSetting: React.FC = () => {
       <Divider />
       <section className="w-full pb-8 dark:bg-zinc-900 flex items-center justify-center">
         <div className="w-full px-6">
-          <div className="max-w-4xl mx-auto mb-12">
           <Alert className="!inline-block mb-12">
             Slash is open source bookmarks and link sharing platform. Our source code is available and accessible on{" "}
-              <Link href="https://github.com/yourselfhosted/slash" target="_blank">
-                GitHub
-              </Link>{" "}
-              so anyone can get it, inspect it and review it.
+            <Link href="https://github.com/boojack/slash">GitHub</Link> so anyone can get it, inspect it and review it.
           </Alert>
-          </div>
-          <div className="w-full grid grid-cols-1 gap-6 lg:gap-12 mt-8 md:grid-cols-3 md:max-w-4xl mx-auto">
+          <div className="w-full grid grid-cols-1 gap-12 mt-8 md:grid-cols-3">
             <div className="flex flex-col p-6 bg-white dark:bg-zinc-800 shadow-lg rounded-lg justify-between border border-gray-300 dark:border-zinc-700">
               <div>
                 <h3 className="text-2xl font-bold text-center dark:text-gray-300">Free</h3>
@@ -143,10 +137,10 @@ const SubscriptionSetting: React.FC = () => {
                 <Link
                   className="w-full"
                   underline="none"
-                  href="https://yourselfhosted.lemonsqueezy.com/checkout/buy/947e9a56-c93a-4294-8d71-2ea4b0f3ec51"
+                  href="https://yourselfhosted.lemonsqueezy.com/checkout/buy/d03a2696-8a8b-49c9-9e19-d425e3884fd7"
                   target="_blank"
                 >
-                  <Button className="w-full bg-gradient-to-r from-pink-500 to-purple-500 shadow hover:opacity-80">Get Pro License</Button>
+                  <Button className="w-full bg-gradient-to-r from-pink-500 to-purple-500 shadow hover:opacity-80">Get Started</Button>
                 </Link>
               </div>
             </div>

frontend/web/src/pages/WorkspaceSetting.tsx

@@ -4,7 +4,6 @@ import { Link } from "react-router-dom";
 import Icon from "@/components/Icon";
 import { stringifyPlanType } from "@/stores/v1/subscription";
 import useWorkspaceStore from "@/stores/v1/workspace";
-import { Role } from "@/types/proto/api/v2/user_service";
 import MemberSection from "../components/setting/MemberSection";
 import WorkspaceSection from "../components/setting/WorkspaceSection";
 import useUserStore from "../stores/v1/user";
@@ -12,7 +11,7 @@ import useUserStore from "../stores/v1/user";
 const WorkspaceSetting: React.FC = () => {
   const workspaceStore = useWorkspaceStore();
   const currentUser = useUserStore().getCurrentUser();
-  const isAdmin = currentUser.role === Role.ADMIN;
+  const isAdmin = currentUser.role === "ADMIN";
   const profile = workspaceStore.profile;
 
   useEffect(() => {
@@ -35,7 +34,7 @@ const WorkspaceSetting: React.FC = () => {
         <div className="mt-2">
           <span className="text-gray-500 mr-2">Current plan:</span>
           <span className="text-2xl mr-4 dark:text-gray-400">{stringifyPlanType(profile.plan)}</span>
-          <Link to="/setting/subscription" unstable_viewTransition>
+          <Link to="/setting/subscription">
             <Button size="sm" variant="outlined" startDecorator={<Icon.Settings className="w-4 h-auto" />}>
               Manage
             </Button>

frontend/web/src/routers/index.tsx

@@ -2,7 +2,6 @@ import { createBrowserRouter } from "react-router-dom";
 import CollectionDashboard from "@/pages/CollectionDashboard";
 import CollectionSpace from "@/pages/CollectionSpace";
 import NotFound from "@/pages/NotFound";
-import ShortcutSpace from "@/pages/ShortcutSpace";
 import SignIn from "@/pages/SignIn";
 import SignUp from "@/pages/SignUp";
 import SubscriptionSetting from "@/pages/SubscriptionSetting";
@@ -12,6 +11,7 @@ import App from "../App";
 import Root from "../layouts/Root";
 import Home from "../pages/Home";
 import ShortcutDetail from "../pages/ShortcutDetail";
+import { shortcutService } from "../services";
 
 const router = createBrowserRouter([
   {
@@ -41,6 +41,10 @@ const router = createBrowserRouter([
           {
             path: "/shortcut/:shortcutId",
             element: <ShortcutDetail />,
+            loader: async ({ params }) => {
+              const shortcut = await shortcutService.getOrFetchShortcutById(Number(params.shortcutId));
+              return shortcut;
+            },
           },
           {
             path: "/setting/general",
@@ -57,11 +61,7 @@ const router = createBrowserRouter([
         ],
       },
       {
-        path: "s/*",
-        element: <ShortcutSpace />,
-      },
-      {
-        path: "c/*",
+        path: "c/:collectionName",
         element: <CollectionSpace />,
       },
       {

frontend/web/src/services/index.ts

@@ -0,0 +1,3 @@
+import shortcutService from "./shortcutService";
+
+export { shortcutService };

frontend/web/src/services/shortcutService.ts

@@ -0,0 +1,64 @@
+import * as api from "../helpers/api";
+import store from "../stores";
+import { createShortcut, deleteShortcut, patchShortcut, setShortcuts } from "../stores/modules/shortcut";
+
+const convertResponseModelShortcut = (shortcut: Shortcut): Shortcut => {
+  return {
+    ...shortcut,
+    createdTs: shortcut.createdTs * 1000,
+    updatedTs: shortcut.updatedTs * 1000,
+  };
+};
+
+const shortcutService = {
+  getState: () => {
+    return store.getState().shortcut;
+  },
+
+  getMyAllShortcuts: async () => {
+    const data = (await api.getShortcutList()).data;
+    const shortcuts = data.map((s) => convertResponseModelShortcut(s));
+    store.dispatch(setShortcuts(shortcuts));
+  },
+
+  getShortcutById: (id: ShortcutId) => {
+    for (const shortcut of shortcutService.getState().shortcutList) {
+      if (shortcut.id === id) {
+        return shortcut;
+      }
+    }
+    return null;
+  },
+
+  getOrFetchShortcutById: async (id: ShortcutId) => {
+    for (const shortcut of shortcutService.getState().shortcutList) {
+      if (shortcut.id === id) {
+        return shortcut;
+      }
+    }
+
+    const data = (await api.getShortcutById(id)).data;
+    const shortcut = convertResponseModelShortcut(data);
+    store.dispatch(createShortcut(shortcut));
+    return shortcut;
+  },
+
+  createShortcut: async (shortcutCreate: ShortcutCreate) => {
+    const data = (await api.createShortcut(shortcutCreate)).data;
+    const shortcut = convertResponseModelShortcut(data);
+    store.dispatch(createShortcut(shortcut));
+  },
+
+  patchShortcut: async (shortcutPatch: ShortcutPatch) => {
+    const data = (await api.patchShortcut(shortcutPatch)).data;
+    const shortcut = convertResponseModelShortcut(data);
+    store.dispatch(patchShortcut(shortcut));
+  },
+
+  deleteShortcutById: async (shortcutId: ShortcutId) => {
+    await api.deleteShortcutById(shortcutId);
+    store.dispatch(deleteShortcut(shortcutId));
+  },
+};
+
+export default shortcutService;

frontend/web/src/stores/index.ts

@@ -0,0 +1,15 @@
+import { configureStore } from "@reduxjs/toolkit";
+import { TypedUseSelectorHook, useSelector } from "react-redux";
+import shortcutReducer from "./modules/shortcut";
+
+const store = configureStore({
+  reducer: {
+    shortcut: shortcutReducer,
+  },
+});
+
+type AppState = ReturnType<typeof store.getState>;
+
+export const useAppSelector: TypedUseSelectorHook<AppState> = useSelector;
+
+export default store;

frontend/web/src/stores/modules/shortcut.ts

@@ -0,0 +1,51 @@
+import { createSlice, PayloadAction } from "@reduxjs/toolkit";
+
+interface State {
+  shortcutList: Shortcut[];
+}
+
+const shortcutSlice = createSlice({
+  name: "shortcut",
+  initialState: {
+    shortcutList: [],
+  } as State,
+  reducers: {
+    setShortcuts: (state, action: PayloadAction<Shortcut[]>) => {
+      return {
+        ...state,
+        shortcutList: action.payload,
+      };
+    },
+    createShortcut: (state, action: PayloadAction<Shortcut>) => {
+      return {
+        ...state,
+        shortcutList: state.shortcutList.concat(action.payload).sort((a, b) => b.createdTs - a.createdTs),
+      };
+    },
+    patchShortcut: (state, action: PayloadAction<Partial<Shortcut>>) => {
+      return {
+        ...state,
+        shortcutList: state.shortcutList.map((s) => {
+          if (s.id === action.payload.id) {
+            return {
+              ...s,
+              ...action.payload,
+            };
+          } else {
+            return s;
+          }
+        }),
+      };
+    },
+    deleteShortcut: (state, action: PayloadAction<ShortcutId>) => {
+      return {
+        ...state,
+        shortcutList: [...state.shortcutList].filter((shortcut) => shortcut.id !== action.payload),
+      };
+    },
+  },
+});
+
+export const { setShortcuts, createShortcut, patchShortcut, deleteShortcut } = shortcutSlice.actions;
+
+export default shortcutSlice.reducer;

frontend/web/src/stores/v1/collection.ts

@@ -84,6 +84,8 @@ const useCollectionStore = create<CollectionState>()((set, get) => ({
       throw new Error("Collection not found");
     }
 
+    console.log("updatedCollection", updatedCollection);
+
     const collectionMap = get().collectionMapById;
     collectionMap[updatedCollection.id] = updatedCollection;
     set(collectionMap);

frontend/web/src/stores/v1/shortcut.ts

@@ -1,128 +1,50 @@
-import { isEqual } from "lodash-es";
 import { create } from "zustand";
-import { combine } from "zustand/middleware";
 import { shortcutServiceClient } from "@/grpcweb";
 import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
 
-interface State {
-  shortcutMapById: Record<number, Shortcut>;
+interface ShortcutState {
+  shortcutMapById: Record<ShortcutId, Shortcut>;
+  fetchShortcutList: () => Promise<Shortcut[]>;
+  getOrFetchShortcutById: (id: ShortcutId) => Promise<Shortcut>;
+  getShortcutById: (id: ShortcutId) => Shortcut;
+  getShortcutList: () => Shortcut[];
 }
 
-const getDefaultState = (): State => {
-  return {
+const useShortcutStore = create<ShortcutState>()((set, get) => ({
   shortcutMapById: {},
-  };
-};
-
-const useShortcutStore = create(
-  combine(getDefaultState(), (set, get) => ({
   fetchShortcutList: async () => {
     const { shortcuts } = await shortcutServiceClient.listShortcuts({});
     const shortcutMap = get().shortcutMapById;
     shortcuts.forEach((shortcut) => {
       shortcutMap[shortcut.id] = shortcut;
     });
-      set({ shortcutMapById: shortcutMap });
+    set(shortcutMap);
     return shortcuts;
   },
-    fetchShortcutByName: async (name: string) => {
-      const { shortcut } = await shortcutServiceClient.getShortcutByName({
-        name,
-      });
-      if (!shortcut) {
-        throw new Error(`Shortcut with name ${name} not found`);
-      }
-      return shortcut;
-    },
-    getOrFetchShortcutById: async (id: number) => {
+  getOrFetchShortcutById: async (id: ShortcutId) => {
     const shortcutMap = get().shortcutMapById;
     if (shortcutMap[id]) {
       return shortcutMap[id] as Shortcut;
     }
 
     const { shortcut } = await shortcutServiceClient.getShortcut({
-        id,
+      id: id,
     });
     if (!shortcut) {
       throw new Error(`Shortcut with id ${id} not found`);
     }
 
     shortcutMap[id] = shortcut;
-      set({ shortcutMapById: shortcutMap });
+    set(shortcutMap);
     return shortcut;
   },
-    getShortcutById: (id: number) => {
+  getShortcutById: (id: ShortcutId) => {
     const shortcutMap = get().shortcutMapById;
-      return shortcutMap[id] || unknownShortcut;
+    return shortcutMap[id] as Shortcut;
   },
   getShortcutList: () => {
     return Object.values(get().shortcutMapById);
   },
-    createShortcut: async (shortcut: Shortcut) => {
-      const { shortcut: createdShortcut } = await shortcutServiceClient.createShortcut({
-        shortcut: shortcut,
-      });
-      if (!createdShortcut) {
-        throw new Error(`Failed to create shortcut`);
-      }
-      const shortcutMap = get().shortcutMapById;
-      shortcutMap[createdShortcut.id] = createdShortcut;
-      set({ shortcutMapById: shortcutMap });
-      return createdShortcut;
-    },
-    updateShortcut: async (shortcut: Partial<Shortcut>, updateMask: string[]) => {
-      const { shortcut: updatedShortcut } = await shortcutServiceClient.updateShortcut({
-        shortcut: shortcut,
-        updateMask,
-      });
-      if (!updatedShortcut) {
-        throw new Error(`Failed to update shortcut`);
-      }
-      const shortcutMap = get().shortcutMapById;
-      shortcutMap[updatedShortcut.id] = updatedShortcut;
-      set({ shortcutMapById: shortcutMap });
-      return updatedShortcut;
-    },
-    deleteShortcut: async (id: number) => {
-      await shortcutServiceClient.deleteShortcut({
-        id,
-      });
-      const shortcutMap = get().shortcutMapById;
-      delete shortcutMap[id];
-      set({ shortcutMapById: shortcutMap });
-    },
-  }))
-);
-
-const unknownShortcut: Shortcut = Shortcut.fromPartial({
-  id: -1,
-  name: "Unknown",
-});
-
-export const getShortcutUpdateMask = (shortcut: Shortcut, updatingShortcut: Shortcut) => {
-  const updateMask: string[] = [];
-  if (!isEqual(shortcut.name, updatingShortcut.name)) {
-    updateMask.push("name");
-  }
-  if (!isEqual(shortcut.link, updatingShortcut.link)) {
-    updateMask.push("link");
-  }
-  if (!isEqual(shortcut.title, updatingShortcut.title)) {
-    updateMask.push("title");
-  }
-  if (!isEqual(shortcut.description, updatingShortcut.description)) {
-    updateMask.push("description");
-  }
-  if (!isEqual(shortcut.tags, updatingShortcut.tags)) {
-    updateMask.push("tags");
-  }
-  if (!isEqual(shortcut.visibility, updatingShortcut.visibility)) {
-    updateMask.push("visibility");
-  }
-  if (!isEqual(shortcut.ogMetadata, updatingShortcut.ogMetadata)) {
-    updateMask.push("og_metadata");
-  }
-  return updateMask;
-};
+}));
 
 export default useShortcutStore;

frontend/web/src/stores/v1/user.ts

@@ -1,26 +1,33 @@
 import { create } from "zustand";
-import { authServiceClient, userServiceClient, userSettingServiceClient } from "@/grpcweb";
-import { User } from "@/types/proto/api/v2/user_service";
+import { userSettingServiceClient } from "@/grpcweb";
 import { UserSetting } from "@/types/proto/api/v2/user_setting_service";
+import * as api from "../../helpers/api";
+
+const convertResponseModelUser = (user: User): User => {
+  return {
+    ...user,
+    createdTs: user.createdTs * 1000,
+    updatedTs: user.updatedTs * 1000,
+  };
+};
 
 interface UserState {
-  userMapById: Record<number, User>;
-  userSettingMapById: Record<number, UserSetting>;
-  currentUserId?: number;
+  userMapById: Record<UserId, User>;
+  userSettingMapById: Record<UserId, UserSetting>;
+  currentUserId?: UserId;
 
   // User related actions.
   fetchUserList: () => Promise<User[]>;
   fetchCurrentUser: () => Promise<User>;
-  getOrFetchUserById: (id: number) => Promise<User>;
-  getUserById: (id: number) => User;
+  getOrFetchUserById: (id: UserId) => Promise<User>;
+  getUserById: (id: UserId) => User;
   getCurrentUser: () => User;
-  setCurrentUserId: (id: number) => void;
-  createUser: (create: Partial<User>) => Promise<User>;
-  patchUser: (userPatch: Partial<User>) => Promise<void>;
-  deleteUser: (id: number) => Promise<void>;
+  createUser: (userCreate: UserCreate) => Promise<User>;
+  patchUser: (userPatch: UserPatch) => Promise<void>;
+  deleteUser: (id: UserId) => Promise<void>;
 
   // User setting related actions.
-  fetchUserSetting: (userId: number) => Promise<UserSetting>;
+  fetchUserSetting: (userId: UserId) => Promise<UserSetting>;
   updateUserSetting: (userSetting: UserSetting, updateMask: string[]) => Promise<UserSetting>;
   getCurrentUserSetting: () => UserSetting;
 }
@@ -29,87 +36,65 @@ const useUserStore = create<UserState>()((set, get) => ({
   userMapById: {},
   userSettingMapById: {},
   fetchUserList: async () => {
-    const { users } = await userServiceClient.listUsers({});
+    const { data: userList } = await api.getUserList();
     const userMap = get().userMapById;
-    users.forEach((user) => {
-      userMap[user.id] = user;
+    userList.forEach((user) => {
+      userMap[user.id] = convertResponseModelUser(user);
     });
     set(userMap);
-    return users;
+    return userList;
   },
   fetchCurrentUser: async () => {
-    const { user } = await authServiceClient.getAuthStatus({});
-    if (!user) {
-      throw new Error("User not found");
-    }
+    const { data } = await api.getMyselfUser();
+    const user = convertResponseModelUser(data);
     const userMap = get().userMapById;
     userMap[user.id] = user;
     set({ userMapById: userMap, currentUserId: user.id });
     return user;
   },
-  getOrFetchUserById: async (id: number) => {
+  getOrFetchUserById: async (id: UserId) => {
     const userMap = get().userMapById;
     if (userMap[id]) {
       return userMap[id] as User;
     }
 
-    const { user } = await userServiceClient.getUser({
-      id: Number(id),
-    });
-    if (!user) {
-      throw new Error("User not found");
-    }
+    const { data } = await api.getUserById(id);
+    const user = convertResponseModelUser(data);
     userMap[id] = user;
     set(userMap);
     return user;
   },
-  createUser: async (userCreate: Partial<User>) => {
-    const { user } = await userServiceClient.createUser({
-      user: userCreate,
-    });
-    if (!user) {
-      throw new Error("User not found");
-    }
+  createUser: async (userCreate: UserCreate) => {
+    const { data } = await api.createUser(userCreate);
+    const user = convertResponseModelUser(data);
     const userMap = get().userMapById;
     userMap[user.id] = user;
     set(userMap);
     return user;
   },
-  patchUser: async (userPatch: Partial<User>) => {
-    const { user } = await userServiceClient.updateUser({
-      user: userPatch,
-      updateMask: ["email", "nickname"],
-    });
-    if (!user) {
-      throw new Error("User not found");
-    }
+  patchUser: async (userPatch: UserPatch) => {
+    const { data } = await api.patchUser(userPatch);
+    const user = convertResponseModelUser(data);
     const userMap = get().userMapById;
     userMap[user.id] = user;
     set(userMap);
   },
-  deleteUser: async (userId: number) => {
-    await userServiceClient.deleteUser({
-      id: userId,
-    });
+  deleteUser: async (userId: UserId) => {
+    await api.deleteUser(userId);
     const userMap = get().userMapById;
     delete userMap[userId];
     set(userMap);
   },
-  getUserById: (id: number) => {
+  getUserById: (id: UserId) => {
     const userMap = get().userMapById;
-    return userMap[id] || unknownUser;
+    return userMap[id] as User;
   },
   getCurrentUser: () => {
     const userMap = get().userMapById;
     const currentUserId = get().currentUserId;
-    return userMap[currentUserId as number];
+    return userMap[currentUserId as UserId];
   },
-  setCurrentUserId: (id: number) => {
-    set({
-      currentUserId: id,
-    });
-  },
-  fetchUserSetting: async (userId: number) => {
+  fetchUserSetting: async (userId: UserId) => {
     const userSetting = (
       await userSettingServiceClient.getUserSetting({
         id: userId,
@@ -137,14 +122,8 @@ const useUserStore = create<UserState>()((set, get) => ({
   getCurrentUserSetting: () => {
     const userSettingMap = get().userSettingMapById;
     const currentUserId = get().currentUserId;
-    return userSettingMap[currentUserId as number];
+    return userSettingMap[currentUserId as UserId];
   },
 }));
 
-const unknownUser: User = User.fromPartial({
-  id: -1,
-  email: "Unknown",
-  nickname: "Unknown",
-});
-
 export default useUserStore;

frontend/web/src/stores/v1/view.ts

@@ -1,8 +1,5 @@
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
-import { Visibility } from "@/types/proto/api/v2/common";
-import { Shortcut } from "@/types/proto/api/v2/shortcut_service";
-import { User } from "@/types/proto/api/v2/user_service";
 
 export interface Filter {
   tab?: string;
@@ -104,15 +101,11 @@ export const getOrderedShortcutList = (shortcutList: Shortcut[], order: Order) =
     if (field === "name") {
       return direction === "asc" ? a.name.localeCompare(b.name) : b.name.localeCompare(a.name);
     } else if (field === "createdTs") {
-      return direction === "asc"
-        ? getDateTimestamp(a.createdTime) - getDateTimestamp(b.createdTime)
-        : getDateTimestamp(b.createdTime) - getDateTimestamp(a.createdTime);
+      return direction === "asc" ? a.createdTs - b.createdTs : b.createdTs - a.createdTs;
     } else if (field === "updatedTs") {
-      return direction === "asc"
-        ? getDateTimestamp(a.updatedTime) - getDateTimestamp(b.updatedTime)
-        : getDateTimestamp(b.updatedTime) - getDateTimestamp(a.updatedTime);
+      return direction === "asc" ? a.updatedTs - b.updatedTs : b.updatedTs - a.updatedTs;
     } else if (field === "view") {
-      return direction === "asc" ? a.viewCount - b.viewCount : b.viewCount - a.viewCount;
+      return direction === "asc" ? a.view - b.view : b.view - a.view;
     } else {
       return 0;
     }
@@ -120,8 +113,4 @@ export const getOrderedShortcutList = (shortcutList: Shortcut[], order: Order) =
   return orderedShortcutList;
 };
 
-const getDateTimestamp = (date: Date = new Date()) => {
-  return new Date(date).getTime();
-};
-
 export default useViewStore;