Bladeren bron

chore(sync): rename logged? to logged-in?

rcmerci 3 jaren geleden
bovenliggende
commit
e147753146

+ 3 - 4
src/main/frontend/components/header.cljs

@@ -41,7 +41,7 @@
   []
   (let [_ (state/sub :auth/id-token)]
     (when-not config/publishing?
-      (if (user-handler/logged?)
+      (if (user-handler/logged-in?)
         [:span.text-sm.font-medium (user-handler/email)]
 
         [:a.button.text-sm.font-medium.block {:on-click (fn []
@@ -85,7 +85,7 @@
         uploading-files (:current-local->remote-files sync-state)
         downloading-files (:current-remote->local-files sync-state)]
     (when-not config/publishing?
-      (when (user-handler/logged?)
+      (when (user-handler/logged-in?)
         (when-not (file-sync-handler/graph-txid-exists?)
           (a/go (reset! *existed-graphs (a/<! (file-sync-handler/list-graphs)))))
         (ui/dropdown-with-links
@@ -139,8 +139,7 @@
 
 (rum/defc dropdown-menu < rum/reactive
   [{:keys [current-repo t]}]
-  (let [;; logged? (user-handler/logged?)
-        page-menu (page-menu/page-menu nil)
+  (let [page-menu (page-menu/page-menu nil)
         page-menu-and-hr (when (seq page-menu)
                            (concat page-menu [{:hr true}]))]
     (ui/dropdown-with-links

+ 1 - 1
src/main/frontend/components/page_menu.cljs

@@ -126,7 +126,7 @@
              :options {:on-click
                        (fn []
                          (shell/get-file-latest-git-log page 100))}})
-          (when (and (user-handler/logged?) (not file-sync-handler/hiding-login&file-sync))
+          (when (and (user-handler/logged-in?) (not file-sync-handler/hiding-login&file-sync))
             (when-let [graph-uuid (file-sync-handler/get-current-graph-uuid)]
               {:title (t :page/file-sync-versions)
                :options {:on-click #(file-sync-handler/list-file-versions graph-uuid page)}}))

+ 1 - 1
src/main/frontend/components/sidebar.cljs

@@ -350,7 +350,7 @@
         journals-length (state/sub :journals-length)
         latest-journals (db/get-latest-journals (state/get-current-repo) journals-length)
         preferred-format (state/sub [:me :preferred_format])
-        logged? (user-handler/logged?)]
+        logged? (user-handler/logged-in?)]
     [:div
      (cond
        (and default-home

+ 1 - 1
src/main/frontend/handler/user.cljs

@@ -127,7 +127,7 @@
    (parse-jwt)
    (:sub)))
 
-(defn logged? []
+(defn logged-in? []
   (boolean
    (some->
     (state/get-auth-id-token)