diff --git a/src/includes/account-creation.pug b/src/includes/account-creation.pug
index 38f6ff1b91fad19bdcf9c668d43e28bc8b069324..a268f923950a30d7ea33dedeea962b298879f9d7 100644
--- a/src/includes/account-creation.pug
+++ b/src/includes/account-creation.pug
@@ -27,4 +27,4 @@ sib-router(default-route='account-creation-index')
include mentor/profile/create.pug
#entrepreneur-new-account(hidden).no-sidebar.container
- include entrepreneur/create.pug
+ include entrepreneur/profile/create.pug
diff --git a/src/includes/entrepreneur/components/menu.pug b/src/includes/entrepreneur/components/menu.pug
index 79869cdc9887ec34016828034c5f6dd3cfeefdb3..b69341d19cd3c24f102b4b5408e8ba5b4b1ac7fb 100644
--- a/src/includes/entrepreneur/components/menu.pug
+++ b/src/includes/entrepreneur/components/menu.pug
@@ -1,4 +1,5 @@
sib-router(default-route='entrepreneur-resource-list')
sib-route(name='entrepreneur-resource-list')
sib-route(name='entrepreneur-account', id-prefix=`${endpoints.users}`, use-id)
+ sib-route(name='entrepreneur-account-edit', id-prefix=`${endpoints.users}`, use-id)
\ No newline at end of file
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 55d83d3493c259e70335e8144e3e824911492966..e2963f8fac71f4720637c2a94ea6b52a0fdb1e53 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -8,10 +8,6 @@ header#header(role='banner')
section#home
- div.container_min
- h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
- button.button_dark.pull-right Watch the presentation
-
//TODO:
//-Distinguish the search form from the listing
//-Create two Sib-displays getting the resources by "types"
@@ -36,5 +32,8 @@ section#home
p.flex
sib-link(next='entrepreneur-resource-list', class='button_base') Ok
- #entrepreneur-account(hidden)
- h2 account
+ #entrepreneur-account(hidden).no-sidebar.container
+ include profile/detail.pug
+
+ #entrepreneur-account-edit(hidden).no-sidebar.container
+ include profile/edit.pug
diff --git a/src/includes/entrepreneur/create.pug b/src/includes/entrepreneur/profile/create.pug
similarity index 96%
rename from src/includes/entrepreneur/create.pug
rename to src/includes/entrepreneur/profile/create.pug
index 1a07b3822f25844da13eaa7304eb218c0702815a..8eb14484cb31bbd26206253af3e000870482f81b 100644
--- a/src/includes/entrepreneur/create.pug
+++ b/src/includes/entrepreneur/profile/create.pug
@@ -1,4 +1,4 @@
-include ../components/widgets
+include ../../components/widgets
figure.logo
img(src="../images/logo.png"
diff --git a/src/includes/entrepreneur/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug
new file mode 100644
index 0000000000000000000000000000000000000000..cf1907f42a1e5c6f1163c044ad3b6fa7eec678b0
--- /dev/null
+++ b/src/includes/entrepreneur/profile/detail.pug
@@ -0,0 +1,43 @@
+include ../../components/widgets
+
+div.container_min
+ h2.title_lead.fd_bleu My Account
+
+div.block_list.flex
+ div.button__actions.w_25
+ div.request__newrequest
+ sib-link(next='entrepreneur-request-create')
+ div
+ div.button_base.ico_gauche.ico_plus Post a new Request
+
+ div.dashboard__database
+ sib-link(next='entrepreneur-database')
+ div.button_base.ico_gauche.ico_database Browse database
+
+ div.dashboard__database
+ sib-link(next='entrepreneur-resource-list')
+ div.button_base.ico_gauche.ico_search Back to dashboard
+
+ div.dashboard__database
+ div#logout-button.button_base(
+ role='log out'
+ ) Logout
+
+ div.profile_information.block_log.w_75
+ sib-link(next='entrepreneur-account-edit')
+ div.button_base.ico_gauche.ico_search Edit
+
+ sib-display(
+ bind-user
+ fields='name, entrepreneur_profile.organisation, registered_on'
+ widget-name='cs-display-property'
+ widget-entrepreneur_profile.registered_on='cs-display-property'
+ )
+
+ sib-display(
+ bind-user
+ fields='email'
+ label-email='Email:'
+ class-email="contact_profil"
+ widget-email='cs-display-resource-property'
+ )
\ No newline at end of file
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
new file mode 100644
index 0000000000000000000000000000000000000000..d713ae06c967d7dc67d581edc0ab6532a68f3855
--- /dev/null
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -0,0 +1,34 @@
+include ../../components/widgets
+
+h2.title_create Edit you account
+
+sib-form.block_log.block_creat_count(
+ bind-user
+ fields="last_name, first_name, username, email, entrepreneur_profile.organisation, entrepreneur_profile.phone"
+
+ range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+
+
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-username="Username"
+ label-entrepreneur_profile.organisation="Organisation"
+ label-entrepreneur_profile.phone="Phone number"
+
+ 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-entrepreneur_profile.organisation='form-label is-dark input_big'
+ multiple-entrepreneur_profile.organisation='sib-multiple-select'
+ widget-entrepreneur_profile.organisation='sib-form-auto-completion'
+
+ range-mentor_profile.organisation=`${endpoints.organisations}`
+
+
+ submit-button="Save modifications"
+ next='entrepreneur-dashboard'
+)
\ No newline at end of file
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index b29146dc68efb25a4c0e8a1c32f64900f0781b36..ce0a0ceeef823cad6f30707c3ee942fa58b60983 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -1,5 +1,9 @@
include ../../components/widgets
+div.container_min
+ h2.title_lead.fd_bleu International index of resources for cooperative mentors and entrepreneurs
+ button.button_dark.pull-right Watch the presentation
+
h2.title_form Search for a resource
//-Question :
diff --git a/src/includes/mentor/profile/detail.pug b/src/includes/mentor/profile/detail.pug
index 0b4b95f47502c2274ab945f36c882249a5939e1a..b5e02a9aa6263c77b11b53b899eb2798029b0f31 100644
--- a/src/includes/mentor/profile/detail.pug
+++ b/src/includes/mentor/profile/detail.pug
@@ -1,4 +1,4 @@
-mentor-account-editinclude ../components/widgets
+include ../../components/widgets
div.container_min
h2.title_lead.fd_bleu My Account