diff --git a/README.md b/README.md index b4e71785e..e04282b09 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ The default production docker-compose already handles it for you, but if you. So check the `docker/docker-compose.yml` file. -### Auto configuration via environment variables +### Configuration via environment variables The following environment variables are also honored for configuring your UXBOX instance: @@ -147,8 +147,7 @@ your UXBOX instance: **Only available at build time!** - `-e UXBOX_API_URL=...` (defaults to `/api`) - `-e UXBOX_VIEW_URL=...` (defaults to `/view/`) -- `-e UXBOX_DEMO=...` (not defined, setting any value will activate demo mode) -- `-e UXBOX_DEBUG=...` (not defined, setting any value will activate debug mode) +- `-e UXBOX_DEMO_WARNING=...` (not defined, setting any value will activate demo mode) Available at runtime: - `-e LANG=...` (defaults to `en_US.UTF-8`) diff --git a/backend/src/uxbox/config.clj b/backend/src/uxbox/config.clj index c7466fa70..cd7521e0f 100644 --- a/backend/src/uxbox/config.clj +++ b/backend/src/uxbox/config.clj @@ -47,19 +47,18 @@ :google-api-key (lookup-env env :uxbox-google-api-key nil) - :email-reply-to (lookup-env env :uxbox-email-reply-to "no-reply@uxbox.io") - :email-from (lookup-env env :uxbox-email-from "no-reply@uxbox.io") + :email-reply-to (lookup-env env :uxbox-email-reply-to "no-reply@nodomain.com") + :email-from (lookup-env env :uxbox-email-from "no-reply@nodomain.com") - :smtp-host (lookup-env env :uxbox-smtp-host "localhost") + :smtp-host (lookup-env env :uxbox-smtp-host "smtp") :smtp-port (lookup-env env :uxbox-smtp-port 25) :smtp-user (lookup-env env :uxbox-smtp-user nil) :smtp-password (lookup-env env :uxbox-smtp-password nil) :smtp-tls (lookup-env env :uxbox-smtp-tls false) :smtp-ssl (lookup-env env :uxbox-smtp-ssl false) - :smtp-enabled (lookup-env env :uxbox-smtp-enabled false) + :smtp-enabled (lookup-env env :uxbox-smtp-enabled true) - :registration-enabled (lookup-env env :uxbox-registration-enabled true) - :secret (lookup-env env :uxbox-secret "5qjiAndGY3")}) + :registration-enabled (lookup-env env :uxbox-registration-enabled true)}) (defn read-test-config [] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 75c172a7f..76926a603 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -67,11 +67,6 @@ services: - UXBOX_SMTP_TLS=false - UXBOX_SMTP_ENABLED=false - ## Security setup - # Overwrite with a randomy generated string. Mainly used as - # shared key for sign cookies, tokens, etc. - - UXBOX_SECRET="the very secret string" - frontend: image: uxbox-frontend:latest restart: always diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss index 78d698c2f..527e5ba66 100644 --- a/frontend/resources/styles/common/framework.scss +++ b/frontend/resources/styles/common/framework.scss @@ -1090,4 +1090,7 @@ input[type=range]:focus::-ms-fill-upper { p { margin: 0; } + .code { + font-family: monospace; + } } diff --git a/frontend/src/uxbox/config.cljs b/frontend/src/uxbox/config.cljs index ad4bf358c..a7d3239de 100644 --- a/frontend/src/uxbox/config.cljs +++ b/frontend/src/uxbox/config.cljs @@ -8,5 +8,5 @@ (goog-define url "http://127.0.0.1:6060/api") (goog-define viewurl "/view/index.html") -(goog-define isdemo false) +(goog-define demo-warning false) (goog-define default-language "en") diff --git a/frontend/src/uxbox/main/ui/login.cljs b/frontend/src/uxbox/main/ui/login.cljs index 970e89fdb..7fcbfacac 100644 --- a/frontend/src/uxbox/main/ui/login.cljs +++ b/frontend/src/uxbox/main/ui/login.cljs @@ -40,9 +40,9 @@ [_] [:div.message-inline [:p - [:strong "WARNING: "] "this is a " [:strong "demo"] " service." - [:br] - [:strong "DO NOT USE"] " for real work, " [:br] + [:strong "WARNING: "] + "This is a " [:strong "demo"] " service, " + [:strong "DO NOT USE"] " for real work, " " the projects will be periodicaly wiped."]]) @@ -51,7 +51,7 @@ (let [{:keys [data] :as form} (fm/use-form ::login-form {})] [:form {:on-submit #(on-submit % form)} [:div.login-content - (when cfg/isdemo + (when cfg/demo-warning [:& demo-warning]) [:input.input-text diff --git a/frontend/src/uxbox/main/ui/profile/recovery.cljs b/frontend/src/uxbox/main/ui/profile/recovery.cljs index b07387661..7f183587b 100644 --- a/frontend/src/uxbox/main/ui/profile/recovery.cljs +++ b/frontend/src/uxbox/main/ui/profile/recovery.cljs @@ -34,6 +34,7 @@ [] (let [{:keys [data] :as form} (fm/use-form ::recovery-form {}) tr (i18n/use-translations) + on-success (fn [] (st/emit! (um/info (tr "profile.recovery.password-changed")) diff --git a/frontend/src/uxbox/main/ui/profile/recovery_request.cljs b/frontend/src/uxbox/main/ui/profile/recovery_request.cljs index 315484038..c77615aa8 100644 --- a/frontend/src/uxbox/main/ui/profile/recovery_request.cljs +++ b/frontend/src/uxbox/main/ui/profile/recovery_request.cljs @@ -35,7 +35,9 @@ tr (i18n/use-translations) on-success (fn [] - (st/emit! (um/info (tr "profile.recovery.recovery-token-sent")))) + (st/emit! (um/info (tr "profile.recovery.recovery-token-sent")) + (rt/nav :profile-recovery))) + on-submit (fn [event] (dom/prevent-default event) diff --git a/frontend/tools.clj b/frontend/tools.clj index 40605bea3..8c0f7d353 100644 --- a/frontend/tools.clj +++ b/frontend/tools.clj @@ -1,10 +1,9 @@ (require '[clojure.pprint :refer [pprint]] '[clojure.java.shell :as shell] '[clojure.java.io :as io] + '[clojure.edn :as edn] '[figwheel.main.api :as figwheel] - '[environ.core :refer [env]] - '[jsonista.core :as json] - '[cognitect.transit :as t]) + '[environ.core :refer [env]]) (require '[cljs.build.api :as api] '[cljs.repl :as repl] '[cljs.repl.node :as node]) @@ -28,13 +27,12 @@ ;; --- Generic Build Options -(def debug? (boolean (:uxbox-debug env nil))) -(def demo? (boolean (:uxbox-demo env nil))) +(def demo? (edn/read-string (:uxbox-demo-warning env "true"))) (def closure-defines - {"uxbox.config.url" (:uxbox-api-url env "http://localhost:6060/api") - "uxbox.config.viewurl" (:uxbox-view-url env "/view/index.html") - "uxbox.config.isdemo" demo?}) + {'uxbox.config.url (:uxbox-api-url env "http://localhost:6060/api") + 'uxbox.config.viewurl (:uxbox-view-url env "/view/index.html") + 'uxbox.config.demo-warning demo?}) (def default-build-options {:cache-analysis true @@ -42,6 +40,7 @@ :language-in :ecmascript6 :language-out :ecmascript5 :closure-defines closure-defines + :anon-fn-naming-policy :mapped :optimizations :none :infer-externs true :verbose false diff --git a/manage.sh b/manage.sh index 9a30475ec..616fecf3f 100755 --- a/manage.sh +++ b/manage.sh @@ -93,6 +93,7 @@ function build-frontend-local { -v $HOME/.m2:/home/uxbox/.m2 \ -e UXBOX_API_URL="/api" \ -e UXBOX_VIEW_URL="/view" \ + -e UXBOX_DEMO_WARNING=true \ $CONTAINER ./scripts/build-$BUILD_TYPE.sh }