Compare revisions

Benoit Alessandroni · Marjolaine Le Bon · Marjolaine Le Bon · Benoit Alessandroni · Benoit Alessandroni · Marjolaine Le Bon
--- a/README.md
+++ b/README.md
@@ -170,22 +170,6 @@ On `config.json`:

 A [sample fixture](https://git.startinblox.com/djangoldp-packages/djangoldp-dashboard/blob/master/djangoldp_dashboard/fixtures/sample.json) can be loaded with `./manage.py loaddata path/to/djangoldp_dashboard/fixtures/sample.json`.

-### Events
-
-Events allow to create and manage instance-level evenement. To activate them, you need:
-
-On Server: `djangoldp_event`, `djangoldp_upload` packages
-
-On `config.json`:
-
-```json
-  "endpoints": {
-      "events": "http://server.url/events/",
-      "typeevents": "http://server.url/typeevents/",
-    "uploads": "http://server.url/upload/"
-  }
-```
-
 ### Project

 Project are a private group chat including Customer and Business Provider management. To activate them, you need:
@@ -236,6 +220,57 @@ On `config.json`:
  }
 ```

+### Events
+
+The events module includes a listing of upcoming events and the capability to create new ones. 
+This module will also work inside the circles.
+To activate it, you need:
+
+On Server: `djangoldp_event`, `djangoldp_upload` packages
+
+On `config.json`:
+
+```json
+  "endpoints": {
+    "events":"http://server.url/events/",
+    "typeevents":"http://server.url/typeevents/",
+    "uploads": "http://server.url/upload/"
+  }
+```
+
+### Resources
+
+The resources module includes a listing of indexed resources and the capability to index new ones. 
+This module will also work inside the circles.
+To activate it, you need:
+
+On Server: `djangoldp_resource`, `djangoldp_upload`, `djangoldp_conversation` packages
+
+On `config.json`:
+
+```json
+  "endpoints": {
+    "resources":"http://server.url/resources/",
+    "resourceskeywords":"http://server.url/keywords/",
+    "resourcestypes":"http://server.url/types/",
+    "uploads": "http://server.url/upload/"
+  }
+```
+
+### Polls
+
+The polls module allows user to create polls related (or not) to circles. To activate it, you need:
+
+On Server: `djangoldp_polls`, `djangoldp_upload`, `djangoldp_conversation` packages
+
+On `config.json`:
+
+```json
+  "endpoints": {
+    "polls":"http://server.url/polls/"
+  }
+```
+
 ## Use with docker

 ### Multi services

--- a/package-lock.json
+++ b/package-lock.json
--- a/src/dependencies.pug
+++ b/src/dependencies.pug
@@ -16,9 +16,13 @@ script(type="module" src="https://unpkg.com/@startinblox/router@0.9" defer)
 script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.7" defer)
 //- script(type="module" src="/lib/sib-notifications/index.js" defer)

-if endpoints.events || (endpoints.get && endpoints.get.events)
-    script(type="module" src="https://unpkg.com/@startinblox/component-event@0.1" defer)
-    //- script(type="module" src="/lib/sib-event/sib-event.js" defer)
+if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents))
+    script(type="module" src="https://unpkg.com/@startinblox/component-event@1.2" defer)
+    //- script(type="module" src="/lib/sib-event-component/sib-event.js" defer)
+
+if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes))
+    script(type="module" src="https://unpkg.com/@startinblox/component-resource@1.0" defer)
+    //- script(type="module" src="/lib/sib-resource/sib-resource.js" defer)

 if endpoints.joboffers || (endpoints.get && endpoints.get.joboffers)
    script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.8" defer)
@@ -36,6 +40,10 @@ if endpoints.users || (endpoints.get && endpoints.get.users)
    script(type="module" src="https://unpkg.com/@startinblox/component-chat@1.1" defer)
    //- script(type="module" src="/lib/solid-xmpp-chat/dist/index.js" defer)

+if endpoints.polls || (endpoints.get && endpoints.get.polls)
+    script(type="module" src="https://unpkg.com/@startinblox/component-poll@1.0" defer)
+    //- script(type="module" src="/lib/sib-polls-component/index.js" defer)
+
 script(src="https://cdn.jsdelivr.net/npm/sweetalert2@10")

 script(src="/scripts/index.js" defer)

--- a/src/images/appointment.svg
+++ b/src/images/appointment.svg
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="34px" height="34px" viewBox="0 0 34 34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>003-appointment</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Circle---Survey-Vote" transform="translate(-1388.000000, -440.000000)" fill="#3C3F57">
+            <g id="Menu-droite" transform="translate(1370.000000, 72.000000)">
+                <g id="003-appointment" transform="translate(18.000000, 368.000000)">
+                    <path d="M30.6796875,2.921875 L27.5143008,2.921875 L27.5143008,1.9921875 C27.5143008,0.893695312 26.6206055,0 25.5221133,0 C24.4236211,0 23.5299258,0.893695312 23.5299258,1.9921875 L23.5299258,2.921875 L12.3736758,2.921875 L12.3736758,1.9921875 C12.3736758,0.893695312 11.4799805,0 10.3814883,0 C9.28299609,0 8.38930078,0.893695312 8.38930078,1.9921875 L8.38930078,2.94644531 C8.33285547,2.93083984 8.2736875,2.921875 8.21226172,2.921875 L5.56637109,2.921875 C3.73555078,2.921875 2.24605859,4.41136719 2.24605859,6.2421875 L2.24605859,17.5533633 C2.24605859,17.920125 2.54342578,18.2174258 2.91012109,18.2174258 C3.27681641,18.2174258 3.57418359,17.920125 3.57418359,17.5533633 L3.57418359,9.76171875 L27.5143008,9.76171875 C27.8809961,9.76171875 28.1783633,9.46441797 28.1783633,9.09765625 C28.1783633,8.73089453 27.8809961,8.43359375 27.5143008,8.43359375 L3.57418359,8.43359375 L3.57418359,6.2421875 C3.57418359,5.14369531 4.46787891,4.25 5.56637109,4.25 L8.21226172,4.25 C8.2736875,4.25 8.33285547,4.24096875 8.38930078,4.22542969 L8.38930078,5.08007812 C8.38930078,6.17857031 9.28299609,7.07226562 10.3814883,7.07226562 C11.4799805,7.07226562 12.3736758,6.17857031 12.3736758,5.08007812 L12.3736758,4.25 L23.5299258,4.25 L23.5299258,5.08007812 C23.5299258,6.17857031 24.4236211,7.07226562 25.5221133,7.07226562 C26.6206055,7.07226562 27.5143008,6.17857031 27.5143008,5.08007812 L27.5143008,4.25 L30.6796875,4.25 C31.7781797,4.25 32.671875,5.14369531 32.671875,6.2421875 L32.671875,31.4761641 C32.671875,32.1354453 32.1355117,32.671875 31.4761641,32.671875 C30.8168164,32.671875 30.2804531,32.1354453 30.2804531,31.4761641 L30.2804531,29.7583008 C30.2804531,29.3915391 29.9830859,29.0942383 29.6163906,29.0942383 L21.8919492,29.0942383 C21.5252539,29.0942383 21.2278867,29.3915391 21.2278867,29.7583008 C21.2278867,30.1250625 21.5252539,30.4223633 21.8919492,30.4223633 L28.9523281,30.4223633 L28.9523281,31.4761641 C28.9523281,31.9085352 29.0617656,32.3157383 29.2541445,32.671875 L2.5234375,32.671875 C1.86435547,32.671875 1.328125,32.1356445 1.328125,31.4765625 L1.328125,30.4223633 L16.1915039,30.4223633 C16.5581992,30.4223633 16.8555664,30.1250625 16.8555664,29.7583008 C16.8555664,29.3915391 16.5581992,29.0942383 16.1915039,29.0942383 L9.55645703,29.0942383 C10.7168398,28.0948906 11.4536836,26.6166875 11.4536836,24.96875 C11.4536836,21.9661914 9.01092969,19.5234375 6.00837109,19.5234375 C3.0058125,19.5234375 0.563058594,21.9661914 0.563058594,24.96875 C0.563058594,26.6166875 1.29990234,28.0948906 2.46028516,29.0942383 L0.6640625,29.0942383 C0.297367187,29.0942383 0,29.3915391 0,29.7583008 L0,31.4765625 C0,32.8679727 1.13202734,34 2.5234375,34 L31.4761641,34 C32.8677734,34 34,32.8678398 34,31.4761641 L34,6.2421875 C34,4.41136719 32.5105078,2.921875 30.6796875,2.921875 Z M11.0455508,5.08007812 C11.0455508,5.44624219 10.7476523,5.74414062 10.3814883,5.74414062 C10.0153242,5.74414062 9.71742578,5.44624219 9.71742578,5.08007812 L9.71742578,1.9921875 C9.71742578,1.62602344 10.0153242,1.328125 10.3814883,1.328125 C10.7476523,1.328125 11.0455508,1.62602344 11.0455508,1.9921875 L11.0455508,5.08007812 Z M26.1861758,5.08007812 C26.1861758,5.44624219 25.8882773,5.74414062 25.5221133,5.74414062 C25.1559492,5.74414062 24.8580508,5.44624219 24.8580508,5.08007812 L24.8580508,1.9921875 C24.8580508,1.62602344 25.1559492,1.328125 25.5221133,1.328125 C25.8882773,1.328125 26.1861758,1.62602344 26.1861758,1.9921875 L26.1861758,5.08007812 Z M1.89118359,24.96875 C1.89118359,22.6985195 3.73814062,20.8515625 6.00837109,20.8515625 C8.27860156,20.8515625 10.1255586,22.6985195 10.1255586,24.96875 C10.1255586,27.2389805 8.27860156,29.0859375 6.00837109,29.0859375 C3.73814062,29.0859375 1.89118359,27.2389805 1.89118359,24.96875 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M31.200865,8.74905 C31.04285,8.59095 30.82355,8.5 30.6,8.5 C30.376365,8.5 30.15715,8.59095 29.99905,8.74905 C29.84095,8.90715 29.75,9.12645 29.75,9.35 C29.75,9.57355 29.840865,9.79285 29.99905,9.95095 C30.157235,10.10905 30.376365,10.2 30.6,10.2 C30.82355,10.2 31.04285,10.10905 31.200865,9.95095 C31.358965,9.79285 31.45,9.57355 31.45,9.35 C31.45,9.12645 31.35905,8.90715 31.200865,8.74905 Z" id="Path"></path>
+                    <path d="M20.150865,29.1483242 C19.99285,28.9901451 19.77355,28.9 19.55,28.9 C19.32645,28.9 19.10715,28.9901451 18.94905,29.1483242 C18.79095,29.3073537 18.7,29.525913 18.7,29.7495748 C18.7,29.974087 18.790865,30.1926463 18.94905,30.3516758 C19.10715,30.5098549 19.32645,30.6 19.55,30.6 C19.77355,30.6 19.99285,30.5098549 20.150865,30.3516758 C20.308965,30.1926463 20.4,29.9732366 20.4,29.7495748 C20.4,29.525913 20.30905,29.3073537 20.150865,29.1483242 Z" id="Path"></path>
+                    <path d="M15.3,20.4 C13.8939434,20.4 12.75,21.5439434 12.75,22.95 C12.75,24.3560566 13.8939434,25.5 15.3,25.5 C16.7060566,25.5 17.85,24.3560566 17.85,22.95 C17.85,21.5439434 16.7060566,20.4 15.3,20.4 Z M15.3,24.1578947 C14.6339803,24.1578947 14.0921053,23.6160197 14.0921053,22.95 C14.0921053,22.2839803 14.6339803,21.7421053 15.3,21.7421053 C15.9660197,21.7421053 16.5078947,22.2839803 16.5078947,22.95 C16.5078947,23.6160197 15.9660197,24.1578947 15.3,24.1578947 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M21.25,20.4 C19.8439434,20.4 18.7,21.5439434 18.7,22.95 C18.7,24.3560566 19.8439434,25.5 21.25,25.5 C22.6560566,25.5 23.8,24.3560566 23.8,22.95 C23.8,21.5439434 22.6560566,20.4 21.25,20.4 Z M21.25,24.1578947 C20.5839803,24.1578947 20.0421053,23.6160197 20.0421053,22.95 C20.0421053,22.2839803 20.5839803,21.7421053 21.25,21.7421053 C21.9160197,21.7421053 22.4578947,22.2839803 22.4578947,22.95 C22.4578947,23.6160197 21.9160197,24.1578947 21.25,24.1578947 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M27.2,20.4 C25.7939434,20.4 24.65,21.5439434 24.65,22.95 C24.65,24.3560566 25.7939434,25.5 27.2,25.5 C28.6060566,25.5 29.75,24.3560566 29.75,22.95 C29.75,21.5439434 28.6060566,20.4 27.2,20.4 Z M27.2,24.1578947 C26.5339803,24.1578947 25.9921053,23.6160197 25.9921053,22.95 C25.9921053,22.2839803 26.5339803,21.7421053 27.2,21.7421053 C27.8660197,21.7421053 28.4078947,22.2839803 28.4078947,22.95 C28.4078947,23.6160197 27.8660197,24.1578947 27.2,24.1578947 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M8.5,13.6 C7.09394342,13.6 5.95,14.7439434 5.95,16.15 C5.95,17.5560566 7.09394342,18.7 8.5,18.7 C9.90605658,18.7 11.05,17.5560566 11.05,16.15 C11.05,14.7439434 9.90605658,13.6 8.5,13.6 Z M8.5,17.3578947 C7.83398026,17.3578947 7.29210526,16.8160197 7.29210526,16.15 C7.29210526,15.4839803 7.83398026,14.9421053 8.5,14.9421053 C9.16601974,14.9421053 9.70789474,15.4839803 9.70789474,16.15 C9.70789474,16.8160197 9.16601974,17.3578947 8.5,17.3578947 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M21.25,13.6 C19.8439434,13.6 18.7,14.7439434 18.7,16.15 C18.7,17.5560566 19.8439434,18.7 21.25,18.7 C22.6560566,18.7 23.8,17.5560566 23.8,16.15 C23.8,14.7439434 22.6560566,13.6 21.25,13.6 Z M21.25,17.3578947 C20.5839803,17.3578947 20.0421053,16.8160197 20.0421053,16.15 C20.0421053,15.4839803 20.5839803,14.9421053 21.25,14.9421053 C21.9160197,14.9421053 22.4578947,15.4839803 22.4578947,16.15 C22.4578947,16.8160197 21.9160197,17.3578947 21.25,17.3578947 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M27.2,13.6 C25.7939434,13.6 24.65,14.7439434 24.65,16.15 C24.65,17.5560566 25.7939434,18.7 27.2,18.7 C28.6060566,18.7 29.75,17.5560566 29.75,16.15 C29.75,14.7439434 28.6060566,13.6 27.2,13.6 Z M27.2,17.3578947 C26.5339803,17.3578947 25.9921053,16.8160197 25.9921053,16.15 C25.9921053,15.4839803 26.5339803,14.9421053 27.2,14.9421053 C27.8660197,14.9421053 28.4078947,15.4839803 28.4078947,16.15 C28.4078947,16.8160197 27.8660197,17.3578947 27.2,17.3578947 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M15.3,13.6 C13.8939434,13.6 12.75,14.7439434 12.75,16.15 C12.75,17.5560566 13.8939434,18.7 15.3,18.7 C16.7060566,18.7 17.85,17.5560566 17.85,16.15 C17.85,14.7439434 16.7060566,13.6 15.3,13.6 Z M15.3,17.3578947 C14.6339803,17.3578947 14.0921053,16.8160197 14.0921053,16.15 C14.0921053,15.4839803 14.6339803,14.9421053 15.3,14.9421053 C15.9660197,14.9421053 16.5078947,15.4839803 16.5078947,16.15 C16.5078947,16.8160197 15.9660197,17.3578947 15.3,17.3578947 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M8.30810749,23.1587132 C8.05218529,22.8804289 7.63744195,22.8804289 7.38145423,23.1587132 L5.24772092,25.4795545 L4.51854577,24.686462 C4.26262357,24.4081777 3.84788023,24.4081777 3.59189251,24.686462 C3.33603583,24.9647463 3.33603583,25.4159874 3.59189251,25.6943429 L4.78442705,26.991269 C4.90734309,27.1248882 5.07396115,27.2 5.24772092,27.2 C5.42148069,27.2 5.58809876,27.1248882 5.71101479,26.991269 L8.30810749,24.1665229 C8.56396417,23.8882386 8.56396417,23.4369975 8.30810749,23.1587132 Z" id="Path"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
--- a/src/images/file.svg
+++ b/src/images/file.svg
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="25px" height="34px" viewBox="0 0 25 34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>003-file</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Circle---Survey-Vote" transform="translate(-1392.000000, -301.000000)" fill="#3C3F57">
+            <g id="Menu-droite" transform="translate(1370.000000, 72.000000)">
+                <g id="003-file" transform="translate(22.000000, 229.000000)">
+                    <path d="M24.998364,6.68645454 C24.99615,6.48798177 24.9186595,6.29350943 24.7714276,6.14755839 L18.7958697,0.226540272 C18.7956092,0.22628218 18.7954138,0.226217657 18.7951534,0.226024088 C18.6540425,0.0863317813 18.4590791,0 18.2438639,0 L1.64344938,0 C0.737201458,0 0,0.730400422 0,1.62836709 L0,31.4073472 C0,32.3052493 0.73713634,33.0357143 1.64338426,33.0357143 L23.3566077,33.0357143 C24.2627905,33.0357143 25,32.3053139 25,31.4073472 L25,6.69445539 C25,6.69161638 24.9986245,6.68922902 24.998364,6.68645454 Z M19.0244991,2.64099114 L22.3347102,5.9209536 L19.1066781,5.9209536 C19.0614211,5.9209536 19.0244991,5.88436905 19.0244991,5.83952557 L19.0244991,2.64099114 Z M23.4388518,31.4074117 C23.4388518,31.4522552 23.4019299,31.4887752 23.3566729,31.4887752 L1.64344938,31.4887752 C1.59819233,31.4887752 1.56133551,31.4522552 1.56133551,31.4074117 L1.56133551,1.62836709 C1.56133551,1.5835236 1.59819233,1.54700358 1.64344938,1.54700358 L17.4632287,1.54700358 L17.4632287,5.83952557 C17.4632287,6.73742771 18.2004953,7.4680217 19.1067432,7.4680217 L23.4388518,7.4680217 L23.4388518,31.4074117 L23.4388518,31.4074117 Z" id="Shape" fill-rule="nonzero"></path>
+                    <path d="M19.7652516,10.7142857 L6.12766983,10.7142857 C5.70217028,10.7142857 5.35714286,11.1140158 5.35714286,11.6071429 C5.35714286,12.1001954 5.70217028,12.5 6.12766983,12.5 L19.7651873,12.5 C20.1906869,12.5 20.5357143,12.1001954 20.5357143,11.6071429 C20.5357143,11.1140158 20.1906869,10.7142857 19.7652516,10.7142857 Z" id="Path"></path>
+                    <path d="M19.7652516,15.1785714 L6.12766983,15.1785714 C5.70217028,15.1785714 5.35714286,15.578376 5.35714286,16.0714286 C5.35714286,16.5644811 5.70217028,16.9642857 6.12766983,16.9642857 L19.7651873,16.9642857 C20.1906869,16.9642857 20.5357143,16.5644811 20.5357143,16.0714286 C20.5357143,15.578376 20.1906869,15.1785714 19.7652516,15.1785714 Z" id="Path"></path>
+                    <path d="M19.7652516,19.6428571 L6.12766983,19.6428571 C5.70217028,19.6428571 5.35714286,20.0426617 5.35714286,20.5357143 C5.35714286,21.0288413 5.70217028,21.4285714 6.12766983,21.4285714 L19.7651873,21.4285714 C20.1906869,21.4285714 20.5357143,21.0288413 20.5357143,20.5357143 C20.5357143,20.0427362 20.1906869,19.6428571 19.7652516,19.6428571 Z" id="Path"></path>
+                    <path d="M12.6522053,25 L6.09779471,25 C5.68879277,25 5.35714286,25.3998046 5.35714286,25.8928571 C5.35714286,26.3859842 5.68879277,26.7857143 6.09779471,26.7857143 L12.6522053,26.7857143 C13.0612072,26.7857143 13.3928571,26.3859842 13.3928571,25.8928571 C13.3928571,25.3997301 13.0612072,25 12.6522053,25 Z" id="Path"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
--- a/src/images/send.png
+++ b/src/images/send.png
--- a/src/images/vote.svg
+++ b/src/images/vote.svg
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="36px" height="36px" viewBox="0 0 36 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>vote</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Circle---Survey-Vote" transform="translate(-1389.000000, -369.000000)" fill="#3A3A3A" fill-rule="nonzero">
+            <g id="Menu-droite" transform="translate(1370.000000, 72.000000)">
+                <g id="vote" transform="translate(19.000000, 297.000000)">
+                    <path d="M30.7812857,27.8250222 C30.7814286,27.82495 30.7815714,27.8248056 30.7817143,27.8247333 L26.0436429,23.2025111 C25.9105,23.0725833 25.7326429,23 25.5477143,23 L10.4523571,23 C10.2673571,23 10.0895714,23.0725833 9.95642857,23.2025111 L5.21835714,27.8247333 C5.21842857,27.8248778 5.21857143,27.82495 5.21871429,27.8250944 C5.08407143,27.9564667 5,28.1404167 5,28.3444444 L5,35.2777778 C5,35.6765889 5.31985714,36 5.71428571,36 L30.2857143,36 C30.6801429,36 31,35.6765889 31,35.2777778 L31,28.3444444 C31,28.1403444 30.9159286,27.9563944 30.7812857,27.8250222 Z M10.7407857,24.4444444 L25.2592143,24.4444444 L28.5166429,27.6222222 L7.48335714,27.6222222 L10.7407857,24.4444444 Z M29.5714286,34.5555556 L6.42857143,34.5555556 L6.42857143,29.0666667 L29.5714286,29.0666667 L29.5714286,34.5555556 Z" id="XMLID_1190_"></path>
+                    <path d="M23.2857143,26 L15.7142857,26 C15.3198571,26 15,26.2239 15,26.5 C15,26.7761 15.3198571,27 15.7142857,27 L23.2857143,27 C23.6801429,27 24,26.7761 24,26.5 C24,26.2239 23.6801429,26 23.2857143,26 Z" id="XMLID_1195_"></path>
+                    <path d="M18.8435333,4.24970152 L17.4998687,5.9411564 L17.1565345,5.50886918 C16.892056,5.17584854 16.4632269,5.17584854 16.1984097,5.50886918 C15.9338634,5.84188982 15.9338634,6.38188641 16.1984097,6.71490704 L17.0208402,7.7502132 C17.1478631,7.91011428 17.3202076,8 17.4998687,8 C17.6795298,8 17.8518067,7.91011428 17.9788973,7.7502132 L19.8015903,5.45573938 C20.0661366,5.12271874 20.0661366,4.58272216 19.8015903,4.24970152 C19.5370441,3.91676616 19.108215,3.91676616 18.8435333,4.24970152 Z" id="XMLID_1196_"></path>
+                    <path d="M13.6756757,13 L22.3243243,13 C22.6974324,13 23,12.6766611 23,12.2777778 L23,9.38888889 C23,8.99000556 22.6974324,8.66666667 22.3243243,8.66666667 C21.9512162,8.66666667 21.6486486,8.99000556 21.6486486,9.38888889 L21.6486486,11.5555556 L14.3513514,11.5555556 L14.3513514,1.44444444 L21.6486486,1.44444444 L21.6486486,3.61111111 C21.6486486,4.00999444 21.9512162,4.33333333 22.3243243,4.33333333 C22.6974324,4.33333333 23,4.00999444 23,3.61111111 L23,0.722222222 C23,0.323338889 22.6974324,0 22.3243243,0 L13.6756757,0 C13.3025676,0 13,0.323338889 13,0.722222222 L13,12.2777778 C13,12.6766611 13.3025676,13 13.6756757,13 Z" id="XMLID_1197_"></path>
+                    <path d="M28.0320899,14.7792188 L28.2419683,15.5623343 L27.4589009,15.7721471 C27.1287029,15.8605903 26.9327504,16.2000043 27.0212571,16.5301964 C27.0953427,16.8067284 27.3453895,16.9890613 27.618708,16.9890613 C27.6716882,16.9890613 27.7256587,16.9821913 27.7792579,16.9678324 L28.5623871,16.7580196 L28.7722036,17.5411351 C28.8462893,17.8176671 29.0963361,18 29.3696546,18 C29.4226348,18 29.4766053,17.99313 29.5302044,17.9787712 C29.8604024,17.8902661 30.0563549,17.550914 29.9678483,17.2207219 L29.7580317,16.4376683 L30.5410991,16.2278555 C30.8712971,16.1394123 31.0672496,15.7999983 30.9787429,15.4698062 C30.8902363,15.139676 30.5506306,14.9436031 30.2207421,15.0321701 L29.4376748,15.2419829 L29.2277964,14.4588675 C29.1392897,14.1287373 28.7999316,13.9327882 28.4697956,14.0212314 C28.1395357,14.1096746 27.9435832,14.4490267 28.0320899,14.7792188 Z" id="XMLID_1199_"></path>
+                    <path d="M35.9757411,13.1338077 C35.9268679,12.9496301 35.8077085,12.7926262 35.6443001,12.6973024 L27.7582949,8.09645619 C27.4179614,7.89790092 26.9828695,8.01572572 26.7865233,8.35956709 L21.0953277,18.3206867 C21.0009962,18.4858139 20.9753858,18.6819969 21.0242589,18.8661745 C21.0731321,19.050424 21.1922915,19.207356 21.3556999,19.3026798 L29.2417051,23.903526 C29.3537505,23.9688724 29.47604,24 29.5966934,24 C29.842553,24 30.0817255,23.8710325 30.2134767,23.6404151 L35.9046723,13.6792955 C35.9990038,13.5142402 36.0246142,13.3179853 35.9757411,13.1338077 Z M29.3370326,22.2990528 L22.6832424,18.4170888 L27.6630386,9.7010732 L34.3168287,13.5830372 L29.3370326,22.2990528 Z" id="XMLID_1203_"></path>
+                    <path d="M7.29011411,17 C7.43999492,17 7.58875593,16.9679326 7.72080608,16.9055596 C7.91866598,16.8121059 8.06303393,16.6581822 8.12212486,16.4776178 L8.97041577,13.8873437 C9.09359368,13.5114146 8.82087952,13.1249139 8.36133119,13.024201 C7.9014383,12.9234176 7.42957217,13.1466211 7.30639427,13.5225502 L6.68102953,15.4320078 L6.08452114,15.3012713 C5.62531736,15.2004174 5.15276213,15.4236914 5.02958423,15.7996205 C4.90640632,16.1756201 5.17912048,16.5620504 5.63866881,16.6628337 L7.06718795,16.9760375 C7.14049172,16.992036 7.21543212,17 7.29011411,17 Z" id="XMLID_1204_"></path>
+                    <path d="M6.40330662,23 C6.52395996,23 6.64632067,22.9688723 6.75829494,22.9035258 L14.6443001,18.3026704 C14.8077085,18.2073464 14.9269391,18.0503423 14.9757411,17.8661643 C15.0246142,17.6819863 14.9990038,17.4858029 14.9046723,17.3206753 L9.2134767,7.35953586 C9.01705932,7.0156938 8.58196742,6.89794066 8.24170506,7.09642444 L0.355699932,11.6972798 C0.192291479,11.7926038 0.0730609322,11.949608 0.0242589303,12.133786 C-0.0246142116,12.317964 0.000996168453,12.5142192 0.0953277349,12.6792749 L5.7865233,22.6404144 C5.91827447,22.8710323 6.15737583,23 6.40330662,23 Z M8.33696145,8.70097276 L13.3167576,17.4170058 L6.66296741,21.2989775 L1.6831713,12.5829445 L8.33696145,8.70097276 Z" id="XMLID_1207_"></path>
+                    <path d="M12.5,26 C12.3685,26 12.2395,26.05345 12.1465,26.1465 C12.0535,26.23955 12,26.3685 12,26.5 C12,26.632 12.05345,26.7605 12.1465,26.85345 C12.2395,26.94695 12.3685,27 12.5,27 C12.6315,27 12.7605,26.94695 12.85345,26.85345 C12.94645,26.7605 13,26.63195 13,26.5 C13,26.3685 12.9465,26.2395 12.85345,26.1465 C12.7605,26.0535 12.6315,26 12.5,26 Z" id="XMLID_1213_"></path>
+                    <path d="M22.5,6 C22.3685,6 22.2395,6.053 22.1465,6.146 C22.0535,6.2395 22,6.368 22,6.5 C22,6.6315 22.05345,6.7605 22.1465,6.8535 C22.23955,6.9465 22.3685,7 22.5,7 C22.6315,7 22.7605,6.9465 22.85345,6.8535 C22.94645,6.7605 23,6.6315 23,6.5 C23,6.368 22.9465,6.2395 22.85345,6.146 C22.7605,6.053 22.6315,6 22.5,6 Z" id="XMLID_1215_"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
--- a/src/index.pug
+++ b/src/index.pug
@@ -13,6 +13,7 @@ html(lang="en")
    include dependencies.pug
    if clientCSS
      link(rel='stylesheet', href=`${clientCSS}`)
+
  body

    .wrapper
@@ -70,15 +71,22 @@ html(lang="en")
            hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}`)
            hubl-reactivity(bind-user nested-field="circles" target-src=`${endpoints.circles || endpoints.get.circles}joinable/`)
            include page-circle.pug
