Merge branch 'release/v1.5.1'

src/components/Gov/GovFooter.vue

@@ -48,9 +48,9 @@
 
           <span class="govuk-footer__licence-description">
             For any feedback or technical queries, please email
-            <gov-link href="mailto:[email protected]"
-              >[email protected]</gov-link
-            >
+            <gov-link :href="`mailto:${contactEmail}`">{{
+              contactEmail
+            }}</gov-link>
           </span>
         </div>
         <div class="govuk-footer__meta-item"></div>

src/main.js

@@ -146,6 +146,12 @@ Vue.mixin({
   computed: {
     now() {
       return moment().format(moment.HTML5_FMT.DATE_TIME_SECONDS);
+    },
+    contactEmail() {
+      return process.env.VUE_APP_CONTACT_EMAIL;
+    },
+    sessionMinutes() {
+      return process.env.VUE_APP_SESSION_TIMEOUT;
     }
   },
   methods: {

src/views/Dashboard.vue

@@ -12,8 +12,8 @@
           <gov-body size="l">
             From here, you can add and edit your pages on Hounslow Connect, as
             well as manage referrals into your service. For any support, contact
-            <gov-link href="mailto:[email protected]">
-              [email protected]
+            <gov-link :href="`mailto:${contactEmail}`">
+              {{ contactEmail }}
             </gov-link>
             or view our
             <gov-link :to="{ name: 'help-index' }">help videos</gov-link>

src/views/auth/Login.vue

@@ -17,7 +17,7 @@
 
             <gov-body size="s">
               For security reasons, you will be automatically logged out after
-              20 minutes.
+              {{ sessionMinutes }} minutes.
             </gov-body>
           </template>
         </gov-grid-column>

src/views/register/Completed.vue

@@ -23,9 +23,7 @@
     <gov-body>
       If you haven't heard back from us within 5 working days please email the
       team at
-      <gov-link href="mailto:[email protected]"
-        >[email protected]</gov-link
-      >
+      <gov-link :href="`mailto:${contactEmail}`">{{ contactEmail }}</gov-link>
     </gov-body>
 
     <gov-button :to="{ name: 'dashboard' }" start>Home</gov-button>

src/views/register/forms/AdditionalInfoTab.vue

@@ -262,7 +262,7 @@ export default {
     },
 
     videoEmbedHelpHref() {
-      const to = "[email protected]";
+      const to = this.contactEmail;
       const subject = `Make a video for my ${this.service.type}`;
       const body = `My ${this.service.type} is: xxx\n\nI am interested in making a video for my ${this.service.type} page on Hounslow Connect.`;
 

src/views/services/Create.vue

@@ -28,11 +28,11 @@
               </li>
               <li>You can return to edit this {{ form.type }} at any time.</li>
               <li>
-                If you would like your service to accept referrals through One
+                If you would like your service to accept referrals through
                 Hounslow Connect, please contact the team at
-                <gov-link href="mailto:[email protected]"
-                  >[email protected]</gov-link
-                >
+                <gov-link :href="`mailto:${contactEmail}`">
+                  {{ contactEmail }}
+                </gov-link>
               </li>
             </gov-list>
 

src/views/services/PreCreate.vue

@@ -12,7 +12,7 @@
           <gov-heading size="xl">Add a new Service Page</gov-heading>
 
           <gov-body>
-            You’re about to add a service/club/activity/group to One Hounslow
+            You’re about to add a service/club/activity/group to Hounslow
             Connect. Here are some things you should know:
           </gov-body>
 

src/views/services/forms/AdditionalInfoTab.vue

@@ -148,8 +148,8 @@
       <gov-grid-column width="one-half">
         <gov-body>
           Please provide your {{ type }}’s public-facing contact details. These
-          will be displayed on your {{ type }}’s page on the One Hounslow
-          Connect website.
+          will be displayed on your {{ type }}’s page on the Hounslow Connect
+          website.
         </gov-body>
 
         <gov-section-break size="l" />
@@ -271,7 +271,7 @@ export default {
       ];
     },
     videoEmbedHelpHref() {
-      const to = "[email protected]";
+      const to = this.contactEmail;
       const subject = `Make a video for my ${this.type}`;
       const body = `My ${this.type} is: xxx\n\nI am interested in making a video for my ${this.type} page on Hounslow Connect.`;
 

src/views/services/forms/DetailsTab.vue

@@ -205,7 +205,7 @@ export default {
   },
   computed: {
     logoHelpHref() {
-      const to = "[email protected]";
+      const to = this.contactEmail;
       const subject = "Help uploading service logo";
 
       return `mailto:${to}?subject=${encodeURIComponent(subject)}`;

src/views/services/forms/ReferralTab.vue

@@ -4,7 +4,7 @@
     <gov-grid-row>
       <gov-grid-column width="one-half">
         <gov-body>
-          Your {{ type }} can be set up to accept referrals through One Hounslow
+          Your {{ type }} can be set up to accept referrals through Hounslow
           Connect. These referrals directly connect your {{ type }} to
           residents.
         </gov-body>
@@ -174,7 +174,7 @@ export default {
       return this.referral_method !== null && this.referral_method !== "none";
     },
     contactAdminTeamEmail() {
-      const to = "[email protected]";
+      const to = this.contactEmail;
       const subject = `Turn referrals on for my ${this.type}`;
       const body = `${this.$options.filters.ucfirst(
         this.type

src/views/services/forms/TaxonomiesTab.vue

@@ -59,7 +59,7 @@ export default {
   },
   computed: {
     contactAdminTeamEmail() {
-      const to = "[email protected]";
+      const to = this.contactEmail;
       const subject = `Incorrect taxonomies applied to ${this.type}`;
       const body = `${this.$options.filters.ucfirst(
         this.type

src/views/users/Create.vue

@@ -11,7 +11,7 @@
           <gov-heading size="m">Add user</gov-heading>
 
           <gov-body
-            >Create users to be able to acces the back-end of the One Hounslow
+            >Create users to be able to acces the back-end of the Hounslow
             Connect service (deciding their permissions in what they have access
             to)</gov-body
           >