diff --git a/.eslintrc.js b/.eslintrc.js index 6984915..c3dcf4b 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -32,9 +32,11 @@ module.exports = { "never" ], "key-spacing": [ - "error", { - "beforeColon": false - } + "error", { "beforeColon": false } + ], + "object-curly-spacing": [ + "error", + "always" ] } } diff --git a/src/assets/scss/bbmri.scss b/src/assets/scss/bbmri.scss index 68da9f3..9ec2dc4 100644 --- a/src/assets/scss/bbmri.scss +++ b/src/assets/scss/bbmri.scss @@ -3,7 +3,7 @@ $theme-colors: ( "secondary": #003674, "danger": #dc3545, "warning": #e95713, - "info": #017ffd, + "info": #3c3c3d, "light": #e7e7e7, "dark": #3c3c3d ); diff --git a/src/components/ConfirmationModal.vue b/src/components/ConfirmationModal.vue deleted file mode 100644 index c7b687c..0000000 --- a/src/components/ConfirmationModal.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - Are you sure you want to abandon this Negotiation? - - - - This is means that you will not be able to access this negotiation again. - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/NegotiationCard.vue b/src/components/NegotiationCard.vue index 638f6e7..33f7d0a 100644 --- a/src/components/NegotiationCard.vue +++ b/src/components/NegotiationCard.vue @@ -1,20 +1,20 @@ - {{ negotiationTitle }} + {{ title }} - {{ negotiationStatus }} + {{ status }} - Negotiation ID: {{ negotiationId }} + Negotiation ID: {{ id }} - Created on: {{ negotiationCreationDate }} + Created on: {{ creationDate }} - Created by: {{ negotiationSubmitter }} + Created by: {{ submitter }} @@ -25,31 +25,26 @@ export default { name: "NegotiationCard", props: { - negotiationId: { + id: { type: String, default: "" }, - negotiationTitle: { + title: { type: String, default: "" }, - negotiationStatus: { + status: { type: String, default: "" }, - negotiationSubmitter: { + submitter: { type: String, default: "" }, - negotiationResources: { - type: Object, - default: undefined - }, - negotiationCreationDate: { + creationDate: { type: Date, default: undefined - }, - + } } } diff --git a/src/components/NegotiationForm.vue b/src/components/NegotiationForm.vue index 49262ec..39e7545 100644 --- a/src/components/NegotiationForm.vue +++ b/src/components/NegotiationForm.vue @@ -1,33 +1,30 @@ + + - - Loading - + + Loading... + - - - {{ notificationBody }} - - - Back to Negotiations - - diff --git a/src/components/NegotiationPosts.vue b/src/components/NegotiationPosts.vue index 1e1133b..cb804f4 100644 --- a/src/components/NegotiationPosts.vue +++ b/src/components/NegotiationPosts.vue @@ -1,6 +1,6 @@ - Comments + Comments - Send a {{ scope }} message + + Send a {{ scope }} message - - - Your request is waiting for approval by our team. No need to keep refreshing the page, - you will be notified of any changes via email. - - diff --git a/src/components/modals/FeedbackModal.vue b/src/components/modals/FeedbackModal.vue new file mode 100644 index 0000000..a7c49bf --- /dev/null +++ b/src/components/modals/FeedbackModal.vue @@ -0,0 +1,58 @@ + + + + + {{ text }} + + + + + {{ dismissButtonText }} + + + + + diff --git a/src/components/modals/NegotiatorModal.vue b/src/components/modals/NegotiatorModal.vue new file mode 100644 index 0000000..3a1434d --- /dev/null +++ b/src/components/modals/NegotiatorModal.vue @@ -0,0 +1,48 @@ + + + + + + {{ title }} + + + + + + + + + + + diff --git a/src/components/modals/PrivatePostModal.vue b/src/components/modals/PrivatePostModal.vue new file mode 100644 index 0000000..b0c7995 --- /dev/null +++ b/src/components/modals/PrivatePostModal.vue @@ -0,0 +1,47 @@ + + + + + + + + Close + + + + + + diff --git a/src/components/modals/UpdateStatusModal.vue b/src/components/modals/UpdateStatusModal.vue new file mode 100644 index 0000000..f2190ef --- /dev/null +++ b/src/components/modals/UpdateStatusModal.vue @@ -0,0 +1,75 @@ + + + + Select new status: + + + {{ response }} + + + + + + Close + + + Submit + + + + + + diff --git a/src/router/index.js b/src/router/index.js index 471503d..95653c0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,7 +3,6 @@ import OidcCallback from "@/components/OidcCallback.vue" import HomePage from "../views/HomePage.vue" import NegotiationCreatePage from "../views/NegotiationCreatePage.vue" import NegotiationPage from "../views/NegotiationPage.vue" -import Login from "@/views/LoginPage.vue" import store from "@/store" import { vuexOidcCreateRouterMiddleware } from "vuex-oidc" import UserPage from "@/views/UserPage.vue" @@ -42,11 +41,6 @@ const router = createRouter({ component: UserPage, props: { userRole: "ADMIN" }, meta: { isPublic: false } - }, { - path: "/login", - name: "login", - component: Login, - meta: { isPublic: true } }, { path: "/negotiations/:negotiationId/:userRole", name: "negotiation-page", diff --git a/src/store/actions.js b/src/store/actions.js index d694a16..bb67c49 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -9,9 +9,7 @@ const USER_PATH = `${BASE_API_PATH}/users/roles` const ATTACHMENTS_PATH = `${BASE_API_PATH}/attachments` function getBearerHeaders(token) { - return { - Authorization: `Bearer ${token}` - } + return { Authorization: `Bearer ${token}` } } @@ -21,9 +19,7 @@ export default { .then((response) => { // it handles the error when backend is unreachable but vite proxy strangely return 200 if (response.data == "") { - return { - code: 500 - } + return { code: 500 } } else { return response.data } @@ -35,7 +31,7 @@ export default { }) }, retrieveAccessCriteriaByResourceId({ state, commit }, { resourceId }) { - return axios.get(`${ACCESS_CRITERIA_PATH}`, {headers: getBearerHeaders(state.oidc.access_token), params: {resourceId: resourceId}}) + return axios.get(`${ACCESS_CRITERIA_PATH}`, { headers: getBearerHeaders(state.oidc.access_token), params: { resourceId: resourceId } }) .then((response) => { return response.data }) @@ -69,7 +65,7 @@ export default { } } } - return axios.post(NEGOTIATION_PATH, data, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.post(NEGOTIATION_PATH, data, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data.id }) @@ -79,7 +75,7 @@ export default { }, retrieveNegotiationsByRole({ state, commit }, { userRole }) { - return axios.get(`${NEGOTIATION_PATH}`, {headers: getBearerHeaders(state.oidc.access_token), params: {userRole: userRole}}) + return axios.get(`${NEGOTIATION_PATH}`, { headers: getBearerHeaders(state.oidc.access_token), params: { userRole: userRole } }) .then((response) => { return response.data }) @@ -89,7 +85,7 @@ export default { }) }, updateNegotiationStatus({ state, commit }, { negotiationId , event }) { - return axios.put(`${NEGOTIATION_PATH}/${negotiationId}/lifecycle/${event}`, {}, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.put(`${NEGOTIATION_PATH}/${negotiationId}/lifecycle/${event}`, {}, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { commit("setNotification", `Negotiation updated correctly with data ${response.data.id}`) return response.data @@ -100,7 +96,7 @@ export default { }) }, retrievePossibleEvents({ state, commit }, { negotiationId }) { - return axios.get(`${NEGOTIATION_PATH}/${negotiationId}/lifecycle`, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.get(`${NEGOTIATION_PATH}/${negotiationId}/lifecycle`, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data }) @@ -109,7 +105,7 @@ export default { }) }, retrievePossibleEventsForResource({ state, commit }, { negotiationId, resourceId }) { - return axios.get(`${NEGOTIATION_PATH}/${negotiationId}/resources/${resourceId}/lifecycle`, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.get(`${NEGOTIATION_PATH}/${negotiationId}/resources/${resourceId}/lifecycle`, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data }) @@ -118,7 +114,7 @@ export default { }) }, updateResourceStatus({ state, commit }, { negotiationId , resourceId, event }) { - return axios.put(`${NEGOTIATION_PATH}/${negotiationId}/resources/${resourceId}/lifecycle/${event}`, {}, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.put(`${NEGOTIATION_PATH}/${negotiationId}/resources/${resourceId}/lifecycle/${event}`, {}, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { commit("setNotification", `Negotiation updated correctly with data ${response.data.id}`) return response.data @@ -129,7 +125,7 @@ export default { }) }, async retrieveNegotiationById({ state, commit }, { negotiationId }) { - return axios.get(`${NEGOTIATION_PATH}/${negotiationId}`, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.get(`${NEGOTIATION_PATH}/${negotiationId}`, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data }) @@ -139,8 +135,8 @@ export default { }, retrievePostsByNegotiationId({ state, commit }, { negotiationId, type, resourceId }) { let url = `${NEGOTIATION_PATH}/${negotiationId}/posts` - let params = resourceId ? {type: type, resource: resourceId} : {type: type} - return axios.get(url, {headers: getBearerHeaders(state.oidc.access_token), params: params}) + let params = resourceId ? { type: type, resource: resourceId } : { type: type } + return axios.get(url, { headers: getBearerHeaders(state.oidc.access_token), params: params }) .then((response) => { return response.data }) @@ -149,7 +145,7 @@ export default { }) }, addMessageToNegotiation({ state, commit }, { data }) { - return axios.post(`${NEGOTIATION_PATH}/${data.negotiationId}/posts`, data, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.post(`${NEGOTIATION_PATH}/${data.negotiationId}/posts`, data, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data }) @@ -158,7 +154,7 @@ export default { }) }, markMessageAsRead({ state }, { data }) { - return axios.put(`${NEGOTIATION_PATH}/${data.negotiationId}/posts/${data.postId}`, data, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.put(`${NEGOTIATION_PATH}/${data.negotiationId}/posts/${data.postId}`, data, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data.id }) @@ -169,7 +165,7 @@ export default { getUnreadMessagesByRole({ state }, { data }) { //the role shoud be complementary in relation of the one from the user let complementaryRole = data.Rolename == ROLES.RESEARCHER ? ROLES.REPRESENTATIVE : ROLES.RESEARCHER - return axios.get(`${NEGOTIATION_PATH}/${data.negotiationId}/${complementaryRole}/posts`, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.get(`${NEGOTIATION_PATH}/${data.negotiationId}/${complementaryRole}/posts`, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data }) @@ -178,7 +174,7 @@ export default { }) }, retrieveUserRoles({ state, commit }) { - return axios.get(USER_PATH, {headers: getBearerHeaders(state.oidc.access_token)}) + return axios.get(USER_PATH, { headers: getBearerHeaders(state.oidc.access_token) }) .then((response) => { return response.data }) diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue deleted file mode 100644 index 65108de..0000000 --- a/src/views/LoginPage.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - Please login before continuing - - - You cannot access this page before logging in - - - - - - - - - - diff --git a/src/views/NegotiationPage.vue b/src/views/NegotiationPage.vue index 680cfaa..b82edc9 100644 --- a/src/views/NegotiationPage.vue +++ b/src/views/NegotiationPage.vue @@ -1,29 +1,53 @@ - - - Go back - - - - {{ negotiation ? negotiation.payload.project.title.toUpperCase() : "" }} - - + + + Go back + + + + + + + + + + + {{ negotiation ? negotiation.payload.project.title.toUpperCase() : "" }} + - + {{ key.toUpperCase() }} @@ -33,8 +57,7 @@ class="mt-3" > {{ subelementkey.toUpperCase() }}: {{ subelement.name }} @@ -51,78 +74,89 @@ - + - Collections ({{ numberOfCollections }}) + COLLECTIONS ({{ numberOfCollections }}) - - - - - {{ collection }} - - {{ getStatusForCollection(collection) }} - - - - - - - - - - - + + + + {{ collection }} + + {{ getStatusForCollection(collection) }} + + + + + + + + + + + + + Your request is waiting for approval by our team. You will be notified of any changes via email. + + - - + + Author: {{ authorName }} - + Negotiation ID: {{ negotiation ? negotiation.id : "" }} - + Status: @@ -131,7 +165,8 @@ class="float-end" type="button" role="button" - @click="showConfirmationDialog" + data-bs-toggle="modal" + data-bs-target="#abandonModal" > Abandon @@ -171,8 +206,7 @@ - - + - - - - - - - Resource ID: {{ privatePostResourceId }} - - - - - - - - - - - - - - - - Resource ID: {{ lifecycleResourceId }} - - - - Respond: - - - {{ response }} - - - Selected item: {{ selectedItem }} - - - - - - \ No newline at end of file
- This is means that you will not be able to access this negotiation again. -
- {{ notificationBody }} -
+ {{ text }} +
- You cannot access this page before logging in -
- Collections ({{ numberOfCollections }}) + COLLECTIONS ({{ numberOfCollections }})
Selected item: {{ selectedItem }}