-
        if endpoints.users || (endpoints.get && endpoints.get.users)
          #messages(hidden).with-sidebar
            include page-messages.pug
+						
+        if endpoints.polls || (endpoints.get && endpoints.get.polls)
+          #polls(hidden).with-sidebar
+            include page-polls.pug

        if endpoints.events || (endpoints.get && endpoints.get.events)
          #events(hidden)
            include page-events.pug

+        if endpoints.resources || (endpoints.get && endpoints.get.resources)
+          #resources(hidden)
+            include page-resources.pug
+
        #admin(hidden).with-sidebar
          include page-admin.pug


--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -66,6 +66,16 @@ solid-router#navbar-router(default-route='dashboard')
      div.menu-label Offres de mission
      div.menu-icon.icon-briefcase
    div.divider
+  if endpoints.resources || (endpoints.get && endpoints.get.resources)
+    solid-route.menu(name='resources')
+      div.menu-label Ressources
+      div.menu-icon.icon-docs
+    div.divider
+  if endpoints.polls || (endpoints.get && endpoints.get.polls)
+    solid-route.menu(name='polls')
+      div.menu-label Gouvernance
+      div.menu-icon.icon-bubbles
+    div.divider
  if endpoints.events || (endpoints.get && endpoints.get.events)
    solid-route.menu(name='events')
      div.menu-label Evènements

