diff --git a/src/images/asid_entre.png b/src/images/asid_entre.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cbad5cd4b10fe82760dd53c805a380c82736728
Binary files /dev/null and b/src/images/asid_entre.png differ
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 69b824c5594f85c70dea7e375136b9f79519301b..da0ecac8d2e74562dd1e9c9ac232148b9849fd6d 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -8,10 +8,6 @@ header#header(role='banner')
section#home
- h1 Mentorship program
-
- p International index of resources for cooperative mentors and entrepreneurs
-
//TODO:
//-Distinguish the search form from the listing
//-Create two Sib-displays getting the resources by "types"
@@ -37,4 +33,4 @@ section#home
sib-link(next='entrepreneur-resource-list', class='button_base') Ok
#entrepreneur-account(hidden)
- h2 account
+ include ./profile/detail.pug
diff --git a/src/includes/entrepreneur/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug
new file mode 100644
index 0000000000000000000000000000000000000000..722ed9a88d2c4ef8bd9b5a7237dd98aaae2a9b12
--- /dev/null
+++ b/src/includes/entrepreneur/profile/detail.pug
@@ -0,0 +1,40 @@
+include ../../components/widgets
+
+div.container_min
+ h2.title_lead.fd_bleu My Account
+
+div.block_list.flex
+ div.button__actions.w_25
+
+ 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')
+ button.button_edit <i class="fas fa-pen" aria-hidden="true"></i>
+
+ sib-display(
+ bind-user
+ fields='name, entrepreneur_profile.organisation.name, registered_on'
+ widget-name='cs-display-property'
+ widget-entrepreneur_profile.organisation.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..e59fb33a5dbffe7344fa1d261d6ea1b27fcc73c0
--- /dev/null
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -0,0 +1,28 @@
+include ../../components/widgets
+
+h2.title_create Edit your account
+
+sib-form.block_log.block_creat_count(
+ bind-user
+ fields="last_name, first_name, username, email, entrepreneur_profile.organisation"
+ range-entrepreneur_profile.organisation=`${endpoints.organisations}`
+
+ label-first_name="Surname"
+ label-last_name="Name"
+ label-username="Username"
+ label-entrepreneur_profile.organisation="Organisation"
+
+ widget-username="sib-form-hidden"
+
+ class-last_name='form-label is-dark'
+ class-first_name='form-label is-dark'
+ class-email='form-label is-dark'
+ class-entrepreneur_profile.phone='form-label is-dark'
+
+ 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="Save modifications"
+ next='entrepreneur-resource-list'
+)
\ No newline at end of file
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 3270dd35941a566cf8d0a8c210bb3cd9b097d1a2..5665de357b5bb7bde95412551a1c3a98e347747b 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -1,10 +1,90 @@
include ../../components/widgets
-p: a Watch a video presentation
-h2 Search for a resource
+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
+
+//-Question :
+//In my opinion, "multiple ressource" solution is closer to the wanted result than the "group-by" solution
+
+//Maybe we sould think from now how we gonna manage the type filter
+
+//What's the best way to retrieve the name of the format? By the resource we get a number. Sould we manage this with a 'switch/case' in js?
+
+//It seems that we don't have likes and dislikes data : sould i ignore them for the moment?
+
+
+container.block_list.flex.flex_espace
+
+ div.w_75.block-g-entre
+ div
+ h2.title_form Search for a resource
+ sib-form#search-by-keyword(
+ data-src=`${endpoints.resources}`,
+ fields='keyword(name_keyword, description, author)'
+ label-keyword="Search by author, name..."
+ widget-keyword="sib-form-placeholder-text"
+
+ widget-description='cs-display-property'
+ widget-name_keyword='cs-display-property'
+ widget-author='cs-display-property'
+
+ submit-button='Search'
+ )
+
+ sib-form(
+ data-src=`${endpoints.resources}`,
+ fields='instance_database_only'
+
+ widget-instance_database_only='cs-display-checkbox'
+
+ class-instance_database_only = 'ss-list checkbox'
+ naked
+ )
+
+ sib-form(
+ data-src=`${endpoints.resources}`,
+ fields='header_criterias, format, publication_year, country, language.name, fields, steps'
+
+ label-header_criterias='More criterias'
+ label-format='Format:'
+ label-publication_year='Year of publication'
+ label-country='Country of publication'
+ label-language.name='Language'
+ label-fields='Field'
+ label-steps='Step of : Staring up a cooperative business'
+ widget-header_criterias='cs-section_header'
+
+ range-language.name=`${endpoints.languages}`
+ range-fields=`${endpoints.fields}`
+ range-steps=`${endpoints.steps}`
+ range-format=`${endpoints.formats}`
+
+ multiple-language.name='sib-multiple-select'
+ widget-language.name='sib-form-auto-completion'
+
+ multiple-format='sib-multiple-select'
+ widget-format='sib-form-auto-completion'
+
+ multiple-fields='sib-multiple-select'
+ widget-fields='sib-form-auto-completion'
+
+ multiple-steps='sib-multiple-select'
+ widget-steps='sib-form-auto-completion'
+
+ naked
+ )
+ div.w_25
+ div.block_aside_entre
+ img(src="../images/asid_entre.png" alt="rechercher de ressources")
+ p Can't find the ressource you need ?
+ div.button__actions
+ sib-link(next='entrepreneur-request-create')
+ div
+ div.button_base Make a request
+
-#circles
sib-display#circles-list(
data-src=`${endpoints.resources}`,
fields='name, description, format, info(author, publication_year, language.name), steps',
@@ -19,9 +99,173 @@ h2 Search for a resource
next='detail'
)
-div.side-block
- p Can't find the ressource you need ?
- div.button__actions
- sib-link(next='entrepreneur-request-create')
- div
- div.button_base.ico_gauche.ico_plus Make a request
\ No newline at end of file
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}2/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}3/`,
+ fields='name'
+
+ label-name ='Step 3 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}3/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}4/`,
+ fields='name'
+
+ label-name ='Step 4 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}4/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+ sib-display#circles-list(
+ data-src=`${endpoints.steps}5/`,
+ fields='name'
+
+ label-name ='Step 5 '
+ label-resources=''
+
+ widget-name='cs-steps-header'
+ )
+
+ sib-display.resource_by_step(
+ data-src=`${endpoints.steps}5/resources/`,
+ fields='name, format, publication_year, description, country, language.name, field, steps',
+ search-fields='search_for_a_resource(name, description, author), format, publication_year, country, language.name, field, steps',
+
+ search-widget-search_for_a_resource="hidden-widget"
+ search-widget-format="hidden-widget"
+ search-widget-publication_year="hidden-widget"
+ search-widget-country="hidden-widget"
+ search-widget-language.name="hidden-widget"
+ search-widget-field="hidden-widget"
+ search-widget-steps="hidden-widget"
+
+
+ widget-name='cs-display-property'
+ widget-publication_year='cs-display-property'
+ widget-description='cs-display-property'
+ widget-language.name="hidden-widget"
+ widget-author="hidden-widget"
+ widget-steps="hidden-widget"
+ widget-format='cs-display-multiple-property'
+ label-format=''
+ multiple-format
+
+ paginate-by="5"
+ )
+
+//- search-fields="keyword, instance_database_only,\
+//- more_criterias(header_criterias, format, publication_year, country, language, field, step)"
+//- search-label-keyword="Search by author, name..."
+//- search-label-header_criterias='More criterias'
+//- search-label-format='Format'
+//- search-label-publication_year='Year of publication'
+//- search-label-country='Country of publication'
+//- search-label-language='Language'
+//- search-label-field='Field'
+//- search-label-step='Step of : Staring up a cooperative business'
+//- search-widget-keyword="sib-form-placeholder-text"
+//- search-widget-instance_database_only='cs-display-checkbox'
+//- search-widget-header_criterias='cs-section_header'
+
+//- search-range-language=`${endpoints.languages}`
+//- search-range-field=`${endpoints.fields}`
+//- search-range-step=`${endpoints.step}`
+
+//- search-multiple-language='sib-multiple-select'
+//- search-widget-language='sib-form-auto-completion'
+
+//- search-multiple-field='sib-multiple-select'
+//- search-widget-field='sib-form-auto-completion'
+
+//- search-multiple-step='sib-multiple-select'
+//- search-widget-step='sib-form-auto-completion'
+
+//- widget-description='cs-display-property'
+//- widget-name='cs-display-property'
diff --git a/src/includes/mentor/profile.pug b/src/includes/mentor/profile.pug
index 55c9374b73295a8c7c57a8d8a8ee59c1031ae65c..2a187952bf99d7bab8c27d62be7caa2352095218 100644
--- a/src/includes/mentor/profile.pug
+++ b/src/includes/mentor/profile.pug
@@ -19,11 +19,14 @@ div.block_list.flex
div.button_base.ico_gauche.ico_search Back to dashboard
div.dashboard__database
- div#logout-button.button_base(
+ div.logout-button.button_base(
role='log out'
) Logout
div.profile_information.block_log.w_75
+ sib-link(next='mentor-account-edit')
+ button.button_edit <i class="fas fa-pen" aria-hidden="true"></i>
+
sib-display(
bind-user
fields='account.picture, name, mentor_profile.headline, mentor_profile.city, mentor_profile.country, registered_on'
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 073ce8799c14e7cdb8c4664cc9e7257a631590c2..5fc9ebf9b9fe366ee22289e7c4d9ee8b151c96ca 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -382,6 +382,9 @@ ico_droite:before{
#mentor-resource-detail a:before{ /* ico link to ressource dans détail ressources*/
content:"\f0c1";
}
+.ico_arrow:before{
+ content: "\f061";
+}
/*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx FIN ICONE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
@@ -543,12 +546,12 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
color: #818998;
font-weight: lighter;
}
-.ss-list.checkbox .ss-option{
+.ss-list.checkbox .ss-option, .ss-list.checkbox input{
position: relative;
font-weight: lighter;
}
-.ss-list.checkbox .ss-option:before {
+.ss-list.checkbox .ss-option:before, , .ss-list.checkbox input:before {
content: "";
position : absolute;
display: block;
@@ -559,7 +562,7 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{
left: -2.5rem;
top: .9rem;
}
-.ss-list.checkbox .ss-option.active:after {
+.ss-list.checkbox .ss-option.active:after, , .ss-list.checkbox input:after {
font-family: "Font Awesome 5 pro";
font-weight: 900;
content: "\f00C";
@@ -695,6 +698,40 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
margin-top: 10rem;
}
+
+/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXX Home entrepreneur XXXXXXXXXXXXXXXXXX
+XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
+
+.block_aside_entre{
+ background: white;
+ margin-left: 2rem;
+ padding: 1.5rem;
+ text-align: center;
+ p{
+ color: #152935;
+ font-size: 1.4rem;
+ font-weight: bold;
+ margin: 2rem 0 2rem 0;
+ }
+}
+.block-g-entre{
+ background: white;
+ padding: 2rem;
+}
+
+#entrepreneur-resource-list container{
+ padding-top: 3.5rem;
+ input[name="keyword"]{
+ float: left;
+ width: 80%;
+ }
+ input[type="submit"]{
+ float: right;
+ margin-top: 0;
+ }
+}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX LISTE RESSOURCE XXXXXXXXXXXXXXXXXX
@@ -1125,6 +1162,26 @@ cs-display-property[name="mentor_profile.country"] p{
color: var(--bg-block);
cursor: pointer;
}
+
+.button_edit{
+ position: absolute;
+ top: -1rem;
+ right: -2rem;
+ width: 5rem;
+ height: 5rem;
+ border-radius: 50%;
+ background: var(--clr-roll-black);
+ color:white;
+ border: 2px rgba(68,76,77, 0) solid;
+ transition: .4s all ease-in;
+ font-size: 1.4rem;
+ cursor: pointer;
+}
+.button_edit:hover{
+ color: var(--clr-roll-black);
+ background: white;
+ border: 2px rgba(68,76,77, 1) solid;
+}
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX MEDIA QUERIES XXXXXXXXXXXXXXXXXXXXX