From c84d1259710abdcd2b4ad29afd6c7ead8b80f0e5 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:29:30 +0200
Subject: [PATCH 01/13] Move to 0.9 and change widget template.
---
src/includes/components/widgets.pug | 14 +++++++-------
src/includes/head.pug | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index e25d7aa0..d261f439 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${value.name}
- p ${value.publication_year}
- p ${value.description}
+ p ${await value.name}
+ p ${await value.publication_year}
+ p ${await value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${value.name}
+ p #[a(href="${value.name}")] ${await value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${value.name}
+ p #[b ${label}] ${await value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${value.order}:] ${value.name}
+ p #[b ${label} ${await value.order}:] ${await value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${value.name}
+ p ${await value.name}
sib-widget(name='cs-resource-reviewer')
template
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 907cc5fc..3f431dc8 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,7 +2,7 @@ head
title CoopStarter
meta(charset="utf-8")
script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
- script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
+ script(type="module" src="https://unpkg.com/@startinblox/core")
script(type="module" src="https://unpkg.com/@startinblox/router")
script(type="module" src="https://unpkg.com/@startinblox/oidc")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
--
GitLab
From c3706979a245dfeac3c1ad7e74e362f75dc9a31d Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:39:22 +0200
Subject: [PATCH 02/13] Finaly remove the amait in widget.
---
src/includes/components/widgets.pug | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index d261f439..e25d7aa0 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${await value.name}
- p ${await value.publication_year}
- p ${await value.description}
+ p ${value.name}
+ p ${value.publication_year}
+ p ${value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${await value.name}
+ p #[a(href="${value.name}")] ${value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${await value.name}
+ p #[b ${label}] ${value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${await value.order}:] ${await value.name}
+ p #[b ${label} ${value.order}:] ${value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${await value.name}
+ p ${value.name}
sib-widget(name='cs-resource-reviewer')
template
--
GitLab
From 1c56c49e45ea0ed0f2733739af0e9af6fe02d6fe Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:29:30 +0200
Subject: [PATCH 03/13] Move to 0.9 and change widget template.
---
src/includes/components/widgets.pug | 14 +++++++-------
src/includes/head.pug | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f2..cd0507c5 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${value.name}
- p ${value.publication_year}
- p ${value.description}
+ p ${await value.name}
+ p ${await value.publication_year}
+ p ${await value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${value.name}
+ p #[a(href="${value.name}")] ${await value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${value.name}
+ p #[b ${label}] ${await value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${value.order}:] ${value.name}
+ p #[b ${label} ${await value.order}:] ${await value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${value.name}
+ p ${await value.name}
sib-widget(name='cs-resource-reviewer')
template
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 907cc5fc..3f431dc8 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,7 +2,7 @@ head
title CoopStarter
meta(charset="utf-8")
script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
- script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
+ script(type="module" src="https://unpkg.com/@startinblox/core")
script(type="module" src="https://unpkg.com/@startinblox/router")
script(type="module" src="https://unpkg.com/@startinblox/oidc")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
--
GitLab
From 00a15038bcecd38b5b14e8470efebabe2a3cc1b6 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:39:22 +0200
Subject: [PATCH 04/13] Finaly remove the amait in widget.
---
src/includes/components/widgets.pug | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index cd0507c5..c14c33f2 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${await value.name}
- p ${await value.publication_year}
- p ${await value.description}
+ p ${value.name}
+ p ${value.publication_year}
+ p ${value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${await value.name}
+ p #[a(href="${value.name}")] ${value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${await value.name}
+ p #[b ${label}] ${value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${await value.order}:] ${await value.name}
+ p #[b ${label} ${value.order}:] ${value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${await value.name}
+ p ${value.name}
sib-widget(name='cs-resource-reviewer')
template
--
GitLab
From cac0da1a79bb6264289481d42600d5fbedef7e34 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 14 Oct 2019 13:55:31 +0200
Subject: [PATCH 05/13] Add await in widget
---
src/includes/components/widgets.pug | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f2..09938d60 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${value.name}
- p ${value.publication_year}
- p ${value.description}
+ p ${await value.name}
+ p ${await value.publication_year}
+ p $await {value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${value.name}
+ p #[a(href="${value.name}")] ${await value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${value.name}
+ p #[b ${label}] ${await value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${value.order}:] ${value.name}
+ p #[b ${label} ${await value.order}:] ${await value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${value.name}
+ p ${await value.name}
sib-widget(name='cs-resource-reviewer')
template
--
GitLab
From a45b84c74f0f3c5790ef46e5bf81c288bda84e5e Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:29:30 +0200
Subject: [PATCH 06/13] Move to 0.9 and change widget template.
---
src/includes/components/widgets.pug | 14 +++++++-------
src/includes/head.pug | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f2..cd0507c5 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${value.name}
- p ${value.publication_year}
- p ${value.description}
+ p ${await value.name}
+ p ${await value.publication_year}
+ p ${await value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${value.name}
+ p #[a(href="${value.name}")] ${await value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${value.name}
+ p #[b ${label}] ${await value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${value.order}:] ${value.name}
+ p #[b ${label} ${await value.order}:] ${await value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${value.name}
+ p ${await value.name}
sib-widget(name='cs-resource-reviewer')
template
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 907cc5fc..3f431dc8 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,7 +2,7 @@ head
title CoopStarter
meta(charset="utf-8")
script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
- script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
+ script(type="module" src="https://unpkg.com/@startinblox/core")
script(type="module" src="https://unpkg.com/@startinblox/router")
script(type="module" src="https://unpkg.com/@startinblox/oidc")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
--
GitLab
From 8437cb44ef8c50f9c1ff85d5fc6ceb320b6b1689 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:39:22 +0200
Subject: [PATCH 07/13] Finaly remove the amait in widget.
---
src/includes/components/widgets.pug | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index cd0507c5..c14c33f2 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${await value.name}
- p ${await value.publication_year}
- p ${await value.description}
+ p ${value.name}
+ p ${value.publication_year}
+ p ${value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${await value.name}
+ p #[a(href="${value.name}")] ${value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${await value.name}
+ p #[b ${label}] ${value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${await value.order}:] ${await value.name}
+ p #[b ${label} ${value.order}:] ${value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${await value.name}
+ p ${value.name}
sib-widget(name='cs-resource-reviewer')
template
--
GitLab
From 816cc4e9760a7b49e2182441cd08fc240d8f7a2c Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:29:30 +0200
Subject: [PATCH 08/13] Move to 0.9 and change widget template.
---
src/includes/components/widgets.pug | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f2..cd0507c5 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${value.name}
- p ${value.publication_year}
- p ${value.description}
+ p ${await value.name}
+ p ${await value.publication_year}
+ p ${await value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${value.name}
+ p #[a(href="${value.name}")] ${await value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${value.name}
+ p #[b ${label}] ${await value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${value.order}:] ${value.name}
+ p #[b ${label} ${await value.order}:] ${await value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${value.name}
+ p ${await value.name}
sib-widget(name='cs-resource-reviewer')
template
--
GitLab
From ecb359c4258fc649f41ee9b443e01fc09cb26cc1 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Thu, 10 Oct 2019 13:39:22 +0200
Subject: [PATCH 09/13] Finaly remove the amait in widget.
---
src/includes/components/widgets.pug | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index cd0507c5..c14c33f2 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${await value.name}
- p ${await value.publication_year}
- p ${await value.description}
+ p ${value.name}
+ p ${value.publication_year}
+ p ${value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${await value.name}
+ p #[a(href="${value.name}")] ${value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${await value.name}
+ p #[b ${label}] ${value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${await value.order}:] ${await value.name}
+ p #[b ${label} ${value.order}:] ${value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${await value.name}
+ p ${value.name}
sib-widget(name='cs-resource-reviewer')
template
--
GitLab
From 30249d895df2609e10eecb4e6d79847fb838e8d9 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 14 Oct 2019 13:55:31 +0200
Subject: [PATCH 10/13] Add await in widget
---
src/includes/components/widgets.pug | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index c14c33f2..09938d60 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -13,9 +13,9 @@ sib-widget(name='cs-display-property')
sib-widget(name='cs-steps-resources-multiple')
template
div.resource_resume_header
- p ${value.name}
- p ${value.publication_year}
- p ${value.description}
+ p ${await value.name}
+ p ${await value.publication_year}
+ p $await {value.description}
sib-widget(name='cs-steps-header')
template
@@ -47,20 +47,20 @@ sib-widget(name='cs-display-checkbox')
sib-widget(name='cs-display-related-property')
template
- p #[a(href="${value.name}")] ${value.name}
+ p #[a(href="${value.name}")] ${await value.name}
sib-widget(name='cs-display-multiple-property')
template
- p #[b ${label}] ${value.name}
+ p #[b ${label}] ${await value.name}
sib-widget(name='cs-display-step-property')
template
- p #[b ${label} ${value.order}:] ${value.name}
+ p #[b ${label} ${await value.order}:] ${await value.name}
sib-widget(name='cs-resource-format-name')
template
div
- p ${value.name}
+ p ${await value.name}
sib-widget(name='cs-resource-reviewer')
template
--
GitLab
From b77676737543d9a93a80c197a09d73a45a1c302b Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 21 Oct 2019 16:36:34 +0200
Subject: [PATCH 11/13] We retrieve the data of the user with entrepreneur
profile.
---
src/includes/components/widgets.pug | 2 +-
src/includes/entrepreneur/profile/create.pug | 10 +++++-----
src/includes/entrepreneur/profile/detail.pug | 6 +++---
src/includes/entrepreneur/profile/edit.pug | 12 ++++++------
src/includes/head.pug | 8 ++++++++
5 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 09938d60..cd0507c5 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -15,7 +15,7 @@ sib-widget(name='cs-steps-resources-multiple')
div.resource_resume_header
p ${await value.name}
p ${await value.publication_year}
- p $await {value.description}
+ p ${await value.description}
sib-widget(name='cs-steps-header')
template
diff --git a/src/includes/entrepreneur/profile/create.pug b/src/includes/entrepreneur/profile/create.pug
index ccfda50e..53717168 100644
--- a/src/includes/entrepreneur/profile/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -12,16 +12,16 @@ h2.title_create Complete your entrepreneur account
sib-form#entrepreneur_profile_creation.block_log.block_creat_count(
bind-user
- fields="last_name, first_name, entrepreneur_profile.organisation, account.picture, username"
+ fields="last_name, first_name, entrepreneurProfile.organisation, account.picture, username"
- range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+ range-entrepreneurProfile.organisation=`${endpoints.organisations}`
label-first_name="Surname"
label-last_name="Name"
- label-entrepreneur_profile.organisation="Organisation *"
+ label-entrepreneurProfile.organisation="Organisation *"
- class-entrepreneur_profile.organisation='form-label is-dark'
- widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+ class-entrepreneurProfile.organisation='form-label is-dark'
+ widget-entrepreneurProfile.organisation='sib-form-auto-completion'
widget-username='sib-form-hidden'
diff --git a/src/includes/entrepreneur/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug
index e0099ead..03ada33e 100644
--- a/src/includes/entrepreneur/profile/detail.pug
+++ b/src/includes/entrepreneur/profile/detail.pug
@@ -25,11 +25,11 @@ div.block_list.flex
sib-display#entrepreneur_info(
bind-user
- fields='account.picture, name, entrepreneur_profile.organisation.name, registered_on'
+ fields='account.picture, name, entrepreneurProfile.organisation.name, registeredOn'
widget-name='cs-display-property'
widget-account.picture='cs-profile-picture'
- widget-entrepreneur_profile.organisation.name='cs-display-property'
- widget-entrepreneur_profile.registered_on='cs-display-property'
+ widget-entrepreneurProfile.organisation.name='cs-display-property'
+ widget-entrepreneurProfile.registeredOn='cs-display-property'
)
sib-display#entrepreneur_contact(
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index 8028caf0..e475c3ad 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -4,22 +4,22 @@ h2.title_create Edit your account
sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
bind-user
- fields="info(last_name, first_name, username, email, entrepreneur_profile.organisation, account.picture)"
- range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+ fields="info(last_name, first_name, username, email, entrepreneurProfile.organisation, account.picture)"
+ range-entrepreneurProfile.organisation=`${endpoints.organisations}`
label-first_name="Surname"
label-last_name="Name"
- label-entrepreneur_profile.organisation="Organisation"
+ label-entrepreneurProfile.organisation="Organisation"
label-account.picture="Profile picture"
widget-username="sib-form-hidden"
class-last_name='form-label is-dark input_big'
class-first_name='form-label is-dark input_big'
class-email='form-label is-dark input_big'
- class-entrepreneur_profile.phone='form-label is-dark input_big'
+ class-entrepreneurProfile.phone='form-label is-dark input_big'
- class-entrepreneur_profile.organisation='form-label is-dark input_big'
- widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+ class-entrepreneurProfile.organisation='form-label is-dark input_big'
+ widget-entrepreneurProfile.organisation='sib-form-auto-completion'
upload-url-account.picture=`${sdn}upload/`
widget-account.picture='cs-form-file-custom'
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 3f431dc8..f5600238 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -10,3 +10,11 @@ head
script(src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous")
script(src="/scripts/coopstarter.js")
link(rel="stylesheet" href="/styles/index.css")
+ script(data-default-context type="application/ld+json" ).
+
+ {
+ "entrepreneurProfile": "http://happy-dev.fr/owl/#entrepreneur_profile",
+ "mentorProfile": "http://happy-dev.fr/owl/#mentor_profile",
+ "account": "http://happy-dev.fr/owl/#account"
+ }
+
\ No newline at end of file
--
GitLab
From eb9900fe460c66800363233f45d9ee7b23c06934 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 21 Oct 2019 16:53:19 +0200
Subject: [PATCH 12/13] Retrieve the data of the mentor profile.
---
src/includes/components/widgets.pug | 4 --
src/includes/mentor/profile/create.pug | 64 +++++++++++++-------------
src/includes/mentor/profile/detail.pug | 32 ++++++-------
src/includes/mentor/profile/edit.pug | 60 ++++++++++++------------
4 files changed, 78 insertions(+), 82 deletions(-)
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 87e67343..cd0507c5 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -15,11 +15,7 @@ sib-widget(name='cs-steps-resources-multiple')
div.resource_resume_header
p ${await value.name}
p ${await value.publication_year}
-<<<<<<< HEAD
p ${await value.description}
-=======
- p $await {value.description}
->>>>>>> 64e247e82a61e60fd470548139cfa3afbd69c5ff
sib-widget(name='cs-steps-header')
template
diff --git a/src/includes/mentor/profile/create.pug b/src/includes/mentor/profile/create.pug
index 677dd802..8c077688 100644
--- a/src/includes/mentor/profile/create.pug
+++ b/src/includes/mentor/profile/create.pug
@@ -12,16 +12,16 @@ h2.title_create Complete your mentor account
sib-form#mentor_profile_creation.block_log.block_creat_count(
bind-user
- fields="account_information(last_name, first_name, mentor_profile.organisation,\
- mentor_profile.phone, mentor_profile.languages, mentor_profile.fields),\
- about_you(header_about_you, account.picture, mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
- mentor_profile.biography, mentor_profile.skills),\
- social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter), username"
+ fields="account_information(last_name, first_name, mentorProfile.organisation,\
+ mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\
+ about_you(header_about_you, account.picture, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\
+ mentorProfile.biography, mentorProfile.skills),\
+ social_media(header_social_media, mentorProfile.linkedin, mentorProfile.twitter), username"
- range-mentor_profile.fields=`${endpoints.fields}`
- range-mentor_profile.organisation=`${endpoints.organisations}`
- range-mentor_profile.languages=`${endpoints.languages}`
- range-mentor_profile.country=`${endpoints.countries}`
+ range-mentorProfile.fields=`${endpoints.fields}`
+ range-mentorProfile.organisation=`${endpoints.organisations}`
+ range-mentorProfile.languages=`${endpoints.languages}`
+ range-mentorProfile.country=`${endpoints.countries}`
label-header_about_you="About you"
label-header_social_media="Social medias"
@@ -31,35 +31,35 @@ sib-form#mentor_profile_creation.block_log.block_creat_count(
label-first_name="Surname"
label-last_name="Name"
- label-mentor_profile.organisation="Organisation"
- label-mentor_profile.phone="Phone number"
- label-mentor_profile.languages="Languages"
- label-mentor_profile.fields="Fields"
+ label-mentorProfile.organisation="Organisation"
+ label-mentorProfile.phone="Phone number"
+ label-mentorProfile.languages="Languages"
+ label-mentorProfile.fields="Fields"
label-account.picture="Photo"
- label-mentor_profile.headline="Headline or current position"
- class-mentor_profile.headline="w_75"
- label-mentor_profile.city="City"
- label-mentor_profile.country="Country"
- label-mentor_profile.biography="Tell us more about your activities"
- label-mentor_profile.skills="What skills can you share with our entrepreneurs ?"
- label-mentor_profile.linkedin="Linkedin"
- label-mentor_profile.twitter="Twitter"
+ label-mentorProfile.headline="Headline or current position"
+ class-mentorProfile.headline="w_75"
+ label-mentorProfile.city="City"
+ label-mentorProfile.country="Country"
+ label-mentorProfile.biography="Tell us more about your activities"
+ label-mentorProfile.skills="What skills can you share with our entrepreneurs ?"
+ label-mentorProfile.linkedin="Linkedin"
+ label-mentorProfile.twitter="Twitter"
- widget-mentor_profile.skills="sib-form-textarea"
- widget-mentor_profile.biography="sib-form-textarea"
+ widget-mentorProfile.skills="sib-form-textarea"
+ widget-mentorProfile.biography="sib-form-textarea"
widget-username="sib-form-hidden"
- class-mentor_profile.organisation='form-label is-dark'
- widget-mentor_profile.organisation='sib-form-auto-completion'
- widget-mentor_profile.country='sib-form-auto-completion'
+ class-mentorProfile.organisation='form-label is-dark'
+ widget-mentorProfile.organisation='sib-form-auto-completion'
+ widget-mentorProfile.country='sib-form-auto-completion'
- class-mentor_profile.languages='form-label is-dark'
- multiple-mentor_profile.languages='sib-multiple-select'
- widget-mentor_profile.languages='sib-form-auto-completion'
+ class-mentorProfile.languages='form-label is-dark'
+ multiple-mentorProfile.languages='sib-multiple-select'
+ widget-mentorProfile.languages='sib-form-auto-completion'
- class-mentor_profile.fields='form-label is-dark'
- multiple-mentor_profile.fields='sib-multiple-select'
- widget-mentor_profile.fields='sib-form-auto-completion'
+ class-mentorProfile.fields='form-label is-dark'
+ multiple-mentorProfile.fields='sib-multiple-select'
+ widget-mentorProfile.fields='sib-form-auto-completion'
upload-url-account.picture=`${sdn}upload/`
widget-account.picture='cs-form-file-custom'
diff --git a/src/includes/mentor/profile/detail.pug b/src/includes/mentor/profile/detail.pug
index bdd0091f..838dde88 100644
--- a/src/includes/mentor/profile/detail.pug
+++ b/src/includes/mentor/profile/detail.pug
@@ -29,13 +29,13 @@ div.block_list.flex
sib-display#mentor_info(
bind-user
- fields='account.picture, name, mentor_profile.headline, mentor_profile.city, mentor_profile.country.name, registered_on'
+ fields='account.picture, name, mentorProfile.headline, mentorProfile.city, mentorProfile.country.name, registered_on'
widget-account.picture='cs-profile-picture'
widget-name='cs-display-property'
- widget-mentor_profile.headline='cs-display-property'
- widget-mentor_profile.city='cs-display-property'
- widget-mentor_profile.country.name='cs-display-property'
- widget-mentor_profile.registered_on='cs-display-property'
+ widget-mentorProfile.headline='cs-display-property'
+ widget-mentorProfile.city='cs-display-property'
+ widget-mentorProfile.country.name='cs-display-property'
+ widget-mentorProfile.registered_on='cs-display-property'
)
sib-display.bold(
@@ -47,26 +47,26 @@ div.block_list.flex
sib-display#mentor_complementary(
bind-user
- fields='biography_label, mentor_profile.biography, skills_label, mentor_profile.skills'
+ fields='biography_label, mentorProfile.biography, skills_label, mentorProfile.skills'
widget-biography_label='cs-display-label'
widget-skills_label='cs-display-label'
label-skills_label='Skills:'
label-biography_label='Activities:'
- widget-mentor_profile.skills='cs-display-property'
- widget-mentor_profile.biography='cs-display-property'
+ widget-mentorProfile.skills='cs-display-property'
+ widget-mentorProfile.biography='cs-display-property'
)
sib-display#mentor_contact(
bind-user
- fields='email, mentor_profile.phone, mentor_profile.linkedin, mentor_profile.twitter'
+ fields='email, mentorProfile.phone, mentorProfile.linkedin, mentorProfile.twitter'
label-email='Email:'
class-email="contact_profil"
- label-mentor_profile.phone='Phone number:'
- class-mentor_profile.phone="contact_profil"
+ label-mentorProfile.phone='Phone number:'
+ class-mentorProfile.phone="contact_profil"
widget-email='cs-display-resource-property'
- widget-mentor_profile.phone='cs-display-resource-property'
- widget-mentor_profile.linkedin='cs-display-link'
- widget-mentor_profile.twitter='cs-display-link'
- label-mentor_profile.twitter='<i class="fab fa-twitter"></i>'
- label-mentor_profile.linkedin='<i class="fab fa-linkedin-in"></i>'
+ widget-mentorProfile.phone='cs-display-resource-property'
+ widget-mentorProfile.linkedin='cs-display-link'
+ widget-mentorProfile.twitter='cs-display-link'
+ label-mentorProfile.twitter='<i class="fab fa-twitter"></i>'
+ label-mentorProfile.linkedin='<i class="fab fa-linkedin-in"></i>'
)
\ No newline at end of file
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index 198a850a..ddf7cdea 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -4,15 +4,15 @@ h2.title_create Edit your account
sib-form#mentor_profile_edition.block_log.block_creat_count(
bind-user
- fields="account_information(last_name, first_name, mentor_profile.organisation,\
- mentor_profile.phone, mentor_profile.languages, mentor_profile.fields),\
- about_you(header_about_you, account.picture, mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
- mentor_profile.biography, mentor_profile.skills, resources),\
- social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter), username"
+ fields="account_information(last_name, first_name, mentorProfile.organisation,\
+ mentorProfile.phone, mentorProfile.languages, mentorProfile.fields),\
+ about_you(header_about_you, account.picture, mentorProfile.headline, mentorProfile.city, mentorProfile.country,\
+ mentorProfile.biography, mentorProfile.skills, resources),\
+ social_media(header_social_media, mentorProfile.linkedin, mentorProfile.twitter), username"
- range-mentor_profile.fields=`${endpoints.fields}`
- range-mentor_profile.organisation=`${endpoints.organisations}`
- range-mentor_profile.languages=`${endpoints.languages}`
+ range-mentorProfile.fields=`${endpoints.fields}`
+ range-mentorProfile.organisation=`${endpoints.organisations}`
+ range-mentorProfile.languages=`${endpoints.languages}`
label-header_about_you="About you"
label-header_social_media="Social medias"
@@ -22,35 +22,35 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
label-first_name="Surname"
label-last_name="Name"
- label-mentor_profile.organisation="Organisation"
- label-mentor_profile.phone="Phone number"
- label-mentor_profile.languages="Languages"
- label-mentor_profile.fields="Fields"
+ label-mentorProfile.organisation="Organisation"
+ label-mentorProfile.phone="Phone number"
+ label-mentorProfile.languages="Languages"
+ label-mentorProfile.fields="Fields"
label-account.picture="Photo"
- label-mentor_profile.headline="Headline or current position"
- class-mentor_profile.headline="w_75"
- label-mentor_profile.city="City"
- label-mentor_profile.country="Country"
- label-mentor_profile.biography="Tell us more about your activities"
- label-mentor_profile.skills="What skills can you share with our entrepreneurs ?"
- label-mentor_profile.linkedin="Linkedin"
- label-mentor_profile.twitter="Twitter"
+ label-mentorProfile.headline="Headline or current position"
+ class-mentorProfile.headline="w_75"
+ label-mentorProfile.city="City"
+ label-mentorProfile.country="Country"
+ label-mentorProfile.biography="Tell us more about your activities"
+ label-mentorProfile.skills="What skills can you share with our entrepreneurs ?"
+ label-mentorProfile.linkedin="Linkedin"
+ label-mentorProfile.twitter="Twitter"
- widget-mentor_profile.skills="sib-form-textarea"
- widget-mentor_profile.biography="sib-form-textarea"
+ widget-mentorProfile.skills="sib-form-textarea"
+ widget-mentorProfile.biography="sib-form-textarea"
widget-username="sib-form-hidden"
widget-resources="hidden-widget"
- class-mentor_profile.organisation='form-label is-dark'
- widget-mentor_profile.organisation='sib-form-auto-completion'
+ class-mentorProfile.organisation='form-label is-dark'
+ widget-mentorProfile.organisation='sib-form-auto-completion'
- class-mentor_profile.languages='form-label is-dark'
- multiple-mentor_profile.languages='sib-multiple-select'
- widget-mentor_profile.languages='sib-form-auto-completion'
+ class-mentorProfile.languages='form-label is-dark'
+ multiple-mentorProfile.languages='sib-multiple-select'
+ widget-mentorProfile.languages='sib-form-auto-completion'
- class-mentor_profile.fields='form-label is-dark'
- multiple-mentor_profile.fields='sib-multiple-select'
- widget-mentor_profile.fields='sib-form-auto-completion'
+ class-mentorProfile.fields='form-label is-dark'
+ multiple-mentorProfile.fields='sib-multiple-select'
+ widget-mentorProfile.fields='sib-form-auto-completion'
upload-url-account.picture=`${sdn}upload/`
widget-account.picture='cs-form-file-custom'
--
GitLab
From 0ba416e2a0baae13bdaa5614a36f5f085d037e11 Mon Sep 17 00:00:00 2001
From: Alice <alice.poggioli@hotmail.fr>
Date: Mon, 21 Oct 2019 17:33:18 +0200
Subject: [PATCH 13/13] Retrive the mentor data in every place.
---
src/includes/entrepreneur/resources/detail.pug | 6 +++---
src/includes/mentor/resources/detail.pug | 6 +++---
src/includes/mentor/resources/validate.pug | 6 +++---
src/includes/public/resources/detail.pug | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/includes/entrepreneur/resources/detail.pug b/src/includes/entrepreneur/resources/detail.pug
index dbb6ea52..4722d2ad 100644
--- a/src/includes/entrepreneur/resources/detail.pug
+++ b/src/includes/entrepreneur/resources/detail.pug
@@ -14,7 +14,7 @@ include ../../components/widgets
bind-resources,
fields='name, steps, format.name, \
submitter_info(submitter.account.picture, submitter.name, \
- submitter.mentor_profile.organisation.name, skills, uri, broken),\
+ submitter.mentorProfile.organisation.name, skills, uri, broken),\
content(preview_image, tags),\
description, review.reviewer.account.picture, review.reviewer.name,\
copyright, specifications(\
@@ -26,7 +26,7 @@ include ../../components/widgets
class-steps="steps"
widget-author='cs-display-resource-property',
widget-country.name='cs-display-resource-property',
- widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+ widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
widget-format.name='cs-display-resource-property'
@@ -68,7 +68,7 @@ include ../../components/widgets
label-uri='Link to resource'
name-uri='original-link'
label-country.name='Country:'
- label-submitter.mentor_profile.organisation.name='Organisation:'
+ label-submitter.mentorProfile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
action-broken='resource-report-broken-link-entrepreneur'
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index cf20f6a7..12e5235f 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -14,7 +14,7 @@ include ../../components/widgets
bind-resources,
fields='name, steps, format.name,\
submitter_info(submitter.account.picture, submitter.name, \
- submitter.mentor_profile.organisation.name, skills, uri, broken),\
+ submitter.mentorProfile.organisation.name, skills, uri, broken),\
content(preview_image, tags),\
description, review.reviewer.account.picture, review.reviewer.name,\
copyright, specifications(\
@@ -26,7 +26,7 @@ include ../../components/widgets
class-steps="steps"
widget-author='cs-display-resource-property',
widget-country='cs-display-resource-property',
- widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+ widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
widget-format.name='cs-display-resource-property'
@@ -68,7 +68,7 @@ include ../../components/widgets
label-uri='Link to resource'
name-uri='original-link'
label-country='Country:'
- label-submitter.mentor_profile.organisation.name='Organisation:'
+ label-submitter.mentorProfile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
action-broken='resource-report-broken-link-mentor'
diff --git a/src/includes/mentor/resources/validate.pug b/src/includes/mentor/resources/validate.pug
index 3b1fee99..3080037c 100644
--- a/src/includes/mentor/resources/validate.pug
+++ b/src/includes/mentor/resources/validate.pug
@@ -19,7 +19,7 @@ sib-router
bind-resources,
fields='name, steps, format.name,\
submitter_info(submitter.account.picture, submitter.name, \
- submitter.mentor_profile.organisation.name, skills, uri, broken),\
+ submitter.mentorProfile.organisation.name, skills, uri, broken),\
content(preview_image, tags),\
description, copyright, specifications(\
header_specifications, author, country.name, language.name,\
@@ -30,7 +30,7 @@ sib-router
class-steps="steps"
widget-author='cs-display-resource-property',
widget-country.name='cs-display-resource-property',
- widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+ widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
widget-format.name='cs-display-resource-property'
@@ -69,7 +69,7 @@ sib-router
label-uri='Link to resource'
name-uri='original-link'
label-country.name='Country:'
- label-submitter.mentor_profile.organisation.name='Organisation:'
+ label-submitter.mentorProfile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
action-broken='resource-report-broken-link-mentor'
diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug
index 84d387e0..486b3680 100644
--- a/src/includes/public/resources/detail.pug
+++ b/src/includes/public/resources/detail.pug
@@ -15,7 +15,7 @@ include ../../components/widgets
bind-resources,
fields='name, steps, format.name,\
submitter_info(submitter.account.picture, submitter.name, \
- submitter.mentor_profile.organisation.name, skills, uri, broken),\
+ submitter.mentorProfile.organisation.name, skills, uri, broken),\
content(preview_image, tags),\
description, review.reviewer.account.picture, review.reviewer.name,\
copyright, specifications(\
@@ -27,7 +27,7 @@ include ../../components/widgets
class-steps="steps"
widget-author='cs-display-resource-property',
widget-country.name='cs-display-resource-property',
- widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+ widget-submitter.mentorProfile.organisation.name='cs-display-resource-property'
class-submitter.name="autor_ressource"
class-broken="broken"
widget-format.name='cs-display-resource-property'
@@ -69,7 +69,7 @@ include ../../components/widgets
label-uri='Link to resource'
name-uri='original-link'
label-country.name='Country:'
- label-submitter.mentor_profile.organisation.name='Organisation:'
+ label-submitter.mentorProfile.organisation.name='Organisation:'
label-author='Author :'
label-submitter.name='Resource posted by:'
action-broken='resource-report-broken-link-public'
--
GitLab