diff --git a/README.md b/README.md
index 671fb2f..e451ea0 100644
--- 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
diff --git a/package-lock.json b/package-lock.json
index 5c89a88..5ae0403 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -587,20 +587,17 @@
"arr-diff": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
- "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
- "optional": true
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
},
"arr-flatten": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
- "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
- "optional": true
+ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
},
"arr-union": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
- "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
- "optional": true
+ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
},
"array-find-index": {
"version": "1.0.2",
@@ -610,8 +607,7 @@
"array-unique": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
- "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
- "optional": true
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
},
"asap": {
"version": "2.0.6",
@@ -634,8 +630,7 @@
"assign-symbols": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
- "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
- "optional": true
+ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
},
"async": {
"version": "3.2.0",
@@ -662,8 +657,7 @@
"atob": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
- "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
- "optional": true
+ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
},
"aws-sign2": {
"version": "0.7.0",
@@ -716,7 +710,6 @@
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
- "optional": true,
"requires": {
"cache-base": "^1.0.1",
"class-utils": "^0.3.5",
@@ -731,7 +724,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "optional": true,
"requires": {
"is-descriptor": "^1.0.0"
}
@@ -740,7 +732,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -749,7 +740,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -758,7 +748,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "optional": true,
"requires": {
"is-accessor-descriptor": "^1.0.0",
"is-data-descriptor": "^1.0.0",
@@ -817,7 +806,6 @@
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
- "optional": true,
"requires": {
"arr-flatten": "^1.1.0",
"array-unique": "^0.3.2",
@@ -835,7 +823,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "optional": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -863,7 +850,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
- "optional": true,
"requires": {
"collection-visit": "^1.0.0",
"component-emitter": "^1.2.1",
@@ -964,7 +950,6 @@
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
- "optional": true,
"requires": {
"arr-union": "^3.1.0",
"define-property": "^0.2.5",
@@ -976,7 +961,6 @@
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "optional": true,
"requires": {
"is-descriptor": "^0.1.0"
}
@@ -1080,7 +1064,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
- "optional": true,
"requires": {
"map-visit": "^1.0.0",
"object-visit": "^1.0.0"
@@ -1128,8 +1111,7 @@
"component-emitter": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
- "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
- "optional": true
+ "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
},
"compressible": {
"version": "2.0.18",
@@ -1218,8 +1200,7 @@
"copy-descriptor": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
- "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
- "optional": true
+ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
},
"copyfiles": {
"version": "2.2.0",
@@ -1566,8 +1547,7 @@
"decode-uri-component": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
- "optional": true
+ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
},
"define-properties": {
"version": "1.1.3",
@@ -1581,7 +1561,6 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
- "optional": true,
"requires": {
"is-descriptor": "^1.0.2",
"isobject": "^3.0.1"
@@ -1591,7 +1570,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -1600,7 +1578,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -1609,7 +1586,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "optional": true,
"requires": {
"is-accessor-descriptor": "^1.0.0",
"is-data-descriptor": "^1.0.0",
@@ -1803,7 +1779,6 @@
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
- "optional": true,
"requires": {
"debug": "^2.3.3",
"define-property": "^0.2.5",
@@ -1818,7 +1793,6 @@
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "optional": true,
"requires": {
"is-descriptor": "^0.1.0"
}
@@ -1827,7 +1801,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "optional": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -1843,7 +1816,6 @@
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
- "optional": true,
"requires": {
"assign-symbols": "^1.0.0",
"is-extendable": "^1.0.1"
@@ -1853,7 +1825,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "optional": true,
"requires": {
"is-plain-object": "^2.0.4"
}
@@ -1864,7 +1835,6 @@
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
- "optional": true,
"requires": {
"array-unique": "^0.3.2",
"define-property": "^1.0.0",
@@ -1880,7 +1850,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "optional": true,
"requires": {
"is-descriptor": "^1.0.0"
}
@@ -1889,7 +1858,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "optional": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -1898,7 +1866,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -1907,7 +1874,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -1916,7 +1882,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "optional": true,
"requires": {
"is-accessor-descriptor": "^1.0.0",
"is-data-descriptor": "^1.0.0",
@@ -1998,7 +1963,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
- "optional": true,
"requires": {
"extend-shallow": "^2.0.1",
"is-number": "^3.0.0",
@@ -2010,7 +1974,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "optional": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -2043,8 +2006,7 @@
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
- "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
- "optional": true
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
},
"forever-agent": {
"version": "0.6.1",
@@ -2065,7 +2027,6 @@
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
- "optional": true,
"requires": {
"map-cache": "^0.2.2"
}
@@ -2122,8 +2083,7 @@
},
"ansi-regex": {
"version": "2.1.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"aproba": {
"version": "1.2.0",
@@ -2160,8 +2120,7 @@
},
"code-point-at": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"concat-map": {
"version": "0.0.1",
@@ -2170,8 +2129,7 @@
},
"console-control-strings": {
"version": "1.1.0",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"core-util-is": {
"version": "1.0.2",
@@ -2274,8 +2232,7 @@
},
"inherits": {
"version": "2.0.4",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"ini": {
"version": "1.3.5",
@@ -2285,7 +2242,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
- "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -2298,20 +2254,17 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
- "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
- "optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -2328,7 +2281,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
- "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -2409,8 +2361,7 @@
},
"number-is-nan": {
"version": "1.0.1",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"object-assign": {
"version": "4.1.1",
@@ -2420,7 +2371,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
- "optional": true,
"requires": {
"wrappy": "1"
}
@@ -2496,8 +2446,7 @@
},
"safe-buffer": {
"version": "5.1.2",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -2527,7 +2476,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
- "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -2545,7 +2493,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
- "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -2584,13 +2531,11 @@
},
"wrappy": {
"version": "1.0.2",
- "bundled": true,
- "optional": true
+ "bundled": true
},
"yallist": {
"version": "3.1.1",
- "bundled": true,
- "optional": true
+ "bundled": true
}
}
},
@@ -2660,8 +2605,7 @@
"get-value": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
- "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
- "optional": true
+ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
},
"getos": {
"version": "3.1.4",
@@ -2792,7 +2736,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
- "optional": true,
"requires": {
"get-value": "^2.0.6",
"has-values": "^1.0.0",
@@ -2803,7 +2746,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
- "optional": true,
"requires": {
"is-number": "^3.0.0",
"kind-of": "^4.0.0"
@@ -2813,7 +2755,6 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
- "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -2900,7 +2841,6 @@
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
- "optional": true,
"requires": {
"kind-of": "^3.0.2"
},
@@ -2909,7 +2849,6 @@
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -2953,7 +2892,6 @@
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
- "optional": true,
"requires": {
"kind-of": "^3.0.2"
},
@@ -2962,7 +2900,6 @@
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -2978,7 +2915,6 @@
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
- "optional": true,
"requires": {
"is-accessor-descriptor": "^0.1.6",
"is-data-descriptor": "^0.1.4",
@@ -2988,8 +2924,7 @@
"kind-of": {
"version": "5.1.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
- "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
- "optional": true
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="
}
}
},
@@ -3012,14 +2947,12 @@
"is-extendable": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
- "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
- "optional": true
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
},
"is-extglob": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
- "optional": true
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
},
"is-finite": {
"version": "1.1.0",
@@ -3057,7 +2990,6 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
- "optional": true,
"requires": {
"kind-of": "^3.0.2"
},
@@ -3066,7 +2998,6 @@
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -3095,7 +3026,6 @@
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
- "optional": true,
"requires": {
"isobject": "^3.0.1"
}
@@ -3140,8 +3070,7 @@
"is-windows": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
- "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
- "optional": true
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
},
"isarray": {
"version": "1.0.0",
@@ -3156,8 +3085,7 @@
"isobject": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
- "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
- "optional": true
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
},
"isstream": {
"version": "0.1.2",
@@ -3256,8 +3184,7 @@
"kind-of": {
"version": "6.0.3",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
- "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
- "optional": true
+ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
},
"lazy-ass": {
"version": "1.6.0",
@@ -3587,8 +3514,7 @@
"map-cache": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
- "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
- "optional": true
+ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
},
"map-obj": {
"version": "1.0.1",
@@ -3599,7 +3525,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
- "optional": true,
"requires": {
"object-visit": "^1.0.0"
}
@@ -3643,7 +3568,6 @@
"version": "3.1.10",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
- "optional": true,
"requires": {
"arr-diff": "^4.0.0",
"array-unique": "^0.3.2",
@@ -3701,7 +3625,6 @@
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
- "optional": true,
"requires": {
"for-in": "^1.0.2",
"is-extendable": "^1.0.1"
@@ -3711,7 +3634,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
- "optional": true,
"requires": {
"is-plain-object": "^2.0.4"
}
@@ -3746,7 +3668,6 @@
"version": "1.2.13",
"resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
- "optional": true,
"requires": {
"arr-diff": "^4.0.0",
"array-unique": "^0.3.2",
@@ -4034,7 +3955,6 @@
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
- "optional": true,
"requires": {
"copy-descriptor": "^0.1.0",
"define-property": "^0.2.5",
@@ -4045,7 +3965,6 @@
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "optional": true,
"requires": {
"is-descriptor": "^0.1.0"
}
@@ -4054,7 +3973,6 @@
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -4075,7 +3993,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
- "optional": true,
"requires": {
"isobject": "^3.0.0"
}
@@ -4095,7 +4012,6 @@
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
- "optional": true,
"requires": {
"isobject": "^3.0.1"
}
@@ -4209,8 +4125,7 @@
"pascalcase": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
- "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
- "optional": true
+ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
},
"path-dirname": {
"version": "1.0.2",
@@ -4294,8 +4209,7 @@
"posix-character-classes": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
- "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
- "optional": true
+ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
},
"pretty-bytes": {
"version": "5.3.0",
@@ -4593,7 +4507,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
- "optional": true,
"requires": {
"extend-shallow": "^3.0.2",
"safe-regex": "^1.1.0"
@@ -4608,8 +4521,7 @@
"repeat-element": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
- "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
- "optional": true
+ "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
},
"repeat-string": {
"version": "1.6.1",
@@ -4681,8 +4593,7 @@
"resolve-url": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
- "optional": true
+ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
},
"restore-cursor": {
"version": "1.0.1",
@@ -4697,8 +4608,7 @@
"ret": {
"version": "0.1.15",
"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
- "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
- "optional": true
+ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
},
"right-align": {
"version": "0.1.3",
@@ -4734,7 +4644,6 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
- "optional": true,
"requires": {
"ret": "~0.1.10"
}
@@ -4831,7 +4740,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
- "optional": true,
"requires": {
"extend-shallow": "^2.0.1",
"is-extendable": "^0.1.1",
@@ -4843,7 +4751,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "optional": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -4893,7 +4800,6 @@
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
- "optional": true,
"requires": {
"base": "^0.11.1",
"debug": "^2.2.0",
@@ -4909,7 +4815,6 @@
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "optional": true,
"requires": {
"is-descriptor": "^0.1.0"
}
@@ -4918,7 +4823,6 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "optional": true,
"requires": {
"is-extendable": "^0.1.0"
}
@@ -4929,7 +4833,6 @@
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
- "optional": true,
"requires": {
"define-property": "^1.0.0",
"isobject": "^3.0.0",
@@ -4940,7 +4843,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
- "optional": true,
"requires": {
"is-descriptor": "^1.0.0"
}
@@ -4949,7 +4851,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -4958,7 +4859,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
- "optional": true,
"requires": {
"kind-of": "^6.0.0"
}
@@ -4967,7 +4867,6 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
- "optional": true,
"requires": {
"is-accessor-descriptor": "^1.0.0",
"is-data-descriptor": "^1.0.0",
@@ -4980,7 +4879,6 @@
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
- "optional": true,
"requires": {
"kind-of": "^3.2.0"
},
@@ -4989,7 +4887,6 @@
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -5005,7 +4902,6 @@
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
"integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
- "optional": true,
"requires": {
"atob": "^2.1.1",
"decode-uri-component": "^0.2.0",
@@ -5017,8 +4913,7 @@
"source-map-url": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
- "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
- "optional": true
+ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
},
"spdx-correct": {
"version": "3.1.0",
@@ -5052,7 +4947,6 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
- "optional": true,
"requires": {
"extend-shallow": "^3.0.0"
}
@@ -5077,7 +4971,6 @@
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
- "optional": true,
"requires": {
"define-property": "^0.2.5",
"object-copy": "^0.1.0"
@@ -5087,7 +4980,6 @@
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
- "optional": true,
"requires": {
"is-descriptor": "^0.1.0"
}
@@ -5239,7 +5131,6 @@
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
- "optional": true,
"requires": {
"kind-of": "^3.0.2"
},
@@ -5248,7 +5139,6 @@
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "optional": true,
"requires": {
"is-buffer": "^1.1.5"
}
@@ -5259,7 +5149,6 @@
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
- "optional": true,
"requires": {
"define-property": "^2.0.2",
"extend-shallow": "^3.0.2",
@@ -5271,7 +5160,6 @@
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
- "optional": true,
"requires": {
"is-number": "^3.0.0",
"repeat-string": "^1.6.1"
@@ -5377,7 +5265,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
- "optional": true,
"requires": {
"arr-union": "^3.1.0",
"get-value": "^2.0.6",
@@ -5400,7 +5287,6 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
- "optional": true,
"requires": {
"has-value": "^0.3.1",
"isobject": "^3.0.0"
@@ -5410,7 +5296,6 @@
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
- "optional": true,
"requires": {
"get-value": "^2.0.3",
"has-values": "^0.1.4",
@@ -5421,7 +5306,6 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
- "optional": true,
"requires": {
"isarray": "1.0.0"
}
@@ -5431,8 +5315,7 @@
"has-values": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
- "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
- "optional": true
+ "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
}
}
},
@@ -5459,8 +5342,7 @@
"urix": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
- "optional": true
+ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
},
"url": {
"version": "0.11.0",
@@ -5483,8 +5365,7 @@
"use": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
- "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
- "optional": true
+ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
},
"util-deprecate": {
"version": "1.0.2",
diff --git a/src/dependencies.pug b/src/dependencies.pug
index 7357840..aaadd92 100644
--- 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)
diff --git a/src/images/appointment.svg b/src/images/appointment.svg
new file mode 100644
index 0000000..07ddc58
--- /dev/null
+++ b/src/images/appointment.svg
@@ -0,0 +1,23 @@
+
+
\ No newline at end of file
diff --git a/src/images/file.svg b/src/images/file.svg
new file mode 100644
index 0000000..324269e
--- /dev/null
+++ b/src/images/file.svg
@@ -0,0 +1,17 @@
+
+
\ No newline at end of file
diff --git a/src/images/send.png b/src/images/send.png
new file mode 100644
index 0000000..674f6ff
Binary files /dev/null and b/src/images/send.png differ
diff --git a/src/images/vote.svg b/src/images/vote.svg
new file mode 100644
index 0000000..8546a10
--- /dev/null
+++ b/src/images/vote.svg
@@ -0,0 +1,22 @@
+
+
\ No newline at end of file
diff --git a/src/index.pug b/src/index.pug
index 7f2880c..62d6857 100644
--- 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
diff --git a/src/menu-left.pug b/src/menu-left.pug
index 65874d8..3ad76a8 100644
--- 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
diff --git a/src/page-circle.pug b/src/page-circle.pug
index 3282972..5ca2271 100644
--- 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
+
diff --git a/src/page-events.pug b/src/page-events.pug
index cea4a6c..22f2b8a 100644
--- a/src/page-events.pug
+++ b/src/page-events.pug
@@ -1,5 +1,7 @@
.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
diff --git a/src/page-polls.pug b/src/page-polls.pug
new file mode 100644
index 0000000..5e14bde
--- /dev/null
+++ b/src/page-polls.pug
@@ -0,0 +1,6 @@
+.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
diff --git a/src/page-resources.pug b/src/page-resources.pug
new file mode 100644
index 0000000..235c99e
--- /dev/null
+++ b/src/page-resources.pug
@@ -0,0 +1,8 @@
+.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
diff --git a/src/styles/abstracts/_fonts.scss b/src/styles/abstracts/_fonts.scss
index 33a8798..191ee64 100644
--- 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');
diff --git a/src/styles/abstracts/_variables.scss b/src/styles/abstracts/_variables.scss
index 03b17c9..32468c1 100644
--- 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);
diff --git a/src/styles/base/menu-left.scss b/src/styles/base/menu-left.scss
index 27daa84..a952da0 100644
--- 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;
}
diff --git a/src/styles/components/comment.scss b/src/styles/components/comment.scss
index 8efbc01..60add66 100644
--- 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'] {
diff --git a/src/styles/components/icons/icons.scss b/src/styles/components/icons/icons.scss
index f85028c..1f5b34f 100644
--- 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',
diff --git a/src/styles/index.scss b/src/styles/index.scss
index e92bc08..72fdbba 100644
--- 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';
+}
diff --git a/src/styles/layout/events/events.scss b/src/styles/layout/events/events.scss
index 6ada157..be0ef78 100644
--- a/src/styles/layout/events/events.scss
+++ b/src/styles/layout/events/events.scss
@@ -1,67 +1,84 @@
-#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
diff --git a/src/styles/layout/job-offers/job-offers.scss b/src/styles/layout/job-offers/job-offers.scss
index 80e6b89..b120517 100644
--- a/src/styles/layout/job-offers/job-offers.scss
+++ b/src/styles/layout/job-offers/job-offers.scss
@@ -180,7 +180,7 @@ solid-job-board {
}
}
- .solid-conversation,
+ .sib-conversation,
.conversation > div {
display: flex;
flex-direction: column-reverse;
diff --git a/src/styles/layout/polls/_index.scss b/src/styles/layout/polls/_index.scss
new file mode 100644
index 0000000..381e936
--- /dev/null
+++ b/src/styles/layout/polls/_index.scss
@@ -0,0 +1 @@
+@import 'polls.scss';
\ No newline at end of file
diff --git a/src/styles/layout/polls/polls.scss b/src/styles/layout/polls/polls.scss
new file mode 100644
index 0000000..348b545
--- /dev/null
+++ b/src/styles/layout/polls/polls.scss
@@ -0,0 +1,550 @@
+solid-poll > div {
+ max-width: 1400px;
+ margin: auto;
+}
+#polls,
+#circle-polls {
+ h2 {
+ text-transform: inherit;
+ }
+ /*style of poll listing*/
+ #default-pollListing, #circles-pollListing {
+ margin: auto;
+ .headline {
+ h2 {
+ font-family: "RefrigeratorDelxW01Bold";
+ font-size: 2.4rem;
+ color: var(--color-primary);
+ float: left;
+ margin-top: 5px;
+ }
+ solid-link {
+ display:flex;
+ justify-content: end;
+ margin-top: 30px;
+ margin-right: 70px;
+ z-index: 1;
+ position: relative;
+ .add-poll {
+ background-color: var(--color-add-button-background);
+ color: var(--color-add-button);
+ box-shadow: 0px 0px 4px 1px #CACACA;
+ text-transform: uppercase;
+ font-weight: 700;
+ line-height: 20px;
+ &::before {
+ font-family: "material-design-icons";
+ content: "\F419";
+ width: 1em;
+ display: inline-block;
+ margin: 0 5px 0 10px;
+ font-size: 2rem;
+ vertical-align: middle;
+ font-weight: 400;
+ }
+ }
+ }
+ }
+ .all-polls {
+ solid-form {
+ display: block;
+ border-bottom: solid 1px #cacaca;
+ height: 90px;
+ margin: 30px 25px 25px;
+ max-width: 85%;
+ solid-form-dropdown-label label {
+ font-size: 1.4rem;
+ font-family: "Facit";
+ }
+ solid-form-placeholder-text {
+ margin-left: 15px;
+ input {
+ border-radius: 4px;
+ }
+ }
+ }
+ > div {
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: left;
+ height: 100%;
+ max-width: 1100px;
+ margin: auto;
+ > solid-display {
+ width: 320px;
+ height: 550px;
+ margin: 0 0 20px 40px;
+ >div:first-of-type {
+ background-color: #fff;
+ height: 100%;
+ -webkit-box-shadow: 0px 0px 4px 1px #CACACA;
+ box-shadow: 0px 0px 4px 1px #CACACA;
+ *[name="body"] {
+ /*size of tags of poll card*/
+ poll-display-votetags {
+ >div {
+ width: 64px;
+ height: 24px;
+ p {
+ font-size: 11px;
+ }
+ }
+ }
+ }
+ img {
+ width: 320px;
+ height: 230px;
+ object-fit: cover;
+ }
+ [name="title"] {
+ font-family: "RefrigeratorDelxW01Bold";
+ color: var(--color-primary);
+ font-size: 1.8rem;
+ font-weight: 600;
+ text-transform: uppercase;
+ height: 30px;
+ width: 100%;
+ display: inline-block;
+ }
+ [name="hostingOrganisation"],
+ [name="endDate"] {
+ color: var(--highlight-font-color);
+ font-family: Facit;
+ font-size: 14px;
+ letter-spacing: 0;
+ line-height: 22px;
+ }
+ [name="hostingOrganisation"] {
+ &::before {
+ content: '\e037';
+ font-family: 'simple-line-icons';
+ color: var(--color-secondary);
+ height: 22px;
+ width: 24px;
+ font-size: 16px;
+ letter-spacing: 0;
+ line-height: 22px;
+ display: inline-block;
+ text-align: center;
+ }
+ }
+ [name="dateLine"] {
+ display: flex;
+ flex-direction: row;
+ margin-top: 10px;
+ div [name="dateImage"]::before {
+ display: inline-block;
+ font: normal normal normal 24px/1 "Material Design Icons";
+ content: "\F6AF";
+ color: var(--color-secondary);
+ height: 22px;
+ width: 24px;
+ font-size: 20px;
+ line-height: 22px;
+ text-align: center;
+ }
+ }
+ [name="shortDescription"] {
+ color: var(--color-main-text);
+ font-family: Facit;
+ font-size: 14px;
+ letter-spacing: 0;
+ line-height: 22px;
+ text-align: center;
+ max-height: 100%;
+ }
+ }
+ }
+ }
+ }
+ }
+ /*personnalise css on poll page*/
+ #default-pollPage, #circles-pollPage {
+ width: 90%;
+ max-width: 1110px;
+ margin: auto;
+ h1,
+ h2 {
+ font-family: "RefrigeratorDelxW01Bold";;
+ }
+ h1 {
+ font-size: 3.2rem;
+ line-height: 3.8rem;
+ margin: 20px auto;
+ }
+ h2 {
+ font-size: 26px;
+ line-height: 31px;
+ }
+ .vote-debate-content .active-tab,
+ .vote-debate-content .border-content {
+ background-color: white;
+ }
+ solid-display.topline {
+ >div:first-of-type {
+ *[name="right"] {
+ poll-display-votetags {
+ >div {
+ width: 64px;
+ height: 24px;
+ p {
+ font-size: 11px;
+ }
+ }
+ }
+ }
+ }
+ }
+ [name="hostingOrganisation"],
+ [name="dateLine"] {
+ color: var(--highlight-font-color);
+ font-family: Facit;
+ font-size: 16px;
+ font-weight: bold;
+ }
+ [name="dateLine"] solid-set-default {
+ display: flex;
+ margin-top: 7px;
+ solid-display-value, solid-display-date-value {
+ margin-left: 7px;
+ }
+ }
+ [name="hostingOrganisation"] {
+ margin-left: 0;
+ [name="hostingOrganisation"]::before {
+ content: '\e037';
+ font-family: "simple-line-icons";
+ font-weight: 400;
+ color: var(--color-secondary);
+ margin-right: 10px;
+ font-size: 16px;
+ }
+ }
+ div [name="dateImage"]::before {
+ font-family: "Material Design Icons";
+ font-weight: 400;
+ content: "\F6AF";
+ color: var(--color-secondary);
+ font-size: 20px;
+ }
+ [name="shortDescription"],
+ [name="longDescription"] {
+ margin: 20px 0;
+ color: var(--color-main-text);
+ font-family: Facit;
+ }
+ [name="shortDescription"] {
+ margin: 20px 0;
+ font-size: 18px;
+ line-height: 28px;
+ }
+ [name="longDescription"] {
+ font-size: 16px;
+ line-height: 26px;
+ }
+ .vote-section,
+ .share-vote {
+ font-family: Facit;
+ padding: 15px 25px;
+ }
+ .vote-tab-content h3::before {
+ font-family: "Material Design Icons";
+ font-weight: 400;
+ font-size: 20px;
+ margin-right: 10px;
+ color: var(--highlight-font-color);
+ }
+ .vote-section > h3::before {
+ content:"\F004";
+ }
+ #totalVotesDisplay::before,
+ .share-vote h3::before {
+ content: "\F00E";
+ }
+ .vote-section > h3 {
+ margin-top: 15px;
+ }
+ #poll-votes-values solid-display > div > solid-set-default,
+ [name="chosenOption"] label {
+ margin-top: 10px;
+ }
+ #poll-votes-values solid-display > div [name="progressBar"] {
+ margin-top: 5px;
+ }
+ div[name="progressBar"] > div,
+ div[name="progressBar"] div .progressBarValue {
+ margin: 0;
+ }
+ .poll-votes-form input[type="submit"] {
+ height: 38px;
+ border-radius: 19px;
+ box-shadow: 0 0 7px 0 rgba(0,0,0,0.15);
+ }
+ .poll-votes-form input[type="submit"]:disabled {
+ opacity: 0.3;
+ }
+ .unavailablePoll {
+ font-style: italic;
+ }
+ .progressBarValue {
+ height: 25px;
+ line-height: 25px;
+ padding-left: 5px;
+ }
+ .send-share,
+ .back-to-list {
+ background-color: var(--highlight-font-color);
+ padding: 5px 25px;
+ font-size: 1.4rem;
+ &::before {
+ font-family: "Material Design Icons";
+ font-weight: 400;
+ font-size: 20px;
+ vertical-align: middle;
+ color: white;
+ }
+ }
+ .send-share {
+ a {
+ font-size: 1.4rem;
+ line-height: 23px;
+ margin-left: 5px;
+ }
+ &::before {
+ content: "\F48A";
+ }
+ }
+ .vote-debate-content .border-content.padded {
+ padding: 0;
+ .debate-tab-content sib-conversation {
+ width: 100%;
+ .sib-conversation {
+ .conversation-item {
+ position: relative;
+ [name="conversation-subhead"] {
+ position: absolute;
+ top: 4px;
+ left: 200px;
+ font-size: 1.3rem;
+ color: #aaa;
+ }
+ [name="conversation-author"] {
+ font-size: 1.3rem;
+ }
+ }
+ .conversation-form {
+ border-top: 1px solid #ddd !important;
+ textarea {
+ background-color: transparent;
+ border: none;
+ font-size: 1.4rem;
+ }
+ }
+ input[type="submit"] {
+ text-indent: -999px;
+ width: 30px;
+ background: url(../images/send.png) no-repeat center;
+ background-size: auto;
+ background-size: contain;
+ border: none;
+ position: absolute;
+ right: 15px;
+ top: calc(50% - 11px);
+ }
+ }
+ }
+ }
+ .poll-footer {
+ padding: 20px 0 40px;
+ .back-to-list {
+ margin-left: 10%;
+ &::before {
+ content: "\F04D";
+ }
+ }
+ .share-poll {
+ visibility: hidden;
+ }
+ }
+ }
+}
+
+#polls, #default-polls, #circles-polls {
+ .views-container {
+ background-color: #f0f3f6;;
+ }
+ #circles-add-survey, #default-add-survey {
+ background-color: white;
+ padding: 50px 0;
+ margin: -20px auto;
+ h2 {
+ font-family: "RefrigeratorDelxW01Bold";
+ font-size: 3.2rem;
+ line-height: 3.8rem;
+ color: var(--title-font-color);
+ margin-bottom: 0;
+ }
+ p {
+ margin-top: 10px;
+ color: var(--color-main-text);
+ font-family: Facit;
+ font-size: 16px;
+ }
+ form {
+ padding: 25px 0;
+ width: 1000px;
+ max-width: 90%;
+ display: block;
+ input {
+ height: 3rem;
+ }
+ textarea {
+ height: 110px;
+ }
+ solid-form-label-text,
+ solid-form-textarea,
+ solid-form-label-textarea,
+ solid-form-textarea-label {
+ display: block;
+ margin: 15px 0;
+ padding: 0;
+ }
+ label > div, solid-form-file-image > div label, solid-form-dropdown-autocompletion[name="tags"] > label::before {
+ margin-bottom: 5px;
+ margin-top: 20px;
+ color: var(--form-title);
+ font-size: 13px;
+ font-weight: 600;
+ text-transform: uppercase;
+ }
+ solid-form-file-image > div {
+ margin-bottom: 15px;
+ button {
+ width: 20px;
+ }
+ input {
+ align-self: center;
+ }
+ label {
+ margin-bottom: 15px;
+ }
+ img {
+ margin-right: 10px;
+ max-width: 250px;
+ }
+ }
+ solid-form-label-text[name="title"] {
+ margin-bottom: 5px;
+ }
+ .form-tips {
+ font-family: Facit;
+ }
+ .h3-like {
+ font-family: "RefrigeratorDelxW01Bold";
+ }
+ solid-multiple-form[name="pollOptions"] {
+ div {
+ margin-bottom: 10px;
+ div {
+ display: flex;
+ width: 100%;
+ justify-content: space-between;
+ poll-custom-choice {
+ width: calc(100% - 45px);
+ solid-form-label-text[name="name"] {
+ margin-bottom: 0;
+ }
+ }
+ button {
+ border: 1px solid var(--color-primary);
+ background-color: transparent;
+ border-radius: 15px;
+ font-size: 24px;
+ color: var(--color-primary);
+ padding: 0;
+ height: 30px;
+ width: 30px;
+ align-self: flex-end;
+ margin-bottom: 5px;
+ }
+ }
+ }
+ > button {
+ height: 28px;
+ line-height: 14px;
+ text-transform: uppercase;
+ font-family: Facit;
+ padding: 0 30px;
+ font-weight: bold;
+ font-size: 13px;
+ margin: 10px 0;
+ color: var(--color-primary);
+ &::before {
+ content: "\F419";
+ font-family: Material Design Icons;
+ margin-right: 7px;
+ font-size: 2rem;
+ vertical-align: middle;
+ text-decoration: none;
+ }
+ }
+ }
+ .ss-main {
+ margin-top: 10px;
+ .ss-multi-selected .ss-values .ss-value {
+ border-radius: 14px;
+ background-color: var(--color-secondary);
+ padding: 5px 10px;
+ font-size: 11px;
+ }
+ }
+ input[type="submit"] {
+ font-size: 1.4rem;
+ margin: 25px 0;
+ float: right;
+ width: max-content;
+ padding: 5px 20px;
+ display: block;
+ text-transform: uppercase;
+ }
+ }
+ .poll-footer {
+ .back-to-list {
+ background-color: var(--highlight-font-color);
+ padding: 5px 25px;
+ font-size: 1.4rem;
+ margin-left: 10%;
+ border-radius: 15px;
+ color: white;
+ &::before {
+ font-family: "Material Design Icons";
+ font-weight: 400;
+ font-size: 20px;
+ vertical-align: middle;
+ color: white;
+ content: "\F04D";
+ }
+ }
+ }
+ }
+}
+
+#circle-polls #circles-pollListing .all-polls solid-form solid-form-placeholder-text input {
+ background-color: #f0f3f6;
+}
+
+.with-sidebar nav>solid-router>ul [name="circle-polls"] {
+ li::before {
+ content: '';
+ height: 40px;
+ width: 40px;
+ mask: url('/images/vote.svg') center no-repeat;
+ mask-size: contain;
+ -webkit-mask: url('/images/vote.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
diff --git a/src/styles/layout/resources/_index.scss b/src/styles/layout/resources/_index.scss
new file mode 100644
index 0000000..e0c41ce
--- /dev/null
+++ b/src/styles/layout/resources/_index.scss
@@ -0,0 +1 @@
+@import 'resources.scss';
\ No newline at end of file
diff --git a/src/styles/layout/resources/resources.scss b/src/styles/layout/resources/resources.scss
new file mode 100644
index 0000000..652daab
--- /dev/null
+++ b/src/styles/layout/resources/resources.scss
@@ -0,0 +1,156 @@
+#resources,
+#circle-resources {
+ width: 100%;
+ font-family: "Facit";
+ font-weight: 400;
+ color: var(--content-font-color);
+ solid-resource {
+ solid-display div {
+ max-width: 1110px;
+ solid-display {
+ margin: 0 0 20px 40px;
+ }
+ }
+ .solid-resource {
+ font-family: "Facit";
+ .page-title {
+ font-family: "RefrigeratorDelxW01Bold";
+ font-size: 3.2rem;
+ line-height: 3.8rem;
+ color: var(--color-primary);
+ }
+ .red-button {
+ background-color: var(--color-add-button-background);
+ }
+ .black-button {
+ background-color: var(--highlight-font-color);
+ margin-left: 10%;
+ }
+ .lnk-newresource {
+ margin-top: 30px;
+ margin-right: 70px;
+ z-index: 1;
+ position: relative;
+ }
+ .listresources .lnk-newkeyword {
+ top: 155px;
+ left: 220px;
+ .button.thin-button.mdi {
+ padding: 5px 20px;
+ }
+ }
+ .listresources {
+ .headline h2 {
+ float: left;
+ margin-top: 5px;
+ color: var(--color-primary);
+ text-transform: none;
+ font-family: "RefrigeratorDelxW01Bold";
+ font-size: 2.4rem;
+ }
+ solid-form {
+ select {
+ width: 150px;
+ }
+ }
+ }
+ .listresources {
+ .lnk-newkeyword .button {
+ font-size: 1.2rem;
+ width: max-content;
+ height: max-content;
+ padding: 10px 30px;
+ color: var(--color-primary);
+ }
+ solid-display solid-display {
+ [name="name"] {
+ font-family: "RefrigeratorDelxW01Bold";
+ color: var(--color-primary);
+ }
+ [name="link"] a, [name="document"] a {
+ width: 75%;
+ margin-bottom: 10px;
+ padding-left: 35px;
+ position: relative;
+ &::before {
+ position: absolute;
+ left: 0;
+ }
+ }
+ }
+ }
+ .resourcedetail {
+ background-color: transparent;
+ [name="name"] {
+ font-family: "RefrigeratorDelxW01Bold";
+ font-size: 3.2rem;
+ line-height: 3.8rem;
+ color: var(--color-primary);
+ }
+ [name="infotext"] {
+ justify-content: flex-start;
+ }
+ .sib-conversation {
+ background-color: white;
+ textarea {
+ background-color: transparent;
+ }
+ }
+ }
+ .newresource label div,
+ .newresource solid-form-file div label {
+ line-height: 2.2rem;
+ text-transform: uppercase;
+ color: var(--form-title);
+ font-size: 13px;
+ font-weight: 600;
+ font-family: Open sans;
+ }
+ .newresource select,
+ .newresource textarea,
+ .newresource input,
+ .newresource solid-multiple-select .ss-main .ss-multi-selected {
+ background-color: var(--form-inputs-background);
+ }
+ .newresource input[type="submit"] {
+ background-color: var(--form-submit-button);
+ }
+ .newresource input[type="file"] {
+ background-color: transparent;
+ }
+ .resource-tag {
+ font-family: Facilt;
+ font-weight: 600;
+ }
+ }
+ }
+ @media (max-width: 991px) {
+ .solid-resource {
+ margin-top: 65px;
+ }
+ }
+}
+
+#resources {
+ background-color: #f0f3f6;
+}
+
+#circle-resources .resources solid-form solid-form-dropdown select {
+ background-color: #f0f3f6;
+}
+
+.with-sidebar nav>solid-router>ul [name="circle-resources"] {
+ li::before {
+ content: '';
+ height: 40px;
+ width: 40px;
+ mask: url('/images/file.svg') center no-repeat;
+ mask-size: contain;
+ -webkit-mask: url('/images/file.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
diff --git a/src/views/circle/page-circle-events.pug b/src/views/circle/page-circle-events.pug
new file mode 100644
index 0000000..5ecad21
--- /dev/null
+++ b/src/views/circle/page-circle-events.pug
@@ -0,0 +1,10 @@
+#circle-listevents
+ solid-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)}`
+ id-prefix='circles'
+ )
\ No newline at end of file
diff --git a/src/views/circle/page-circle-polls.pug b/src/views/circle/page-circle-polls.pug
new file mode 100644
index 0000000..59fbe37
--- /dev/null
+++ b/src/views/circle/page-circle-polls.pug
@@ -0,0 +1,9 @@
+#circle-polls
+ solid-poll(
+ class='w700'
+ id-prefix='circles'
+ bind-resources
+ nested-field="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
diff --git a/src/views/circle/page-circle-resources.pug b/src/views/circle/page-circle-resources.pug
new file mode 100644
index 0000000..cfb9159
--- /dev/null
+++ b/src/views/circle/page-circle-resources.pug
@@ -0,0 +1,11 @@
+#circle-listresources
+ solid-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)}`
+ id-prefix='circles'
+ )
\ No newline at end of file