From 550ca7e4b2f69d8591f20fc625834da600d10cc7 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 26 May 2020 12:53:22 +0200 Subject: [PATCH] :sparkles: Enable google auth button only when is enabled. --- frontend/src/uxbox/config.cljs | 6 ++++-- frontend/src/uxbox/main/ui/auth/login.cljs | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/src/uxbox/config.cljs b/frontend/src/uxbox/config.cljs index 3d7be3446..c7246e394 100644 --- a/frontend/src/uxbox/config.cljs +++ b/frontend/src/uxbox/config.cljs @@ -12,11 +12,13 @@ (this-as global (let [config (obj/get global "uxboxConfig") - puri (obj/get config "publicURI" "http://localhost:3449") - buri (obj/get config "backendURI" "http://localhost:6060") + puri (obj/get config "publicURI" "http://localhost:3449") + buri (obj/get config "backendURI" "http://localhost:6060") + gcid (obj/get config "googleClientID" true) warn (obj/get config "demoWarning" true)] (def default-language "en") (def demo-warning warn) (def backend-uri buri) + (def google-client-id gcid) (def public-uri puri) (def default-theme "default"))) diff --git a/frontend/src/uxbox/main/ui/auth/login.cljs b/frontend/src/uxbox/main/ui/auth/login.cljs index d9ad2951f..882480656 100644 --- a/frontend/src/uxbox/main/ui/auth/login.cljs +++ b/frontend/src/uxbox/main/ui/auth/login.cljs @@ -12,6 +12,7 @@ [cljs.spec.alpha :as s] [beicon.core :as rx] [rumext.alpha :as mf] + [uxbox.config :as cfg] [uxbox.common.spec :as us] [uxbox.main.ui.icons :as i] [uxbox.main.data.auth :as da] @@ -78,9 +79,10 @@ [:& login-form {:locale locale}] - [:a.btn-secondary.btn-large.btn-google-auth - {:on-click login-with-google} - "Login with google"] + (when cfg/google-client-id + [:a.btn-secondary.btn-large.btn-google-auth + {:on-click login-with-google} + "Login with google"]) [:div.links [:div.link-entry