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

update: integrations events and resources on circles

This commit is contained in:
Marjolaine Le Bon 2020-08-11 13:01:13 +02:00
parent 415f06c36e
commit 250192ef51
9 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/menu-left.pug
View File

@ -70,7 +70,7 @@ solid-router#navbar-router(default-route='dashboard')
div.menu-icon.icon-calendar div.menu-icon.icon-calendar
div.divider div.divider
if endpoints.resources || (endpoints.get && endpoints.get.resources) if endpoints.resources || (endpoints.get && endpoints.get.resources)
sib-route.menu(name='resources') solid-route.menu(name='resources')
div.menu-label Ressources div.menu-label Ressources
div.menu-icon.icon-docs div.menu-icon.icon-docs
div.divider div.divider

8
src/page-circle.pug
View File

@ -32,10 +32,10 @@ nav.jsRightMenu(role='navigation')
solid-route(name='circle-information') solid-route(name='circle-information')
li li
a Information a Information
sib-route(name='circle-events' use-id) solid-route(name='circle-resources' use-id)
li
a Events
sib-route(name='circle-resources' use-id)
li li
a Resources a Resources
solid-route(name='circle-events' use-id)
li
a Events

1
src/page-events.pug
View File

@ -1,5 +1,6 @@
.views-container .views-container
sib-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}` sib-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}`
range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}` range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
) )

1
src/page-resources.pug
View File

@ -2,5 +2,6 @@
sib-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}` sib-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.resources)}`
range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}` range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}`
range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}` range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}` upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
) )

9
src/styles/base/menu-left.scss
View File

@ -46,6 +46,10 @@
background-color: var(--color-menu-badge-background); background-color: var(--color-menu-badge-background);
} }
} }
&[name="resources"][active] .menu-icon:before,
&[name="events"][active] .menu-icon:before {
background-color: transparent;
}
.menu-icon { .menu-icon {
align-items: center; align-items: center;
@ -88,6 +92,11 @@
>solid-display { >solid-display {
display: block; display: block;
} }
&[name="events"], &[name="resources"] {
.menu-label {
width: 9.9em;
}
}
} }
.sub-menu { .sub-menu {

15
src/styles/layout/events/events.scss
View File

@ -1,4 +1,4 @@
#events { #events, #circle-events {
width: 100%; width: 100%;
font-family: "Facit"; font-family: "Facit";
font-weight: 400; font-weight: 400;
@ -16,10 +16,12 @@
.event-place-name { .event-place-name {
font-weight: 700; font-weight: 700;
} }
#listevents [name="name"], #listevents, #circle-listevents {
[name="name"],
solid-display-link-event .mdi::before { solid-display-link-event .mdi::before {
color: #C4262E; color: #C4262E;
} }
}
.event-place-name, .event-place-name,
.nextevent-startdate, .nextevent-startdate,
solid-display-link-event { solid-display-link-event {
@ -30,12 +32,13 @@
font-weight: 400; font-weight: 400;
.page-title { .page-title {
font-family: "RefrigeratorDelxW01Bold"; font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem; font-size: 3.2rem;
line-height: 3.8rem; line-height: 3.8rem;
color: #063B5C; color: #063B5C;
} }
} }
#listevents { #listevents,
#circle-listevents {
.newtype .button{ .newtype .button{
font-size: 1.2rem; font-size: 1.2rem;
width: max-content; width: max-content;

6
src/styles/layout/resources/resources.scss
View File

@ -7,6 +7,12 @@
background-color: #F0F3F6; background-color: #F0F3F6;
.sib-resource { .sib-resource {
font-family: "Facit"; font-family: "Facit";
.page-title {
font-family: "RefrigeratorDelxW01Bold";
font-size: 3.2rem;
line-height: 3.8rem;
color: #063B5C;
}
.red-button { .red-button {
background-color: #C4262E; background-color: #C4262E;
} }

15
src/views/circle/page-circle-events.pug
View File

@ -1,6 +1,9 @@
sib-display( #circle-listevents
class='w700' sib-event(
bind-resources class='w700'
nested-field="events" bind-resources
fields='name, shortDescription, startDate' nested-field="events"
) range-event-type=`${endpoints.typeevents || (endpoints.get && endpoints.get.typeevents)}`
range-event-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
)

16
src/views/circle/page-circle-resources.pug
View File

@ -1,6 +1,10 @@
sib-display( #circle-listresources
class='w700' sib-resource(
bind-resources class='w700'
nested-field="resources" bind-resources
fields='name, shortdesc, keywords' nested-field="resources"
) range-resource-type=`${endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes)}`
range-resource-keyword=`${endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)}`
range-resource-circle=`${endpoints.circles || (endpoints.get && endpoints.get.circles)}`
upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
)