From 64b223f92e23d3f6574f8eac9a253ab746e4bc04 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Mon, 11 Jan 2021 20:14:20 +0100 Subject: [PATCH] feature: directory + left-menu + index --- src/index.pug | 97 ++++++--------------------- src/views/page-directory.pug | 9 +-- src/views/partials/menu-left.pug | 110 +++++++++++++++---------------- 3 files changed, 81 insertions(+), 135 deletions(-) diff --git a/src/index.pug b/src/index.pug index 025e81c..f7febe8 100644 --- a/src/index.pug +++ b/src/index.pug @@ -56,6 +56,10 @@ html(lang="en") #dashboard(hidden, data-view="dashboard") include views/page-dashboard.pug + if publicDirectory && endpoints.get.users + #members(hidden, data-view="members", no-render) + include views/page-directory.pug + if endpoints.get.projects #project(hidden, data-view="project", no-render).with-sidebar.whitespace-normal hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.projects") @@ -80,31 +84,22 @@ html(lang="en") hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) include views/page-circle.pug + if endpoints.get.users + #messages(hidden, data-view="messages", no-render).with-sidebar + hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.contacts") + include views/page-messages.pug + if endpoints.get.polls + #polls(hidden, data-view="polls").with-sidebar + include views/page-polls.pug + if endpoints.get.events + #events(hidden, data-view="events") + include views/page-events.pug - - //- if publicDirectory && endpoints.get.users - //- #members(hidden, data-view="members", no-render) - //- include views/page-directory.pug - - - //- if endpoints.get.users - //- #messages(hidden, data-view="messages", no-render).with-sidebar - //- hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.contacts") - //- include views/page-messages.pug - - //- if endpoints.get.polls - //- #polls(hidden, data-view="polls", no-render).with-sidebar - //- include views/page-polls.pug - - //- if endpoints.get.events - //- #events(hidden, data-view="events", no-render) - //- include views/page-events.pug - - //- if endpoints.get.resources - //- #resources(hidden, data-view="resources", no-render) - //- include views/page-resources.pug + if endpoints.get.resources + #resources(hidden, data-view="resources") + include views/page-resources.pug #admin(hidden, data-view="admin", no-render).with-sidebar.whitespace-normal include views/page-admin.pug @@ -112,9 +107,10 @@ html(lang="en") #about(data-view="about", no-render) include views/page-about.pug - //- if endpoints.get.skills && endpoints.post.uploads && endpoints.post.users - //- #profile(hidden, data-view="profile", no-render).no-sidebar - //- include views/page-profile.pug + if endpoints.get.skills && endpoints.post.uploads && endpoints.post.users + #profile(hidden, data-view="profile", no-render).no-sidebar + include views/page-profile.pug + //- if endpoints.get.joboffers //- #job-offers(hidden, data-view="job-offers", no-render).no-sidebar.with-padding @@ -128,57 +124,6 @@ html(lang="en") //- hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}`) //- hubl-reactivity(bind-user nested-field="joboffers" target-src=`${endpoints.joboffers || endpoints.get.joboffers}current/`) //- include views/page-job-offers.pug - - //- if endpoints.get.projects - //- #project(hidden, data-view="project", no-render).with-sidebar.whitespace-normal - //- hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.projects") - //- hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.projects}`) - //- hubl-reactivity(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`) - //- hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}`) - //- hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.post.projects}joinable/`) - //- hubl-reactivity(data-src=`${endpoints.projects || endpoints.get.projects}joinable/` target-src=`${endpoints.projects || endpoints.get.projects}`) - //- hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}`) - //- hubl-reactivity(bind-user nested-field="projects" target-src=`${endpoints.projects || endpoints.get.projects}joinable/`) - //- include views/page-project.pug - - //- if endpoints.get.circles - //- #circle(hidden, data-view="circle").segment.lg-full.with-sidebar - //- hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.circles") - //- hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.circles}`) - //- hubl-reactivity(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`) - //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}`) - //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.post.circles}joinable/`) - //- hubl-reactivity(data-src=`${endpoints.circles || endpoints.get.circles}joinable/` target-src=`${endpoints.circles || endpoints.get.circles}`) - //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}`) - //- hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) - //- include views/page-circle.pug - - //- if endpoints.get.users - //- #messages(hidden, data-view="messages", no-render).with-sidebar - //- hubl-reactivity(bind-user nested-field='inbox' target-src="store://user.contacts") - //- include views/page-messages.pug - - //- if endpoints.get.polls - //- #polls(hidden, data-view="polls", no-render).with-sidebar - //- include views/page-polls.pug - - //- if endpoints.get.events - //- #events(hidden, data-view="events", no-render) - //- include views/page-events.pug - - //- if endpoints.get.resources - //- #resources(hidden, data-view="resources", no-render) - //- include views/page-resources.pug - - //- #admin(hidden, data-view="admin").segment.lg-full.with-sidebar - //- include views/page-admin.pug - - //- #about(data-view="about") - //- include views/page-about.pug - - //- if endpoints.get.skills && endpoints.post.uploads && endpoints.post.users - //- #profile(hidden, data-view="profile", no-render).no-sidebar - //- include views/page-profile.pug if analytics each provider in analytics diff --git a/src/views/page-directory.pug b/src/views/page-directory.pug index 3937823..57af17a 100644 --- a/src/views/page-directory.pug +++ b/src/views/page-directory.pug @@ -1,4 +1,5 @@ -solid-directory( - data-src=`${endpoints.users || endpoints.get.users}` - range-skills=`${endpoints.skills || endpoints.get.skills}` -) +div.segment.lg-full.padding-top-xlarge.padding-right-large.padding-bottom-xlarge.padding-left-large.whitespace-normal + solid-directory( + data-src=`${endpoints.users || endpoints.get.users}` + range-skills=`${endpoints.skills || endpoints.get.skills}` + ) diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug index d46e6ae..65c9476 100644 --- a/src/views/partials/menu-left.pug +++ b/src/views/partials/menu-left.pug @@ -103,36 +103,36 @@ solid-router#navbar-router(default-route='dashboard') div.icon.icon-small.icon-home div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.dashboard") div.divider - //- if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) - //- solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='members') - //- div.segment.margin-right-xxsmall - //- div.segment.icon.icon-small.icon-people - //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.profileDirectory") - //- div.divider + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='members') + div.segment.margin-right-xxsmall + div.icon.icon-small.icon-people + div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.profileDirectory") + div.divider //- if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) //- solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='job-offers', rdf-type='hd:joboffer') //- div.segment.margin-right-xxsmall //- div.segment.icon.icon-small.icon-briefcase //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.jobBoard") //- div.divider - //- if endpoints.resources || (endpoints.get && endpoints.get.resources) - //- solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='resources') - //- div.segment.margin-right-xxsmall - //- div.segment.icon.icon-small.icon-docs - //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.resources") - //- div.divider - //- if endpoints.polls || (endpoints.get && endpoints.get.polls) - //- solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='polls') - //- div.segment.margin-right-xxsmall - //- div.segment.icon.icon-small.icon-bubbles - //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.gov") - //- div.divider - //- if endpoints.events || (endpoints.get && endpoints.get.events) - //- solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='events') - //- div.segment.margin-right-xxsmall - //- div.segment.icon.icon-small.icon-calendar - //- div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events") - //- div.divider + if endpoints.resources || (endpoints.get && endpoints.get.resources) + solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='resources') + div.segment.margin-right-xxsmall + div.segment.icon.icon-small.icon-docs + div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.resources") + div.divider + if endpoints.polls || (endpoints.get && endpoints.get.polls) + solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='polls') + div.segment.margin-right-xxsmall + div.segment.icon.icon-small.icon-bubbles + div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.gov") + div.divider + if endpoints.events || (endpoints.get && endpoints.get.events) + solid-route.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name='events') + div.segment.margin-right-xxsmall + div.segment.icon.icon-small.icon-calendar + div.segment.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.events") + div.divider if endpoints.projects || (endpoints.get && endpoints.get.projects) div.menu-wrapper solid-link.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active @@ -191,36 +191,36 @@ solid-router#navbar-router(default-route='dashboard') order-asc="circle.name" ) div.divider - //- div.menu-wrapper - //- div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active - //- div.segment.margin-right-xxsmall - //- div.segment.icon.icon-small.icon-envelope-letter - //- div.segment.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages") - //- div.menu-chevron.segment - //- div.icon-arrow-up - //- solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) - //- div.sub-menu.menu-notification - //- div#loader-messages.loader.loader-menu - //- div - //- div - //- div - //- div - //- //- search-fields="contact.name" - //- //- search-label-contact.name="" - //- //- data-trans="search-label-contact.name=menuLeft.search" - //- //- search-widget-contact.name="hubl-search-users" - //- solid-display.message-tab.segment.lg-full( - //- bind-user - //- nested-field='contacts' - //- fields='contact' - //- loader-id='loader-messages' - //- empty-widget='hubl-create-contact' - //- empty-value='' - //- widget-contact='hubl-menu-fix-url-contact' - //- order-asc="contact.username" - //- ) - //-div.divider - //- + div.menu-wrapper + div.menu.segment.lg-full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active + div.segment.margin-right-xxsmall + div.segment.icon.icon-small.icon-envelope-letter + div.segment.lg-three-quarter.text-uppercase.text-letter-spacing-large(data-trans="menuLeft.messages") + div.menu-chevron.segment + div.icon-arrow-up + solid-route(name='messages', rdf-type='foaf:user', use-id='', hidden) + div.sub-menu.menu-notification + div#loader-messages.loader.loader-menu + div + div + div + div + //- search-fields="contact.name" + //- search-label-contact.name="" + //- data-trans="search-label-contact.name=menuLeft.search" + //- search-widget-contact.name="hubl-search-users" + solid-display.message-tab.segment.lg-full( + bind-user + nested-field='contacts' + fields='contact' + loader-id='loader-messages' + empty-widget='hubl-create-contact' + empty-value='' + widget-contact='hubl-menu-fix-url-contact' + order-asc="contact.username" + ) + div.divider + solid-route(name='admin', hidden) - //-solid-route.menu(name='profile', hidden) + solid-route.menu(name='profile', hidden) solid-route(name='about', hidden)