From 2379c08130cefc930b92653c840408579e339437 Mon Sep 17 00:00:00 2001 From: 0-Elia-0 <126093891+0-Elia-0@users.noreply.github.com> Date: Mon, 15 Jan 2024 12:11:23 +0100 Subject: [PATCH 1/9] Collapsing actions on proposals in mobile view --- .../src/components/ProfessorProposalsList.js | 43 +------------------ frontend/src/style/index.css | 4 ++ 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/frontend/src/components/ProfessorProposalsList.js b/frontend/src/components/ProfessorProposalsList.js index 9637719..02b68a8 100644 --- a/frontend/src/components/ProfessorProposalsList.js +++ b/frontend/src/components/ProfessorProposalsList.js @@ -284,7 +284,7 @@ function ProposalRow({ {format(parseISO(proposal.expiration_date), "dd/MM/yyyy")} - + - - { - navigate("/proposals/" + proposal.proposal_id + "/copy"); - }} - > - - - Copy - - - { - navigate("/proposals/" + proposal.proposal_id + "/update"); - }} - > - - - Update - - - { - setShowArchiveModal(true); - }} - > - - - Archive - - + Date: Mon, 15 Jan 2024 12:49:02 +0100 Subject: [PATCH 2/9] Graphical bug fix of bottom buttons in details page --- frontend/src/pages/ProposalDetailsPage.js | 138 +++++++++++----------- 1 file changed, 72 insertions(+), 66 deletions(-) diff --git a/frontend/src/pages/ProposalDetailsPage.js b/frontend/src/pages/ProposalDetailsPage.js index e5ec605..862c29b 100644 --- a/frontend/src/pages/ProposalDetailsPage.js +++ b/frontend/src/pages/ProposalDetailsPage.js @@ -1043,68 +1043,71 @@ function ProposalDetailsPage({ mode }) { - - - - - - {mode === "update" && loggedUser.role === 0 && ( - - - - )} - - {(mode === "add" || mode === "copy") && - loggedUser.role === 0 && ( - - - - )} - - {mode === "read" && loggedUser.role === 1 && ( - - - - )} - - {!(mode === "update" && loggedUser.role === 0) && - !(mode === "add" || mode === "copy") && - !(mode === "read" && loggedUser.role === 1) && ( - - - - Actions - - - + + + + + + {mode === "update" && loggedUser.role === 0 && ( + + + + )} + + {(mode === "add" || mode === "copy") && loggedUser.role === 0 && ( + + + + )} + + {mode === "read" && loggedUser.role === 1 && ( + + + + )} + + {!(mode === "update" && loggedUser.role === 0) && + !(mode === "add" || mode === "copy") && + !(mode === "read" && loggedUser.role === 1) && ( + + + + Actions + + + + {mode === "read" && loggedUser.role === 0 && ( )} - - - )} - + + + + )} + + + Are you sure? From e418b89d0e56460d4273d35f3a4f50fa2c2b4349 Mon Sep 17 00:00:00 2001 From: 0-Elia-0 <126093891+0-Elia-0@users.noreply.github.com> Date: Mon, 15 Jan 2024 12:51:19 +0100 Subject: [PATCH 3/9] DetailsPage prettier formatting --- frontend/src/pages/ProposalDetailsPage.js | 148 +++++++++++----------- 1 file changed, 76 insertions(+), 72 deletions(-) diff --git a/frontend/src/pages/ProposalDetailsPage.js b/frontend/src/pages/ProposalDetailsPage.js index 862c29b..2c20c17 100644 --- a/frontend/src/pages/ProposalDetailsPage.js +++ b/frontend/src/pages/ProposalDetailsPage.js @@ -297,7 +297,7 @@ function ProposalDetailsPage({ mode }) { case "read": case "update": case "copy": - // read, update and copy mode + // read, update and copy mode getProposalById(proposal_id) .then(async (res) => { let data = await res.json(); @@ -365,7 +365,7 @@ function ProposalDetailsPage({ mode }) { setUnauthorized(true); scrollToTarget(); }); - break; + break; case "add": setTitle(""); setSupervisor(loggedUser.name + " " + loggedUser.surname); @@ -1044,70 +1044,76 @@ function ProposalDetailsPage({ mode }) { - - - - - {mode === "update" && loggedUser.role === 0 && ( - - - - )} - - {(mode === "add" || mode === "copy") && loggedUser.role === 0 && ( - - - - )} - - {mode === "read" && loggedUser.role === 1 && ( - - - - )} - - {!(mode === "update" && loggedUser.role === 0) && - !(mode === "add" || mode === "copy") && - !(mode === "read" && loggedUser.role === 1) && ( - - - - Actions - - - - + + + + + {mode === "update" && loggedUser.role === 0 && ( + + + + )} + + {(mode === "add" || mode === "copy") && + loggedUser.role === 0 && ( + + + + )} + + {mode === "read" && loggedUser.role === 1 && ( + + + + )} + + {!(mode === "update" && loggedUser.role === 0) && + !(mode === "add" || mode === "copy") && + !(mode === "read" && loggedUser.role === 1) && ( + + + + Actions + + + {mode === "read" && loggedUser.role === 0 && ( )} - - - - )} - + + + )} + - Are you sure? From a8f7660bb77e44b0aa2eb9fdb2619331c770ffe8 Mon Sep 17 00:00:00 2001 From: 0-Elia-0 <126093891+0-Elia-0@users.noreply.github.com> Date: Mon, 15 Jan 2024 13:09:29 +0100 Subject: [PATCH 4/9] Upgrading the user experience and visibility of type and level fields in non reading ode in details page for proposals --- frontend/src/pages/ProposalDetailsPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/ProposalDetailsPage.js b/frontend/src/pages/ProposalDetailsPage.js index 2c20c17..7be02b4 100644 --- a/frontend/src/pages/ProposalDetailsPage.js +++ b/frontend/src/pages/ProposalDetailsPage.js @@ -637,7 +637,7 @@ function ProposalDetailsPage({ mode }) { - + {mode === "read" ? ( @@ -674,7 +674,7 @@ function ProposalDetailsPage({ mode }) { )} - + From c06ad6ccb28a39c11daca9a2c2b903f276f0c135 Mon Sep 17 00:00:00 2001 From: 0-Elia-0 <126093891+0-Elia-0@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:24:08 +0100 Subject: [PATCH 5/9] Keyword field graphical bug fix --- frontend/src/pages/ProposalDetailsPage.js | 8 ++++---- frontend/src/style/ProposalDetails.css | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/frontend/src/pages/ProposalDetailsPage.js b/frontend/src/pages/ProposalDetailsPage.js index 7be02b4..fc0612a 100644 --- a/frontend/src/pages/ProposalDetailsPage.js +++ b/frontend/src/pages/ProposalDetailsPage.js @@ -674,7 +674,7 @@ function ProposalDetailsPage({ mode }) { )} - + @@ -913,7 +913,7 @@ function ProposalDetailsPage({ mode }) {
- + - + - +
diff --git a/frontend/src/style/ProposalDetails.css b/frontend/src/style/ProposalDetails.css index 8796b9d..a8ac249 100644 --- a/frontend/src/style/ProposalDetails.css +++ b/frontend/src/style/ProposalDetails.css @@ -106,9 +106,10 @@ } .text-plus { + display: flex; flex-direction: row; - justify-content: center; + justify-content: space-between; align-items: center; margin-bottom: 6px; } From ff85edb91fa9d3fbb4343913d62177adb37f14cf Mon Sep 17 00:00:00 2001 From: 0-Elia-0 <126093891+0-Elia-0@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:34:29 +0100 Subject: [PATCH 6/9] Applications list mobile graphical bug fix --- frontend/src/pages/ApplicationList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/ApplicationList.js b/frontend/src/pages/ApplicationList.js index bb13dbe..f0f40ec 100644 --- a/frontend/src/pages/ApplicationList.js +++ b/frontend/src/pages/ApplicationList.js @@ -71,13 +71,13 @@ function ApplicationList() { - + {application.name} {application.surname} {' '} has applied for this thesis on {formattedDate(application.application_date)} - + - + From 4f423e2601c1b35c9d8b205347381a79a1e6a12f Mon Sep 17 00:00:00 2001 From: 0-Elia-0 <126093891+0-Elia-0@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:49:43 +0100 Subject: [PATCH 8/9] Application details graphical fix --- frontend/src/pages/ApplicationDetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/ApplicationDetailsPage.js b/frontend/src/pages/ApplicationDetailsPage.js index 7aae5b9..cc82997 100644 --- a/frontend/src/pages/ApplicationDetailsPage.js +++ b/frontend/src/pages/ApplicationDetailsPage.js @@ -449,7 +449,7 @@ ProposalInfo.propTypes = { function RowInfo(props) { return ( - + {props.title} : From eeb9da8f30056b74c89a18d2696d3b56b59a5589 Mon Sep 17 00:00:00 2001 From: 0-Elia-0 <126093891+0-Elia-0@users.noreply.github.com> Date: Mon, 15 Jan 2024 17:09:39 +0100 Subject: [PATCH 9/9] Small graphical bug fix --- frontend/src/components/ProposalsSearchArea.js | 2 +- frontend/src/pages/ThesisRequestDetailsPage.js | 7 ++++--- frontend/src/style/ProposalDetails.css | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/ProposalsSearchArea.js b/frontend/src/components/ProposalsSearchArea.js index af6c61e..6169313 100644 --- a/frontend/src/components/ProposalsSearchArea.js +++ b/frontend/src/components/ProposalsSearchArea.js @@ -247,7 +247,7 @@ function ProposalsSearchArea(props) { } -
+
Filter by:
diff --git a/frontend/src/pages/ThesisRequestDetailsPage.js b/frontend/src/pages/ThesisRequestDetailsPage.js index 1ca0087..3a6002a 100644 --- a/frontend/src/pages/ThesisRequestDetailsPage.js +++ b/frontend/src/pages/ThesisRequestDetailsPage.js @@ -203,14 +203,15 @@ function ThesisRequestDetailsPage() {
- - - + diff --git a/frontend/src/style/ProposalDetails.css b/frontend/src/style/ProposalDetails.css index a8ac249..70f4292 100644 --- a/frontend/src/style/ProposalDetails.css +++ b/frontend/src/style/ProposalDetails.css @@ -59,9 +59,10 @@ #add-proposal-btn, #add-keyword-btn, -#add-group-btn { +#add-group-btn, +#add-request-btn { background-color: #5bc0de; - border-color: #5bc0de; + border: 2px solid #5bc0de; } #add-proposal-btn:hover,