--- a/src/page-circle.pug
+++ b/src/page-circle.pug
@@ -16,6 +16,12 @@
          include views/circle/page-circle-chat.pug
        #circle-information.content-box__height(hidden)
          include views/circle/page-circle-profile.pug
+        #circle-events(hidden)
+          include views/circle/page-circle-events.pug
+        #circle-resources(hidden)
+          include views/circle/page-circle-resources.pug
+        #circle-polls(hidden)
+          include views/circle/page-circle-polls.pug

 nav.jsRightMenu(role='navigation')
  solid-router(default-route='circle-chat')
@@ -28,3 +34,16 @@ nav.jsRightMenu(role='navigation')
      solid-route(name='circle-information')
        li
          a Information
+      if (endpoints.resources || (endpoints.get && endpoints.get.resources)) && (endpoints.resourceskeywords || (endpoints.get && endpoints.get.resourceskeywords)) && (endpoints.resourcestypes || (endpoints.get && endpoints.get.resourcestypes))
+        solid-route(name='circle-resources' use-id)
+          li
+            a Resources
+      if (endpoints.events || (endpoints.get && endpoints.get.events)) && (endpoints.typeevents || (endpoints.get && endpoints.get.typeevents))
+        solid-route(name='circle-events' use-id)
+          li
+            a Events
+      if endpoints.polls || (endpoints.get && endpoints.get.polls)
+        solid-route(name='circle-polls' use-id)
+          li
+            a Polls
+      
--- a/src/page-events.pug
+++ b/src/page-events.pug
 .views-container
