diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 87e67343d749d1a6c4fef201ae6fdef4fb5fa0d4..cd0507c55bc7d26a280d794161c738e9feccaa03 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 677dd802b9e7576e7cde75500cc8189f160028cf..8c077688e45ade9999b5bf8adb6d505653cf3f67 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 bdd0091f92a397942d70aded9c71da6becf520f2..838dde88c271e2183168c807c9d129dd4f0b952c 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 198a850a3b35ce05fb54806682eb33c30e7e4f1a..ddf7cdea6b124c96546d4ce32317af58bd6b064d 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'