Selaa lähdekoodia

enhance(ui): clear up to the beta matters

charlie 2 vuotta sitten
vanhempi
sitoutus
22b0fb7311

+ 6 - 12
src/main/frontend/components/file_sync.cljs

@@ -12,7 +12,7 @@
             [frontend.db.model :as db-model]
             [frontend.fs :as fs]
             [frontend.fs.sync :as fs-sync]
-            [frontend.handler.file-sync :refer [*beta-unavailable?] :as file-sync-handler]
+            [frontend.handler.file-sync :as file-sync-handler]
             [frontend.handler.notification :as notification]
             [frontend.handler.repo :as repo-handler]
             [frontend.handler.user :as user-handler]
@@ -721,9 +721,7 @@
 
   (let [[loading? set-loading?] (rum/use-state false)]
     [:div.cp__file-sync-welcome-logseq-sync
-     [:span.head-bg
-
-      [:strong "CLOSED BETA"]]
+     [:span.head-bg]
 
      [:h1.text-2xl.font-bold.flex-col.sm:flex-row
       [:span.opacity-80 "Welcome to "]
@@ -745,7 +743,6 @@
                                (if (and (number? ex-time)
                                         (< (* ex-time 1000) (js/Date.now)))
                                  (do
-                                   (vreset! *beta-unavailable? true)
                                    (maybe-onboarding-show :unavailable))
 
                                  ;; Logseq sync available
@@ -763,15 +760,12 @@
     [:span.pr-2.dark:text-white.text-gray-800 "Logseq Sync"]
     [:span.opacity-80 "is not yet available for you. 😔 "]]
 
-   [:h2
-    "Thanks for creating an account! To ensure that our file syncing service runs well when we release it"
-    [: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 and backers. We can notify you once it becomes available for you."]
+   (when-let [expire-time (:ExpireTime (state/get-user-info))]
+     (when (number? expire-time)
+       [:h2 (util/format "Expired at: %s" (js/Date. (* 1000 expire-time)))]))
 
    [:div.pt-6.flex.justify-end.space-x-2
-    (ui/button "Close" :on-click close-fn :background "gray" :class "opacity-60")]])
+    (ui/button "Close" :on-click close-fn :background "gray" :class "opacity-60 text-link")]])
 
 (rum/defc onboarding-congrats-successful-sync
   [close-fn]

+ 0 - 4
src/main/frontend/handler/file_sync.cljs

@@ -19,11 +19,8 @@
             [lambdaisland.glogi :as log]
             [logseq.common.path :as path]))
 
-(def *beta-unavailable? (volatile! false))
-
 (def refresh-file-sync-component (atom false))
 
-
 (defn get-current-graph-uuid []
   (state/get-current-file-sync-graph-uuid))
 
@@ -227,7 +224,6 @@
        (async/unsub p topic c))))
 
 (defn reset-user-state! []
-  (vreset! *beta-unavailable? false)
   (state/set-state! :file-sync/onboarding-state nil))
 
 (defn calculate-time-left

+ 4 - 0
src/main/frontend/ui.css

@@ -278,6 +278,10 @@ html.is-mobile {
   text-sm leading-4 font-medium rounded-[6px] text-white
   focus:outline-none transition ease-in-out duration-150;
 
+  &.bg-gray-600 {
+    color: var(--ls-primary-text-color);
+  }
+
   &:disabled {
     opacity: 0.5;
     cursor: not-allowed;