From 2ec570f67d1cadd64c1b8c8a7a77aca37683abc8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 19 Oct 2020 16:12:14 +0200 Subject: [PATCH] feature: router 0.10 --- src/dependencies.pug | 4 ++-- src/index.pug | 24 +++++++++++----------- src/page-admin.pug | 6 +++--- src/page-circle.pug | 10 ++++----- src/page-project.pug | 6 +++--- src/views/admin/page-admin-circles.pug | 4 ++-- src/views/admin/page-admin-communities.pug | 4 ++-- src/views/admin/page-admin-projects.pug | 6 +++--- src/views/circle/page-circle-left.pug | 2 +- src/views/circle/page-circle-profile.pug | 4 ++-- src/views/project/page-project-profile.pug | 4 ++-- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/dependencies.pug b/src/dependencies.pug index aaadd92..cd32fc1 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -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="/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="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) 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) if (endpoints.uploads || (endpoints.get && endpoints.get.uploads)) && (endpoints.skills || (endpoints.get && endpoints.get.skills)) && (endpoints.users || (endpoints.get && endpoints.get.users)) diff --git a/src/index.pug b/src/index.pug index 62d6857..a891ad4 100644 --- a/src/index.pug +++ b/src/index.pug @@ -27,15 +27,15 @@ html(lang="en") main#viewport.content.notLoggedIn 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 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 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) 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}`) @@ -49,7 +49,7 @@ html(lang="en") include page-job-offers.pug 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) 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}`) @@ -61,7 +61,7 @@ html(lang="en") include page-project.pug 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) 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}`) @@ -72,29 +72,29 @@ html(lang="en") hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`) include page-circle.pug if endpoints.users || (endpoints.get && endpoints.get.users) - #messages(hidden).with-sidebar + #messages(hidden, data-view="messages").with-sidebar include page-messages.pug if endpoints.polls || (endpoints.get && endpoints.get.polls) - #polls(hidden).with-sidebar + #polls(hidden, data-view="polls").with-sidebar include page-polls.pug if endpoints.events || (endpoints.get && endpoints.get.events) - #events(hidden) + #events(hidden, data-view="events") include page-events.pug if endpoints.resources || (endpoints.get && endpoints.get.resources) - #resources(hidden) + #resources(hidden, data-view="resources") include page-resources.pug - #admin(hidden).with-sidebar + #admin(hidden, data-view="admin").with-sidebar include page-admin.pug - #about.no-sidebar.with-padding + #about(data-view="about").no-sidebar.with-padding 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)) - #profile(hidden).no-sidebar + #profile(hidden, data-view="profile").no-sidebar include page-profile.pug if analytics diff --git a/src/page-admin.pug b/src/page-admin.pug index 979faed..f56d15d 100644 --- a/src/page-admin.pug +++ b/src/page-admin.pug @@ -1,12 +1,12 @@ .views-container.sidebar-is-closed 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 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 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 nav.jsRightMenu(role='navigation') solid-router(default-route='admin-circles') diff --git a/src/page-circle.pug b/src/page-circle.pug index 5ca2271..210491f 100644 --- a/src/page-circle.pug +++ b/src/page-circle.pug @@ -12,15 +12,15 @@ button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU div.content-box__height 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 - #circle-information.content-box__height(hidden) + #circle-information.content-box__height(hidden, data-view="circle-information") include views/circle/page-circle-profile.pug - #circle-events(hidden) + #circle-events(hidden, data-view="circle-events") include views/circle/page-circle-events.pug - #circle-resources(hidden) + #circle-resources(hidden, data-view="circle-resources") include views/circle/page-circle-resources.pug - #circle-polls(hidden) + #circle-polls(hidden, data-view="circle-polls") include views/circle/page-circle-polls.pug nav.jsRightMenu(role='navigation') diff --git a/src/page-project.pug b/src/page-project.pug index 3c10265..d8e482f 100644 --- a/src/page-project.pug +++ b/src/page-project.pug @@ -16,11 +16,11 @@ button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle MENU div.content-box__height 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 - #project-information.content-box__height(hidden) + #project-information.content-box__height(hidden, data-view="project-information") include views/project/page-project-profile.pug - #project-picture(hidden) + #project-picture(hidden, data-view="project-picture") include views/project/page-project-picture.pug nav.jsRightMenu(role='navigation') diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug index a75f432..9a2e73c 100644 --- a/src/views/admin/page-admin-circles.pug +++ b/src/views/admin/page-admin-circles.pug @@ -10,7 +10,7 @@ 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 solid-widget(name='hubl-circle-owner') @@ -120,5 +120,5 @@ 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 diff --git a/src/views/admin/page-admin-communities.pug b/src/views/admin/page-admin-communities.pug index b5dce38..6596e36 100644 --- a/src/views/admin/page-admin-communities.pug +++ b/src/views/admin/page-admin-communities.pug @@ -18,7 +18,7 @@ solid-ac-checker(data-src="${value}", nested-field="members", no-permission='acl:Append') 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.admin-header.flex h3 Communautés @@ -49,5 +49,5 @@ 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 diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug index d984c27..29d689c 100644 --- a/src/views/admin/page-admin-projects.pug +++ b/src/views/admin/page-admin-projects.pug @@ -8,10 +8,10 @@ h1.without-margin Administration 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 - #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 div.content-box__info.flex @@ -144,5 +144,5 @@ div div - #admin-project-create(hidden) + #admin-project-create(hidden, data-view="admin-project-create") include page-admin-projects-create.pug \ No newline at end of file diff --git a/src/views/circle/page-circle-left.pug b/src/views/circle/page-circle-left.pug index 5ecf22c..99f27dd 100644 --- a/src/views/circle/page-circle-left.pug +++ b/src/views/circle/page-circle-left.pug @@ -1,4 +1,4 @@ -#circle-left(hidden) +#circle-left(hidden, data-view="circle-left") div.content-box__info.flex(style="padding: 15px") p Tu as quitté ce cercle. diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index 4bcfeeb..ee2cf06 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -2,7 +2,7 @@ solid-router(default-route='circle-profile', hidden) solid-route(name='circle-profile') solid-route(name='circle-edit') -#circle-profile(hidden) +#circle-profile(hidden, data-view="circle-profile") solid-widget(name='hubl-circle-team-contact') 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 diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index bb1b7a7..150ad9f 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -2,7 +2,7 @@ solid-router(default-route='project-profile', hidden) solid-route(name='project-profile') solid-route(name='project-edit') -#project-profile(hidden) +#project-profile(hidden, data-view="project-profile") include ../../templates/hubl-captain.pug 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' ) -#project-edit.content-box__height(hidden) +#project-edit.content-box__height(hidden, data-view="project-edit") include page-project-edit.pug