diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 733b0ae02e7932c4091cd685c9758d638519c620..23dce79333d196eef2878c1fbe4fede64d96f3ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,9 +46,7 @@ build_development: VUE_APP_I18N_FALLBACK_LOCALE=fr\n VUE_APP_I18N_SUPPORTED_LOCALE=fr,en\n VUE_APP_LOGO=@/assets/logo.png\n - VUE_APP_TITLE=Login - Pigma\n - VUE_APP_CLIENT_NAME=PIGMA\n - VUE_APP_CLIENT_CONTACT_MAIL=pigma@gipatgeri.fr\n + VUE_APP_TITLE=Onegeo-Suite\n VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png\n VUE_APP_LOGIN_API_PATH=/fr/login/\n VUE_APP_ORGANISATION_API_PATH=/fr/organisation/\n diff --git a/README.md b/README.md index a9716158319ac07bd5165ee2999f663e22de3495..0b925df442083dc2341f655db775b48287fb3992 100644 --- a/README.md +++ b/README.md @@ -28,12 +28,6 @@ VUE_APP_I18N_SUPPORTED_LOCALE=fr,en # App title VUE_APP_TITLE=Onegeo-Suite -# Client name -VUE_APP_CLIENT_NAME=ONEGEOSUITE - -# Client contact mail -VUE_APP_CLIENT_CONTACT_MAIL=admin@contact.org - # Favicon VUE_APP_FAVICON_URL=${VUE_APP_DOMAIN}/assets/favicon.png diff --git a/public/config.js b/public/config.js index 9d096c3d6bed1bf063ebfcc1649a0e9564445e42..48d791bea0e99c4c137312b86735011827de78a1 100644 --- a/public/config.js +++ b/public/config.js @@ -5,7 +5,17 @@ export default { /^\/onegeo-login/, /^\/portail/, ], + client: { + name: "Demo", + email: "contact@neogeo.fr" + }, forms: { + signin: { + title: { + en: "Enter your login", + fr: "Saisissez vos identifiants", + } + }, signup: { disabled: false, hiddenFields: [], diff --git a/src/assets/logo.png b/src/assets/logo.png index 6481cdac496a1499d933ff548a8f973af518775c..b4420d7ff034f36bd291dd90a441c6ca56b4a9b9 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/views/SignIn.vue b/src/views/SignIn.vue index 7f3a9c0c7c802ab4680a25b83c600bae1cecb200..7730561dbd73964fec9a8382c0fd3f78365f2c22 100644 --- a/src/views/SignIn.vue +++ b/src/views/SignIn.vue @@ -5,7 +5,18 @@ <img alt="logo" :src="logoPath"/> </div> <div class="sign-in-form"> - <h5 class="title">{{ $t('signin.title', { org: clientName}) }}</h5> + <h5 + v-if="$config.forms.signin.title" + class="title" + > + {{ $config.forms.signin.title[$i18n.locale] }} + </h5> + <h5 + v-else + class="title" + > + {{ $t('signin.title', { org: $config.client.name }) }} + </h5> <form> <div class="form-row"> <input @@ -61,14 +72,17 @@ {{ $t('words.login') }} </b-button> </div> - <div class="form-row attention-message"> + <div + v-if="$config.client.name" + class="form-row attention-message" + > <img src="@/assets/attention_image.jpg" height="100" /> <p> - {{ $t('signin.warning', { org: clientName }) }} - <a :href="`mailto:${clientMail}`">{{ clientMail }}</a> + {{ $t('signin.warning', { org: $config.client.name }) }} + <a :href="`mailto:${$config.client.email}`">{{ $config.client.email }}</a> </p> </div> <div class="form-row"> @@ -140,12 +154,6 @@ export default { logoPath() { return require(process.env.VUE_APP_LOGO); - }, - clientName() { - return process.env.VUE_APP_CLIENT_NAME; - }, - clientMail() { - return process.env.VUE_APP_CLIENT_CONTACT_MAIL; } }, diff --git a/src/views/UserProfile.vue b/src/views/UserProfile.vue index 4877c3c1f46e76194e3780789d3dbebc47bb3360..4f266ad9c01028008348d19b3e5a75c6616be98f 100644 --- a/src/views/UserProfile.vue +++ b/src/views/UserProfile.vue @@ -163,11 +163,14 @@ <div class="row g-2 align-items-center"> <div class="col-3"> </div> - <div v-if="userData && adminMail" class="col"> + <div v-if="userData && $config.client.mail" class="col"> <div style="margin: 0 0.5em 0.5em 0.1em; font-size: 0.9em; font-style: italic;" > - {{ $t('profile.form.personalDetails.organisation.help') }} <a :href="`mailto:${adminMail}`">{{ adminMail }}</a>. + {{ $t('profile.form.personalDetails.organisation.help') }} + <a :href="`mailto:${$config.client.mail}`"> + {{ $config.client.mail }} + </a>. </div> </div> </div> @@ -448,8 +451,6 @@ configure({ }, }); -const ADMIN_MAIL = process.env.VUE_APP_CLIENT_CONTACT_MAIL; - export default { name: 'UserProfile', @@ -484,7 +485,6 @@ export default { btnPressed: false, showPassword: false, showNewPassword2: false, - adminMail: ADMIN_MAIL }; },