diff --git a/src/includes/entrepreneur/resources/list.pug b/src/includes/entrepreneur/resources/list.pug
index 776e3f2e5e25264f285574c1a87a081c099e0931..cdc10ab3bf9d6242d923143a88f3000c6dd0599a 100644
--- a/src/includes/entrepreneur/resources/list.pug
+++ b/src/includes/entrepreneur/resources/list.pug
@@ -116,18 +116,16 @@ container.block_list.flex.flex_espace
)
sib-display.resource_by_step(
- loader-id="step1-loader"
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -139,7 +137,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -175,16 +173,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -196,7 +193,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -232,16 +229,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -252,7 +248,7 @@ container.block_list.flex.flex_espace
search-widget-fields='sib-form-auto-completion'
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -288,16 +284,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -309,7 +304,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -344,16 +339,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -365,7 +359,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -400,16 +394,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -421,7 +414,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
diff --git a/src/includes/head.pug b/src/includes/head.pug
index 3f431dc843b07ff34c35a4fc07cd5a097858ec02..907cc5fc4ad7e7f01b96f182cc4888633a610f1e 100644
--- a/src/includes/head.pug
+++ b/src/includes/head.pug
@@ -2,7 +2,7 @@ head
title CoopStarter
meta(charset="utf-8")
script(src="https://unpkg.com/@webcomponents/webcomponentsjs@1.2.7/webcomponents-loader.js")
- script(type="module" src="https://unpkg.com/@startinblox/core")
+ script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
script(type="module" src="https://unpkg.com/@startinblox/router")
script(type="module" src="https://unpkg.com/@startinblox/oidc")
script(type="module" src="https://unpkg.com/@startinblox/component-conversation")
diff --git a/src/includes/mentor/browseDatabase.pug b/src/includes/mentor/browseDatabase.pug
index da53014c24da614e859cba1ccc08a32948f4c8c3..e2f32bf9e94a521b70fd7007a8040e05206f8ada 100644
--- a/src/includes/mentor/browseDatabase.pug
+++ b/src/includes/mentor/browseDatabase.pug
@@ -28,7 +28,7 @@ container.block_list.flex.flex_espace
sib-form.search-by-keyword(
data-src=`${endpoints.resources}`,
loader-id="resources-mentor-database-loader"
- fields='keyword(name_keyword)'
+ fields='keyword(name_keyword)'
label-name_keyword="Search by name..."
widget-name_keyword="sib-form-placeholder-text"
@@ -98,8 +98,11 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-browse-database
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
- loader-id="resources-loader"
+ loader-id="resources-loader-step1-browse-database"
data-src=`${endpoints.steps}1/`,
fields='name'
class="accordion active"
@@ -112,16 +115,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -133,7 +135,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -167,16 +169,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -188,7 +189,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -223,16 +224,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -244,7 +244,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -279,16 +279,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -300,7 +299,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -334,16 +333,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -355,7 +353,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -389,16 +387,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -410,7 +407,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug
index c986393472edd63c6ebfd7a8bbc6c0ab257f7867..92ffcd16d78bece3f2e4baccf7cbcff5a6749354 100644
--- a/src/includes/public/resources/list.pug
+++ b/src/includes/public/resources/list.pug
@@ -85,7 +85,11 @@ container.block_list.flex.flex_espace
//Step 1
div.step
+ div#resources-loader-step1-public
+ hidden
+ i.fas.fa-spinner.fa-spin
sib-display#circles-list(
+ loader-id="resources-loader-step1-public"
data-src=`${endpoints.steps}1/`,
fields='name'
class="accordion active"
@@ -98,7 +102,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}1/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -118,7 +122,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -154,7 +158,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}2/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -174,7 +178,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -211,7 +215,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}3/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -231,7 +235,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -267,7 +271,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}4/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -287,7 +291,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -323,7 +327,7 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}5/resources/validated/`,
- fields='name, author, format.name, publication_year, description, country, language, fields',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), more_criterias_hidden(format, publication_year, country, language, fields, type)',
search-range-format=`${endpoints.formats}`
search-range-language=`${endpoints.languages}`
@@ -343,7 +347,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -378,16 +382,15 @@ container.block_list.flex.flex_espace
sib-display.resource_by_step(
data-src=`${endpoints.steps}6/resources/validated/`,
- fields='name, format.name, publication_year, description, like, dislike',
+ fields='name, author, format.name, publication_year, description, like, dislike, country, language, fields',
search-fields='search_for_a_resource(name), 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-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'
@@ -399,7 +402,7 @@ container.block_list.flex.flex_espace
widget-name='cs-display-property'
- widget-country='cs-display-property'
+ widget-country='hidden-widget'
widget-publication_year='cs-display-property'
widget-description='cs-display-property'
widget-fields='hidden-widget'
@@ -414,7 +417,8 @@ container.block_list.flex.flex_espace
label-fields=''
multiple-fields
class="panel"
- next='entrepreneur-resource-detail'
+
+ next='public-resource-detail'
paginate-by="5"
)
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 9b87630995f4a1d9aa72e33c5b4885d37c2f568b..33cea8bf7ec21dc3da65da4e9ee5d7e267aee0eb 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -245,19 +245,23 @@ function addProperFilterToSearchComponents(targetId) {
let keyword_form = baseElement.querySelectorAll(".search-by-keyword")[0];
let keyword_field = keyword_form.querySelector(`input[name="name_keyword"]`);
- let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
- let keyword_hidden_fields = baseElement.querySelectorAll(
- 'hidden-widget[name="search_for_a_resource"] input'
- );
+ if (keyword_field) {
+ let keyword_submit = baseElement.querySelectorAll(" .keyword_submit")[0];
+ let keyword_hidden_fields = baseElement.querySelectorAll(
+ 'hidden-widget[name="search_for_a_resource"] input'
+ );
+
+ keyword_submit.addEventListener("click", function() {
+ keyword_hidden_fields.forEach(hidden_field => {
+ hidden_field.setAttribute("value", keyword_field.value);
+ hidden_field.value = keyword_field.value;
- keyword_submit.addEventListener("click", function() {
- keyword_hidden_fields.forEach(hidden_field => {
- hidden_field.setAttribute("value", keyword_field.value);
- let parent_form = hidden_field.closest("sib-form");
- parent_form.component.inputChange();
- refreshPagination();
+ let parent_form = hidden_field.closest("sib-form");
+ parent_form.component.inputChange();
+ refreshPagination();
+ });
});
- });
+ }
//SEARCH IN DATABASE INSTANCE ONLY
let instance_only = baseElement.querySelectorAll(