-  sib-event(data-src=`${endpoints.events || (endpoints.get && endpoints.get.events)}`
+  solid-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)}`
+            id-prefix='default'
  )
\ No newline at end of file
--- a/src/page-polls.pug
+++ b/src/page-polls.pug
+.views-container
+  solid-poll(
+    data-src=`${endpoints.polls || (endpoints.get && endpoints.get.polls)}`
+    range-base-polls=`${endpoints.pollRangeBase || (endpoints.get && endpoints.get.pollRangeBase)}`
+    upload-dir=`${endpoints.uploads || (endpoints.get && endpoints.get.uploads)}`
+  )
\ No newline at end of file
--- a/src/page-resources.pug
+++ b/src/page-resources.pug
+.views-container
+  solid-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)}`
+            id-prefix='default'
+  )
\ No newline at end of file
--- a/src/styles/abstracts/_fonts.scss
+++ b/src/styles/abstracts/_fonts.scss
@@ -11,7 +11,6 @@
    font-family: 'Facit';
    src: url('../fonts/FacitRegular.eot');
    src: url('../fonts/FacitRegular.eot') format('embedded-opentype'),
-         url('../fonts/FacitRegular.woff2') format('woff2'),
         url('../fonts/FacitRegular.woff') format('woff'),
         url('../fonts/FacitRegular.ttf') format('truetype'),
         url('../fonts/FacitRegular.svg#FacitRegular') format('svg');
