Merge branch 'redmine-issues/15476' into 'develop'

REDMINE_ISSUE-15476

See merge request onegeo-suite/sites/onegeo-suite-site-login-vuejs!35

.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

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
 

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: [],

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;
     }
   },
 

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
     };
   },