From 31bd34df98626c7deb549d784b59b8edbdf77a6d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 10 Feb 2020 13:59:23 +0100 Subject: [PATCH] sorted src, activate condition for public directory and job offers, dev parameter for local lib folder --- config.sample.federated.json | 1 + config.sample.json | 1 + src/dependencies.pug | 47 ++++++++----- src/header.pug | 11 ++- src/index.pug | 21 ++---- src/menu-left.pug | 70 ++++++++++--------- src/page-admin.pug | 16 +++-- src/page-circle.pug | 4 +- ...mbers-directory.pug => page-directory.pug} | 1 - src/page-job-offers.pug | 33 ++++++--- src/page-project.pug | 4 +- src/page-user-panel.pug | 9 --- src/styles/base/menu-left.scss | 12 ++-- src/styles/layout/events/_index.scss | 2 +- src/styles/layout/events/events.scss | 4 -- .../admin}/page-admin-circles-create.pug | 0 src/{ => views/admin}/page-admin-circles.pug | 5 +- .../admin}/page-admin-projects-create.pug | 0 src/{ => views/admin}/page-admin-projects.pug | 4 +- src/{ => views/admin}/page-admin-users.pug | 0 src/{ => views/circle}/page-circle-chat.pug | 0 src/{ => views/circle}/page-circle-edit.pug | 2 +- src/{ => views/circle}/page-circle-left.pug | 0 .../circle}/page-circle-profile.pug | 2 +- .../job-offer}/page-job-offer-create.pug | 0 .../job-offer}/page-job-offer-edit.pug | 0 src/{ => views/project}/page-project-chat.pug | 0 src/{ => views/project}/page-project-edit.pug | 2 +- src/{ => views/project}/page-project-left.pug | 0 .../project}/page-project-profile.pug | 10 +-- 30 files changed, 142 insertions(+), 119 deletions(-) rename src/{page-members-directory.pug => page-directory.pug} (99%) delete mode 100644 src/page-user-panel.pug rename src/{ => views/admin}/page-admin-circles-create.pug (100%) rename src/{ => views/admin}/page-admin-circles.pug (97%) rename src/{ => views/admin}/page-admin-projects-create.pug (100%) rename src/{ => views/admin}/page-admin-projects.pug (95%) rename src/{ => views/admin}/page-admin-users.pug (100%) rename src/{ => views/circle}/page-circle-chat.pug (100%) rename src/{ => views/circle}/page-circle-edit.pug (98%) rename src/{ => views/circle}/page-circle-left.pug (100%) rename src/{ => views/circle}/page-circle-profile.pug (98%) rename src/{ => views/job-offer}/page-job-offer-create.pug (100%) rename src/{ => views/job-offer}/page-job-offer-edit.pug (100%) rename src/{ => views/project}/page-project-chat.pug (100%) rename src/{ => views/project}/page-project-edit.pug (97%) rename src/{ => views/project}/page-project-left.pug (100%) rename src/{ => views/project}/page-project-profile.pug (91%) diff --git a/config.sample.federated.json b/config.sample.federated.json index a17abca..7c8bd6f 100644 --- a/config.sample.federated.json +++ b/config.sample.federated.json @@ -6,6 +6,7 @@ "clientLogoHeight": "32px", "clientCSS": "/path/to/custom.css", "authorityName": "djangoldp-server-name", + "publicDirectory": false, "endpoints": { "get": { "circles": "http://localhost:8000/circles/", diff --git a/config.sample.json b/config.sample.json index 0197c37..9649336 100644 --- a/config.sample.json +++ b/config.sample.json @@ -6,6 +6,7 @@ "clientLogoHeight": "32px", "clientCSS": "/path/to/custom.css", "authorityName": "djangoldp-server-name", + "publicDirectory": false, "endpoints": { "circles": "http://localhost:8000/circles/", "projects": "http://localhost:8000/projects/", diff --git a/src/dependencies.pug b/src/dependencies.pug index 95d17f8..a70d24b 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,24 +1,33 @@ -script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8") script(src="/scripts/index.js") -//- local -//- script(type="module" src="/lib/sib-router/src/index.js") -//- script(type="module" src="/lib/sib-chat/sib-chat.js") -//- script(type="module" src="/lib/sib-notifications/sib-notifications.js") -//- script(type="module" src="/lib/sib-event/sib-event.js") -//- script(type="module" src="/lib/sib-conversation/sib-conversation.js") -//- script(type="module" src="/lib/sib-directory/sib-directory.js") -//- script(type="module" src="/lib/sib-job-board/sib-job-board.js") - -//- CDN -script(type="module" src="https://unpkg.com/@startinblox/core@0.9") -script(type="module" src="https://unpkg.com/@startinblox/router@0.7") -script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.4") -script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3") -script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1") -//- script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3") -//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3") -//- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3") +//- Scripts - use add `"libLocal" = true` on config.json to use your local `lib` folder +if libLocal + script(type="module" src="/lib/sib-oidc/index.js") + script(type="module" src="/lib/sib-router/src/index.js") + script(type="module" src="/lib/sib-notifications/index.js") + if endpoints.users || (endpoints.get && endpoints.get.users) + script(type="module" src="/lib/sib-chat/sib-chat.js") + if endpoints.events || (endpoints.get && endpoints.get.events) + script(type="module" src="/lib/sib-event/sib-event.js") + if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) + script(type="module" src="/lib/sib-job-board/sib-job-board.js") + script(type="module" src="/lib/sib-conversation/sib-conversation.js") + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + script(type="module" src="/lib/sib-directory/sib-directory.js") +else + script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8") + script(type="module" src="https://unpkg.com/@startinblox/core@0.9") + script(type="module" src="https://unpkg.com/@startinblox/router@0.7") + script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.3") + if endpoints.users || (endpoints.get && endpoints.get.users) + script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.4") + if endpoints.events || (endpoints.get && endpoints.get.events) + script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1") + if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) + script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3") + script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3") + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3") //- Stylesheets link(rel='stylesheet', href='/styles/index.css') diff --git a/src/header.pug b/src/header.pug index a198a38..2ad85fa 100644 --- a/src/header.pug +++ b/src/header.pug @@ -22,7 +22,16 @@ details#user-controls.notLoggedIn bind-user ) #user-controls__panel - include page-user-panel.pug + nav(role="user's functionalities menu") + ul + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + li + sib-link(next='my-profile') My profile + //-li + sib-link(next='user-settings') Settings + li + sib-link(next='admin') Admin + button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out button(role='log in' onclick="document.querySelector('sib-auth').login();") Login diff --git a/src/index.pug b/src/index.pug index 26454a2..2df531e 100644 --- a/src/index.pug +++ b/src/index.pug @@ -17,19 +17,13 @@ html(lang="en") include menu-left.pug div#viewport - //- #members(hidden).no-sidebar - //- include page-members-directory.pug + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + #members(hidden).no-sidebar + include page-directory.pug - //- #job-offers(hidden).no-sidebar - //- include page-job-offers.pug - - //- #job-offer-create(hidden).no-sidebar - //- sib-link(class="backlink", next="job-offers") Back - //- include page-job-offer-create.pug - - //- #job-offer-edit(hidden).no-sidebar - //- sib-link(class="backlink", next="job-offers") Back - //- include page-job-offer-edit.pug + if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) + #job-offers(hidden).no-sidebar + include page-job-offers.pug if endpoints.projects || (endpoints.get && endpoints.get.projects) #project(hidden).with-sidebar @@ -49,6 +43,3 @@ html(lang="en") #admin(hidden).with-sidebar include page-admin.pug - - //- #my-profile(hidden).no-sidebar - //- include page-user-profile.pug diff --git a/src/menu-left.pug b/src/menu-left.pug index 4b1ac41..02e0e59 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -7,18 +7,40 @@ sib-widget(name='hd-create') p.create You are not part of any ${value} yet. To create a new one, you can go to the sib-link(next='admin') administration panel +sib-widget(name='menu-fix-url-circle') + template + sib-display( + data-src='${value}' + fields='name, badge' + value-badge='${value}' + widget-badge='hd-counter' + widget-name='sib-display-div' + ) + +sib-widget(name='menu-fix-url-project') + template + sib-display( + data-src='${value}' + fields='project(customer.name, name), badge' + class-name='project-name' + class-customer.name='project-customer' + value-badge='${value}' + widget-badge='hd-counter' + widget-name='sib-display-div' + ) + nav#main__menu.jsLeftMenu sib-router#navbar-router(default-route='members') - //- sib-route.menu(name='members') - //- div.menu-label Members - //- div.menu-icon.icon-people - //- div.divider - //- sib-route.menu(name='job-offers', rdf-type='hd:joboffer') - //- div.menu-label Job offers - //- div.menu-icon.icon-briefcase - //- sib-route(name='job-offer-create', hidden) - //- sib-route(name='job-offer-edit', use-id, hidden) - //- div.divider + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + sib-route.menu(name='members') + div.menu-label Members + div.menu-icon.icon-people + div.divider + if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) + sib-route.menu(name='job-offers', rdf-type='hd:joboffer') + div.menu-label Job offers + div.menu-icon.icon-briefcase + div.divider if endpoints.events || (endpoints.get && endpoints.get.events) sib-route.menu(name='events') div.menu-label Events @@ -35,20 +57,13 @@ nav#main__menu.jsLeftMenu sib-route(name='project', rdf-type='hd:project', use-id='', hidden) div.sub-menu.menu-notification sib-display.project-tab( - data-src=`${endpoints.projects || (endpoints.get && endpoints.get.projects)}` - fields='project(customer.name, name), badge' - class-customer.name='project-customer' - class-name='project-name' + bind-user + nested-field='projects' + fields='project' empty-widget='hd-create' empty-value='project' - search-fields='team' - search-widget-team='sib-form-hidden' - search-value-team='-' - hd-inherit-user-id='search-value-team' - hd-inherit-widgets - widget-badge='hd-counter' - action-badge='badge' - order-by='customer.name' + widget-project='menu-fix-url-project' + order-by='project.customer.name' next='project' ) div.divider @@ -62,22 +77,13 @@ nav#main__menu.jsLeftMenu div.menu-icon.icon-folder-alt sib-route(name='circle', rdf-type='hd:circle', use-id='', hidden) div.sub-menu.menu-notification - sib-widget(name='menu-circle-fix-url') - template - sib-display( - data-src='${value}' - fields='name, badge' - value-badge='${value}' - widget-badge='hd-counter' - widget-name='sib-display-div' - ) sib-display( bind-user nested-field='circles' fields='circle' empty-widget='hd-create' empty-value='circle' - widget-circle='menu-circle-fix-url' + widget-circle='menu-fix-url-circle' order-by='circle.name' next='circle' ) diff --git a/src/page-admin.pug b/src/page-admin.pug index c396fd4..4876a37 100644 --- a/src/page-admin.pug +++ b/src/page-admin.pug @@ -1,20 +1,22 @@ .views-container.sidebar-is-closed if endpoints.circles || (endpoints.get && endpoints.get.circles) #admin-circles(hidden) - include page-admin-circles.pug + include views/admin/page-admin-circles.pug if endpoints.projects || (endpoints.get && endpoints.get.projects) #admin-projects(hidden) - include page-admin-projects.pug - //- #admin-users(hidden) - include page-admin-users.pug + include views/admin/page-admin-projects.pug + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + #admin-users(hidden) + include views/admin/page-admin-users.pug nav.jsRightMenu(role='navigation') sib-router(default-route='admin-circles') ul li.jsOffsiteToggle a Fold menu - //- sib-route(name='admin-users') - li - a Users + if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) + sib-route(name='admin-users') + li + a Users if endpoints.circles || (endpoints.get && endpoints.get.circles) sib-route(name='admin-circles') li diff --git a/src/page-circle.pug b/src/page-circle.pug index e938ee3..9f84093 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -13,9 +13,9 @@ div.content-box__info sib-ac-checker(permission='acl:Read', bind-resources) #circle-chat(hidden) - include page-circle-chat.pug + include views/circle/page-circle-chat.pug #circle-information(hidden) - include page-circle-profile.pug + include views/circle/page-circle-profile.pug nav.jsRightMenu(role='navigation') sib-router(default-route='circle-chat') diff --git a/src/page-members-directory.pug b/src/page-directory.pug similarity index 99% rename from src/page-members-directory.pug rename to src/page-directory.pug index 7b835cf..e8f8c3c 100644 --- a/src/page-members-directory.pug +++ b/src/page-directory.pug @@ -3,4 +3,3 @@ sib-directory( range-groups=`${endpoints.groups || endpoints.get.groups}`, range-skills=`${endpoints.skills || endpoints.get.skills}` ) - diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug index 1772d1f..b7cb186 100644 --- a/src/page-job-offers.pug +++ b/src/page-job-offers.pug @@ -1,10 +1,25 @@ -.job-offers__container - sib-job-board( - data-src=`${endpoints.joboffers || endpoints.get.joboffers}`, - range-skills=`${endpoints.skills || endpoints.get.skills}` - ) +.content-box.full-width + #job-offer-board + .job-offers__container + sib-job-board( + data-src=`${endpoints.joboffers || endpoints.get.joboffers}`, + range-skills=`${endpoints.skills || endpoints.get.skills}` + ) - div.job-offers__newoffer - sib-link(next="job-offer-create").plus-button - div.icon-plus - div Post a new offer + div.job-offers__newoffer + sib-link(next="job-offer-create").plus-button + div.icon-plus + div Post a new offer + + #job-offer-create(hidden) + sib-link(class="backlink", next="job-offers") Back + include views/job-offer/page-job-offer-create.pug + + #job-offer-edit(hidden) + sib-link(class="backlink", next="job-offers") Back + include views/job-offer/page-job-offer-edit.pug + +sib-router(default-route='job-offer-board') + sib-route(name='job-offer-board') + sib-route(name='job-offer-create') + sib-route(name='job-offer-edit') \ No newline at end of file diff --git a/src/page-project.pug b/src/page-project.pug index ae2e06c..ffb9269 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -19,9 +19,9 @@ div.content-box__info sib-ac-checker(permission='acl:Read', bind-resources) #project-chat(hidden) - include page-project-chat.pug + include views/project/page-project-chat.pug #project-information(hidden) - include page-project-profile.pug + include views/project/page-project-profile.pug dialog(id='project-contributions-help').modal sib-link(next='project-profile') diff --git a/src/page-user-panel.pug b/src/page-user-panel.pug deleted file mode 100644 index 6e6c310..0000000 --- a/src/page-user-panel.pug +++ /dev/null @@ -1,9 +0,0 @@ -nav(role="user's functionalities menu") - ul - //- li - //- sib-link(next='my-profile') My profile - //-li - sib-link(next='user-settings') Settings - li - sib-link(next='admin') Admin - button(role='log out' onclick="document.querySelector('sib-auth').logout();") Log out diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss index 8ffd616..0ff6c1e 100644 --- a/src/styles/base/menu-left.scss +++ b/src/styles/base/menu-left.scss @@ -145,7 +145,8 @@ >div { color: $color-244-10-70; cursor: pointer; - >menu-circle-fix-url>sib-display>div { + >menu-fix-url-circle>sib-display>div, + >menu-fix-url-project>sib-display>div { padding: 1rem 1rem 1rem 3.2rem; } } @@ -156,7 +157,8 @@ } &>sib-display[active]>div, - &>sib-display>div>menu-circle-fix-url>sib-display[active]>div { + &>sib-display>div>menu-fix-url-circle>sib-display[active]>div, + &>sib-display>div>menu-fix-url-project>sib-display[active]>div { background-color: $color-46-100-67; color: $color-233-18-29; font-weight: bold; @@ -164,11 +166,13 @@ } &.menu-notification { - > sib-display > div > sib-display > div > menu-circle-fix-url { + > sib-display > div > sib-display > div > menu-fix-url-circle, + > sib-display > div > sib-display > div > menu-fix-url-project { flex: 1; } > sib-display > div > sib-display > div, - > sib-display > div > sib-display > div > menu-circle-fix-url > sib-display > div { + > sib-display > div > sib-display > div > menu-fix-url-circle > sib-display > div, + > sib-display > div > sib-display > div > menu-fix-url-project > sib-display > div { display: flex; sib-display-div { flex: 3; diff --git a/src/styles/layout/events/_index.scss b/src/styles/layout/events/_index.scss index a28b32f..be4ff7d 100644 --- a/src/styles/layout/events/_index.scss +++ b/src/styles/layout/events/_index.scss @@ -1 +1 @@ -@import 'events'; \ No newline at end of file +@import 'events.scss'; \ No newline at end of file diff --git a/src/styles/layout/events/events.scss b/src/styles/layout/events/events.scss index 73a75c3..3b38a7e 100644 --- a/src/styles/layout/events/events.scss +++ b/src/styles/layout/events/events.scss @@ -1,7 +1,3 @@ -$color-203-87-19: hsl(203, 87.8%, 19.2%); -$color-357-67-45: hsl(357,67.5%,45.9%); -$color-212-4-50: hsl(212.7,4.3%,50%); -$color-0-0-22: hsl(0,0%,22.7%); #events { width: 100%; font-family: "Facit"; diff --git a/src/page-admin-circles-create.pug b/src/views/admin/page-admin-circles-create.pug similarity index 100% rename from src/page-admin-circles-create.pug rename to src/views/admin/page-admin-circles-create.pug diff --git a/src/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug similarity index 97% rename from src/page-admin-circles.pug rename to src/views/admin/page-admin-circles.pug index 110dc4b..cab4012 100644 --- a/src/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -9,12 +9,11 @@ #circle-left(hidden) - include page-circle-left.pug + include ../circle/page-circle-left.pug #admin-circle-list(hidden) - - include templates/hd-user-avatar.pug + include ../../templates/hd-user-avatar.pug sib-widget(name='circle-owner') template diff --git a/src/page-admin-projects-create.pug b/src/views/admin/page-admin-projects-create.pug similarity index 100% rename from src/page-admin-projects-create.pug rename to src/views/admin/page-admin-projects-create.pug diff --git a/src/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug similarity index 95% rename from src/page-admin-projects.pug rename to src/views/admin/page-admin-projects.pug index 53ecede..abec857 100644 --- a/src/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -8,10 +8,10 @@ h1.title-left.without-margin Administration #project-left(hidden) - include page-project-left.pug + include ../project/page-project-left.pug #admin-project-list(hidden) - include templates/hd-user-avatar.pug + include ../../templates/hd-user-avatar.pug div.content-box__info div.admin-header diff --git a/src/page-admin-users.pug b/src/views/admin/page-admin-users.pug similarity index 100% rename from src/page-admin-users.pug rename to src/views/admin/page-admin-users.pug diff --git a/src/page-circle-chat.pug b/src/views/circle/page-circle-chat.pug similarity index 100% rename from src/page-circle-chat.pug rename to src/views/circle/page-circle-chat.pug diff --git a/src/page-circle-edit.pug b/src/views/circle/page-circle-edit.pug similarity index 98% rename from src/page-circle-edit.pug rename to src/views/circle/page-circle-edit.pug index 266781b..f1ab588 100644 --- a/src/page-circle-edit.pug +++ b/src/views/circle/page-circle-edit.pug @@ -1,6 +1,6 @@ div.content-box__info - include templates/hd-user-avatar.pug + include ../../templates/hd-user-avatar.pug sib-widget(name='hd-user-groups') template ${await value.name} diff --git a/src/page-circle-left.pug b/src/views/circle/page-circle-left.pug similarity index 100% rename from src/page-circle-left.pug rename to src/views/circle/page-circle-left.pug diff --git a/src/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug similarity index 98% rename from src/page-circle-profile.pug rename to src/views/circle/page-circle-profile.pug index cd4e302..1c102b2 100644 --- a/src/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -3,7 +3,7 @@ sib-router(default-route='circle-profile', hidden) sib-route(name='circle-edit') #circle-profile(hidden) - include templates/hd-circle-team.pug + include ../../templates/hd-circle-team.pug .content-box__info .space-between diff --git a/src/page-job-offer-create.pug b/src/views/job-offer/page-job-offer-create.pug similarity index 100% rename from src/page-job-offer-create.pug rename to src/views/job-offer/page-job-offer-create.pug diff --git a/src/page-job-offer-edit.pug b/src/views/job-offer/page-job-offer-edit.pug similarity index 100% rename from src/page-job-offer-edit.pug rename to src/views/job-offer/page-job-offer-edit.pug diff --git a/src/page-project-chat.pug b/src/views/project/page-project-chat.pug similarity index 100% rename from src/page-project-chat.pug rename to src/views/project/page-project-chat.pug diff --git a/src/page-project-edit.pug b/src/views/project/page-project-edit.pug similarity index 97% rename from src/page-project-edit.pug rename to src/views/project/page-project-edit.pug index 63f9938..61e5aa2 100644 --- a/src/page-project-edit.pug +++ b/src/views/project/page-project-edit.pug @@ -1,6 +1,6 @@ div.content-box__info - include templates/hd-user-avatar.pug + include ../../templates/hd-user-avatar.pug sib-widget(name='hd-fieldset-title') template diff --git a/src/page-project-left.pug b/src/views/project/page-project-left.pug similarity index 100% rename from src/page-project-left.pug rename to src/views/project/page-project-left.pug diff --git a/src/page-project-profile.pug b/src/views/project/page-project-profile.pug similarity index 91% rename from src/page-project-profile.pug rename to src/views/project/page-project-profile.pug index aefb717..0f7c765 100644 --- a/src/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -3,11 +3,11 @@ sib-router(default-route='project-profile', hidden) sib-route(name='project-edit') #project-profile(hidden) - include templates/hd-business-provider.pug - include templates/hd-captain.pug - include templates/hd-circle-team.pug - include templates/hd-customer.pug - include templates/hd-project-team.pug + include ../../templates/hd-business-provider.pug + include ../../templates/hd-captain.pug + include ../../templates/hd-circle-team.pug + include ../../templates/hd-customer.pug + include ../../templates/hd-project-team.pug .content-box__info