Move sync to close beta

src/main/frontend/components/file_sync.cljs

@@ -764,7 +764,7 @@
     [:br]
     "to our users, we need a little more time to test it. That’s why we decided to first roll it out only to our "
     [:br]
-    "charitable OpenCollective sponsors. We can notify you once it becomes available for you."]
+    "charitable OpenCollective sponsors and backers. We can notify you once it becomes available for you."]
 
    [:div.pt-6.flex.justify-end.space-x-2
     (ui/button "Close" :on-click close-fn :background "gray" :class "opacity-60")]])

src/main/frontend/components/header.cljs

@@ -199,7 +199,7 @@
       (when (and sync-enabled?
                  current-repo
                  (not (config/demo-graph? current-repo))
-                 (user-handler/alpha-user?))
+                 (user-handler/alpha-or-beta-user?))
         (fs-sync/indicator))
 
       (when (and (not= (state/get-current-route) :home)

src/main/frontend/components/settings.cljs

@@ -687,28 +687,38 @@
      (zotero-settings-row)
      (encryption-row enable-encryption?)
 
+     (when-not web-platform?
+       [:div.mt-1.sm:mt-0.sm:col-span-2
+        [:hr]
+        (if logged-in?
+          [:div
+           (user-handler/email)
+           [:p (ui/button (t :logout) {:class "p-1"
+                                       :icon "logout"
+                                       :on-click user-handler/logout})]]
+          [:div
+           (ui/button (t :login) {:class "p-1"
+                                  :icon "login"
+                                  :on-click (fn []
+                                              (state/close-settings!)
+                                              (js/window.open config/LOGIN-URL))})
+           [:p.text-sm.opacity-50 (t :settings-page/login-prompt)]])])
+
+     (when-not web-platform?
+       [:<>
+        [:div.it.sm:grid.sm:grid-cols-3.sm:gap-4.sm:items-start
+         [:label.flex.font-medium.leading-5.self-start.mt-1 (ui/icon  (if logged-in? "lock-open" "lock") {:class "mr-1"}) (t :settings-page/beta-features)]]
+        [:div.flex.flex-col.gap-4
+         {:class (when-not user-handler/alpha-or-beta-user? "opacity-50 pointer-events-none cursor-not-allowed")}
+         (sync-switcher-row enable-sync?)]])
+
      (when-not web-platform?
        [:<>
         [:hr]
         [:div.it.sm:grid.sm:grid-cols-3.sm:gap-4.sm:items-start
-         [:label.flex.font-medium.leading-5.self-start.mt-1 (ui/icon  (if logged-in? "lock-open" "lock") {:class "mr-1"}) (t :settings-page/alpha-features)]
-         [:div.mt-1.sm:mt-0.sm:col-span-2
-          (if logged-in?
-            [:div
-              (user-handler/email)
-              [:p (ui/button (t :logout) {:class "p-1"
-                                          :icon "logout"
-                                          :on-click user-handler/logout})]]
-            [:div
-             (ui/button (t :login) {:class "p-1"
-                                    :icon "login"
-                                    :on-click (fn []
-                                                (state/close-settings!)
-                                                (js/window.open config/LOGIN-URL))})
-             [:p.text-sm.opacity-50 (t :settings-page/login-prompt)]])]]
+         [:label.flex.font-medium.leading-5.self-start.mt-1 (ui/icon  (if logged-in? "lock-open" "lock") {:class "mr-1"}) (t :settings-page/alpha-features)]]
         [:div.flex.flex-col.gap-4
          {:class (when-not user-handler/alpha-user? "opacity-50 pointer-events-none cursor-not-allowed")}
-         (sync-switcher-row enable-sync?)
          (whiteboards-switcher-row enable-whiteboards?)]])]))
 
 (rum/defcs settings
@@ -750,7 +760,8 @@
                ;;   [:assets "assets" (t :settings-page/tab-assets) (ui/icon "box")])
 
                [:advanced "advanced" (t :settings-page/tab-advanced) (ui/icon "bulb")]
-               [:features "features" (t :settings-page/tab-features) (ui/icon "app-feature" {:extension? true})]
+               [:features "features" (t :settings-page/tab-features) (ui/icon "app-feature" {:extension? true
+                                                                                             :style {:margin-left 2}})]
 
                (when plugins-of-settings
                  [:plugins-setting "plugins" (t :settings-of-plugins) (ui/icon "puzzle")])]]

src/main/frontend/dicts.cljc

@@ -243,7 +243,8 @@
         :settings-page/network-proxy "Network proxy"
         :settings-page/filename-format "Filename format"
         :settings-page/alpha-features "Alpha features"
-        :settings-page/login-prompt "To access new features before anyone else you must be a financial supporter or alpha tester of Logseq and therefore log in first."
+        :settings-page/beta-features "Beta features"
+        :settings-page/login-prompt "To access new features before anyone else you must be an Open Collective Sponsor or Backer of Logseq and therefore log in first."
         :settings-page/sync "Sync"
         :settings-page/enable-whiteboards "Whiteboards"
         :logseq "Logseq"
@@ -1409,7 +1410,7 @@
            :settings-page/network-proxy "网络代理"
            :settings-page/filename-format "文件名格式"
            :settings-page/edit-setting "编辑"
-           :settings-page/login-prompt "你必须是 Logseq 的 Open Collective Sponsor 才能提前使用新功能（仍在测试中），因此需要登录。"
+           :settings-page/login-prompt "你必须是 Logseq 的 Open Collective Sponsor 或者 Backer 才能提前使用新功能（仍在测试中），因此需要登录。"
            :settings-page/alpha-features "Alpha 功能"
            :settings-page/custom-global-configuration "自定义全局配置"
            :settings-page/edit-global-config-edn "编辑全局 config.edn"

src/main/frontend/handler/events.cljs

@@ -83,7 +83,7 @@
         (map? result)
         (do
           (state/set-state! :user/info result)
-          (let [status (if (user-handler/alpha-user?) :welcome :unavailable)]
+          (let [status (if (user-handler/alpha-or-beta-user?) :welcome :unavailable)]
             (when (and (= status :welcome) (user-handler/logged-in?))
               (async/<! (file-sync-handler/load-session-graphs))
               (p/let [repos (repo-handler/refresh-repos!)]

src/main/frontend/handler/user.cljs

@@ -183,7 +183,10 @@
   (or config/dev?
       (contains? (state/user-groups) "alpha-tester")))
 
-(comment
-  (defn beta-user?
-   []
-   (contains? (state/user-groups) "beta-tester")))
+(defn beta-user?
+  []
+  (contains? (state/user-groups) "beta-tester"))
+
+(defn alpha-or-beta-user?
+  []
+  (or (alpha-user?) (beta-user?)))