From 24f60f3334e42f7229975944c6d79d0e86fe40b2 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 10 Jul 2019 17:21:54 +0200
Subject: [PATCH 1/6] Review the router and archi
---
src/includes/mentor/create.pug | 7 +++++++
src/includes/mentor/login.pug | 3 +++
src/index.pug | 15 ++++++++++++++-
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index e69de29b..71ce5c03 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -0,0 +1,7 @@
+h2 Create a mentor account
+
+details
+ summary All available fields:
+ sib-form(
+ data-src=`${endpoints.users}`
+ )
diff --git a/src/includes/mentor/login.pug b/src/includes/mentor/login.pug
index 005ae884..5bef16a4 100644
--- a/src/includes/mentor/login.pug
+++ b/src/includes/mentor/login.pug
@@ -8,3 +8,6 @@ form(method='POST' action='/login')
label(for='password') Password
input.form-control(type='password' id='password' placeholder='password' name='password')
button.btn.btn-primary(type='submit') Log in
+
+sib-link(next='mentor-new-account')
+ div Create an account
\ No newline at end of file
diff --git a/src/index.pug b/src/index.pug
index c8374c44..3ebd83f0 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -1,6 +1,19 @@
doctype html
html
include includes/head.pug
+
+ sib-router(default-route='splash')
+ sib-route(name='splash')
+ sib-route(name='mentor-new-account')
+ sib-route(name='entrepreneur-new-account')
body
- include includes/splash.pug
+ #splash(hidden).no-sidebar
+ include includes/splash.pug
+
+ #mentor-new-account(hidden).no-sidebar
+ include includes/mentor/create.pug
+
+ #entrepreneur-new-account(hidden).no-sidebar
+ include includes/entrepreneur/create.pug
+
--
GitLab
From 7e34dda7f1c785e8c4edbbe2b218c5512805906d Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Wed, 10 Jul 2019 18:37:53 +0200
Subject: [PATCH 2/6] Updating to sib-core 0.8
---
src/includes/head.pug | 2 +-
src/includes/mentor/create.pug | 63 +++++++++++++++++++++++++++++++
src/includes/resource/edit.pug | 2 +-
src/includes/resource/list.pug | 24 +++++-------
src/includes/splash.pug | 2 +-
src/includes/templates/header.pug | 2 +-
6 files changed, 77 insertions(+), 18 deletions(-)
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 1c19e5ae..db6e75e6 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.7")
+ script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
script(type="module" src="https://unpkg.com/@startinblox/oidc@0.6")
script(src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous")
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index 71ce5c03..2e9de531 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -4,4 +4,67 @@ details
summary All available fields:
sib-form(
data-src=`${endpoints.users}`
+ fields="account_information(username, last_name, first_name, mentor_profile.organisation,\
+ email, mentor_profile.phone, mentor_profile.language,\
+ password, password_confirmation, account.picture),\
+ about_you(mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
+ mentor_profile.biography, mentor_profile.skills),\
+ social_media(mentor_profile.linkedin, mentor_profile.twitter)"
+
+ label-account_information="Create a mentor account"
+ label-about_you="About you"
+ label-social_media="Social medias"
+
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-email="Email"
+ label-mentor_profile.organisation="Organisation"
+ label-mentor_profile.phone="Phone number"
+ label-password="Password"
+ label-password_confirmation="Password confirmation"
+ label-mentor_profile.language="Language"
+ label-account.picture="Photo"
+ label-mentor_profile.headline="Headline or current position"
+ 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"
+
+
+ submit-button="CREATE AN ACCOUNT"
+ widget-username="sib-form-hidden"
)
+
+
+ //- Name, Surname, Organisation, Email, Phone number,
+ //- Language, Password, Password Confirmation
+
+ //- About you
+ //- Photo, Headline or current position, City, Country,
+ //- Tell use more about your activities, Whats skills can you share with our entrepreneurs ?
+
+ //- Social medias
+ //- Linkedin, Twitter
+
+
+ //- data-src="{{request.scheme}}://{{ request.META.HTTP_HOST }}/api/users/{{ request.user.id }}/"
+ //- data-fields="username, first_name, last_name, email, userprofile.photo, userprofile.city, userprofile.postcode"
+
+ //- label-first_name="Prénom"
+ //- label-last_name="Nom"
+ //- label-email="Email"
+ //- label-userprofile.photo="Photo"
+ //- label-userprofile.city="Ville"
+ //- label-userprofile.postcode="Code postal"
+
+ //- widget-username="sib-form-hidden"
+ //- widget-first_name="sib-form-label-placeholder-text"
+ //- widget-last_name="sib-form-label-placeholder-text"
+ //- widget-email="sib-form-label-placeholder-text"
+ //- widget-userprofile.photo="sib-form-label-placeholder-text"
+ //- widget-userprofile.city="sib-form-label-placeholder-text"
+ //- widget-userprofile.postcode="sib-form-label-placeholder-text"
+
+ //- next="accueil"
diff --git a/src/includes/resource/edit.pug b/src/includes/resource/edit.pug
index a38e3e94..63c30f7f 100644
--- a/src/includes/resource/edit.pug
+++ b/src/includes/resource/edit.pug
@@ -3,7 +3,7 @@ h2 Edit this resource
sib-form.block(
bind-resources
- data-fields='title, description, skills, closingDate'
+ fields='title, description, skills, closingDate'
class-title='field form-label is-light is-expanded'
label-title='Title*'
diff --git a/src/includes/resource/list.pug b/src/includes/resource/list.pug
index dd4eca3f..8cfc6c60 100644
--- a/src/includes/resource/list.pug
+++ b/src/includes/resource/list.pug
@@ -14,19 +14,15 @@ div.resources__newresource
#circles
sib-display#circles-list(
- data-src=`${sdn}/resources/`,
- data-fields='title, description, format, author, publication_year, language.name, steps',
- search-fields='title, description, format',
- widget-format='resource-format-name',
- multiple-format,
-
- widget-steps='resource-format-name',
- multiple-steps,
-
- set-content='title, description',
- set-info='author, publication_year, language.name',
- next='edit'
-
+ data-src=`${sdn}/resources/`,
+ fields='content(title, description), format, info(author, publication_year, language.name), steps',
+ search-fields='title, description, format',
+ widget-format='resource-format-name',
+ multiple-format,
+
+ widget-steps='resource-format-name',
+ multiple-steps,
+
+ next='edit'
)
-
//- group-by='step'
\ No newline at end of file
diff --git a/src/includes/splash.pug b/src/includes/splash.pug
index c0e742a2..caa93d28 100644
--- a/src/includes/splash.pug
+++ b/src/includes/splash.pug
@@ -14,4 +14,4 @@ sib-link(next='entrepreneur-login')
include mentor/login.pug
#entrepreneur-login(hidden).no-sidebar
- include entrepreneur/login.pug
\ No newline at end of file
+ include entrepreneur/login.pug
diff --git a/src/includes/templates/header.pug b/src/includes/templates/header.pug
index 16d06eeb..7d250afe 100644
--- a/src/includes/templates/header.pug
+++ b/src/includes/templates/header.pug
@@ -12,7 +12,7 @@ sib-widget(name='account-user-name')
include menu.pug
sib-display#user-controls__profile(
- data-fields='first_name, account.picture',
+ fields='first_name, account.picture',
widget-first_name='account-user-name',
widget-account.picture='account-user-avatar',
bind-user
--
GitLab
From ffafbac05b1f58796f770142ea563021533c9858 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 11 Jul 2019 12:06:19 +0200
Subject: [PATCH 3/6] Trying to force the login through oidc directly
---
src/includes/entrepreneur/login.pug | 21 +++++++++++++--------
src/includes/mentor/login.pug | 18 ++++++++++--------
src/index.pug | 11 +++++++++++
3 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/includes/entrepreneur/login.pug b/src/includes/entrepreneur/login.pug
index 3ca1e327..70bb0b04 100644
--- a/src/includes/entrepreneur/login.pug
+++ b/src/includes/entrepreneur/login.pug
@@ -1,10 +1,15 @@
h2 I am an entrepreneur
-form(method='POST' action='/login')
- div.form-group
- label(for='email') Email
- input.form-control(type='text' id='email' placeholder='email' name='email')
- div.form-group
- label(for='password') Password
- input.form-control(type='password' id='password' placeholder='password' name='password')
- button.btn.btn-primary(type='submit') Log in
\ No newline at end of file
+button(role='log in' onclick="document.querySelector('sib-auth').login();") Login as entrepreneur
+
+//- form(method='POST' action='/login')
+//- div.form-group
+//- label(for='email') Email
+//- input.form-control(type='text' id='email' placeholder='email' name='email')
+//- div.form-group
+//- label(for='password') Password
+//- input.form-control(type='password' id='password' placeholder='password' name='password')
+//- button.btn.btn-primary(type='submit') Log in
+
+sib-link(next='entrepreneur-new-account')
+ div Create an account
\ No newline at end of file
diff --git a/src/includes/mentor/login.pug b/src/includes/mentor/login.pug
index 5bef16a4..97c2ede6 100644
--- a/src/includes/mentor/login.pug
+++ b/src/includes/mentor/login.pug
@@ -1,13 +1,15 @@
h2 I am a mentor
-form(method='POST' action='/login')
- div.form-group
- label(for='email') Email
- input.form-control(type='text' id='email' placeholder='email' name='email')
- div.form-group
- label(for='password') Password
- input.form-control(type='password' id='password' placeholder='password' name='password')
- button.btn.btn-primary(type='submit') Log in
+button(role='log in' onclick="document.querySelector('sib-auth').login();") Login as mentor
+
+//- form(method='POST' action='/login')
+//- div.form-group
+//- label(for='email') Email
+//- input.form-control(type='text' id='email' placeholder='email' name='email')
+//- div.form-group
+//- label(for='password') Password
+//- input.form-control(type='password' id='password' placeholder='password' name='password')
+//- button.btn.btn-primary(type='submit') Log in
sib-link(next='mentor-new-account')
div Create an account
\ No newline at end of file
diff --git a/src/index.pug b/src/index.pug
index 3ebd83f0..08db7c68 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -16,4 +16,15 @@ html
#entrepreneur-new-account(hidden).no-sidebar
include includes/entrepreneur/create.pug
+ sib-auth
+ sib-auth-provider(
+ class="sib-auth-provider"
+ data-authority=`${sdn}`
+ data-client_id=`${client_id}`,
+ data-id="coopstarter"
+ data-response_type='id_token token',
+ data-scope='openid profile email',
+ data-automaticSilentRenew='true',
+ data-loadUserInfo='true'
+ )
--
GitLab
From 6b37786113de872f69804f0641677cd7fdee92b3 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 11 Jul 2019 16:37:20 +0200
Subject: [PATCH 4/6] Adding proper sets and widgets to the registration form
for mentor
---
src/includes/head.pug | 2 +-
src/includes/mentor/create.pug | 58 ++++++++++++----------------------
src/includes/mentor/login.pug | 9 ------
3 files changed, 21 insertions(+), 48 deletions(-)
diff --git a/src/includes/head.pug b/src/includes/head.pug
index db6e75e6..63f83633 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -4,7 +4,7 @@ head
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/router@0.7")
- script(type="module" src="https://unpkg.com/@startinblox/oidc@0.6")
+ script(type="module" src="https://unpkg.com/@startinblox/oidc@0.7")
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/coopstarter.css")
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index 2e9de531..ab8ba287 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -1,19 +1,33 @@
h2 Create a mentor account
+sib-widget(name='cs-section_header')
+ template
+ h2 ${label}
+
+sib-widget(name='cs-section_introduction')
+ template
+ div
+ h2 ${label}
+ p Informations will appear on your profile to inform entrepreneurs about your skills and activities. We will also use those information to address specific resources for validation.
+
details
summary All available fields:
sib-form(
data-src=`${endpoints.users}`
- fields="account_information(username, last_name, first_name, mentor_profile.organisation,\
+ fields="account_information(header_account, username, last_name, first_name, mentor_profile.organisation,\
email, mentor_profile.phone, mentor_profile.language,\
password, password_confirmation, account.picture),\
- about_you(mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
+ about_you(header_about_you, mentor_profile.headline, mentor_profile.city, mentor_profile.country,\
mentor_profile.biography, mentor_profile.skills),\
- social_media(mentor_profile.linkedin, mentor_profile.twitter)"
+ social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter)"
- label-account_information="Create a mentor account"
- label-about_you="About you"
- label-social_media="Social medias"
+ label-header_account="Create a mentor account"
+ label-header_about_you="About you"
+ label-header_social_media="Social medias"
+
+ widget-header_social_media="cs-section_header"
+ widget-header_account="cs-section_header"
+ widget-header_about_you="cs-section_introduction"
label-first_name="Surname"
label-last_name="Name"
@@ -36,35 +50,3 @@ details
submit-button="CREATE AN ACCOUNT"
widget-username="sib-form-hidden"
)
-
-
- //- Name, Surname, Organisation, Email, Phone number,
- //- Language, Password, Password Confirmation
-
- //- About you
- //- Photo, Headline or current position, City, Country,
- //- Tell use more about your activities, Whats skills can you share with our entrepreneurs ?
-
- //- Social medias
- //- Linkedin, Twitter
-
-
- //- data-src="{{request.scheme}}://{{ request.META.HTTP_HOST }}/api/users/{{ request.user.id }}/"
- //- data-fields="username, first_name, last_name, email, userprofile.photo, userprofile.city, userprofile.postcode"
-
- //- label-first_name="Prénom"
- //- label-last_name="Nom"
- //- label-email="Email"
- //- label-userprofile.photo="Photo"
- //- label-userprofile.city="Ville"
- //- label-userprofile.postcode="Code postal"
-
- //- widget-username="sib-form-hidden"
- //- widget-first_name="sib-form-label-placeholder-text"
- //- widget-last_name="sib-form-label-placeholder-text"
- //- widget-email="sib-form-label-placeholder-text"
- //- widget-userprofile.photo="sib-form-label-placeholder-text"
- //- widget-userprofile.city="sib-form-label-placeholder-text"
- //- widget-userprofile.postcode="sib-form-label-placeholder-text"
-
- //- next="accueil"
diff --git a/src/includes/mentor/login.pug b/src/includes/mentor/login.pug
index 97c2ede6..c907c435 100644
--- a/src/includes/mentor/login.pug
+++ b/src/includes/mentor/login.pug
@@ -2,14 +2,5 @@ h2 I am a mentor
button(role='log in' onclick="document.querySelector('sib-auth').login();") Login as mentor
-//- form(method='POST' action='/login')
-//- div.form-group
-//- label(for='email') Email
-//- input.form-control(type='text' id='email' placeholder='email' name='email')
-//- div.form-group
-//- label(for='password') Password
-//- input.form-control(type='password' id='password' placeholder='password' name='password')
-//- button.btn.btn-primary(type='submit') Log in
-
sib-link(next='mentor-new-account')
div Create an account
\ No newline at end of file
--
GitLab
From c3a45ca30efa5dfee7690109458610d346f745e7 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 11 Jul 2019 20:21:57 +0200
Subject: [PATCH 5/6] Adding user account creation
---
src/includes/entrepreneur/create.pug | 25 ++++++++++
src/includes/mentor/create.pug | 74 ++++++++++++++--------------
2 files changed, 61 insertions(+), 38 deletions(-)
diff --git a/src/includes/entrepreneur/create.pug b/src/includes/entrepreneur/create.pug
index e69de29b..aa34b6f1 100644
--- a/src/includes/entrepreneur/create.pug
+++ b/src/includes/entrepreneur/create.pug
@@ -0,0 +1,25 @@
+h2 Create an entrepreneur account
+
+sib-form(
+
+ data-src=`${endpoints.users}`
+ fields="username, last_name, first_name, entrepreneur_profile.organisation,\
+ email, password, password_confirmation"
+
+ range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-username="Username"
+ label-email="Email"
+ label-entrepreneur_profile.organisation="Organisation *"
+ label-password="Password"
+ label-password_confirmation="Password confirmation"
+
+ class-entrepreneur_profile.organisation='form-label is-dark'
+ multiple-entrepreneur_profile.organisation='sib-multiple-select'
+ widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+
+ submit-button="CREATE AN ACCOUNT"
+)
+
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index ab8ba287..ba27033e 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -10,43 +10,41 @@ sib-widget(name='cs-section_introduction')
h2 ${label}
p Informations will appear on your profile to inform entrepreneurs about your skills and activities. We will also use those information to address specific resources for validation.
-details
- summary All available fields:
- sib-form(
- data-src=`${endpoints.users}`
- fields="account_information(header_account, username, last_name, first_name, mentor_profile.organisation,\
- email, mentor_profile.phone, mentor_profile.language,\
- password, password_confirmation, account.picture),\
- about_you(header_about_you, 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)"
-
- label-header_account="Create a mentor account"
- label-header_about_you="About you"
- label-header_social_media="Social medias"
-
- widget-header_social_media="cs-section_header"
- widget-header_account="cs-section_header"
- widget-header_about_you="cs-section_introduction"
-
- label-first_name="Surname"
- label-last_name="Name"
- label-email="Email"
- label-mentor_profile.organisation="Organisation"
- label-mentor_profile.phone="Phone number"
- label-password="Password"
- label-password_confirmation="Password confirmation"
- label-mentor_profile.language="Language"
- label-account.picture="Photo"
- label-mentor_profile.headline="Headline or current position"
- 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"
+sib-form(
+ data-src=`${endpoints.users}`
+ fields="account_information(header_account, username, last_name, first_name, mentor_profile.organisation,\
+ email, mentor_profile.phone, mentor_profile.language,\
+ password, password_confirmation, account.picture),\
+ about_you(header_about_you, 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)"
+
+ label-header_account="Create a mentor account"
+ label-header_about_you="About you"
+ label-header_social_media="Social medias"
+
+ widget-header_social_media="cs-section_header"
+ widget-header_account="cs-section_header"
+ widget-header_about_you="cs-section_introduction"
+
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-email="Email"
+ label-mentor_profile.organisation="Organisation"
+ label-mentor_profile.phone="Phone number"
+ label-password="Password"
+ label-password_confirmation="Password confirmation"
+ label-mentor_profile.language="Language"
+ label-account.picture="Photo"
+ label-mentor_profile.headline="Headline or current position"
+ 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"
- submit-button="CREATE AN ACCOUNT"
- widget-username="sib-form-hidden"
- )
+ submit-button="CREATE AN ACCOUNT"
+ widget-username="sib-form-hidden"
+)
--
GitLab
From f68302dad9aa5df28c83f24f8c7a260e647f89fe Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Sun, 14 Jul 2019 19:03:08 +0200
Subject: [PATCH 6/6] Adding proper calls to the proper routes
---
src/includes/entrepreneur/create.pug | 28 +++++------
src/includes/mentor/create.pug | 74 ++++++++++++++++++----------
src/includes/splash.pug | 2 +-
3 files changed, 64 insertions(+), 40 deletions(-)
diff --git a/src/includes/entrepreneur/create.pug b/src/includes/entrepreneur/create.pug
index aa34b6f1..8f40f7ea 100644
--- a/src/includes/entrepreneur/create.pug
+++ b/src/includes/entrepreneur/create.pug
@@ -2,23 +2,23 @@ h2 Create an entrepreneur account
sib-form(
- data-src=`${endpoints.users}`
- fields="username, last_name, first_name, entrepreneur_profile.organisation,\
- email, password, password_confirmation"
+ data-src=`${endpoints.entrepreneurs}`
+ fields="user.username, user.last_name, user.first_name, organisation,\
+ user.email, user.password, user.password_confirmation"
- range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+ range-organisation=`${endpoints.organisations}`
- label-first_name="Surname"
- label-last_name="Name"
- label-username="Username"
- label-email="Email"
- label-entrepreneur_profile.organisation="Organisation *"
- label-password="Password"
- label-password_confirmation="Password confirmation"
+ label-user.first_name="Surname"
+ label-user.last_name="Name"
+ label-user.username="Username"
+ label-user.email="Email"
+ label-organisation="Organisation *"
+ label-user.password="Password"
+ label-user.password_confirmation="Password confirmation"
- class-entrepreneur_profile.organisation='form-label is-dark'
- multiple-entrepreneur_profile.organisation='sib-multiple-select'
- widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+ class-organisation='form-label is-dark'
+ multiple-organisation='sib-multiple-select'
+ widget-organisation='sib-form-auto-completion'
submit-button="CREATE AN ACCOUNT"
)
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index ba27033e..568c7188 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -1,9 +1,17 @@
-h2 Create a mentor account
-
sib-widget(name='cs-section_header')
template
h2 ${label}
+sib-widget(name='cs-form-password')
+ template
+ label
+ div ${label}
+ input(
+ type='password'
+ value="${value}"
+ name="${name}"
+ )
+
sib-widget(name='cs-section_introduction')
template
div
@@ -11,14 +19,18 @@ sib-widget(name='cs-section_introduction')
p Informations will appear on your profile to inform entrepreneurs about your skills and activities. We will also use those information to address specific resources for validation.
sib-form(
- data-src=`${endpoints.users}`
- fields="account_information(header_account, username, last_name, first_name, mentor_profile.organisation,\
- email, mentor_profile.phone, mentor_profile.language,\
- password, password_confirmation, account.picture),\
- about_you(header_about_you, 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)"
+ data-src=`${endpoints.mentors}`
+ fields="account_information(header_account, user.username, user.last_name, user.first_name, organisation,\
+ user.email, phone, language,\
+ user.password, user.password_confirmation, account.picture),\
+ about_you(header_about_you, headline, city, country,\
+ biography, skills),\
+ social_media(header_social_media, linkedin, twitter)"
+
+ range-organisation=`${endpoints.organisations}`
+ range-language=`${endpoints.languages}`
+
label-header_account="Create a mentor account"
label-header_about_you="About you"
label-header_social_media="Social medias"
@@ -27,24 +39,36 @@ sib-form(
widget-header_account="cs-section_header"
widget-header_about_you="cs-section_introduction"
- label-first_name="Surname"
- label-last_name="Name"
- label-email="Email"
- label-mentor_profile.organisation="Organisation"
- label-mentor_profile.phone="Phone number"
- label-password="Password"
- label-password_confirmation="Password confirmation"
- label-mentor_profile.language="Language"
+ label-user.username="Username"
+ label-user.first_name="Surname"
+ label-user.last_name="Name"
+ label-user.email="Email"
+ label-organisation="Organisation"
+ label-phone="Phone number"
+ label-user.password="Password"
+ label-user.password_confirmation="Password confirmation"
+ label-language="Language"
label-account.picture="Photo"
- label-mentor_profile.headline="Headline or current position"
- 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-headline="Headline or current position"
+ label-city="City"
+ label-country="Country"
+ label-biography="Tell us more about your activities"
+ label-skills="What skills can you share with our entrepreneurs ?"
+ label-linkedin="Linkedin"
+ label-twitter="Twitter"
+
+ widget-skills="sib-form-textarea"
+ widget-biography="sib-form-textarea"
+ widget-user.password_confirmation="cs-form-password"
+ widget-user.password="cs-form-password"
+
+ class-organisation='form-label is-dark'
+ multiple-organisation='sib-multiple-select'
+ widget-organisation='sib-form-auto-completion'
+ class-language='form-label is-dark'
+ multiple-language='sib-multiple-select'
+ widget-language='sib-form-auto-completion'
submit-button="CREATE AN ACCOUNT"
- widget-username="sib-form-hidden"
)
diff --git a/src/includes/splash.pug b/src/includes/splash.pug
index caa93d28..8c90634d 100644
--- a/src/includes/splash.pug
+++ b/src/includes/splash.pug
@@ -2,7 +2,7 @@ sib-router
sib-route(name='mentor-login')
sib-route(name='entrepreneur-login')
-h2 Welcome to our international index of resources for cooperative mentors and entrepreneurs
+h2 Welcome to your international index of resources for cooperative mentors and entrepreneurs
sib-link(next='mentor-login')
div I am a mentor
--
GitLab