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/profile/detail.pug b/src/includes/entrepreneur/profile/detail.pug
index a597bd0cb78a454819cb3e489fde11c7854867d0..722ed9a88d2c4ef8bd9b5a7237dd98aaae2a9b12 100644
--- a/src/includes/entrepreneur/profile/detail.pug
+++ b/src/includes/entrepreneur/profile/detail.pug
@@ -21,7 +21,7 @@ div.block_list.flex
div.profile_information.block_log.w_75
sib-link(next='entrepreneur-account-edit')
- button.button_edit Edit
+ button.button_edit <i class="fas fa-pen" aria-hidden="true"></i>
sib-display(
bind-user
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index 3f0197f8e9e1544b6b7090b085ca80eeeb182f91..84fcc332151af2f0a1f92b9638190b5a84f3c15c 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -4,10 +4,9 @@ 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"
-
+ 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"
diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 6a555021412fd6c3e456c7210e607788fac2704f..872e9ef355944df44b2ea33964bd175d55ba87ac 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -1,11 +1,10 @@
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 :
//In my opinion, "multiple ressource" solution is closer to the wanted result than the "group-by" solution
@@ -16,64 +15,76 @@ h2.title_form Search for a resource
//It seems that we don't have likes and dislikes data : sould i ignore them for the moment?
-div.block_log.block_list
- 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'
- )
-
- sib-form#circles-list(
- data-src=`${endpoints.resources}`,
- fields='more_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-instance_database_only='cs-display-checkbox'
- 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='sib-multiple-select'
- widget-language='sib-form-auto-completion'
-
- multiple-field='sib-multiple-select'
- widget-field='sib-form-auto-completion'
-
- multiple-step='sib-multiple-select'
- widget-step='sib-form-auto-completion'
-
-
-
- naked
- )
-
-//- form
-//- div
-//- label(for="name") Enter your name
-//- input(type="text" name="name" id="name" )
+container.block_list.flex.flex_espace
-//- div
-//- button(value="Search")
-
-
+ 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.steps}1/`,
fields='name'
@@ -290,9 +301,3 @@ div.block_log.block_list
//- widget-description='cs-display-property'
//- widget-name='cs-display-property'
-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
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index 245cf662f7ebaf9f5ef8a9837bdd2c63c11ba4d7..fc8f613b000d2de63fb05220e354fb2916fdc137 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -19,7 +19,7 @@ section#home
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-detail', use-id)
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-validate', use-id)
- dialog#mentor-resource-detail.no-sidebar.container
+ dialog#mentor-resource-detail.no-sidebar
include resources/detail.pug
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
diff --git a/src/includes/mentor/profile/detail.pug b/src/includes/mentor/profile/detail.pug
index 00a95bf89c4aebfbc3d6f31e86fdc545a09fa84b..f6d61e1250068849f8f1d6257e628371b5b837d5 100644
--- a/src/includes/mentor/profile/detail.pug
+++ b/src/includes/mentor/profile/detail.pug
@@ -25,7 +25,7 @@ div.block_list.flex
div.profile_information.block_log.w_75
sib-link(next='mentor-account-edit')
- button.button_edit Edit
+ button.button_edit <i class="fas fa-pen" aria-hidden="true"></i>
sib-display(
bind-user
diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug
index 84265290b564741b382d19c245edba48ffce5d43..427645b0745e0611f93b8ebb5bcdc810d9bfbce7 100644
--- a/src/includes/mentor/resources/detail.pug
+++ b/src/includes/mentor/resources/detail.pug
@@ -1,6 +1,6 @@
include ../../components/widgets
-.block_log.block_creat_count
+.block_log.block_creat_count.no_shadow
sib-display(
bind-resources,
fields='name, steps, format, content(preview_image, tags),\
@@ -12,12 +12,17 @@ include ../../components/widgets
edit',
widget-submitter.name='cs-display-resource-property',
+ class-name="title_form"
+ class-steps="steps"
widget-edit='sib-action',
widget-author='cs-display-resource-property',
widget-country='cs-display-resource-property',
widget-submitter.mentor_profile.organisation.name='cs-display-resource-property'
+ class-submitter.name="autor_ressource"
+ class-broken="broken"
widget-format='cs-display-multiple-property'
widget-uri='cs-display-link'
+ class-uri="pull-left"
widget-skills='cs-display-resource-property'
widget-description='cs-display-property'
widget-name='cs-display-property'
@@ -29,6 +34,7 @@ include ../../components/widgets
widget-review.status='cs-resource-status'
widget-review.reviewer.account.picture='cs-account-picture'
widget-review.reviewer.name='cs-resource-reviewer'
+ class-review.reviewer.name="validator_ressource"
widget-header_specifications='cs-section_header'
label-broken='Report broken link'
@@ -63,6 +69,14 @@ include ../../components/widgets
action-broken='resource-report-broken-link'
)
+ //- Add likes here
+ <div class="like">
+ <p class="backlink"><i class='far fa-thumbs-up'></i>18</p>
+ <p class="backlink"><i class='far fa-thumbs-down'></i>3</p>
+ </div>
+ <div class="like">
+ <p class="backlink"><i class="fas fa-times"></i></p>
+ </div>
sib-display(
bind-resources
fields=""
diff --git a/src/includes/mentor/resources/list.pug b/src/includes/mentor/resources/list.pug
index 185e7b695b0fecef4c7167ea191fbebd36365ed5..8fcfea89d469221d74f8c25c993577c3b7bf8823 100644
--- a/src/includes/mentor/resources/list.pug
+++ b/src/includes/mentor/resources/list.pug
@@ -37,6 +37,7 @@ div.block_list
action-validate='mentor-resource-validate'
label-validate='Check ->'
+ class-validate="check_ressource"
widget-validate='cs-validate-action'
)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index ebf57127038f0c6321f8d49118ade04d4b6cb637..6111b607817222644091ca09154f7d41082aaed2 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -50,14 +50,21 @@ jQuery(document).ready(function($) {
refreshList("refusal-dialog-form", "pending-resources");
refreshList("improvement-dialog-form", "pending-resources");
- const logoutButton = document.getElementById('logout-button');
- logoutButton.addEventListener('click', function() {
+ const logoutButtons = document.getElementsByClassName("logout-button");
+ for (var i = 0; i < logoutButtons.length; i++) {
+ logoutButtons[i].addEventListener("click", function() {
window.dispatchEvent(
- new CustomEvent('requestNavigation', { detail: { route: 'splash-index' } })
+ new CustomEvent("requestNavigation", {
+ detail: { route: "splash-index" }
+ })
);
- document.querySelector('sib-auth').logout();
- setTimeout(function(){ location.reload(); }, 1000);
- })
+ document.querySelector("sib-auth").logout();
+ setTimeout(function() {
+ location.reload();
+ }, 1000);
+ });
+ }
+
//In the entrepreneur dashboard, we set data from the display form to the hidden ones.
let keyword_form = document.getElementById('search-by-keyword');
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 6f55b44dc2f1b5becaf762a14d0a5fb2a5864e80..5fc9ebf9b9fe366ee22289e7c4d9ee8b151c96ca 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -122,6 +122,10 @@ img{
width: auto;
}
+.block{
+ display: block;
+}
+
.flex, sib-set-default,#resources-history>div div, #entrepreneur-new-account sib-form form{
display: flex;
flex-direction: row;
@@ -129,7 +133,7 @@ img{
justify-content: center;
}
-.flex_espace, sib-set-default,#resources-history>div div, #entrepreneur-new-account sib-form form{
+.flex_espace, sib-set-default,#resources-history>div div, #entrepreneur-new-account sib-form form {
justify-content: space-between;
}
sib-set-default[name="actions"]{
@@ -218,6 +222,10 @@ body{
margin: 0 auto;
}
+.no_shadow{
+ box-shadow: none;
+}
+
.button_base, input[type="submit"], #mentor-resource-detail a,.sib-conversation form input[type="submit"]{
transition: all .3s ease-in-out;
background-color: var(--bg-btn-base);
@@ -273,7 +281,7 @@ p{
font-size: 1.8rem;
}
-.backlink{
+.backlink, .broken sib-link{
display: inline-block;
color: var(--clr-typo-base);
font-size: 1.4rem;
@@ -284,7 +292,7 @@ p{
cursor: pointer;
}
-.backlink:hover{
+.backlink:hover, .broken sib-link:hover{
color: var(--bg-btn-base);
}
@@ -374,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*/
@@ -432,7 +443,7 @@ input, textarea, select, form .ss-main .ss-multi-selected{
input:focus, textarea:focus{
background: var(--bg-form-focus);
}
-.title_form, cs-section_introduction h2, div#mentor-resource-detail cs-display-property[name="name"] p{
+.title_form,.title_form p, cs-section_introduction h2, div#mentor-resource-detail cs-display-property[name="name"] p{
font-family: 'var(--typo)';
font-size: 2.2rem;
text-align: left;
@@ -535,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;
@@ -551,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";
@@ -585,7 +596,7 @@ header#header img {
background: blue;
margin-right: 5rem;
}
-header#header .avatar img{
+header#header .avatar img, #mentor-resource-detail .avatar img{
border-radius: 50%;
}
@@ -618,6 +629,7 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
width: 3rem;
height: 3rem;
border-radius: 50%;
+ cursor: pointer;
}
#header .flex, #header>div{
@@ -686,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
@@ -843,7 +889,44 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{
display:flex;
justify-content: space-between;
}
-
+
+#pending-resources {
+ sib-set-default[name="content"] sib-display-value{
+ font-size: 1.6rem;
+ color: #444C4D;
+ margin-bottom: 2rem;
+ }
+ sib-set-default[name="info"]{
+ justify-content: flex-start;
+ cs-display-resource-property{
+ margin-right: 0rem;
+ p,b{
+ color: var(--clr-typo-base);
+ font-size: 1.4rem;
+ }
+ }
+ }
+}
+.request_accordeon {
+ sib-set-default[name="content"] sib-display-value{
+ font-size: 1.6rem;
+ color: #444C4D;
+ }
+ sib-set-default[name="info"]{
+ justify-content: flex-start;
+ cs-display-resource-property{
+ margin-right: 7rem;
+ p,b{
+ color: var(--clr-typo-base);
+ font-size: 1.4rem;
+ }
+ }
+ }
+}
+.check_ressource>div{
+ position: relative;
+ top: 35%;
+}
/*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
cs-display-step-property[label="Step"] p{
@@ -871,10 +954,81 @@ sib-set-default[name="submitter_info"]{
margin-bottom: 1rem;
}
}
+
+#mentor-resource-detail{
+ border: none;
+ top: 0;
+ padding: 0;
+ width: 100%;
+ height: auto;
+ background: rgba(0,0,0,0.7);
+ .block_creat_count{
+ margin: 0 0 0 auto;
+ }
+ .title_form{
+ font-size: 1.6rem;
+ color: #3D424A;
+ font-family: 'var(--typo-btn)';
+ text-align: left;
+ border: none;
+ font-weight: bold;
+ margin: 0 0 1.5rem 0;
+ padding: 0;
+ p {
+ font-size: 2.2rem;
+ margin: 0 0 2rem 0;
+ font-weight: normal;
+ }
+ }
+ cs-display-multiple-property[name="format"] p{
+ text-align: right;
+ }
+ .avatar{
+ float: left;
+ margin-right: 1rem;
+ }
+ .steps{
+ cs-display-step-property p{
+ color: #3D424A;
+ font-size: 2.2rem;
+ }
+ }
+ .like{
+ display: flex;
+ flex-wrap: nowrap;
+ justify-content: flex-end;
+ p.backlink{
+ font-size: 1.4rem;
+ margin:0 0 0 2.5rem;
+ text-decoration: none;
+ }
+ }
+ .autor_ressource, .validator_ressource{
+ p{
+ color: var(--clr-typo-base);
+ font-size: 1.4rem;
+ }
+ b{
+ display: block;
+ color: var(--clr-roll-black);
+ }
+ }
+ cs-display-link *, sib-link{
+ margin: 0;
+ }
+ .broken sib-link{
+ margin: 1rem 0 0 3rem;
+ }
+ cs-display-property p{
+ clear: both;
+ padding-top: 2rem;
+ }
+}
+
#mentor-resource-detail a{
text-decoration: none;
display: inline-block;
- margin: 3rem 0;
+ margin: 0;
}
sib-set-default[name="specifications"]>cs-display-resource-property,
@@ -941,6 +1095,7 @@ cs-validate-action div{
clear: both;
text-align: right;
}
+
/* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXX PROFILE XXXXXXXXXXXXXXXXXXXXX
@@ -1007,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