@@ -21,7 +20,6 @@
    font-family: 'Facit';
    src: url('../fonts/FacitBold.eot');
    src: url('../fonts/FacitBold.eot') format('embedded-opentype'),
-         url('../fonts/FacitBold.woff2') format('woff2'),
         url('../fonts/FacitBold.woff') format('woff'),
         url('../fonts/FacitBold.ttf') format('truetype'),
         url('../fonts/FacitBold.svg#FacitBold') format('svg');

--- a/src/styles/abstracts/_variables.scss
+++ b/src/styles/abstracts/_variables.scss
@@ -102,6 +102,8 @@
  --color-select-list: var(--color-secondary);
  --color-select-add-button: var(--color-button-secondary);
  --color-select-add-button-background: var(--color-button-white);
+  --color-add-button-background: var(--color-button-secondary);
+  --color-add-button: var(--color-white);

  --color-label-light: var(--color-grey-6);


--- a/src/styles/base/menu-left.scss
+++ b/src/styles/base/menu-left.scss
@@ -106,7 +106,7 @@

        solid-set-default[name='project'] {
          flex: 3;
-          
+
          .project-customer,
          .project-name {
            box-sizing: border-box;
@@ -158,7 +158,7 @@
      .message-tab>div>solid-display>div>solid-display-div>div {
        box-sizing: border-box;
        width: calc(80vw - 96px); /*96px = padding of the element + width and margin of counter */
-        
+
        @include breakpoint(lg) {
          width: 150px;
        }

--- a/src/styles/components/comment.scss
+++ b/src/styles/components/comment.scss
@@ -37,9 +37,9 @@
      }
    }

-    solid-conversation.conversation {
+    sib-conversation.conversation {

-      .solid-conversation {
+      .sib-conversation {
        font-family: Open Sans;

        [name='conversation-wrapper'] {

--- a/src/styles/components/icons/icons.scss
+++ b/src/styles/components/icons/icons.scss
@@ -176,7 +176,7 @@ $icons: (
  control-pause: '\e072',
  control-forward: '\e073',
  control-end: '\e074',
-  calender: '\e075',
+  calendar: '\e075',
  bulb: '\e076',
  chart: '\e077',
  arrow-up-circle: '\e078',

--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -21,6 +21,8 @@
    @import 'layout/members/index';
    @import 'layout/job-offers/index';
    @import 'layout/user/index';
-    @import 'layout/events/index';
+    @import 'layout/events/index';    
+    @import 'layout/resources/index';
    @import 'layout/dashboard/index';
-}
\ No newline at end of file
+    @import 'layout/polls/index';
+}
--- a/src/styles/layout/events/events.scss
+++ b/src/styles/layout/events/events.scss
-#events {
+solid-event section {
+    max-width: 1400px;
+    margin: auto;
+}
+#events,
+#circle-events {
    width: 100%;
    font-family: "Facit";
    font-weight: 400;
-    color: $color-0-0-22;
-    sib-event {
+    color: var(--color-main-text);
+    solid-event {
+        solid-display div {
+            max-width: 1110px;
+            solid-display {
+                margin: 0 0 20px 40px;
+            }
+        }
        .red-button,
        .event-type {
-            background-color: $color-357-67-45;
+            background-color: var(--color-add-button-background);
        }
        .black-button {
-            background-color: $color-0-0-22;
+            background-color: var(--highlight-font-color);
            margin-left: 10%;
        }
        .event-type,
        .event-place-name {
            font-weight: 700;
        }
-        #listevents [name="name"],
-        solid-display-link-event .mdi::before {
-            color:  $color-357-67-45;
+        #listevents,
+        #circle-listevents {
+            [name="name"],
+            event-display-link-event .mdi::before {
+                color: var(--color-primary);
+            }
        }
        .event-place-name,
        .nextevent-startdate,
-        solid-display-link-event {
-            color: $color-0-0-22;
+        event-display-link-event {
+            color: var(--highlight-font-color);
        }
-        .sib-event {
+        .solid-event {
            font-family: "Facit";
            font-weight: 400;
            .page-title {
                font-family: "RefrigeratorDelxW01Bold";
-                    font-size: 3.2rem;
-                    line-height: 3.8rem;
-                    color: $color-203-87-19;
+                font-size: 3.2rem;
+                line-height: 3.8rem;
+                color: var(--color-primary);
            }
        }
-        #listevents {
-            .newtype .button{
+        #default-listevents,
+        #circles-listevents {
+            .newtype .button {
                font-size: 1.2rem;
                width: max-content;
                height: max-content;
                padding: 5px 20px;
-                color: $color-203-87-19;
+                color: var(--color-primary);
            }
-            solid-form solid-form-dropdown{
-                label div {
-                    height: 2.5rem;
-                }
-                &::before {
-                    font-family: "RefrigeratorDelxW01Bold";
-                    font-size: 2.4rem;
-                    line-height: 29px;
-                    color: $color-203-87-19;
-                    top: -40px;
-                    content: "Research an event";
+            .headline h2 {
+                float: left;
+                margin-top: 35px;
+                color: var(--color-primary);
+                text-transform: none;
+                font-family: "RefrigeratorDelxW01Bold";
+                font-size: 2.4rem;
+            }
+            solid-form {
+                solid-form-dropdown-label {
+                    label {
+                        height: 2.5rem;
+                    }
                }
            }
            [name="name"] {
                font-family: "RefrigeratorDelxW01Bold";
-                font-size: 2.2rem;
+                font-size: 1.8rem;
                line-height: 2.6rem;
                letter-spacing: 0.32px;
-                color: $color-203-87-19;
+                color: var(--color-primary);
                padding: 5px;
                max-width: 250px;
                margin: 5px auto;
@@ -72,34 +89,97 @@
                width: max-content;
                height: max-content;
            }
-            solid-display-location-events {
+            event-display-location-events {
                padding: 5px;
            }
        }
-        #eventdetail {
+        .eventdetail {
+            solid-display div {
+                display: block;
+            }
+            .mdi::before {
+                margin: 0 5px 0 20px;
+            }
+            [name="infotext"] {
+                text-align: left;
+            }
            [name="name"] {
                font-family: "RefrigeratorDelxW01Bold";
                font-size: 3.2rem;
                line-height: 3.8rem;
-                color: $color-203-87-19;
+                color: var(--color-primary);
+                display: block;
            }
-            solid-display div .event-type {
+            color: var(--color-primary);
+            .event-type {
                width: max-content;
-                padding: 5px 20px; 
+                padding: 5px 20px;
+                font-size: 1.1rem;
+                line-height: 1.3rem;
+                height: 13px;
+                margin: 10px 20px;
            }
            [name="longDescription"] p {
                font-size: 1.6rem;
                line-height: 2.6rem;
            }
-            solid-display-link-event a {
+            event-display-link-event a {
                font-size: 1.6rem;
            }
        }
-        #newevent input[type="submit"], 
-        #newtype input[type="submit"],
+        .newevent label div, 
+        .newevent solid-form-file-label div label {
+            line-height: 2.2rem;
+            text-transform: uppercase;
+            color: var(--form-title);
+            font-size: 13px;
+            font-weight: 600;
+            font-family: Open sans;
+        }
+        .newevent select, 
+        .newevent textarea, 
+        .newevent input, 
+        .newtype input {
+            background-color: var(--form-inputs-background);
+        }
+        .newevent input[type="submit"],
+        .newtype input[type="submit"],
        button {
            width: max-content;
-            padding: 5px 20px; 
+            padding: 5px 20px;
+            background-color: #3C3F57;
+        }
+        .newevent input[type="file"] {
+            background-color: transparent;
        }
    }
+    @media (max-width: 991px) {
+        #listevents {
+            margin-top: 65px;
+        }
+    }
+}
+
+#events {
+    background-color: #f0f3f6;
+}
+
+#circle-events solid-event .events solid-form solid-form-dropdown-label select {
+    background-color: #f0f3f6;
+}
+
+.with-sidebar nav>solid-router>ul [name="circle-events"] {
+    li::before {
+        content: '';
+        height: 40px;
+        width: 40px;
+        mask: url('/images/appointment.svg') center no-repeat;
+        mask-size: contain;
+        -webkit-mask: url('/images/appointment.svg') center no-repeat;
+        -webkit-mask-size: contain;
+        background-color: var(--color-right-menu-text);
+    }
+    &[active] li::before {
+        background-color: var(--color-right-menu-active-text);
+    }
 }
\ No newline at end of file
No results found