Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-09 08:20:45 -05:00
Code Issues Activity

🔧 ldap frontend config, locales, gulp config

Browse source
This commit is contained in:
Vitaly Kornilov 2020-07-24 18:20:42 +03:00 committed by Andrey Antukh
parent 005f70ed19
commit 6fd7a23690
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/gulpfile.js
View file

@ -113,6 +113,7 @@ function readConfig(data) {
const demoWarn = process.env.UXBOX_DEMO_WARNING; const demoWarn = process.env.UXBOX_DEMO_WARNING;
const deployDate = process.env.UXBOX_DEPLOY_DATE; const deployDate = process.env.UXBOX_DEPLOY_DATE;
const deployCommit = process.env.UXBOX_DEPLOY_COMMIT; const deployCommit = process.env.UXBOX_DEPLOY_COMMIT;
const loginWithLDAP = process.env.UXBOX_LOGIN_WITH_LDAP;
let cfg = { let cfg = {
demoWarning: demoWarn === "true" demoWarning: demoWarn === "true"
@ -130,6 +131,10 @@ function readConfig(data) {
cfg.deployCommit = deployCommit; cfg.deployCommit = deployCommit;
} }
if (loginWithLDAP !== undefined) {
cfg.loginWithLDAP = loginWithLDAP;
}
Object.assign(cfg, data); Object.assign(cfg, data);
return JSON.stringify(cfg); return JSON.stringify(cfg);

9
frontend/resources/locales.json
View file

@ -107,6 +107,15 @@
"es" : "Entrar" "es" : "Entrar"
} }
}, },
"auth.login-with-ldap-submit-label" : {
"used-in" : [ "src/uxbox/main/ui/auth/login.cljs:108" ],
"translations" : {
"en" : "Sign in with LDAP",
"fr" : "",
"es" : "",
"ru" : "Вход через LDAP"
}
},
"auth.login-subtitle" : { "auth.login-subtitle" : {
"used-in" : [ "src/uxbox/main/ui/auth/login.cljs:89" ], "used-in" : [ "src/uxbox/main/ui/auth/login.cljs:89" ],
"translations" : { "translations" : {

2
frontend/src/uxbox/config.cljs
View file

@ -15,10 +15,12 @@
puri (obj/get config "publicURI") puri (obj/get config "publicURI")
wuri (obj/get config "workerURI") wuri (obj/get config "workerURI")
gcid (obj/get config "googleClientID" true) gcid (obj/get config "googleClientID" true)
lwl (obj/get config "loginWithLDAP" false)
warn (obj/get config "demoWarning" true)] warn (obj/get config "demoWarning" true)]
(def default-language "en") (def default-language "en")
(def demo-warning warn) (def demo-warning warn)
(def google-client-id gcid) (def google-client-id gcid)
(def login-with-ldap lwl)
(def worker-uri wuri) (def worker-uri wuri)
(def public-uri puri) (def public-uri puri)
(def default-theme "default"))) (def default-theme "default")))