From 8b556ed348d0525a5ff6a647a049da043b4fb91c Mon Sep 17 00:00:00 2001 From: Alice <alice.poggioli@hotmail.fr> Date: Thu, 19 Sep 2019 12:09:57 +0200 Subject: [PATCH] Feature: Add a public dashboard to consult resource without permission. --- src/includes/mentor/profile/edit.pug | 5 - src/includes/public/components/header.pug | 20 ++ src/includes/public/components/menu.pug | 4 + src/includes/public/dashboard.pug | 17 ++ src/includes/public/resources/detail.pug | 0 src/includes/public/resources/list.pug | 347 ++++++++++++++++++++++ src/includes/splash.pug | 7 +- src/index.pug | 4 + 8 files changed, 398 insertions(+), 6 deletions(-) create mode 100644 src/includes/public/components/header.pug create mode 100644 src/includes/public/components/menu.pug create mode 100644 src/includes/public/dashboard.pug create mode 100644 src/includes/public/resources/detail.pug create mode 100644 src/includes/public/resources/list.pug diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug index 018315e5..d2318a29 100644 --- a/src/includes/mentor/profile/edit.pug +++ b/src/includes/mentor/profile/edit.pug @@ -58,12 +58,7 @@ sib-form#mentor_profile_edition.block_log.block_creat_count( class-headline='w_75' submit-button="Save modifications" -<<<<<<< HEAD next='mentor-dashboard' ) sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard -======= - next='mentor-resource-list' -) ->>>>>>> 9192f2b5e98a215b5211905e68417f1a06b2baf6 diff --git a/src/includes/public/components/header.pug b/src/includes/public/components/header.pug new file mode 100644 index 00000000..ac670d15 --- /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 00000000..19d3bb02 --- /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 00000000..ff156e47 --- /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 00000000..e69de29b diff --git a/src/includes/public/resources/list.pug b/src/includes/public/resources/list.pug new file mode 100644 index 00000000..1b25577a --- /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 126f9521..bc841a1a 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 757c3a2c..97b326b5 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( -- GitLab