From 539b2974172e76b8460328be67ad38cb62591d4f Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Pasquier Date: Mon, 24 Jun 2019 13:56:49 +0200 Subject: [PATCH] feature: endpoints in config --- src/config.sample.json | 51 +++++++++++++++++++++++++++++----- src/header.pug | 2 +- src/menu-left.pug | 12 ++++---- src/page-circle-create.pug | 6 ++-- src/page-circle-edit.pug | 4 +-- src/page-job-offer-create.pug | 4 +-- src/page-job-offers.pug | 4 +-- src/page-members-directory.pug | 6 ++-- src/page-project-create.pug | 6 ++-- src/page-project-edit.pug | 4 +-- 10 files changed, 68 insertions(+), 31 deletions(-) diff --git a/src/config.sample.json b/src/config.sample.json index b1b6429..a0748eb 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 a5b5db5..45aff5a 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 104aada..64f390f 100644 --- a/src/menu-left.pug +++ b/src/menu-left.pug @@ -18,10 +18,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=' - ' @@ -34,10 +34,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' @@ -49,10 +49,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 e5378db..f446f11 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 008bc6d..a6edfed 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 8b9a437..04d44a9 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 0eaebc6..bbddec7 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 fd2fd52..8ec3a33 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 3368f2f..f7c3f77 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 3038890..ad0bbd9 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',