Improving the login workflow

src/includes/account-creation.pug

+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

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

src/includes/entrepreneur/create.pug

 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"
 )
 

src/includes/entrepreneur/login.pug

-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

src/includes/mentor/create.pug

 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"
 )

src/includes/mentor/login.pug

-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

src/includes/splash.pug

 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
+    cs-login(bind-user)
+        button#mentor_login.button_base Connect to the knowledge base
\ No newline at end of file
-                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

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(){}