diff --git a/src/includes/dashboard.pug b/src/includes/dashboard/index.pug similarity index 100% rename from src/includes/dashboard.pug rename to src/includes/dashboard/index.pug diff --git a/src/includes/entrepreneur/create.pug b/src/includes/entrepreneur/create.pug new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/includes/header.pug b/src/includes/header.pug index 0285464a6e1c54246a0013b40ec84bd563384478..88ff4885f20e629dbacf0eee5ea5d8cb40ad8d27 100644 --- a/src/includes/header.pug +++ b/src/includes/header.pug @@ -20,13 +20,6 @@ sib-widget(name='account-user-name') button(role='log in' onclick="document.querySelector('sib-auth').login();") Login - #resources(hidden).no-sidebar - include home.pug - - #resource-create(hidden).no-sidebar - sib-link(class="backlink", next="resources") Back - include resource/create.pug - sib-auth diff --git a/src/includes/home.pug b/src/includes/home.pug index 499e58b9497135903036d0288c7976e6a3aa5441..fc31b8607c8d6352010ab0e57534a4c4fc10f855 100644 --- a/src/includes/home.pug +++ b/src/includes/home.pug @@ -3,9 +3,6 @@ section#home p International index of resources for cooperative mentors and entrepreneurs - p: a Watch a presentation - - h2 Search for a resource //TODO: //-Distinguish the search form from the listing //-Create two Sib-displays getting the resources by "types" @@ -17,22 +14,13 @@ section#home template p ${value.title} + #list(hidden) + include resource/list.pug - #circles - sib-display#circles-list( - data-src=`${sdn}/resources/`, - data-fields='title, description, format, author, publication_year, language.name, steps', - search-fields='title, description, format', - widget-format='resource-format-title', - multiple-format, - - widget-steps='resource-format-title', - multiple-steps, - - set-content='title, description', - set-info='author, publication_year, language.name', - next='detail' - ) - + #create(hidden).no-sidebar + sib-link(class="backlink", next="resource/list") Back to the list + include resource/create.pug - //- group-by='step' + #edit(hidden).no-sidebar + sib-link(class="backlink", next="resource/list") Back to the list + include resource/edit.pug \ No newline at end of file diff --git a/src/includes/mentor/create.pug b/src/includes/mentor/create.pug new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/includes/mentor/profile.pug b/src/includes/mentor/profile.pug new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/includes/menu.pug b/src/includes/menu.pug index ad6ce620b342c2e9c9933c2af18bc353494f9867..6179bd6cb7ffd677edc7edd0009022dad2fcf1e4 100644 --- a/src/includes/menu.pug +++ b/src/includes/menu.pug @@ -1,11 +1,13 @@ -sib-router(default-route="home") - .d-flex - details - summary menu - .d-flex.menu-opened - .clients-menu.d-flex.flex-column.col-md-4.col-12.text-center - h2 Clients - .talents-menu.d-flex.flex-column.col-md-4.col-12.text-center - h2 Talents - .about-menu.d-flex.flex-column.col-md-4.col-12.text-center - h2 À propos +sib-router(default-route="home", route-prefix="resources") + sib-route(name='list') + div.menu-label Resources + div.menu-icon.icon-people + div.divider + sib-ac-checker(permission="acl:Write") + sib-route(name='create') + div.menu-label Create a resource + div.menu-icon.icon-people + sib-ac-checker(permission="acl:Write" bind-resources) + sib-route(id-prefix=`${endpoints.resources}`, name='edit', use-id) + div.menu-label Edit a resource + div.menu-icon.icon-people \ No newline at end of file diff --git a/src/includes/resource/create.pug b/src/includes/resource/create.pug index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..754d2dd032f21c0139faab1a1a4cbc4565fa2a25 100644 --- a/src/includes/resource/create.pug +++ b/src/includes/resource/create.pug @@ -0,0 +1,7 @@ +h2 Create a new resource + +details + summary All fields: + sib-form( + data-src=`${endpoints.resources}` + ) \ No newline at end of file diff --git a/src/includes/resource/edit.pug b/src/includes/resource/edit.pug index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3f865d0dc7dd1053b845a34905c0c82b6d0032b2 100644 --- a/src/includes/resource/edit.pug +++ b/src/includes/resource/edit.pug @@ -0,0 +1,26 @@ +h2 Edit this resource + +sib-form.block( + bind-resources + + data-fields='title, description, skills, closingDate' + + class-title='field form-label is-light is-expanded' + label-title='Title*' + + class-description='field form-label is-light is-expanded' + label-description='Description*' + widget-description='sib-form-textarea' + + class-skills='form-label is-dark' + label-skills='The required skills for this mission:*' + multiple-skills='sib-multiple-select' + widget-skills='sib-form-auto-completion' + + class-closingDate='form-label is-dark' + label-closingDate='Publication end date:*' + widget-closingDate='sib-form-date' + + next='resources' +) + diff --git a/src/includes/resource/list.pug b/src/includes/resource/list.pug new file mode 100644 index 0000000000000000000000000000000000000000..4a40cf13371d39621f99315669f21fe14a8a2711 --- /dev/null +++ b/src/includes/resource/list.pug @@ -0,0 +1,33 @@ +p: a Watch a presentation + +h2 Search for a resource + +div.resources__newresource + sib-link(next="resource/create").plus-button + div.icon-plus + div Post a new Resource + +#circles + sib-display#circles-list( + data-src=`${sdn}/resources/`, + data-fields='title, description, format, author, publication_year, language.name, steps', + search-fields='title, description, format', + widget-format='resource-format-title', + multiple-format, + + widget-steps='resource-format-title', + multiple-steps, + + set-content='title, description', + set-info='author, publication_year, language.name', + next='edit' + + ) + + sib-form( + id='resource-edit' + data-fields="title, description, format, author" + next="list" + bind-resources + ) + //- group-by='step' \ No newline at end of file diff --git a/src/includes/resources.pug b/src/includes/resources.pug deleted file mode 100644 index a5c721492e2d2691e0cf2160db98b641486bdd95..0000000000000000000000000000000000000000 --- a/src/includes/resources.pug +++ /dev/null @@ -1,7 +0,0 @@ -#circles - sib-display#circles-list( - data-src=`${sdn}/resources/`, - data-fields='title, description', - search-fields='title, description', - next='group' - ) diff --git a/src/index.pug b/src/index.pug index d94604fcbb450b5a5ee6ccc7d5f8c4437f64eb61..3d239102afe611dd4479bce4b0590a5c7508ded8 100644 --- a/src/index.pug +++ b/src/index.pug @@ -2,5 +2,8 @@ doctype html html include includes/head.pug body - include includes/header.pug - include includes/home.pug + header#header(role='banner') + include includes/header.pug + main + include includes/home.pug +