autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'jbpasquier/endpoints' into 'staging'

Browse Source 
feature: endpoints in config

See merge request startinblox/applications/sib-app!51
This commit is contained in:
Gaëlle Morin 2019-06-24 12:00:24 +00:00
commit acbf7cdbd7
10 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/config.sample.json
View File

@ -1,29 +1,66 @@
{ {
"dev": { "dev": {
"sdn": "http://127.0.0.1:8000",
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"client_id": "000000" "authority": "http://127.0.0.1:8000/openid/",
"client_id": "000000",
"endpoints": {
"businessproviders": "http://127.0.0.1:8000/businessproviders/",
"circles": "http://127.0.0.1:8000/circles/",
"groups": "http://127.0.0.1:8000/groups/",
"joboffers": "http://127.0.0.1:8000/job-offers/",
"projects": "http://127.0.0.1:8000/projects/",
"skills": "http://127.0.0.1:8000/skills/",
"users": "http://127.0.0.1:8000/users/"
}
}, },
"alpha": { "alpha": {
"sdn": "https://api.alpha.happy-dev.fr",
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"client_id": "218707" "authority": "https://api.alpha.happy-dev.fr/openid/",
"client_id": "218707",
"endpoints": {
"businessproviders": "https://api.alpha.happy-dev.fr/businessproviders/",
"circles": "https://api.alpha.happy-dev.fr/circles/",
"groups": "https://api.alpha.happy-dev.fr/groups/",
"joboffers": "https://api.alpha.happy-dev.fr/job-offers/",
"projects": "https://api.alpha.happy-dev.fr/projects/",
"skills": "https://api.alpha.happy-dev.fr/skills/",
"users": "https://api.alpha.happy-dev.fr/users/"
}
}, },
"paris": { "paris": {
"sdn": "https://api.test-paris.happy-dev.fr", "sdn": "https://api.test-paris.happy-dev.fr",
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"client_id": "196656" "authority": "https://api.test-paris.happy-dev.fr/openid/",
"client_id": "196656",
"endpoints": {
"businessproviders": "https://api.test-paris.happy-dev.fr/businessproviders/",
"circles": "https://api.test-paris.happy-dev.fr/sources/circles/",
"groups": "https://api.test-paris.happy-dev.fr/groups/",
"joboffers": "https://api.test-paris.happy-dev.fr/sources/job-offers/",
"projects": "https://api.test-paris.happy-dev.fr/sources/projects/",
"skills": "https://api.test-paris.happy-dev.fr/skills/",
"users": "https://api.test-paris.happy-dev.fr/users/"
}
}, },
"nantes": { "nantes": {
"sdn": "https://api.test-nantes.happy-dev.fr",
"cdn": "https://cdn.happy-dev.fr", "cdn": "https://cdn.happy-dev.fr",
"xmpp": "https://jabber.happy-dev.fr/http-bind/", "xmpp": "https://jabber.happy-dev.fr/http-bind/",
"client_id": "621272" "authority": "https://api.test-nantes.happy-dev.fr/openid/",
"client_id": "621272",
"endpoints": {
"businessproviders": "https://api.test-nantes.happy-dev.fr/businessproviders/",
"circles": "https://api.test-nantes.happy-dev.fr/sources/circles/",
"groups": "https://api.test-nantes.happy-dev.fr/groups/",
"joboffers": "https://api.test-nantes.happy-dev.fr/sources/job-offers/",
"projects": "https://api.test-nantes.happy-dev.fr/sources/projects/",
"skills": "https://api.test-nantes.happy-dev.fr/skills/",
"users": "https://api.test-nantes.happy-dev.fr/users/"
}
} }
} }

2
src/header.pug
View File

