diff --git a/config.sample.federated.json b/config.sample.federated.json index 57aa616..f37a338 100644 --- a/config.sample.federated.json +++ b/config.sample.federated.json @@ -9,18 +9,26 @@ "publicDirectory": false, "endpoints": { "get": { + "dashboards": "http://localhost:8000/dashboards/", + "groups": "http://localhost:8000/groups/", "circles": "http://localhost:8000/circles/", "projects": "http://localhost:8000/projects/", "customers": "http://localhost:8000/customers/", + "businessproviders": "http://localhost:8000/sources/businessproviders/", + "skills": "http://localhost:8000/sources/skills/", "events": "http://localhost:8000/events/", "typeevents": "http://localhost:8000/typeevents/", "users": "http://localhost:8000/users/", "uploads": "http://localhost:8000/upload/" }, "post": { + "dashboards": "http://localhost:8000/dashboards/", + "groups": "http://localhost:8000/groups/", "circles": "http://localhost:8000/circles/", "projects": "http://localhost:8000/projects/", "customers": "http://localhost:8000/customers/", + "businessproviders": "http://localhost:8000/sources/businessproviders/", + "skills": "http://localhost:8000/sources/skills/", "events": "http://localhost:8000/events/", "typeevents": "http://localhost:8000/typeevents/", "users": "http://localhost:8000/users/", diff --git a/config.sample.json b/config.sample.json index 1741c1c..61a14c9 100644 --- a/config.sample.json +++ b/config.sample.json @@ -8,9 +8,13 @@ "authorityName": "djangoldp-server-name", "publicDirectory": false, "endpoints": { + "dashboards": "http://localhost:8000/dashboards/", + "groups": "http://localhost:8000/groups/", "circles": "http://localhost:8000/circles/", "projects": "http://localhost:8000/projects/", "customers": "http://localhost:8000/customers/", + "businessproviders": "http://localhost:8000/sources/businessproviders/", + "skills": "http://localhost:8000/sources/skills/", "events": "http://localhost:8000/events/", "typeevents": "http://localhost:8000/typeevents/", "users": "http://localhost:8000/users/", diff --git a/src/dependencies.pug b/src/dependencies.pug index 9efccab..2e7f26f 100644 --- a/src/dependencies.pug +++ b/src/dependencies.pug @@ -1,54 +1,6 @@ script(src="/scripts/index.js") //- 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") -<<<<<<< HEAD - if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) -======= - if endpoints.dashboard || (endpoints.get && endpoints.get.dashboard) ->>>>>>> 7e58f36... update: test in dependencies - script(type="module" src="/lib/sib-dashboard/sib-dashboard.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.5") - 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") -<<<<<<< HEAD - if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) - script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1") -======= - if endpoints.dashboard || (endpoints.get && endpoints.get.dashboard) - script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1") - - - - - -//- script(src="/scripts/index.js") - -//- 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") @@ -62,6 +14,8 @@ if libLocal 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") + if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) + script(type="module" src="/lib/sib-dashboard/sib-dashboard.js") else script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8") script(type="module" src="https://unpkg.com/@startinblox/core@0.9") @@ -76,15 +30,8 @@ else 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") - -script(type="module" src="/lib/sib-dashboard/sib-dashboard.js") - - - - - - ->>>>>>> 7e58f36... update: test in dependencies + if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) + script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1") //- Stylesheets link(rel='stylesheet', href='/styles/index.css') diff --git a/src/index.pug b/src/index.pug index 2ffceea..a6fd51f 100644 --- a/src/index.pug +++ b/src/index.pug @@ -18,7 +18,7 @@ html(lang="en") include menu-left.pug div#viewport - if endpoints.dashboard || (endpoints.get && endpoints.get.dashboard) + if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) #dashboard(hidden).no-sidebar include page-dashboard.pug diff --git a/src/menu-left.pug b/src/menu-left.pug index b3e9a36..b5ffa8c 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -31,7 +31,7 @@ sib-widget(name='menu-fix-url-project') nav#main__menu.jsLeftMenu sib-router#navbar-router(default-route='dashboard') - if endpoints.dashboard || (endpoints.get && endpoints.get.dashboard) + if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards) sib-route.menu(name='dashboard') div.menu-label Dashboard div.menu-icon.icon-dashboard diff --git a/src/page-dashboard.pug b/src/page-dashboard.pug index 2c6e8ea..15444c2 100644 --- a/src/page-dashboard.pug +++ b/src/page-dashboard.pug @@ -1,5 +1,5 @@ .views-container h2 Dashboard sib-dashboard( - data-src=`${endpoints.dashboard || endpoints.get.dashboard}` + data-src=`${endpoints.dashboards || endpoints.get.dashboards}` )