Merge branch 'master' into feat/db

libs/README.md

@@ -25,6 +25,7 @@ import "@logseq/libs"
 1. https://github.com/pengx17/logseq-plugin-template-react
 2. https://github.com/pengx17/logseq-plugin-template-svelte
 3. https://github.com/tiensonqin/logseq-cljs-playground
+4. https://github.com/YU000jp/logseq-plugin-sample-kit-typescript
 
 #### Feedback
 If you have any feedback or encounter any issues, feel free to join Logseq's discord group.

src/main/frontend/components/user/login.cljs

@@ -6,6 +6,7 @@
             [frontend.rum :refer [adapt-class]]
             [frontend.modules.shortcut.core :as shortcut]
             [frontend.handler.user :as user]
+            [frontend.handler.route :as route-handler]
             [cljs-bean.core :as bean]
             [frontend.handler.notification :as notification]
             [frontend.state :as state]
@@ -44,7 +45,9 @@
         (when session
           (user/login-callback session)
           (notification/show! (str "Hi, " username " :)") :success)
-          (shui/dialog-close!)))
+          (shui/dialog-close!)
+          (when (= :user-login (state/get-current-route))
+            (route-handler/redirect! {:to :home}))))
       [])
 
     nil))
@@ -75,15 +78,19 @@
                  user'          (bean/->clj user)]
              (user-pane sign-out! user')))))]))
 
-(rum/defcs page <
+(rum/defcs modal-inner <
   shortcut/disable-all-shortcuts
   [_state]
   (page-impl))
 
+(rum/defc page
+  []
+  [:div.pt-10 (page-impl)])
+
 (defn open-login-modal!
   []
   (shui/dialog-open!
-    (fn [_close] (page))
+    (fn [_close] (modal-inner))
     {:label "user-login"
      :content-props {:onPointerDownOutside #(let [inputs (sel "form[data-amplify-form] input:not([type=checkbox])")
                                                   inputs (some->> inputs (map (fn [^js e] (.-value e))) (remove string/blank?))]

src/main/frontend/handler/events.cljs

@@ -141,7 +141,9 @@
 (defmethod handle :user/login [[_ host-ui?]]
   (if (or host-ui? (not util/electron?))
     (js/window.open config/LOGIN-URL)
-    (login/open-login-modal!)))
+    (if (mobile-util/native-platform?)
+      (route-handler/redirect! {:to :user-login})
+      (login/open-login-modal!))))
 
 (defmethod handle :graph/added [[_ repo {:keys [empty-graph?]}]]
   (search-handler/rebuild-indices!)