Merge branch 'feature/dashboard' of git.startinblox.com:applications/sib-app into feature/dashboard
This commit is contained in:
commit
4d47402c86
@ -9,18 +9,26 @@
|
|||||||
"publicDirectory": false,
|
"publicDirectory": false,
|
||||||
"endpoints": {
|
"endpoints": {
|
||||||
"get": {
|
"get": {
|
||||||
|
"dashboards": "http://localhost:8000/dashboards/",
|
||||||
|
"groups": "http://localhost:8000/groups/",
|
||||||
"circles": "http://localhost:8000/circles/",
|
"circles": "http://localhost:8000/circles/",
|
||||||
"projects": "http://localhost:8000/projects/",
|
"projects": "http://localhost:8000/projects/",
|
||||||
"customers": "http://localhost:8000/customers/",
|
"customers": "http://localhost:8000/customers/",
|
||||||
|
"businessproviders": "http://localhost:8000/sources/businessproviders/",
|
||||||
|
"skills": "http://localhost:8000/sources/skills/",
|
||||||
"events": "http://localhost:8000/events/",
|
"events": "http://localhost:8000/events/",
|
||||||
"typeevents": "http://localhost:8000/typeevents/",
|
"typeevents": "http://localhost:8000/typeevents/",
|
||||||
"users": "http://localhost:8000/users/",
|
"users": "http://localhost:8000/users/",
|
||||||
"uploads": "http://localhost:8000/upload/"
|
"uploads": "http://localhost:8000/upload/"
|
||||||
},
|
},
|
||||||
"post": {
|
"post": {
|
||||||
|
"dashboards": "http://localhost:8000/dashboards/",
|
||||||
|
"groups": "http://localhost:8000/groups/",
|
||||||
"circles": "http://localhost:8000/circles/",
|
"circles": "http://localhost:8000/circles/",
|
||||||
"projects": "http://localhost:8000/projects/",
|
"projects": "http://localhost:8000/projects/",
|
||||||
"customers": "http://localhost:8000/customers/",
|
"customers": "http://localhost:8000/customers/",
|
||||||
|
"businessproviders": "http://localhost:8000/sources/businessproviders/",
|
||||||
|
"skills": "http://localhost:8000/sources/skills/",
|
||||||
"events": "http://localhost:8000/events/",
|
"events": "http://localhost:8000/events/",
|
||||||
"typeevents": "http://localhost:8000/typeevents/",
|
"typeevents": "http://localhost:8000/typeevents/",
|
||||||
"users": "http://localhost:8000/users/",
|
"users": "http://localhost:8000/users/",
|
||||||
|
@ -8,9 +8,13 @@
|
|||||||
"authorityName": "djangoldp-server-name",
|
"authorityName": "djangoldp-server-name",
|
||||||
"publicDirectory": false,
|
"publicDirectory": false,
|
||||||
"endpoints": {
|
"endpoints": {
|
||||||
|
"dashboards": "http://localhost:8000/dashboards/",
|
||||||
|
"groups": "http://localhost:8000/groups/",
|
||||||
"circles": "http://localhost:8000/circles/",
|
"circles": "http://localhost:8000/circles/",
|
||||||
"projects": "http://localhost:8000/projects/",
|
"projects": "http://localhost:8000/projects/",
|
||||||
"customers": "http://localhost:8000/customers/",
|
"customers": "http://localhost:8000/customers/",
|
||||||
|
"businessproviders": "http://localhost:8000/sources/businessproviders/",
|
||||||
|
"skills": "http://localhost:8000/sources/skills/",
|
||||||
"events": "http://localhost:8000/events/",
|
"events": "http://localhost:8000/events/",
|
||||||
"typeevents": "http://localhost:8000/typeevents/",
|
"typeevents": "http://localhost:8000/typeevents/",
|
||||||
"users": "http://localhost:8000/users/",
|
"users": "http://localhost:8000/users/",
|
||||||
|
@ -14,7 +14,7 @@ if libLocal
|
|||||||
script(type="module" src="/lib/sib-conversation/sib-conversation.js")
|
script(type="module" src="/lib/sib-conversation/sib-conversation.js")
|
||||||
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
|
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
|
||||||
script(type="module" src="/lib/sib-directory/sib-directory.js")
|
script(type="module" src="/lib/sib-directory/sib-directory.js")
|
||||||
if endpoints.dashboard || (endpoints.get && endpoints.get.dashboard)
|
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
|
||||||
script(type="module" src="/lib/sib-dashboard/sib-dashboard.js")
|
script(type="module" src="/lib/sib-dashboard/sib-dashboard.js")
|
||||||
else
|
else
|
||||||
script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8")
|
script(type="module" src="https://unpkg.com/@startinblox/oidc@0.8")
|
||||||
@ -30,7 +30,7 @@ else
|
|||||||
script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
|
script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
|
||||||
if publicDirectory && (endpoints.users || (endpoints.get && endpoints.get.users))
|
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="https://unpkg.com/@startinblox/component-directory@0.3")
|
||||||
if endpoints.dashboard || (endpoints.get && endpoints.get.dashboard)
|
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
|
||||||
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1")
|
script(type="module" src="https://unpkg.com/@startinblox/component-dashboard@0.1")
|
||||||
|
|
||||||
//- Stylesheets
|
//- Stylesheets
|
||||||
|
@ -18,7 +18,7 @@ html(lang="en")
|
|||||||
include menu-left.pug
|
include menu-left.pug
|
||||||
div#viewport
|
div#viewport
|
||||||
|
|
||||||
if endpoints.dashboard || (endpoints.get && endpoints.get.dashboard)
|
if endpoints.dashboards || (endpoints.get && endpoints.get.dashboards)
|
||||||
#dashboard(hidden).no-sidebar
|
#dashboard(hidden).no-sidebar
|
||||||
include page-dashboard.pug
|
include page-dashboard.pug
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ sib-widget(name='menu-fix-url-project')
|
|||||||
|
|
||||||
nav#main__menu.jsLeftMenu
|
nav#main__menu.jsLeftMenu
|
||||||
sib-router#navbar-router(default-route='dashboard')
|
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')
|
sib-route.menu(name='dashboard')
|
||||||
div.menu-label Dashboard
|
div.menu-label Dashboard
|
||||||
div.menu-icon.icon-dashboard
|
div.menu-icon.icon-dashboard
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
.views-container
|
.views-container
|
||||||
h2 Dashboard
|
h2 Dashboard
|
||||||
sib-dashboard(
|
sib-dashboard(
|
||||||
data-src=`${endpoints.dashboard || endpoints.get.dashboard}`
|
data-src=`${endpoints.dashboards || endpoints.get.dashboards}`
|
||||||
)
|
)
|
||||||
|
@ -22,4 +22,5 @@ div#viewport {
|
|||||||
@import 'layout/circle/index';
|
@import 'layout/circle/index';
|
||||||
@import 'layout/user/index';
|
@import 'layout/user/index';
|
||||||
@import 'layout/events/index';
|
@import 'layout/events/index';
|
||||||
|
@import 'layout/dashboard/index';
|
||||||
}
|
}
|
1
src/styles/layout/dashboard/_index.scss
Normal file
1
src/styles/layout/dashboard/_index.scss
Normal file
@ -0,0 +1 @@
|
|||||||
|
@import 'dashboard.scss';
|
3
src/styles/layout/dashboard/dashboard.scss
Normal file
3
src/styles/layout/dashboard/dashboard.scss
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
.dashboard>div {
|
||||||
|
margin: 0 2px;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user