diff --git a/src/includes/components/widgets.pug b/src/includes/components/widgets.pug index dd460b9db7faadabb8043c805c31bc20deecd866..e12cccc80cae4f723b0d9c0dd09bf39c10ccbf68 100644 --- a/src/includes/components/widgets.pug +++ b/src/includes/components/widgets.pug @@ -118,14 +118,22 @@ sib-widget(name='cs-section_introduction') sib-widget(name='cs-account-picture') template figure.avatar - img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Coopstarter") + img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Profile picture") sib-widget(name='cs-profile-picture') template - img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Coopstarter") + img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Profile picture") +sib-widget(name='cs-preview-picture') + template + img(name="${name}", src="\${value || '/images/alien.jpg'}", alt="Preview of the resource") + +sib-widget(name="hidden-widget") + template + div(data-content style="display:none;") + +sib-widget(name="fake-tabs") + template + h2.fake-tabs ${value} - sib-widget(name="hidden-widget") - template - div(data-content style="display:none;") - \ No newline at end of file + \ No newline at end of file diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug index e91bebd00b6ce36ef844d0efce9bdcbc8a8faddb..106a3a9963c677f1abb6f98ab305e1894a2420ab 100644 --- a/src/includes/entrepreneur/dashboard.pug +++ b/src/includes/entrepreneur/dashboard.pug @@ -7,9 +7,6 @@ header#header(role='banner') include ./components/header.pug section#home - div#coopstarter-loader - hidden Loading, please wait... - //TODO: //-Distinguish the search form from the listing //-Create two Sib-displays getting the resources by "types" diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug index 124b14c5c3dc4606196f7ec7342c0d708f7562e9..06f5572d2c4daad3da8b1706b872ad6b20534480 100644 --- a/src/includes/entrepreneur/resources/list.pug +++ b/src/includes/entrepreneur/resources/list.pug @@ -14,9 +14,12 @@ container.block_list.flex.flex_espace div.w_75.block-g-entre div h2.title_form Search for a resource + div#resources-loader + hidden <i class="fas fa-cog fa-spin"></i> + sib-form#search-by-keyword( data-src=`${endpoints.resources}`, - loader-id="coopstarter-loader" + loader-id="resources-loader" fields='keyword(name_keyword, description, author)' label-keyword="Search by author, name..." widget-keyword="sib-form-placeholder-text" @@ -39,7 +42,7 @@ container.block_list.flex.flex_espace naked ) - sib-form#more_criterias( + sib-form#more_criterias.flex.flex_espace( data-src=`${endpoints.resources}`, fields='header_criterias, format, publication_year, country, language, fields' label-header_criterias='More criterias' @@ -75,249 +78,284 @@ container.block_list.flex.flex_espace div div.button_base Make a request - div#resources-loader - hidden Loading resources, please wait... + + //Fake tabs to filter by type. + div.tabs.flex_espace + div(class='tablink filter_by_type active', onclick="openFakeTab(this)") + sib-display#type1( + data-src=`${endpoints.types}1/` + fields='name' + widget-name='fake-tabs' + ) - //Step 1 - sib-display#circles-list( - loader-id="resources-loader" - data-src=`${endpoints.steps}1/`, - fields='name' + div(class='tablink filter_by_type', onclick="openFakeTab(this)") + sib-display#type2( + data-src=`${endpoints.types}2/` + fields='name' + widget-name='fake-tabs' + ) + + div.block_log.block_list + + //Step 1 + div.step + sib-display#circles-list( + loader-id="resources-loader" + data-src=`${endpoints.steps}1/`, + fields='name' + + label-name ='Step 1 ' + label-resources='' + + widget-name='cs-steps-header' + ) + + sib-display.resource_by_step( + data-src=`${endpoints.steps}1/resources/`, + fields='name, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 2 + div.step + sib-display#circles-list( + data-src=`${endpoints.steps}2/`, + fields='name' + + label-name ='Step 2 ' + label-resources='' + + widget-name='cs-steps-header' + ) + + sib-display.resource_by_step( + data-src=`${endpoints.steps}2/resources/`, + fields='name, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 3 + div.step + 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, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 4 + div.step + 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, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 5 + div.step + 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, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) - label-name ='Step 1 ' - label-resources='' - - widget-name='cs-steps-header' - ) - - sib-display.resource_by_step( - data-src=`${endpoints.steps}1/resources/`, - fields='name, author, format, publication_year, description, country, language, fields', - search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)', - search-range-format=`${endpoints.formats}` - search-range-language=`${endpoints.languages}` - search-range-fields=`${endpoints.fields}` - - - search-widget-search_for_a_resource="hidden-widget" - search-widget-more_criterias_hidden="hidden-widget" - search-multiple-format='sib-form-dropdown' - search-widget-format='sib-form-auto-completion' - search-multiple-language='sib-form-dropdown' - search-widget-language='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' - - - widget-name='cs-display-property' - widget-country='cs-display-property' - widget-publication_year='cs-display-property' - widget-description='cs-display-property' - widget-fields='hidden-widget' - widget-language="hidden-widget" - widget-author="cs-display-property" - widget-format='cs-display-multiple-property' - label-format='' - multiple-format - label-language='' - multiple-language - label-fields='' - multiple-fields - - paginate-by="5" - ) - - //Step 2 - sib-display#circles-list( - data-src=`${endpoints.steps}2/`, - fields='name' - - label-name ='Step 2 ' - label-resources='' - - widget-name='cs-steps-header' - ) - - sib-display.resource_by_step( - data-src=`${endpoints.steps}2/resources/`, - fields='name, author, format, publication_year, description, country, language, fields', - search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)', - search-range-format=`${endpoints.formats}` - search-range-language=`${endpoints.languages}` - search-range-fields=`${endpoints.fields}` - - - search-widget-search_for_a_resource="hidden-widget" - search-widget-more_criterias_hidden="hidden-widget" - search-multiple-format='sib-form-dropdown' - search-widget-format='sib-form-auto-completion' - search-multiple-language='sib-form-dropdown' - search-widget-language='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' - - - widget-name='cs-display-property' - widget-country='cs-display-property' - widget-publication_year='cs-display-property' - widget-description='cs-display-property' - widget-fields='hidden-widget' - widget-language="hidden-widget" - widget-author="cs-display-property" - widget-format='cs-display-multiple-property' - label-format='' - multiple-format - label-language='' - multiple-language - label-fields='' - multiple-fields - - paginate-by="5" - ) - - //Step 3 - 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, author, format, publication_year, description, country, language, fields', - search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)', - search-range-format=`${endpoints.formats}` - search-range-language=`${endpoints.languages}` - search-range-fields=`${endpoints.fields}` - - - search-widget-search_for_a_resource="hidden-widget" - search-widget-more_criterias_hidden="hidden-widget" - search-multiple-format='sib-form-dropdown' - search-widget-format='sib-form-auto-completion' - search-multiple-language='sib-form-dropdown' - search-widget-language='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' - - - widget-name='cs-display-property' - widget-country='cs-display-property' - widget-publication_year='cs-display-property' - widget-description='cs-display-property' - widget-fields='hidden-widget' - widget-language="hidden-widget" - widget-author="cs-display-property" - widget-format='cs-display-multiple-property' - label-format='' - multiple-format - label-language='' - multiple-language - label-fields='' - multiple-fields - - paginate-by="5" - ) - - //Step 4 - 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, author, format, publication_year, description, country, language, fields', - search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)', - search-range-format=`${endpoints.formats}` - search-range-language=`${endpoints.languages}` - search-range-fields=`${endpoints.fields}` - - - search-widget-search_for_a_resource="hidden-widget" - search-widget-more_criterias_hidden="hidden-widget" - search-multiple-format='sib-form-dropdown' - search-widget-format='sib-form-auto-completion' - search-multiple-language='sib-form-dropdown' - search-widget-language='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' - - - widget-name='cs-display-property' - widget-country='cs-display-property' - widget-publication_year='cs-display-property' - widget-description='cs-display-property' - widget-fields='hidden-widget' - widget-language="hidden-widget" - widget-author="cs-display-property" - widget-format='cs-display-multiple-property' - label-format='' - multiple-format - label-language='' - multiple-language - label-fields='' - multiple-fields - - paginate-by="5" - ) - - //Step 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, author, format, publication_year, description, country, language, fields', - search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields)', - search-range-format=`${endpoints.formats}` - search-range-language=`${endpoints.languages}` - search-range-fields=`${endpoints.fields}` - - - search-widget-search_for_a_resource="hidden-widget" - search-widget-more_criterias_hidden="hidden-widget" - search-multiple-format='sib-form-dropdown' - search-widget-format='sib-form-auto-completion' - search-multiple-language='sib-form-dropdown' - search-widget-language='sib-form-auto-completion' - search-multiple-fields='sib-form-dropdown' - search-widget-fields='sib-form-auto-completion' - - - widget-name='cs-display-property' - widget-country='cs-display-property' - widget-publication_year='cs-display-property' - widget-description='cs-display-property' - widget-fields='hidden-widget' - widget-language="hidden-widget" - widget-author="cs-display-property" - widget-format='cs-display-multiple-property' - label-format='' - multiple-format - label-language='' - multiple-language - label-fields='' - multiple-fields - - paginate-by="5" - ) - diff --git a/src/includes/mentor/components/header.pug b/src/includes/mentor/components/header.pug index f223156c5959f25b135ccba0be54ba8fdb127b71..00e1d699e5899a62190e162255388cd51dd49fc8 100644 --- a/src/includes/mentor/components/header.pug +++ b/src/includes/mentor/components/header.pug @@ -23,4 +23,13 @@ bind-user fields='account.picture', widget-account.picture='cs-account-picture' - ) \ No newline at end of file + ) + + sib-link(next='mentor-dashboard') + p Dashboard + sib-link(next='mentor-database') + p Resources database + sib-link(next='mentor-account') + p My account + sib-link.logout-button(next='mentor-dashboard') + p Logout \ No newline at end of file diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug index 556b71bb9b3b16609624e8cd86a40edd56d34076..d5b10e3bdbd6e239583655ba3b2947598f514c45 100644 --- a/src/includes/mentor/profile/edit.pug +++ b/src/includes/mentor/profile/edit.pug @@ -60,3 +60,6 @@ sib-form#mentor_profile_edition.block_log.block_creat_count( submit-button="Save modifications" next='mentor-resource-list' ) + +sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard +sib-link(class="backlink", next="mentor-account") Back to the profile diff --git a/src/includes/mentor/resources/detail.pug b/src/includes/mentor/resources/detail.pug index 4dd59199a3c9d02a41bbda48243a47a5f693962c..08f394178fa52c8f5b9638d97a69f78cd35052f9 100644 --- a/src/includes/mentor/resources/detail.pug +++ b/src/includes/mentor/resources/detail.pug @@ -35,7 +35,7 @@ include ../../components/widgets widget-language.name='cs-display-resource-property' widget-submitter.account.picture='cs-account-picture' widget-broken='cs-broken-action' - widget-preview_image='cs-profile-picture' + widget-preview_image='cs-preview-picture' widget-review.reviewer.account.picture='cs-account-picture' widget-review.reviewer.name='cs-resource-reviewer' class-review.reviewer.name="validator_ressource" diff --git a/src/includes/public/components/header.pug b/src/includes/public/components/header.pug new file mode 100644 index 0000000000000000000000000000000000000000..ac670d151c8003d1f5e3130ba7df31990364e565 --- /dev/null +++ b/src/includes/public/components/header.pug @@ -0,0 +1,20 @@ +.container + .flex.flex_espace.flex_item_center + sib-link(next='entrepreneur-resource-list') + figure.logo_head.margin_bord_ecran + img(src="../images/logo_head.png" alt="Coopstarter") + + include menu.pug + + div.flex.flex_espace.flex_item_center + sib-form( + data-src=`${endpoints.languages}` + fields='languages' + range-languages=`${endpoints.languages}` + widget-languages='sib-form-dropdown' + selected-languages=`${endpoints.languages}/1/` + label-languages='' + naked + ) + input.ico_droite.ico_search + diff --git a/src/includes/public/components/menu.pug b/src/includes/public/components/menu.pug new file mode 100644 index 0000000000000000000000000000000000000000..19d3bb02784957e11f5583da705f1291d4b1e357 --- /dev/null +++ b/src/includes/public/components/menu.pug @@ -0,0 +1,4 @@ +sib-router(default-route='public-resource-list') + sib-route(name='public-resource-list') + + \ No newline at end of file diff --git a/src/includes/public/dashboard.pug b/src/includes/public/dashboard.pug new file mode 100644 index 0000000000000000000000000000000000000000..ff156e4725b9f3227bd9eabede8d394146442e13 --- /dev/null +++ b/src/includes/public/dashboard.pug @@ -0,0 +1,17 @@ +// Dashboard for entrepreneur, containing the search engine +// Access to all resources +// Capabilities to request a resource +// Like and comment + +header#header(role='banner') + include ./components/header.pug + +section#home + + #public-resource-list(hidden).no-sidebar.container + include ./resources/list.pug + + + + + diff --git a/src/includes/public/resources/detail.pug b/src/includes/public/resources/detail.pug new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug new file mode 100644 index 0000000000000000000000000000000000000000..1b25577a8dfb027afc049aaf08f5b0ae9aa51b5f --- /dev/null +++ b/src/includes/public/resources/list.pug @@ -0,0 +1,347 @@ +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 + +//-About : +//It will be great to have autocompletion on country +//I'm waiting for a confirmation to suppress step field + + +container.block_list.flex.flex_espace + div.w_75.block-g-entre + div + h2.title_form Search for a resource + + div#resources-public-loader + hidden Loading resources, please wait... + + sib-form#search-by-keyword( + data-src=`${endpoints.resources}`, + loader-id="resources-public-loader" + 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' + + naked + ) + + div#keyword_submit.button__actions + div.button_base.ico_gauche Search + + sib-form#instance_database_only( + 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#more_criterias( + data-src=`${endpoints.resources}`, + fields='header_criterias, format, publication_year, country, language, fields' + label-header_criterias='More criterias' + label-format='Format:' + label-publication_year='Year of publication' + label-country='Country of publication' + label-language='Language' + label-fields='Field' + widget-header_criterias='cs-section_header' + + range-language=`${endpoints.languages}` + range-fields=`${endpoints.fields}` + range-format=`${endpoints.formats}` + + multiple-language='sib-form-dropdown' + widget-language='sib-form-auto-completion' + + multiple-format='sib-form-dropdown' + widget-format='sib-form-auto-completion' + + multiple-fields='sib-form-dropdown' + widget-fields='sib-form-auto-completion' + + naked + ) + + + //Fake tabs to filter by type. + div.tabs.flex_espace + div(class='tablink filter_by_type active', onclick="openFakeTab(this)") + sib-display#type1( + data-src="https://api.coopstarter.happy-dev.fr/types/1/" + fields='name' + widget-name='fake-tabs' + ) + + div(class='tablink filter_by_type', onclick="openFakeTab(this)") + sib-display#type2( + data-src="https://api.coopstarter.happy-dev.fr/types/2/" + fields='name' + widget-name='fake-tabs' + ) + + div.block_log.block_list + + //Step 1 + sib-display#circles-list( + loader-id="resources-loader" + data-src=`${endpoints.steps}1/`, + fields='name' + + label-name ='Step 1 ' + label-resources='' + + widget-name='cs-steps-header' + ) + + sib-display.resource_by_step( + data-src=`${endpoints.steps}1/resources/`, + fields='name, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + search-widget-more_criterias_hidden="hidden-widget" + search-widget-search_for_a_resource="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 2 + sib-display#circles-list( + data-src=`${endpoints.steps}2/`, + fields='name' + + label-name ='Step 2 ' + label-resources='' + + widget-name='cs-steps-header' + ) + + sib-display.resource_by_step( + data-src=`${endpoints.steps}2/resources/`, + fields='name, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 3 + 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, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 4 + 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, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + + //Step 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, author, format, publication_year, description, country, language, fields', + search-fields='search_for_a_resource(name, description, author), more_criterias_hidden(format, publication_year, country, language, fields, type)', + search-range-format=`${endpoints.formats}` + search-range-language=`${endpoints.languages}` + search-range-fields=`${endpoints.fields}` + search-range-type=`${endpoints.types}` + + + search-widget-search_for_a_resource="hidden-widget" + search-widget-more_criterias_hidden="hidden-widget" + search-multiple-type='sib-form-dropdown' + search-widget-type='sib-form-auto-completion' + search-multiple-format='sib-form-dropdown' + search-widget-format='sib-form-auto-completion' + search-multiple-language='sib-form-dropdown' + search-widget-language='sib-form-auto-completion' + search-multiple-fields='sib-form-dropdown' + search-widget-fields='sib-form-auto-completion' + + + widget-name='cs-display-property' + widget-country='cs-display-property' + widget-publication_year='cs-display-property' + widget-description='cs-display-property' + widget-fields='hidden-widget' + widget-language="hidden-widget" + widget-author="cs-display-property" + widget-format='cs-display-multiple-property' + label-format='' + multiple-format + label-language='' + multiple-language + label-fields='' + multiple-fields + + paginate-by="5" + ) + diff --git a/src/includes/splash.pug b/src/includes/splash.pug index 126f9521317af9867b701cf3171fe116b3e5fb19..bc841a1a60c32d968dc2a3ad61a075425302ae72 100644 --- a/src/includes/splash.pug +++ b/src/includes/splash.pug @@ -12,4 +12,9 @@ h2.title_lead Welcome to our international index of resources for cooperative me alt="Connect as mentor") cs-login(bind-user) - button#mentor_login.button_base Connect to the knowledge base \ No newline at end of file + button#mentor_login.button_base Connect to the knowledge base + + sib-link(next='public-dashboard') + button#public-acces.button_base Access without registration + + \ No newline at end of file diff --git a/src/index.pug b/src/index.pug index 757c3a2c7f8bdbd28c20a8f5d93cf586fb0f9b44..97b326b592cdd829cecca836c67c617cc06b0c98 100644 --- a/src/index.pug +++ b/src/index.pug @@ -7,6 +7,7 @@ html sib-route(name='account-creation') sib-route(name='mentor-dashboard') sib-route(name='entrepreneur-dashboard') + sib-route(name='public-dashboard') body #mentor-dashboard(hidden).no-sidebar @@ -20,6 +21,9 @@ html #account-creation(hidden).no-sidebar.container include includes/account-creation.pug + + #public-dashboard(hidden).no-sidebar + include includes/public/dashboard.pug sib-auth sib-auth-provider( diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js index b5ce30fd3e6ea3b32dbb9d99b57b7df5df3b96bb..7e419a9431478612e7cf2ddfc54562eccefce760 100644 --- a/src/scripts/coopstarter.js +++ b/src/scripts/coopstarter.js @@ -14,6 +14,18 @@ function openTab(pageName, elmnt) { elmnt.classList.add("active"); } +//Manage the visual of the fake tabs in entrepreneur dashboard. +function openFakeTab(elmnt) { + // Hide all elements with class="tabcontent" by default */ + var i, tablinks; + tablinks = document.getElementsByClassName("tablink"); + + for (i = 0; i < tablinks.length; i++) { + tablinks[i].classList.remove("active"); + } + elmnt.classList.add("active"); +} + function linkDatasetToField(detail, targetFormName, inputName) { let targetForm = document.getElementById(targetFormName); targetForm.addEventListener("populate", event => { @@ -74,7 +86,6 @@ function selectHiddenManagement(select_hidden, option_selected, form) { } form.querySelector("sib-form").component.inputChange(); refreshPagination(); - } //Manage input hidden field to fullfill them with more "more criterias" selection @@ -82,13 +93,43 @@ function inputHiddenManagement(field, field_search, form) { field.setAttribute("value", field_search.value); form.querySelector("sib-form").component.inputChange(); refreshPagination(); +} +//Manage select hidden for type to fullfill them with more "more criterias" selection +function selectHiddenManagementForType(tab, form) { + let type_hidden_field = document.querySelectorAll( + 'hidden-widget[name="more_criterias_hidden"] select[name="type"]' + ); + if (tab.classList.contains("active")) { + //Fullfill hidden field + let type_field_search = tab + .querySelector(`sib-display`) + .getAttribute("data-src"); + + type_hidden_field.forEach(function(select_hidden) { + options_hidden = select_hidden.getElementsByTagName("option"); + for (let option_hidden of options_hidden) { + option_hidden.removeAttribute("selected"); + if (option_hidden.value == '{"@id": "' + type_field_search + '"}') { + //Actually selecting the option if it is the good one + option_hidden.setAttribute("selected", "selected"); + select_hidden.setAttribute("value", option_hidden.value); + form.querySelector("sib-form").component.inputChange(); + refreshPagination(); + } + } + //Trigerring a reload of the associated form + let parent_form = select_hidden.closest("sib-form"); + parent_form.component.inputChange(); + refreshPagination(); + }); + } } jQuery(document).ready(function($) { //Refresh pagination refreshPagination(); - + console.log('toto'); // Get the element with id="defaultOpen" and click on it document.getElementById("defaultOpen").click(); @@ -133,8 +174,15 @@ jQuery(document).ready(function($) { forms.forEach(form => { form.addEventListener("populate", e => { + //Manage fake tabs + let tabs = document.getElementsByClassName("filter_by_type"); + for (let tab of tabs) { + selectHiddenManagementForType(tab, form); + } + //On load in dashbord Entrepreneur refreshPagination(); + //SEARCH BY KEYWORD //To retrieve keyword //https://git.happy-dev.fr/startinblox/framework/sib-core/issues/379 @@ -152,7 +200,6 @@ jQuery(document).ready(function($) { hidden_field.setAttribute("value", keyword_field.value); form.querySelector("sib-form").component.inputChange(); refreshPagination(); - }); }); @@ -168,14 +215,12 @@ jQuery(document).ready(function($) { }; //MORE CRITERIAS - //TODO: Refactor this section ? const more_criterias_form = document.getElementById("more_criterias"); // https://git.happy-dev.fr/startinblox/framework/sib-core/issues/453 window.setTimeout(() => { //Refresh data list on delete resources const deleteButton = document.querySelectorAll("sib-delete"); - for (var i = 0; i < deleteButton.length; i++) { deleteButton[i].addEventListener("resourceDeleted", e => { const historyList = document.getElementById("resources-history"); @@ -198,13 +243,21 @@ jQuery(document).ready(function($) { }); } + //Manage fake tabs for type + let tabs = document.getElementsByClassName("filter_by_type"); + + for (let tab of tabs) { + tab.addEventListener( + "click", + selectHiddenManagementForType(tab, form) + ); + } + //To retrieve format - //TODO: How we should filled the hidden field with multiple value? - //TODO: The hidden search field set with one value doesn't work let format_field_search = more_criterias_form.querySelector( `select[name="format"]` ); - format_hidden_field = document.querySelectorAll( + let format_hidden_field = document.querySelectorAll( 'hidden-widget[name="more_criterias_hidden"] select[name="format"]' ); diff --git a/src/styles/index.scss b/src/styles/index.scss index 4681eb3a6f034e582059e8f5427bd667e9aa054b..68d777e02713a6df99c14ca62d591f2e276a34e1 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -346,7 +346,7 @@ p{ /* XXXXXXXXXXXXXXXXXXXXXXXXXXXX ICONES XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ -.ico_gauche, #mentor-resource-detail a{ +.ico_gauche, #mentor-resource-detail a, #entrepreneur-resource-list cs-display-property[name="name"] p{ padding-left: 3.5rem; position: relative; } @@ -355,7 +355,7 @@ p{ position: relative; } -.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before{ +.ico_gauche:before,ico_droite:before, #mentor-resource-detail a:before,#entrepreneur-resource-list cs-display-property[name="name"] p:before{ font-family: "Font Awesome 5 pro"; font-weight: 900; position : absolute; @@ -385,6 +385,13 @@ ico_droite:before{ .ico_arrow:before{ content: "\f061"; } +#entrepreneur-resource-list cs-display-property[name="name"] p:before{ + content:"\f005"; + left: 0.4rem; + top: 0.2rem; + font-size: 1.1rem; + color: #5DC6F2; +} /*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXx FIN ICONE XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ @@ -546,12 +553,19 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{ color: #818998; font-weight: lighter; } -.ss-list.checkbox .ss-option, .ss-list.checkbox input{ +.ss-list.checkbox .ss-option, .ss-list.checkbox label{ position: relative; font-weight: lighter; } -.ss-list.checkbox .ss-option:before, , .ss-list.checkbox input:before { +.ss-list.checkbox label{ + font-family: "var(--typo-btn)"; + font-size: 1.5rem; + top: 2rem; + left: .5rem; + +} +.ss-list.checkbox .ss-option:before, .ss-list.checkbox label:before { content: ""; position : absolute; display: block; @@ -561,8 +575,9 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{ border-radius: 3px; left: -2.5rem; top: .9rem; + cursor: pointer; } -.ss-list.checkbox .ss-option.active:after, , .ss-list.checkbox input:after { +.ss-list.checkbox .ss-option.active:after, .ss-list.checkbox label:focus:after { font-family: "Font Awesome 5 pro"; font-weight: 900; content: "\f00C"; @@ -573,6 +588,19 @@ form .ss-main .ss-multi-selected .ss-values .ss-value{ left: -1.95rem; top: .9rem; } +.ss-list.checkbox label:before{ + left: -3rem; + top: 0; +} +.ss-list.checkbox label:focus:after{ + left: -2.6rem; + top: 0; +} +.ss-list.checkbox label:not(:focus):after +.ss-list.checkbox label+input[type="checkbox"]{ + position: absolute; + left: -10000rem; +} /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -725,13 +753,88 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ padding-top: 3.5rem; input[name="keyword"]{ float: left; - width: 80%; + width: 76%; } - #keyword_submit{ + #keyword_submit div{ float: right; margin-top: 0; width: 20%; + top: -1rem; } + cs-section_header[name="header_criterias"] h2.title_form{ + font-family: 'var(--typo-btn)'; + font-size: 1.4rem; + color: var(--clr-typo-base); + border-bottom: 1px solid #DBE2ED; + margin: 5rem 0 2rem 0; + padding-bottom: .5rem; + } + .tablink{ + width: 50%; + } + .tablink+.block_log{ + background: none; + padding: var(--marge-base) 0; + } + .step{ + background: white; + -webkit-box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.13); + -moz-box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.13); + box-shadow: 0px 0px 7px 0px rgba(0,0,0,0.13); + padding: 2rem; + margin-bottom: 1.5rem; + cs-display-property[name="publication_year"] p{ + font-size: 1.4rem; + font-weight: bold; + margin-bottom: 1rem; + } + cs-display-property p{ + margin-bottom: 0; + } + cs-display-multiple-property[name="format"] p{ + border-radius: 5px; + background-color: #5DC6F2; + padding: .5rem; + font-family: 'var(--typo-btn)'; + color: var(--bg-block); + text-decoration: none; + text-align: center; + font-size: 1.4rem; + border:2px solid #5DC6F2; + cursor: pointer; + display: inline-block; + margin: .5rem; + transition: .4s all ease-in; + } + cs-display-multiple-property[name="format"] p:hover{ + background-color: var(--bg-block); + color: #5DC6F2; + } + div sib-display div{ + padding: 1.5rem; + } + div sib-display:nth-child(odd) div{ + background: #F7F9FE; + } + div sib-display:nth-child(even) div{ + background: white; + } + cs-steps-header p{ + margin-bottom: 1.5rem; + b{ + text-transform: uppercase; + } + } + + } +} +#entrepreneur-resource-list cs-display-property[name="name"] p{ + font-size: 1.6rem; + color: var(--clr-roll-black); + padding-left: 2.5rem; +} +#more_criterias.flex.flex_espace{ + width: 100%; } /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -835,7 +938,25 @@ div .tit_element_list{ color: var(--clr-roll-black); font-size: 1.6rem; } - +#resources-history { + sib-set-default{ + margin-bottom: 4rem; + } + hidden-widget{ + display: none; + } + cs-section_header[name="header_criterias"] h2.title_form{ + font-family: 'var(--typo-btn)'; + font-size: 1.4rem; + color: var(--clr-typo-base); + border-bottom: 1px solid #DBE2ED; + margin: 5rem 0 2rem 0; + padding-bottom: .5rem; +} +} +sib-display#pending-resources div{ + clear: both; +} .contenu_list{ height: 0; } @@ -890,7 +1011,9 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ display:flex; justify-content: space-between; } - +#reviews .backlink{ + margin: 0; +} #pending-resources { sib-set-default[name="content"] sib-display-value{ font-size: 1.6rem; @@ -928,6 +1051,18 @@ sib-multiple label, cs-resource-status[name="review.status"]+*{ position: relative; top: 35%; } +#requests sib-multiple{ + margin-right: 7rem; + label, cs-display-multiple-property[name="fields"] p{ + color: var(--clr-typo-base); + font-size: 1.4rem; + margin: 0 1rem 0 0; + font-family: 'var(--typo-btn)'; + } + cs-display-multiple-property[name="fields"]{ + float: left; + } +} /*XXXXXXXXXXXXXXXXXXXXX DETAIL RESSOURCES XXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/ cs-display-step-property[label="Step"] p{