diff --git a/src/config.sample.json b/src/config.sample.json
index b1b6429de6ecbf434a6692ae7e47a7b194b36a71..a0748eb48200f17f6942261b5c7d067b96f96cfe 100644
--- a/src/config.sample.json
+++ b/src/config.sample.json
@@ -1,29 +1,66 @@
{
"dev": {
- "sdn": "http://127.0.0.1:8000",
"cdn": "https://cdn.happy-dev.fr",
"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": {
- "sdn": "https://api.alpha.happy-dev.fr",
"cdn": "https://cdn.happy-dev.fr",
"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": {
"sdn": "https://api.test-paris.happy-dev.fr",
"cdn": "https://cdn.happy-dev.fr",
"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": {
- "sdn": "https://api.test-nantes.happy-dev.fr",
"cdn": "https://cdn.happy-dev.fr",
"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/"
+ }
}
}
\ No newline at end of file
diff --git a/src/header.pug b/src/header.pug
index a5b5db5dfacd2759379bef7c916b7739283ba8b4..45aff5ac515c5968cc806fdbb5e092511536042d 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -27,7 +27,7 @@ button(role='log in' onclick="document.querySelector('sib-auth').login();") Logi
sib-auth
sib-auth-provider(
class="sib-auth-provider"
- data-authority=`${sdn}/openid/`
+ data-authority=`${authority}`
data-client_id=`${client_id}`,
data-id="paris"
data-response_type='id_token token',
diff --git a/src/menu-left.pug b/src/menu-left.pug
index b4df35d3b17e9d167fae93e5c70e67f7bd8d5b84..1d4bd37a030f7cc64e0f9f809a45e4bddf0225e1 100644
--- a/src/menu-left.pug
+++ b/src/menu-left.pug
@@ -19,10 +19,10 @@ nav#main__menu
div.menu-icon.icon-arrow-up
div.menu-label Projects
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
sib-display(
- data-src=`${sdn}/sources/projects/`
+ data-src=`${endpoints.projects}`
data-fields='project'
set-project='customer.name, dash, name'
value-dash=' - '
@@ -35,10 +35,10 @@ nav#main__menu
//- div.menu-icon.icon-arrow-up
//- div.menu-label Cercles
//- 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
//- sib-display(
- //- data-src=`${sdn}/sources/circles/`,
+ //- data-src=`${endpoints.circles}`,
//- data-fields='name',
//- widget-name='sib-display-div',
//- next='circle'
@@ -50,10 +50,10 @@ nav#main__menu
div.menu-icon.icon-arrow-up
div.menu-label Chat
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
sib-display(
- data-src=`${sdn}/users/`
+ data-src=`${endpoints.users}`
data-fields='username, account.user'
widget-username='sib-display-div'
widget-account.user='hd-counter'
diff --git a/src/page-circle-create.pug b/src/page-circle-create.pug
index e5378dbca44abf66975925d7493f47d334fd5bd0..f446f1100c083aa8c395f9fe41c39e48343180a5 100644
--- a/src/page-circle-create.pug
+++ b/src/page-circle-create.pug
@@ -3,9 +3,9 @@
p Here you can create a new group according to your interests, what you want to share, etc.
sib-form(
- data-src=`${sdn}/sources/circles/`,
- range-owner=`${sdn}/users/`,
- range-team=`${sdn}/users/`
+ data-src=`${endpoints.circles}`,
+ range-owner=`${endpoints.users}`,
+ range-team=`${endpoints.users}`
data-fields='name, description, description-text, owner, owner-text, team, team-text, jabberRoom, foaf:jabberID',
diff --git a/src/page-circle-edit.pug b/src/page-circle-edit.pug
index 008bc6d3ae2d5dc6e76eb72938593953ebfb12fd..a6edfedf56320d54018a5b36c5bc23e9da328c52 100644
--- a/src/page-circle-edit.pug
+++ b/src/page-circle-edit.pug
@@ -1,9 +1,9 @@
#circle-edit.content-box.with-form.full-width
h1 Edit group
sib-form.block(
- range-owner=`${sdn}/members/`,
+ range-owner=`${endpoints.users}`,
data-fields="name, description, owner, team, jabberID, jabberRoom"
- range-team=`${sdn}/members/`,
+ range-team=`${endpoints.users}`,
widget-team='sib-form-multiple-dropdown',
bind-resources
)
diff --git a/src/page-job-offer-create.pug b/src/page-job-offer-create.pug
index 25cf1baadb34e0f1cdde3455acce56ac0a37916f..9e7cb2e7321d5156ab0a808e9276ca3e77a9b0f6 100644
--- a/src/page-job-offer-create.pug
+++ b/src/page-job-offer-create.pug
@@ -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...'
sib-form.block(
- data-src=`${sdn}/sources/job-offers/`
- range-skills=`${sdn}/skills/`
+ data-src=`${endpoints.joboffers}`
+ range-skills=`${endpoints.skills}`
data-fields='title, title-text, description, description-text, skills, closingDate'
diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug
index 6a42e97d4fb03aa7077dae62acabede41f8ee484..b42a50ab4c1ca653c5f7520e4d65dc72f8705d4a 100644
--- a/src/page-job-offers.pug
+++ b/src/page-job-offers.pug
@@ -1,7 +1,7 @@
.job-offers__container
sib-job-board(
- data-src=`${sdn}/job-offers/`,
- range-skills=`${sdn}/skills/`
+ data-src=`${endpoints.joboffers}`,
+ range-skills=`${endpoints.skills}`
)
div.job-offers__newoffer
diff --git a/src/page-members-directory.pug b/src/page-members-directory.pug
index fd2fd522980416512c77e14bf73cde830e27c775..8ec3a33dc8d9060c74a2bf160d40ac8048b72491 100644
--- a/src/page-members-directory.pug
+++ b/src/page-members-directory.pug
@@ -1,6 +1,6 @@
sib-directory(
- data-src=`${sdn}/users/`,
- range-groups=`${sdn}/groups/`,
- range-skills=`${sdn}/skills/`
+ data-src=`${endpoints.users}`,
+ range-groups=`${endpoints.groups}`,
+ range-skills=`${endpoints.skills}`
)
diff --git a/src/page-project-create.pug b/src/page-project-create.pug
index 3368f2f0216884bcaac36a16a6d7c367daf64ebf..f7c3f77c6c8eed484e976862697121d33e6f93bd 100644
--- a/src/page-project-create.pug
+++ b/src/page-project-create.pug
@@ -3,9 +3,9 @@
p Here you can create your project, add members and assign them a job.
sib-form.block(
- data-src=`${sdn}/sources/projects/`,
- range-members=`${sdn}/users/`,
- range-team=`${sdn}/users/`,
+ data-src=`${endpoints.projects}`,
+ range-members=`${endpoints.users}`,
+ range-team=`${endpoints.users}`,
data-fields='block-project__info, block-project__fee, block-project__customer',
diff --git a/src/page-project-edit.pug b/src/page-project-edit.pug
index 3038890e225c4d2f292b93a5ec79baaf4b99af47..ad0bbd9f841c6fb42a5a4e6e4d4de341deae7114 100644
--- a/src/page-project-edit.pug
+++ b/src/page-project-edit.pug
@@ -14,7 +14,7 @@
naked,
data-src='${id}',
data-fields='user.name, name',
- range-user.name=`${sdn}/users/`,
+ range-user.name=`${endpoints.users}`,
class-name='field',
class-user.name='field',
label-name='Role',
@@ -31,7 +31,7 @@
label-description='Project description',
set-block-project__fee='fieldset-fee, businessProvider, businessProvider.fee',
- range-businessProvider=`${sdn}/businessproviders/`,
+ range-businessProvider=`${endpoints.businessproviders}`,
label-businessProvider='Business provider',
label-businessProvider.fee='Amount of the contribution (%)',
widget-fieldset-fee='hd-template-project-title',