From dad4de907672a20cf632c69372127b71e800d9c2 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Tue, 7 Apr 2020 19:02:28 +0200
Subject: [PATCH] Fixing the images path and adding the footer everywhere

---
 src/includes/account-creation.pug               |  6 +++---
 src/includes/entrepreneur/components/header.pug |  2 +-
 src/includes/entrepreneur/dashboard.pug         |  2 ++
 src/includes/entrepreneur/profile/create.pug    |  4 ++--
 src/includes/entrepreneur/requests/create.pug   |  2 +-
 src/includes/entrepreneur/resources/list.pug    |  2 +-
 src/includes/footer.pug                         |  8 ++++----
 src/includes/mentor/components/header.pug       |  2 +-
 src/includes/mentor/profile/create.pug          |  4 ++--
 src/includes/mentor/validation-process.pug      | 10 +++++-----
 src/includes/public/components/header.pug       |  2 +-
 src/includes/public/dashboard.pug               |  3 ++-
 src/includes/splash.pug                         |  4 ++--
 13 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/includes/account-creation.pug b/src/includes/account-creation.pug
index 0d783b57..625a5d32 100644
--- a/src/includes/account-creation.pug
+++ b/src/includes/account-creation.pug
@@ -5,21 +5,21 @@ sib-router(default-route='account-creation-index')
 
 #account-creation-index(hidden).flex
     figure(class="logo")
-        img(src="../images/logo.png" alt="Coopstarter logo")
+        img(src=`${client_domain}/images/logo.png` alt="Coopstarter logo")
 
     h2.title_lead=`${data.welcome}`
 
     sib-link.block_log(next='mentor-new-account')
         div
             figure.img_log
