From e453841d66333c1a76edfbfb3d0e5bc22e3639a1 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 2 Mar 2017 17:12:45 +0100 Subject: [PATCH] Improve demo warning on home and add conditional build options. --- frontend/resources/styles/common/framework.scss | 1 + frontend/scripts/dist-main.clj | 6 +++++- frontend/scripts/dist-view.clj | 6 +++++- frontend/src/uxbox/config.cljs | 1 + frontend/src/uxbox/main/ui/auth/login.cljs | 12 +++++++++--- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss index 27719f541..0667545ad 100644 --- a/frontend/resources/styles/common/framework.scss +++ b/frontend/resources/styles/common/framework.scss @@ -1083,6 +1083,7 @@ input[type=range]:focus::-ms-fill-upper { color: $color-info-darker; margin-bottom: 1.2rem; padding: .8rem; + text-align: center; p { margin: 0; } diff --git a/frontend/scripts/dist-main.clj b/frontend/scripts/dist-main.clj index 40508fcc2..b3358329e 100644 --- a/frontend/scripts/dist-main.clj +++ b/frontend/scripts/dist-main.clj @@ -4,9 +4,13 @@ (def debug? (boolean (:uxbox-debug env nil))) +(def demo? + (boolean (:uxbox-demo env nil))) + (def defines {"uxbox.config.url" "/api" - "uxbox.config.viewurl" "/view/"}) + "uxbox.config.viewurl" "/view/" + "uxbox.config.isdemo" demo?}) (def options {:main 'uxbox.main diff --git a/frontend/scripts/dist-view.clj b/frontend/scripts/dist-view.clj index c573c4f85..b1ed96a4b 100644 --- a/frontend/scripts/dist-view.clj +++ b/frontend/scripts/dist-view.clj @@ -4,9 +4,13 @@ (def debug? (boolean (:uxbox-debug env nil))) +(def demo? + (boolean (:uxbox-demo env nil))) + (def defines {"uxbox.config.url" "/api" - "uxbox.config.viewurl" "/view/"}) + "uxbox.config.viewurl" "/view/" + "uxbox.config.isdemo" demo?}) (def options {:main 'uxbox.view diff --git a/frontend/src/uxbox/config.cljs b/frontend/src/uxbox/config.cljs index f82a1ee03..8a3420275 100644 --- a/frontend/src/uxbox/config.cljs +++ b/frontend/src/uxbox/config.cljs @@ -8,3 +8,4 @@ (goog-define url "http://127.0.0.1:6060/api") (goog-define viewurl "http://127.0.0.1:3449/view/index.html") +(goog-define isdemo false) diff --git a/frontend/src/uxbox/main/ui/auth/login.cljs b/frontend/src/uxbox/main/ui/auth/login.cljs index 4e151aefd..c59514baf 100644 --- a/frontend/src/uxbox/main/ui/auth/login.cljs +++ b/frontend/src/uxbox/main/ui/auth/login.cljs @@ -9,9 +9,10 @@ (:require [lentes.core :as l] [cuerdas.core :as str] [potok.core :as ptk] + [uxbox.builtins.icons :as i] + [uxbox.config :as cfg] [uxbox.main.store :as st] [uxbox.main.data.auth :as da] - [uxbox.builtins.icons :as i] [uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.navigation :as nav] [uxbox.util.mixins :as mx :include-macros true] @@ -40,8 +41,13 @@ :password (:password data)})))] [:form {:on-submit on-submit} [:div.login-content - [:div.message-inline.hide - [:p "UXBOX is currently on alpha version. That means that you're going to use a non-stable environment. Sorry for the inconvenience."]] + (when cfg/isdemo + [:div.message-inline + [:p + [:strong "WARNING: "] "this is a " [:strong "demo"] " service." + [:br] + [:strong "DO NOT USE"] " for real work, " [:br] + " the projects will be periodicaly wiped."]]) [:input.input-text {:name "email" :tab-index "2"