From 28bf4baa05c0b41ad2337c8e1f0578f8e05d1d68 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 29 Aug 2019 15:22:17 +0200
Subject: [PATCH 1/3] Improving the login workflow
---
src/includes/account-creation.pug | 30 ++++++++++++++++++++++++++++
src/includes/components/widgets.pug | 13 +-----------
src/includes/entrepreneur/create.pug | 11 +++-------
src/includes/entrepreneur/login.pug | 7 -------
src/includes/mentor/create.pug | 25 ++++++++++++-----------
src/includes/mentor/login.pug | 9 ---------
src/includes/splash.pug | 27 ++++++-------------------
src/index.pug | 15 +++++++-------
8 files changed, 60 insertions(+), 77 deletions(-)
create mode 100644 src/includes/account-creation.pug
delete mode 100644 src/includes/entrepreneur/login.pug
delete mode 100644 src/includes/mentor/login.pug
diff --git a/src/includes/account-creation.pug b/src/includes/account-creation.pug
new file mode 100644
index 00000000..4c83f46b
--- /dev/null
+++ b/src/includes/account-creation.pug
@@ -0,0 +1,30 @@
+sib-router(default-route='account-creation-index')
+ sib-route(name='account-creation-index')
+ sib-route(name='mentor-new-account')
+ sib-route(name='entrepreneur-new-account')
+
+#account-creation-index(hidden).flex
+ figure(class="logo")
+ img(src="../images/logo.png" alt="Coopstarter logo")
+
+ h2.title_lead Welcome to our international index of resources for cooperative mentors and entrepreneurs
+
+ sib-link.block_log(next='mentor-new-account')
+ div
+ figure.img_log
+ img(src="../images/mentor.png"
+ alt="Create your account as mentor")
+ h2.button_base I am a mentor
+
+ sib-link.block_log(next='entrepreneur-new-account')
+ div
+ figure.img_log
+ img(src="../images/fusee.png"
+ alt="Create your account as entrepreneur")
+ h2.button_base I am an entrepreneur
+
+#mentor-new-account(hidden).no-sidebar.container
+ include mentor/create.pug
+
+#entrepreneur-new-account(hidden).no-sidebar.container
+ include entrepreneur/create.pug
diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug
index 888ab077..3de85c72 100644
--- a/src/includes/components/widgets.pug
+++ b/src/includes/components/widgets.pug
@@ -35,20 +35,9 @@ sib-widget(name='cs-action')
next="\${value}"
) ${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
- h2 ${label}
+ h2.title_form ${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.
\ No newline at end of file
diff --git a/src/includes/entrepreneur/create.pug b/src/includes/entrepreneur/create.pug
index 762271ca..e666cec2 100644
--- a/src/includes/entrepreneur/create.pug
+++ b/src/includes/entrepreneur/create.pug
@@ -1,21 +1,16 @@
include ../components/widgets
-h2 Create an entrepreneur account
+h2.title_form Complete your entrepreneur account
sib-form(
data-src=`${endpoints.entrepreneurs}`
- fields="user.username, user.last_name, user.first_name, organisation,\
- user.email, user.password, user.password_confirmation"
+ fields="user.last_name, user.first_name, organisation"
range-organisation=`${endpoints.organisations}`
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-organisation='form-label is-dark'
multiple-organisation='sib-multiple-select'
@@ -24,6 +19,6 @@ sib-form(
widget-user.password='cs-form-password'
widget-user.password_confirmation='cs-form-password'
- submit-button="CREATE AN ACCOUNT"
+ submit-button="COMPLETE YOUR ACCOUNT"
)
diff --git a/src/includes/entrepreneur/login.pug b/src/includes/entrepreneur/login.pug
deleted file mode 100644
index ffdcef9e..00000000
--- a/src/includes/entrepreneur/login.pug
+++ /dev/null
@@ -1,7 +0,0 @@
-h2 I am an entrepreneur
-
-cs-login(bind-user)
- button(id='entrepreneur_login') Login as entrepreneur
-
-sib-link(next='entrepreneur-new-account')
- div Create an account
\ No newline at end of file
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index 3acffdd6..053e4e21 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -1,10 +1,19 @@
include ../components/widgets
+figure.logo
+ img(src="../images/logo.png"
+ alt="Connect as mentor")
+
+figure.logo.img_log
+ img(src="../images/mentor.png"
+ alt="Connect as mentor")
+
+h2.title_form Complete your mentor account
+
sib-form(
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),\
+ fields="account_information(user.last_name, user.first_name, organisation,\
+ phone, language, account.picture),\
about_you(header_about_you, headline, city, country,\
biography, skills),\
social_media(header_social_media, linkedin, twitter)"
@@ -13,22 +22,16 @@ sib-form(
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"
widget-header_social_media="cs-section_header"
- widget-header_account="cs-section_header"
widget-header_about_you="cs-section_introduction"
- 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-headline="Headline or current position"
@@ -41,8 +44,6 @@ sib-form(
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'
@@ -52,5 +53,5 @@ sib-form(
multiple-language='sib-multiple-select'
widget-language='sib-form-auto-completion'
- submit-button="CREATE AN ACCOUNT"
+ submit-button="COMPLETE YOUR ACCOUNT"
)
diff --git a/src/includes/mentor/login.pug b/src/includes/mentor/login.pug
deleted file mode 100644
index 7c733598..00000000
--- a/src/includes/mentor/login.pug
+++ /dev/null
@@ -1,9 +0,0 @@
-figure.img_log
- img(src="../images/mentor.png"
- alt="Connect as mentor")
-
-cs-login(bind-user)
- button#mentor_login.button_base Login as mentor
-
-sib-link(next='mentor-new-account')
- div.button_base Create an account
diff --git a/src/includes/splash.pug b/src/includes/splash.pug
index 1fd52476..126f9521 100644
--- a/src/includes/splash.pug
+++ b/src/includes/splash.pug
@@ -1,30 +1,15 @@
sib-router(default-route='splash-index')
sib-route(name='splash-index')
- sib-route(name='mentor-login')
- sib-route(name='entrepreneur-login')
figure(class="logo")
img(src="../images/logo.png" alt="Coopstarter logo")
h2.title_lead Welcome to our international index of resources for cooperative mentors and entrepreneurs
-#splash-index(hidden).flex
- sib-link.block_log(next='mentor-login')
- div
- figure.img_log
- img(src="../images/mentor.png"
- alt="Connect as mentor")
- h2.button_base I am a mentor
+#splash-index(hidden).no-sidebar.block_log.flex
+ figure.img_log
+ img(src="../images/mentor.png"
+ alt="Connect as mentor")
- sib-link.block_log(next='entrepreneur-login')
- div
- figure.img_log
- img(src="../images/fusee.png"
- alt="Connect as entrepreneur")
- h2.button_base I am an entrepreneur
-
-#mentor-login(hidden).no-sidebar.block_log.flex
- include mentor/login.pug
-
-#entrepreneur-login(hidden).no-sidebar.block_log.flex
- include entrepreneur/login.pug
+ cs-login(bind-user)
+ button#mentor_login.button_base Connect to the knowledge base
\ No newline at end of file
diff --git a/src/index.pug b/src/index.pug
index d72a1d50..d3785ad5 100644
--- a/src/index.pug
+++ b/src/index.pug
@@ -4,8 +4,7 @@ html
sib-router(default-route='splash')
sib-route(name='splash')
- sib-route(name='mentor-new-account')
- sib-route(name='entrepreneur-new-account')
+ sib-route(name='account-creation')
sib-route(name='mentor-dashboard')
sib-route(name='entrepreneur-dashboard')
@@ -19,11 +18,8 @@ html
#splash(hidden).no-sidebar.container
include includes/splash.pug
- #mentor-new-account(hidden).no-sidebar.container
- include includes/mentor/create.pug
-
- #entrepreneur-new-account(hidden).no-sidebar.container
- include includes/entrepreneur/create.pug
+ #account-creation(hidden).no-sidebar.container
+ include includes/account-creation.pug
sib-auth
sib-auth-provider(
@@ -39,7 +35,6 @@ script(type='module').
class CoopStarterLoginComponent extends HTMLElement {
async connectedCallback() {
mentor_login.onclick = () => this.triggerLogin();
- entrepreneur_login.onclick = () => this.triggerLogin();
this.update();
}
@@ -64,6 +59,10 @@ script(type='module').
window.dispatchEvent(
new CustomEvent('requestNavigation', { detail: { route: 'entrepreneur-dashboard' } })
);
+ } else {
+ window.dispatchEvent(
+ new CustomEvent('requestNavigation', { detail: { route: 'account-creation' } })
+ );
}
}
empty(){}
--
GitLab
From a6cd5e36be70969efe3647f2484de1f8f6c57117 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 29 Aug 2019 17:17:56 +0200
Subject: [PATCH 2/3] Trying to fix the mentor completion form
---
src/includes/mentor/create.pug | 62 +++++++++++++++++-----------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index 053e4e21..f2bc01a8 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -11,16 +11,16 @@ figure.logo.img_log
h2.title_form Complete your mentor account
sib-form(
- data-src=`${endpoints.mentors}`
- fields="account_information(user.last_name, user.first_name, organisation,\
- phone, language, account.picture),\
- about_you(header_about_you, headline, city, country,\
- biography, skills),\
- social_media(header_social_media, linkedin, twitter)"
+ bind-user
+ fields="account_information(last_name, first_name, mentor_profile.organisation,\
+ mentor_profile.phone, mentor_profile.language, 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)"
- range-organisation=`${endpoints.organisations}`
- range-language=`${endpoints.languages}`
+ range-mentor_profile.organisation=`${endpoints.organisations}`
+ range-mentor_profile.language=`${endpoints.languages}`
label-header_about_you="About you"
label-header_social_media="Social medias"
@@ -28,30 +28,30 @@ sib-form(
widget-header_social_media="cs-section_header"
widget-header_about_you="cs-section_introduction"
- label-user.first_name="Surname"
- label-user.last_name="Name"
- label-organisation="Organisation"
- label-phone="Phone number"
- label-language="Language"
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-mentor_profile.organisation="Organisation"
+ label-mentor_profile.phone="Phone number"
+ label-mentor_profile.language="Language"
label-account.picture="Photo"
- 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"
-
- 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'
+ 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"
+
+ widget-mentor_profile.skills="sib-form-textarea"
+ widget-mentor_profile.biography="sib-form-textarea"
+
+ class-mentor_profile.organisation='form-label is-dark'
+ multiple-mentor_profile.organisation='sib-multiple-select'
+ widget-mentor_profile.organisation='sib-form-auto-completion'
+
+ class-mentor_profile.language='form-label is-dark'
+ multiple-mentor_profile.language='sib-multiple-select'
+ widget-mentor_profile.language='sib-form-auto-completion'
submit-button="COMPLETE YOUR ACCOUNT"
)
--
GitLab
From b04f5f15265851efae9b62c82064528f19de50b9 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Thu, 29 Aug 2019 22:10:00 +0200
Subject: [PATCH 3/3] Proper completion of mentor or entrepreneur profile
---
src/includes/entrepreneur/create.pug | 24 ++++++++++++------------
src/includes/mentor/create.pug | 4 +++-
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/includes/entrepreneur/create.pug b/src/includes/entrepreneur/create.pug
index e666cec2..2cc9a0be 100644
--- a/src/includes/entrepreneur/create.pug
+++ b/src/includes/entrepreneur/create.pug
@@ -3,22 +3,22 @@ include ../components/widgets
h2.title_form Complete your entrepreneur account
sib-form(
- data-src=`${endpoints.entrepreneurs}`
- fields="user.last_name, user.first_name, organisation"
+ bind-user
+ fields="last_name, first_name, entrepreneur_profile.organisation, username"
- range-organisation=`${endpoints.organisations}`
-
- label-user.first_name="Surname"
- label-user.last_name="Name"
- label-organisation="Organisation *"
+ range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-entrepreneur_profile.organisation="Organisation *"
- class-organisation='form-label is-dark'
- multiple-organisation='sib-multiple-select'
- widget-organisation='sib-form-auto-completion'
+ class-entrepreneur_profile.organisation='form-label is-dark'
+ multiple-entrepreneur_profile.organisation='sib-multiple-select'
+ widget-entrepreneur_profile.organisation='sib-form-auto-completion'
- widget-user.password='cs-form-password'
- widget-user.password_confirmation='cs-form-password'
+ widget-username='sib-form-hidden'
submit-button="COMPLETE YOUR ACCOUNT"
+ next="entrepreneur-dashboard"
)
diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug
index f2bc01a8..21cf7bee 100644
--- a/src/includes/mentor/create.pug
+++ b/src/includes/mentor/create.pug
@@ -16,7 +16,7 @@ sib-form(
mentor_profile.phone, mentor_profile.language, 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)"
+ social_media(header_social_media, mentor_profile.linkedin, mentor_profile.twitter), username"
range-mentor_profile.organisation=`${endpoints.organisations}`
@@ -44,6 +44,7 @@ sib-form(
widget-mentor_profile.skills="sib-form-textarea"
widget-mentor_profile.biography="sib-form-textarea"
+ widget-username="sib-form-hidden"
class-mentor_profile.organisation='form-label is-dark'
multiple-mentor_profile.organisation='sib-multiple-select'
@@ -54,4 +55,5 @@ sib-form(
widget-mentor_profile.language='sib-form-auto-completion'
submit-button="COMPLETE YOUR ACCOUNT"
+ next='mentor-dashboard'
)
--
GitLab