diff --git a/src/frontend/boilerplates/archipelago/.env b/src/frontend/boilerplates/archipelago/.env index 58ca156ea..5ca5fa0ca 100644 --- a/src/frontend/boilerplates/archipelago/.env +++ b/src/frontend/boilerplates/archipelago/.env @@ -1,3 +1,3 @@ -REACT_APP_MIDDLEWARE_URL=http://localhost:3000/ +REACT_APP_MIDDLEWARE_URL=https://data.gl.flod.io/ REACT_APP_MAPBOX_ACCESS_TOKEN= PORT=5000 diff --git a/src/frontend/boilerplates/archipelago/src/App.js b/src/frontend/boilerplates/archipelago/src/App.js index ec5834869..fe2f81489 100644 --- a/src/frontend/boilerplates/archipelago/src/App.js +++ b/src/frontend/boilerplates/archipelago/src/App.js @@ -18,7 +18,7 @@ const App = () => ( ( + + diff --git a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/ProjectShow.js b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/ProjectShow.js index be9b8f5b5..731bfb120 100644 --- a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/ProjectShow.js +++ b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/ProjectShow.js @@ -15,6 +15,19 @@ const ProjectShow = props => ( + + + + + + + + + + + + + diff --git a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/index.js b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/index.js index 6664a26e4..5f2c148b9 100644 --- a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/index.js +++ b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Project/index.js @@ -30,10 +30,12 @@ export default { 'pair:description': 'Description', 'pair:hasStatus': 'Statut', 'pair:homePage': 'Site web', - 'pair:involves': 'Implique', + 'pair:involves': 'Implique les acteurs', 'pair:needs': 'Compétences requises', - 'pair:documentedBy': 'Documenté par', - 'pair:hasTopic': 'A pour thème' + 'pair:documentedBy': 'Documents liés', + 'pair:hasTopic': 'A pour thème', + 'pair:partOf': 'Fait partie du projet', + 'pair:hasPart': 'Contient les activités' } } } diff --git a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskEdit.js b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskEdit.js index 841d619fd..ec924df17 100644 --- a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskEdit.js +++ b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskEdit.js @@ -49,6 +49,7 @@ const TaskEdit = props => ( + diff --git a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskShow.js b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskShow.js index 8199f934e..c2d766b44 100644 --- a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskShow.js +++ b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/TaskShow.js @@ -44,6 +44,18 @@ const TaskShow = props => ( + + + + + + + + + + + + diff --git a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/index.js b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/index.js index 60f9a198c..ea1e713fd 100644 --- a/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/index.js +++ b/src/frontend/boilerplates/archipelago/src/resources/Agent/Activity/Task/index.js @@ -27,18 +27,19 @@ export default { fields: { 'pair:label': 'Titre', 'pair:description': 'Description', - 'pair:assignedTo': 'Est assigné à', - 'pair:partOf': 'Fait partie de', + 'pair:assignedTo': 'Est assigné à la personne', + 'pair:partOf': 'Fait partie du projet', 'pair:hasType': 'Type', 'pair:hasStatus': 'Statut', 'pair:dueDate': 'Date attendue', 'pair:endDate': 'Date de fin effective', - 'pair:hasFollower': 'Suivie par', - 'pair:involves': 'Implique', - 'pair:inspiredBy': 'Inspiré par', + 'pair:hasFollower': 'Suivie par la personne', + 'pair:involves': 'Implique la personne', + 'pair:inspiredBy': 'Inspiré par la tâche', 'pair:hasTopic': 'A pour thème', - 'pair:needs': 'A besoin de', - 'pair:uses': 'Utilise' + 'pair:needs': 'A besoin de la compétence', + 'pair:uses': 'Utilise le doc', + 'pair:requires': 'Est dépendant de la tâche' } } } diff --git a/src/frontend/packages/auth-provider/src/authProvider.js b/src/frontend/packages/auth-provider/src/authProvider.js index 0f7df83e0..02113bd81 100644 --- a/src/frontend/packages/auth-provider/src/authProvider.js +++ b/src/frontend/packages/auth-provider/src/authProvider.js @@ -1,17 +1,23 @@ import jwtDecode from 'jwt-decode'; import { defaultToArray, getAclUri, getAclContext } from './utils'; -const authProvider = ({ middlewareUri, allowAnonymous = true, checkUser, httpClient, checkPermissions, resources }) => ({ +const authProvider = ({ + middlewareUri, + allowAnonymous = true, + checkUser, + httpClient, + checkPermissions, + resources +}) => ({ login: async params => { const url = new URL(window.location.href); - window.location.href = `${middlewareUri}auth?redirectUrl=` + encodeURIComponent(url.origin + '/login?login=true') + window.location.href = `${middlewareUri}auth?redirectUrl=` + encodeURIComponent(url.origin + '/login?login=true'); }, logout: async () => { const url = new URL(window.location.href); - if( !allowAnonymous ) { + if (!allowAnonymous) { localStorage.removeItem('token'); - window.location.href = - `${middlewareUri}auth/logout?redirectUrl=` + encodeURIComponent(url.origin + '/login') + window.location.href = `${middlewareUri}auth/logout?redirectUrl=` + encodeURIComponent(url.origin + '/login'); } else { // Redirect to login page after disconnecting from SSO // The login page will remove the token, display a notification and redirect to the homepage @@ -24,10 +30,10 @@ const authProvider = ({ middlewareUri, allowAnonymous = true, checkUser, httpCli }, checkAuth: async () => { const token = localStorage.getItem('token'); - if( !token && !allowAnonymous ) throw new Error(); + if (!token && !allowAnonymous) throw new Error(); }, checkUser: userData => { - if( checkUser ) { + if (checkUser) { return checkUser(userData); } else { return true;