From 250192ef514a9bcc8c8b3d689e1dc8def0c7646b Mon Sep 17 00:00:00 2001
From: Marjolaine Le Bon <marjolaine@happy-dev.fr>
Date: Tue, 11 Aug 2020 13:01:13 +0200
Subject: [PATCH] update: integrations events and resources on circles
---
src/menu-left.pug | 2 +-
src/page-circle.pug | 8 ++++----
src/page-events.pug | 1 +
src/page-resources.pug | 1 +
src/styles/base/menu-left.scss | 9 +++++++++
src/styles/layout/events/events.scss | 15 +++++++++------
src/styles/layout/resources/resources.scss | 6 ++++++
src/views/circle/page-circle-events.pug | 15 +++++++++------
src/views/circle/page-circle-resources.pug | 16 ++++++++++------
9 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/src/menu-left.pug b/src/menu-left.pug
index ae725762..14bb67b0 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -70,7 +70,7 @@ solid-router#navbar-router(default-route='dashboard')
div.menu-icon.icon-calendar
div.divider
if endpoints.resources || (endpoints.get && endpoints.get.resources)
- sib-route.menu(name='resources')
+ solid-route.menu(name='resources')
div.menu-label Ressources
div.menu-icon.icon-docs
div.divider
diff --git a/src/page-circle.pug b/src/page-circle.pug
index 7286b46d..3b167d7d 100644
--- a/src/page-circle.pug
+++ b/src/page-circle.pug
@@ -32,10 +32,10 @@ nav.jsRightMenu(role='navigation')
solid-route(name='circle-information')
li
a Information
- sib-route(name='circle-events' use-id)
- li
- a Events
- sib-route(name='circle-resources' use-id)
+ solid-route(name='circle-resources' use-id)
li
a Resources
+ solid-route(name='circle-events' use-id)
+ li
+ a Events
diff --git a/src/page-events.pug b/src/page-events.pug
index cea4a6c8..865da57e 100644
--- a/src/page-events.pug
+++ b/src/page-events.pug
@@ -1,5 +1,6 @@
.views-container
sib-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.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)}`
)
\ No newline at end of file
diff --git a/src/page-resources.pug b/src/page-resources.pug
index 9f6220e9..bda242a7 100644
--- a/src/page-resources.pug
+++ b/src/page-resources.pug
@@ -2,5 +2,6 @@
sib-resource(data-src=`${endpoints.resources || (endpoints.get && endpoints.get.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)}`
)
\ No newline at end of file
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 7b070ed6..4a876f24 100644
--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -46,6 +46,10 @@
background-color: var(--color-menu-badge-background);
}
}
+ &[name="resources"][active] .menu-icon:before,
+ &[name="events"][active] .menu-icon:before {
+ background-color: transparent;
+ }
.menu-icon {
align-items: center;
@@ -88,6 +92,11 @@
>solid-display {
display: block;
}
+ &[name="events"], &[name="resources"] {
+ .menu-label {
+ width: 9.9em;
+ }
+ }
}
.sub-menu {
diff --git a/src/styles/layout/events/events.scss b/src/styles/layout/events/events.scss
index cda12244..af9af2e3 100644
--- a/src/styles/layout/events/events.scss
+++ b/src/styles/layout/events/events.scss
@@ -1,4 +1,4 @@
-#events {
+#events, #circle-events {
width: 100%;
font-family: "Facit";
font-weight: 400;
@@ -16,10 +16,12 @@
.event-place-name {
font-weight: 700;
}
- #listevents [name="name"],
+ #listevents, #circle-listevents {
+ [name="name"],
solid-display-link-event .mdi::before {
color: #C4262E;
}
+ }
.event-place-name,
.nextevent-startdate,
solid-display-link-event {
@@ -30,12 +32,13 @@
font-weight: 400;
.page-title {
font-family: "RefrigeratorDelxW01Bold";
- font-size: 3.2rem;
- line-height: 3.8rem;
- color: #063B5C;
+ font-size: 3.2rem;
+ line-height: 3.8rem;
+ color: #063B5C;
}
}
- #listevents {
+ #listevents,
+ #circle-listevents {
.newtype .button{
font-size: 1.2rem;
width: max-content;
diff --git a/src/styles/layout/resources/resources.scss b/src/styles/layout/resources/resources.scss
index 0f603ee8..a72abe2c 100644
--- a/src/styles/layout/resources/resources.scss
+++ b/src/styles/layout/resources/resources.scss
@@ -7,6 +7,12 @@
background-color: #F0F3F6;
.sib-resource {
font-family: "Facit";
+ .page-title {
+ font-family: "RefrigeratorDelxW01Bold";
+ font-size: 3.2rem;
+ line-height: 3.8rem;
+ color: #063B5C;
+ }
.red-button {
background-color: #C4262E;
}
diff --git a/src/views/circle/page-circle-events.pug b/src/views/circle/page-circle-events.pug
index 9acc4f82..beba9b6c 100644
--- a/src/views/circle/page-circle-events.pug
+++ b/src/views/circle/page-circle-events.pug
@@ -1,6 +1,9 @@
-sib-display(
- class='w700'
- bind-resources
- nested-field="events"
- fields='name, shortDescription, startDate'
-)
\ No newline at end of file
+#circle-listevents
+ sib-event(
+ class='w700'
+ bind-resources
+ 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)}`
+ )
\ No newline at end of file
diff --git a/src/views/circle/page-circle-resources.pug b/src/views/circle/page-circle-resources.pug
index 1fb4cdd5..b26eaf6a 100644
--- a/src/views/circle/page-circle-resources.pug
+++ b/src/views/circle/page-circle-resources.pug
@@ -1,6 +1,10 @@
-sib-display(
- class='w700'
- bind-resources
- nested-field="resources"
- fields='name, shortdesc, keywords'
-)
\ No newline at end of file
+#circle-listresources
+ sib-resource(
+ class='w700'
+ bind-resources
+ 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)}`
+ )
\ No newline at end of file
--
GitLab