-                img(src="../images/mentor.png" 
+                img(src=`${client_domain}/images/mentor.png` 
                 alt="Create your account as mentor")
             h2.button_base=`${data.IAmContributor}`
 
     sib-link.block_log(next='entrepreneur-new-account')
         div
             figure.img_log
-                img(src="../images/fusee.png" 
+                img(src=`${client_domain}/images/fusee.png` 
                 alt="Create your account as entrepreneur")
             h2.button_base=`${data.IAmSearcher}`
 
diff --git a/src/includes/entrepreneur/components/header.pug b/src/includes/entrepreneur/components/header.pug
index 1a6790b1..090a10c2 100644
--- a/src/includes/entrepreneur/components/header.pug
+++ b/src/includes/entrepreneur/components/header.pug
@@ -2,7 +2,7 @@
     .flex.flex_espace.flex_item_center
         sib-link(next='entrepreneur-resource-list')
             figure.logo_head.margin_bord_ecran
-                img(src="../images/logo_head.png" alt="Coopstarter")
+                img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter")
             
         include menu.pug
         
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 6d50f78e..c4cae05c 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -45,3 +45,5 @@ section#home
         include profile/view.pug
 
 
+footer#footer 
+    include ./../footer.pug
diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index 7e9412f9..c09851fb 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -1,9 +1,9 @@
 figure.logo
-    img(src="../images/logo.png" 
+    img(src=`${client_domain}/images/logo.png` 
         alt="Coopstarter")
 
 figure.logo.img_log
-    img(src="../images/fusee.png" 
+    img(src=`${client_domain}/images/fusee.png` 
         alt="Create an entrepreneur account")
 
 h2.title_create=`${data.CompleteSearcherAccount}`
diff --git a/src/includes/entrepreneur/requests/create.pug b/src/includes/entrepreneur/requests/create.pug
index 924e4b94..95e1b777 100644
--- a/src/includes/entrepreneur/requests/create.pug
+++ b/src/includes/entrepreneur/requests/create.pug
@@ -10,7 +10,7 @@
         h2.title_form=`${data.RequestRessource}`
 
         p.p_entete=`${data.RequestRessourceInfo}`
-        img(src="../images/asid_entre.png" alt="Rechercher des ressources")
+        img(src=`${client_domain}/images/asid_entre.png` alt="Rechercher des ressources")
 
         sib-form#request-creation-form(
                 loader-id="request-creation-form-loader"
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index aa872bb8..f8692e70 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -75,7 +75,7 @@ container.block_list
 
         div.w_25
             div.block_aside_entre
-                img(src="../images/asid_entre.png" alt="rechercher de ressources")
+                img(src=`${client_domain}/images/asid_entre.png` alt="Rechercher des ressources")
                 p=`${data.CantFindRessourceYouNeed}`
                 div.button__actions
                     sib-link(next='entrepreneur-request-create')
diff --git a/src/includes/footer.pug b/src/includes/footer.pug
index c44d6711..3bf3ec99 100644
--- a/src/includes/footer.pug
+++ b/src/includes/footer.pug
@@ -2,20 +2,20 @@
     .flex.flex_espace.flex_item_center
         a.logo_footer(href='https://coopseurope.coop/')
             figure.margin_bord_ecran
-                img(src="../images/logo_CE.png" alt="Coopstarter")
+                img(src=`${client_domain}/images/logo_CE.png` alt="Cooperatives Europe")
         a.logo_footer(href='mentor-resource-list')
             figure.margin_bord_ecran
-                img(src="../images/logo_coops4dev.jpg" alt="Coopstarter")
+                img(src=`${client_domain}/images/logo_coops4dev.jpg` alt="Coops 4 Dev logo")
         a.logo_footer(href='mentor-resource-list')
             figure.flex.flex_item_center
-                img.textMore(src="../images/ica_logo.png" alt="Coopstarter")
+                img.textMore(src=`${client_domain}/images/ica_logo.png` alt="International Cooperative Alliance logo")
                 div
                     p International
                     p Co-operative
                     p Alliance
         a.logo_footer(href='mentor-resource-list')
             figure.flex.flex_item_center
-                img.textMore(src="../images/logo_UE.jpg" alt="Coopstarter")
+                img.textMore(src=`${client_domain}/images/logo_UE.jpg` alt="European Union Logo")
                 div
                     p Co-funded 
                     p by the 
diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug
index 33b1b3ef..5781831d 100644
--- a/src/includes/mentor/components/header.pug
+++ b/src/includes/mentor/components/header.pug
@@ -2,7 +2,7 @@
     .flex.flex_espace.flex_item_center
         sib-link(next='mentor-resource-list')
             figure.logo_head.margin_bord_ecran
-                img(src="../images/logo_head.png" alt="Coopstarter")
+                img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter")
             
         include menu.pug
         
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index 14da1346..0cd81b9c 100644
--- a/src/includes/mentor/profile/create.pug
+++ b/src/includes/mentor/profile/create.pug
@@ -1,9 +1,9 @@
 figure.logo
-    img(src="../images/logo.png" 
+    img(src=`${client_domain}/images/logo.png` 
         alt="Coopstarter")
 
 figure.logo.img_log
-    img(src="../images/mentor.png" 
+    img(src=`${client_domain}/images/mentor.png` 
         alt="Create a mentor account")
 
 h2.title_create= data.CompleteContributorAccount
diff --git a/src/includes/mentor/validation-process.pug b/src/includes/mentor/validation-process.pug
index 9fc2df93..6e8fe997 100644
--- a/src/includes/mentor/validation-process.pug
+++ b/src/includes/mentor/validation-process.pug
@@ -5,27 +5,27 @@ div.block_log.block_creat_count.no_shadow
         h2=`${data.WhatValidationProcess}`
         div.flex.w_100
             figure.w_50
-                img( src="../images/valid_1.png"
+                img( src=`${client_domain}/images/valid_1.png`
                 alt="")
                 figcaption.w_75=`${data.ContributorUploadResourceToDatabase}`
 
             figure.w_50
-                img( src="../images/valid_2.png"
+                img( src=`${client_domain}/images/valid_2.png`
                 alt="")
                 figcaption.w_75=`${data.ResourceSentToQualifiedPeersForValidation}`
               
             figure.w_33
-                img( src="../images/valid_3.png"
+                img( src=`${client_domain}/images/valid_3.png`
                 alt="")
                 figcaption.w_75=`${data.ResourceBecomesAvailableInDatabase}`
             
             figure.w_33
-                img( src="../images/valid_4.png"
+                img( src=`${client_domain}/images/valid_4.png`
                 alt="")
                 figcaption.w_75=`${data.ResourceIsNotValidated}`
             
             figure.w_33
-                img( src="../images/valid_5.png"
+                img( src=`${client_domain}/images/valid_5.png`
                 alt="")
                 figcaption.w_75=`${data.ResourceReportedInapropriate}`
         
\ No newline at end of file
diff --git a/src/includes/public/components/header.pug b/src/includes/public/components/header.pug
index 764b71c8..4502d388 100644
--- a/src/includes/public/components/header.pug
+++ b/src/includes/public/components/header.pug
@@ -2,7 +2,7 @@
     .flex.flex_espace.flex_item_center
         sib-link(next='public-resource-list')
             figure.logo_head.margin_bord_ecran
-                img(src="../images/logo_head.png" alt="Coopstarter")
+                img(src=`${client_domain}/images/logo_head.png` alt="Coopstarter")
             
         include menu.pug
         
diff --git a/src/includes/public/dashboard.pug b/src/includes/public/dashboard.pug
index ae990f15..ef5178c3 100644
--- a/src/includes/public/dashboard.pug
+++ b/src/includes/public/dashboard.pug
@@ -20,7 +20,8 @@ section#home
     #user-account-view(hidden).no-sidebar.container
         include profile/view.pug
 
-
+footer#footer 
+    include ./../footer.pug
 
 
 
diff --git a/src/includes/splash.pug b/src/includes/splash.pug
index 23f0b1a8..1f97a1fb 100644
--- a/src/includes/splash.pug
+++ b/src/includes/splash.pug
@@ -2,13 +2,13 @@ sib-router(default-route='splash-index')
     sib-route(name='splash-index')
 
 figure(class="logo")
-    img(src="../images/logo.png" alt="Coopstarter logo")
+    img(src=`${client_domain}/images/logo.png` alt="Coopstarter logo")
 
 h2.title_lead=`${data.welcome}`
 
 #splash-index(hidden).no-sidebar.block_log.flex.loggin
     figure.img_log
-        img(src="../images/mentor.png" 
+        img(src=`${client_domain}/images/mentor.png` 
             alt="Connect as mentor")
 
     cs-login(bind-user)
-- 
GitLab