From f0cbd556dff9014d59793c7606d04b2d719563a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABlle=20Morin?= <morin.gaelle@gmail.com> Date: Thu, 28 Mar 2019 19:09:57 +0100 Subject: [PATCH] seems better --- src/dependencies.pug.orig | 7 +++++-- src/index.pug | 2 +- src/menu-left.pug | 5 ++--- src/page-members.pug | 37 +++++-------------------------------- 4 files changed, 13 insertions(+), 38 deletions(-) diff --git a/src/dependencies.pug.orig b/src/dependencies.pug.orig index 106cd46a..5f9094a7 100644 --- a/src/dependencies.pug.orig +++ b/src/dependencies.pug.orig @@ -32,7 +32,10 @@ script(type="module" src="https://unpkg.com/@startinblox/router@0.6") script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.1") <<<<<<< HEAD script(type="module" src="https://unpkg.com/@startinblox/component-notifications") -======= script(type="module" src="https://unpkg.com/@startinblox/component-directory") ->>>>>>> fde7dc4... wip +======= +//- + script(type="module" src="https://unpkg.com/@startinblox/component-directory") +script(type="module" src="/lib/sib-directory/sib-directory.js") +>>>>>>> 0a46b80... seems better diff --git a/src/index.pug b/src/index.pug index 3f08fcc0..b532680b 100644 --- a/src/index.pug +++ b/src/index.pug @@ -17,7 +17,7 @@ html(lang="en") main#mainContainer //- #dashboard(hidden) include page-dashboard.pug - #members(hidden) + #directory(hidden) include page-members.pug #member-chat(hidden) include page-member-chat.pug diff --git a/src/menu-left.pug b/src/menu-left.pug index fbb76fd2..03c26d56 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -1,6 +1,6 @@ nav#navbar - sib-router#navbar-router(default-route='members') - sib-route.menu(name='members') + sib-router#navbar-router(default-route='directory') + sib-route.menu(name='directory') div.menu-notification sib-display( data-fields, @@ -9,7 +9,6 @@ nav#navbar ) div.menu-label Members div.menu-icon.icon-people - sib-route.menu(hidden, name='member', id-prefix=`${sdn}/members/`) div.divider sib-route.menu(name='job-offers') div.menu-notification diff --git a/src/page-members.pug b/src/page-members.pug index b5f5d407..d5a4552e 100644 --- a/src/page-members.pug +++ b/src/page-members.pug @@ -4,41 +4,14 @@ div.grid-layer include templates/template-skills.pug div.grid-layer-main.containerV - h1 Members - sib-display#profiles-list( - data-src=`${sdn}/members/`, - search-range-groups=`${sdn}/groups/`, - search-range-skills=`${sdn}/skills/`, - - search-fields='name, groups, skills', - set-name='pseudo, user.first_name, user.last_name', - search-label-name='Search by lastname, firstname...', - search-label-groups='Filter by role', - search-label-skills='Search by skills', - search-widget-name='sib-form-placeholder-text', - search-widget-groups='sib-form-placeholder-dropdown', - search-widget-skills='sib-form-placeholder-text', - - counter-template='<span>${counter} members</span>', - - data-fields='header, infos', - set-header='user.account.picture, user.name, pseudonym, bio, send', - set-infos='city, user.groups, user.email, phone, user.skills', - set-pseudonym='before-pseudo,user.username', - value-before-pseudo='@', - label-send='SEND A MESSAGE', - action-send='member-chat', - widget-user.account.picture='sib-display-img', - widget-user.groups='groups-name', - widget-user.skills='skills-name', - multiple-user.groups, - multiple-user.skills, - - paginate-by='3', - next='member' + sib-directory( + data-src=`${sdn}/members/`, + range-groups=`${sdn}/groups/`, + range-skills=`${sdn}/skills/` ) + div.grid-layer-links.containerV div.containerH.containerCenter.how-link div.containerV.fix.icon-idea -- GitLab