autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into release/hubl-752

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2020-10-22 12:57:54 +02:00
commit c2318ac662
11 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dependencies.pug
View File

@ -10,7 +10,7 @@ script(type="module" src="https://unpkg.com/@startinblox/core@0.12" defer)
script(type="module" src="https://unpkg.com/@startinblox/oidc@0.10" defer) script(type="module" src="https://unpkg.com/@startinblox/oidc@0.10" defer)
//- script(type="module" src="/lib/sib-auth/index.js" defer) //- script(type="module" src="/lib/sib-auth/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/router@0.9" defer) script(type="module" src="https://unpkg.com/@startinblox/router@0.10" defer)
//- script(type="module" src="/lib/sib-router/src/index.js" defer) //- script(type="module" src="/lib/sib-router/src/index.js" defer)
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.7" defer) script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.7" defer)
@ -25,7 +25,7 @@ if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpo
//- script(type="module" src="/lib/sib-resource/sib-resource.js" defer) //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.8" defer) script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.9" defer)
//- script(type="module" src="/lib/solid-job-board/dist/index.js" defer) //- script(type="module" src="/lib/solid-job-board/dist/index.js" defer)
if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users))

24
src/index.pug
View File

@ -27,15 +27,15 @@ html(lang="en")
main#viewport.content.notLoggedIn main#viewport.content.notLoggedIn
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
#dashboard(hidden).no-sidebar.with-padding #dashboard(hidden, data-view="dashboard").no-sidebar.with-padding
include page-dashboard.pug include page-dashboard.pug
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users)) if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
#members(hidden).no-sidebar.with-padding #members(hidden, data-view="members").no-sidebar.with-padding
include page-directory.pug include page-directory.pug
if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers) if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
#job-offers(hidden).no-sidebar.with-padding #job-offers(hidden, data-view="job-offers").no-sidebar.with-padding
if (endpoints.post && endpoints.post.joboffers) && (endpoints.get && endpoints.get.joboffers) if (endpoints.post && endpoints.post.joboffers) && (endpoints.get && endpoints.get.joboffers)
hubl-reactivity(data-src=`${endpoints.post.joboffers}current/` target-src=`${endpoints.get.joboffers}`) hubl-reactivity(data-src=`${endpoints.post.joboffers}current/` target-src=`${endpoints.get.joboffers}`)
hubl-reactivity(data-src=`${endpoints.post.joboffers}expired/` target-src=`${endpoints.get.joboffers}`) hubl-reactivity(data-src=`${endpoints.post.joboffers}expired/` target-src=`${endpoints.get.joboffers}`)
@ -49,7 +49,7 @@ html(lang="en")
include page-job-offers.pug include page-job-offers.pug
if endpoints.projects || (endpoints.get && endpoints.get.projects) if endpoints.projects || (endpoints.get && endpoints.get.projects)
#project(hidden).with-sidebar #project(hidden, data-view="project").with-sidebar
if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects) if (endpoints.post && endpoints.post.projects) && (endpoints.get && endpoints.get.projects)
hubl-reactivity(data-src=`${endpoints.post.projects}joinable/` target-src=`${endpoints.get.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(data-src=`${endpoints.post.projects}` target-src=`${endpoints.get.projects}`)
@ -61,7 +61,7 @@ html(lang="en")
include page-project.pug include page-project.pug
if endpoints.circles || (endpoints.get && endpoints.get.circles) if endpoints.circles || (endpoints.get && endpoints.get.circles)
#circle(hidden).with-sidebar #circle(hidden, data-view="circle").with-sidebar
if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles) if (endpoints.post && endpoints.post.circles) && (endpoints.get && endpoints.get.circles)
hubl-reactivity(data-src=`${endpoints.post.circles}joinable/` target-src=`${endpoints.get.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(data-src=`${endpoints.post.circles}` target-src=`${endpoints.get.circles}`)
@ -72,29 +72,29 @@ html(lang="en")
hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`)
include page-circle.pug include page-circle.pug
if endpoints.users || (endpoints.get && endpoints.get.users) if endpoints.users || (endpoints.get && endpoints.get.users)
#messages(hidden).with-sidebar #messages(hidden, data-view="messages").with-sidebar
include page-messages.pug include page-messages.pug
if endpoints.polls || (endpoints.get && endpoints.get.polls) if endpoints.polls || (endpoints.get && endpoints.get.polls)
#polls(hidden).with-sidebar #polls(hidden, data-view="polls").with-sidebar
include page-polls.pug include page-polls.pug
if endpoints.events || (endpoints.get && endpoints.get.events) if endpoints.events || (endpoints.get && endpoints.get.events)
#events(hidden) #events(hidden, data-view="events")
include page-events.pug include page-events.pug
if endpoints.resources || (endpoints.get && endpoints.get.resources) if endpoints.resources || (endpoints.get && endpoints.get.resources)
#resources(hidden) #resources(hidden, data-view="resources")
include page-resources.pug include page-resources.pug
#admin(hidden).with-sidebar #admin(hidden, data-view="admin").with-sidebar
include page-admin.pug include page-admin.pug
#about.no-sidebar.with-padding #about(data-view="about").no-sidebar.with-padding
include page-about.pug include page-about.pug
if (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.uploads || (endpoints.post && endpoints.post.uploads)) && (endpoints.users || (endpoints.post && endpoints.post.users)) if (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.uploads || (endpoints.post && endpoints.post.uploads)) && (endpoints.users || (endpoints.post && endpoints.post.users))
#profile(hidden).no-sidebar #profile(hidden, data-view="profile").no-sidebar
include page-profile.pug include page-profile.pug
if analytics if analytics

6
src/page-admin.pug
View File

@ -1,12 +1,12 @@
.views-container.sidebar-is-closed .views-container.sidebar-is-closed
if endpoints.circles || (endpoints.get && endpoints.get.circles) if endpoints.circles || (endpoints.get && endpoints.get.circles)
#admin-circles(hidden) #admin-circles(hidden, data-view="admin-circles")
include views/admin/page-admin-circles.pug include views/admin/page-admin-circles.pug
if endpoints.projects || (endpoints.get && endpoints.get.projects) if endpoints.projects || (endpoints.get && endpoints.get.projects)
#admin-projects(hidden) #admin-projects(hidden, data-view="admin-projects")
include views/admin/page-admin-projects.pug include views/admin/page-admin-projects.pug
if (endpoints.users || (endpoints.get && endpoints.get.users)) if (endpoints.users || (endpoints.get && endpoints.get.users))
#admin-communities(hidden) #admin-communities(hidden, data-view="admin-communities")
include views/admin/page-admin-communities.pug include views/admin/page-admin-communities.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu(role='navigation')
solid-router(default-route='admin-circles') solid-router(default-route='admin-circles')

10
src/page-circle.pug
View File

@ -12,15 +12,15 @@
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
div.content-box__height div.content-box__height
solid-ac-checker(permission='acl:Read', bind-resources) solid-ac-checker(permission='acl:Read', bind-resources)
#circle-chat(hidden) #circle-chat(hidden, data-view="circle-chat")
include views/circle/page-circle-chat.pug include views/circle/page-circle-chat.pug
#circle-information.content-box__height(hidden) #circle-information.content-box__height(hidden, data-view="circle-information")
include views/circle/page-circle-profile.pug include views/circle/page-circle-profile.pug
#circle-events(hidden) #circle-events(hidden, data-view="circle-events")
include views/circle/page-circle-events.pug include views/circle/page-circle-events.pug
#circle-resources(hidden) #circle-resources(hidden, data-view="circle-resources")
include views/circle/page-circle-resources.pug include views/circle/page-circle-resources.pug
#circle-polls(hidden) #circle-polls(hidden, data-view="circle-polls")
include views/circle/page-circle-polls.pug include views/circle/page-circle-polls.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu(role='navigation')

6
src/page-project.pug
View File

@ -16,11 +16,11 @@
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
div.content-box__height div.content-box__height
solid-ac-checker(permission='acl:Read', bind-resources) solid-ac-checker(permission='acl:Read', bind-resources)
#project-chat(hidden) #project-chat(hidden, data-view="project-chat")
include views/project/page-project-chat.pug include views/project/page-project-chat.pug
#project-information.content-box__height(hidden) #project-information.content-box__height(hidden, data-view="project-information")
include views/project/page-project-profile.pug include views/project/page-project-profile.pug
#project-picture(hidden) #project-picture(hidden, data-view="project-picture")
include views/project/page-project-picture.pug include views/project/page-project-picture.pug
nav.jsRightMenu(role='navigation') nav.jsRightMenu(role='navigation')

4
src/views/admin/page-admin-circles.pug
View File

@ -10,7 +10,7 @@
include ../circle/page-circle-left.pug include ../circle/page-circle-left.pug
#admin-circle-list.content-box__height(hidden) #admin-circle-list.content-box__height(hidden, data-view="admin-circle-list")
include ../../templates/hubl-user-avatar.pug include ../../templates/hubl-user-avatar.pug
solid-widget(name='hubl-circle-owner') solid-widget(name='hubl-circle-owner')
@ -121,5 +121,5 @@
div div
div div
#admin-circle-create.content-box__height(hidden) #admin-circle-create.content-box__height(hidden, data-view="admin-circle-create")
include page-admin-circles-create.pug include page-admin-circles-create.pug

4
src/views/admin/page-admin-communities.pug
View File

@ -18,7 +18,7 @@
solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append') solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append')
div.button.text-bold.text-uppercase.button-disabled Membre, aucune permission div.button.text-bold.text-uppercase.button-disabled Membre, aucune permission
#admin-communities-list.content-box__height(hidden) #admin-communities-list.content-box__height(hidden, data-view="admin-communities-list")
div.content-box__info.flex div.content-box__info.flex
div.admin-header.flex div.admin-header.flex
h3 Communautés h3 Communautés
@ -49,5 +49,5 @@
div div
div div
#admin-users-create.content-box__height(hidden) #admin-users-create.content-box__height(hidden, data-view="admin-users-create")
include page-admin-users-create.pug include page-admin-users-create.pug

6
src/views/admin/page-admin-projects.pug
View File

@ -8,10 +8,10 @@
h1.without-margin Administration h1.without-margin Administration
button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU
#project-left(hidden) #project-left(hidden, data-view="project-left")
include ../project/page-project-left.pug include ../project/page-project-left.pug
#admin-project-list.content-box__height(hidden) #admin-project-list.content-box__height(hidden, data-view="admin-project-list")
include ../../templates/hubl-user-avatar.pug include ../../templates/hubl-user-avatar.pug
div.content-box__info.flex div.content-box__info.flex
@ -145,5 +145,5 @@
div div
div div
#admin-project-create(hidden) #admin-project-create(hidden, data-view="admin-project-create")
include page-admin-projects-create.pug include page-admin-projects-create.pug

2
src/views/circle/page-circle-left.pug
View File

@ -1,4 +1,4 @@
#circle-left(hidden) #circle-left(hidden, data-view="circle-left")
div.content-box__info.flex(style="padding: 15px") div.content-box__info.flex(style="padding: 15px")
p Tu as quitté ce cercle. p Tu as quitté ce cercle.

4
src/views/circle/page-circle-profile.pug
View File

@ -2,7 +2,7 @@ solid-router(default-route='circle-profile', hidden)
solid-route(name='circle-profile') solid-route(name='circle-profile')
solid-route(name='circle-edit') solid-route(name='circle-edit')
#circle-profile(hidden) #circle-profile(hidden, data-view="circle-profile")
solid-widget(name='hubl-circle-team-contact') solid-widget(name='hubl-circle-team-contact')
template template
@ -109,5 +109,5 @@ solid-router(default-route='circle-profile', hidden)
) )
#circle-edit.content-box__height(hidden) #circle-edit.content-box__height(hidden, data-view="circle-edit")
include page-circle-edit.pug include page-circle-edit.pug

4
src/views/project/page-project-profile.pug
View File

@ -2,7 +2,7 @@ solid-router(default-route='project-profile', hidden)
solid-route(name='project-profile') solid-route(name='project-profile')
solid-route(name='project-edit') solid-route(name='project-edit')
#project-profile(hidden) #project-profile(hidden, data-view="project-profile")
include ../../templates/hubl-captain.pug include ../../templates/hubl-captain.pug
solid-widget(name='hubl-project-team-contact') solid-widget(name='hubl-project-team-contact')
@ -107,5 +107,5 @@ solid-router(default-route='project-profile', hidden)
widget-is_admin='hubl-project-user-admin' widget-is_admin='hubl-project-user-admin'
) )
#project-edit.content-box__height(hidden) #project-edit.content-box__height(hidden, data-view="project-edit")
include page-project-edit.pug include page-project-edit.pug