update: integrations events and resources on circles

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

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
       

src/page-events.pug

 .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

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

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 {

src/styles/layout/events/events.scss

-#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;

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;
             }

src/views/circle/page-circle-events.pug

-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

src/views/circle/page-circle-resources.pug

-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