Merge branch 'master' into feature/community-directory
This commit is contained in:
		
							
								
								
									
										11
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								README.md
									
									
									
									
									
								
							| @ -267,7 +267,8 @@ Eg.: | ||||
|             "get": "http://server.url/events/", | ||||
|             "post": "http://server.url/events/", | ||||
|             "typeevents": "http://server.url/typeevents/", | ||||
|             "postTypeevents": "http://server.url/typeevents/" | ||||
|             "postTypeevents": "http://server.url/typeevents/", | ||||
|             "uploads": "http://server.url/upload/" | ||||
|           } | ||||
|         } | ||||
|       ] | ||||
| @ -353,7 +354,8 @@ Module declaration, on `config.json`: | ||||
|         "get": "http://server.url/events/", | ||||
|         "post": "http://server.url/events/", | ||||
|         "typeevents": "http://server.url/typeevents/", | ||||
|         "postTypeevents": "http://server.url/typeevents/" | ||||
|         "postTypeevents": "http://server.url/typeevents/", | ||||
|         "uploads": "http://server.url/upload/" | ||||
|       } | ||||
|     } | ||||
| ``` | ||||
| @ -496,7 +498,10 @@ On `config.json`: | ||||
|       "type": "polls", | ||||
|       "endpoints": { | ||||
|         "get": "http://server.url/polls/", | ||||
|         "post": "http://server.url/polls/" | ||||
|         "post": "http://server.url/polls/", | ||||
|         "pollRangeTags": "http://server.url/tags/", | ||||
|         "pollRangeCircles": "http://server.url/circles/", | ||||
|         "uploads": "http://server.url/upload/" | ||||
|       } | ||||
|     } | ||||
| ``` | ||||
|  | ||||
| @ -4,7 +4,13 @@ script(type="module" src="https://cdn.skypack.dev/@startinblox/core@0.16" defer) | ||||
| script(type="module" src="https://cdn.skypack.dev/@startinblox/router@0.11" defer) | ||||
| //- script(type="module" src="/lib/sib-router/src/index.js" defer) | ||||
|  | ||||
| - const componentSet = new Set(components.map(c=>c.type)); | ||||
| - | ||||
|   const componentSet = new Set(components.map(c=>c.type)); | ||||
|   components.map(c => { | ||||
|     if(c.extensions) { | ||||
|       c.extensions.forEach(e => componentSet.add(e.type)); | ||||
|     } | ||||
|   }); | ||||
|  | ||||
| if componentSet.has("autoLogin") || componentSet.has("registering") | ||||
|   script(type="module" src="https://cdn.skypack.dev/@startinblox/oidc@0.14" defer) | ||||
| @ -27,8 +33,8 @@ if componentSet.has("events") | ||||
|   //- script(type="module", src="/lib/solid-event/solid-event.js", defer) | ||||
|  | ||||
| //- Disabled - Not in core@0.16 | ||||
| //- if componentSet.has("events") || componentSet.has("polls") || componentSet.has("resources") | ||||
|   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.9" defer) | ||||
| if componentSet.has("events") || componentSet.has("polls") || componentSet.has("resources") | ||||
|   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.10" defer) | ||||
|  | ||||
| if componentSet.has("jobBoard") | ||||
|   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-job-board@5.0" defer) | ||||
| @ -38,10 +44,9 @@ if componentSet.has("notification") | ||||
|   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-notifications@0.12" defer) | ||||
|   //- script(type="module" src="/lib/sib-notifications/index.js" defer) | ||||
|  | ||||
| //- Disabled - Not in core@0.16 | ||||
| //- if componentSet.has("polls") | ||||
| //-   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@1.2" defer) | ||||
| //-   //- script(type="module" src="/lib/sib-polls-component/index.js" defer) | ||||
| if componentSet.has("polls") | ||||
|   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-poll@2.1" defer) | ||||
|   //script(type="module" src="/lib/solid-poll/index.js" defer) | ||||
|  | ||||
| if componentSet.has("profileDirectory") | ||||
|   script(type="module" src="https://cdn.skypack.dev/@startinblox/component-directory@5.1" defer) | ||||
|  | ||||
| @ -137,7 +137,7 @@ html(lang="en") | ||||
|                   include views/page-job-board.pug | ||||
|  | ||||
|               if component.type == "polls" | ||||
|                 .with-sidebar | ||||
|                 .scrollbar-content | ||||
|                   include views/page-polls.pug | ||||
|  | ||||
|               if component.type == "projects" | ||||
| @ -182,7 +182,7 @@ html(lang="en") | ||||
|  | ||||
|             if component.type == "lang" | ||||
|               hubl-lang( | ||||
|                 hidden  | ||||
|                 hidden | ||||
|                 lang=component.parameters.name | ||||
|                 file=component.parameters.file | ||||
|               ) | ||||
| @ -221,12 +221,12 @@ html(lang="en") | ||||
|           div | ||||
|           div | ||||
|           div | ||||
|         div#something-goes-wrong(hidden)  | ||||
|         div#something-goes-wrong(hidden) | ||||
|           br | ||||
|           span(data-trans="errors.somethingGoesWrong") | ||||
|           span   | ||||
|           a(data-trans='errors.reload' href='/') | ||||
|      | ||||
|  | ||||
|     if client.i18n | ||||
|       hubl-fallback-lang( | ||||
|         hidden | ||||
|  | ||||
| @ -1,8 +1,8 @@ | ||||
| .views-container | ||||
|   solid-poll( | ||||
|     data-src=`${component.endpoints.get}` | ||||
|     range-base-polls=`${component.endpoints.pollRangeBase}` | ||||
|     upload-dir=`${component.endpoints.uploads}` | ||||
|     id-prefix='default' | ||||
|     uniq=component.uniq | ||||
|   ) | ||||
| solid-poll( | ||||
|   data-src=component.endpoints.get | ||||
|   data-dest=component.endpoints.post | ||||
|   range-tags=component.endpoints.pollRangeTags | ||||
|   range-circles=component.endpoints.pollRangeCircles | ||||
|   upload-dir=component.endpoints.uploads | ||||
|   uniq=component.uniq | ||||
| ) | ||||
|  | ||||
		Reference in New Issue
	
	Block a user