@ -27,7 +27,7 @@ button(role='log in' onclick="document.querySelector('sib-auth').login();") Logi
sib-auth sib-auth
sib-auth-provider( sib-auth-provider(
class="sib-auth-provider" class="sib-auth-provider"
data-authority=`${sdn}/openid/` data-authority=`${authority}`
data-client_id=`${client_id}`, data-client_id=`${client_id}`,
data-id="paris" data-id="paris"
data-response_type='id_token token', data-response_type='id_token token',

12
src/menu-left.pug
View File

@ -19,10 +19,10 @@ nav#main__menu
div.menu-icon.icon-arrow-up div.menu-icon.icon-arrow-up
div.menu-label Projects div.menu-label Projects
div.menu-icon.icon-folder-alt div.menu-icon.icon-folder-alt
sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`, rdf-type='hd:project', use-id='') sib-route(hidden,name='project', id-prefix=`${endpoints.projects}`, rdf-type='hd:project', use-id='')
div.sub-menu.menu-notification div.sub-menu.menu-notification
sib-display( sib-display(
data-src=`${sdn}/sources/projects/` data-src=`${endpoints.projects}`
data-fields='project' data-fields='project'
set-project='customer.name, dash, name' set-project='customer.name, dash, name'
value-dash=' - ' value-dash=' - '
@ -35,10 +35,10 @@ nav#main__menu
//- div.menu-icon.icon-arrow-up //- div.menu-icon.icon-arrow-up
//- div.menu-label Cercles //- div.menu-label Cercles
//- div.menu-icon.icon-globe //- div.menu-icon.icon-globe
//- sib-route(hidden, name='circle', id-prefix=`${sdn}/circles/`, rdf-type='hd:circle') //- sib-route(hidden, name='circle', id-prefix=`${endpoints.circles}`, rdf-type='hd:circle')
//- div.sub-menu //- div.sub-menu
//- sib-display( //- sib-display(
//- data-src=`${sdn}/sources/circles/`, //- data-src=`${endpoints.circles}`,
//- data-fields='name', //- data-fields='name',
//- widget-name='sib-display-div', //- widget-name='sib-display-div',
//- next='circle' //- next='circle'
@ -50,10 +50,10 @@ nav#main__menu
div.menu-icon.icon-arrow-up div.menu-icon.icon-arrow-up
div.menu-label Chat div.menu-label Chat
div.menu-icon.icon-envelope-letter div.menu-icon.icon-envelope-letter
sib-route(hidden, name='messages', id-prefix=`${sdn}/users/`, rdf-type='foaf:user', use-id='') sib-route(hidden, name='messages', id-prefix=`${endpoints.users}`, rdf-type='foaf:user', use-id='')
div.sub-menu.menu-notification div.sub-menu.menu-notification
sib-display( sib-display(
data-src=`${sdn}/users/` data-src=`${endpoints.users}`
data-fields='username, account.user' data-fields='username, account.user'
widget-username='sib-display-div' widget-username='sib-display-div'
widget-account.user='hd-counter' widget-account.user='hd-counter'

6
src/page-circle-create.pug
View File

@ -3,9 +3,9 @@
p Here you can create a new group according to your interests, what you want to share, etc. p Here you can create a new group according to your interests, what you want to share, etc.
sib-form( sib-form(
data-src=`${sdn}/sources/circles/`, data-src=`${endpoints.circles}`,
range-owner=`${sdn}/users/`, range-owner=`${endpoints.users}`,
range-team=`${sdn}/users/` range-team=`${endpoints.users}`
data-fields='name, description, description-text, owner, owner-text, team, team-text, jabberRoom, foaf:jabberID', data-fields='name, description, description-text, owner, owner-text, team, team-text, jabberRoom, foaf:jabberID',

4
src/page-circle-edit.pug
View File

@ -1,9 +1,9 @@
#circle-edit.content-box.with-form.full-width #circle-edit.content-box.with-form.full-width
h1 Edit group h1 Edit group
sib-form.block( sib-form.block(
range-owner=`${sdn}/members/`, range-owner=`${endpoints.users}`,
data-fields="name, description, owner, team, jabberID, jabberRoom" data-fields="name, description, owner, team, jabberID, jabberRoom"
range-team=`${sdn}/members/`, range-team=`${endpoints.users}`,
widget-team='sib-form-multiple-dropdown', widget-team='sib-form-multiple-dropdown',
bind-resources bind-resources
) )

4
src/page-job-offer-create.pug
View File

@ -11,8 +11,8 @@
p Be specific and exhaustive to avoid answering too many questions later. Indicate what is the best way to fill the offer, the prerequisites...' p Be specific and exhaustive to avoid answering too many questions later. Indicate what is the best way to fill the offer, the prerequisites...'
sib-form.block( sib-form.block(
data-src=`${sdn}/sources/job-offers/` data-src=`${endpoints.joboffers}`
range-skills=`${sdn}/skills/` range-skills=`${endpoints.skills}`
data-fields='title, title-text, description, description-text, skills, closingDate' data-fields='title, title-text, description, description-text, skills, closingDate'

4
src/page-job-offers.pug
View File

@ -1,7 +1,7 @@
.job-offers__container .job-offers__container
sib-job-board( sib-job-board(
data-src=`${sdn}/job-offers/`, data-src=`${endpoints.joboffers}`,
range-skills=`${sdn}/skills/` range-skills=`${endpoints.skills}`
) )
div.job-offers__newoffer div.job-offers__newoffer

6
src/page-members-directory.pug
View File

@ -1,6 +1,6 @@
sib-directory( sib-directory(
data-src=`${sdn}/users/`, data-src=`${endpoints.users}`,
range-groups=`${sdn}/groups/`, range-groups=`${endpoints.groups}`,
range-skills=`${sdn}/skills/` range-skills=`${endpoints.skills}`
) )

6
src/page-project-create.pug
View File

@ -3,9 +3,9 @@
p Here you can create your project, add members and assign them a job. p Here you can create your project, add members and assign them a job.
sib-form.block( sib-form.block(
data-src=`${sdn}/sources/projects/`, data-src=`${endpoints.projects}`,
range-members=`${sdn}/users/`, range-members=`${endpoints.users}`,
range-team=`${sdn}/users/`, range-team=`${endpoints.users}`,
data-fields='block-project__info, block-project__fee, block-project__customer', data-fields='block-project__info, block-project__fee, block-project__customer',

4
src/page-project-edit.pug
View File

@ -14,7 +14,7 @@
naked, naked,
data-src='${id}', data-src='${id}',
data-fields='user.name, name', data-fields='user.name, name',
range-user.name=`${sdn}/users/`, range-user.name=`${endpoints.users}`,
class-name='field', class-name='field',
class-user.name='field', class-user.name='field',
label-name='Role', label-name='Role',
@ -31,7 +31,7 @@
label-description='Project description', label-description='Project description',
set-block-project__fee='fieldset-fee, businessProvider, businessProvider.fee', set-block-project__fee='fieldset-fee, businessProvider, businessProvider.fee',
range-businessProvider=`${sdn}/businessproviders/`, range-businessProvider=`${endpoints.businessproviders}`,
label-businessProvider='Business provider', label-businessProvider='Business provider',
label-businessProvider.fee='Amount of the contribution (%)', label-businessProvider.fee='Amount of the contribution (%)',
widget-fieldset-fee='hd-template-project-title', widget-fieldset-fee='hd-template-project-title',