Merge pull request #310 from ls1intum/code-cleanup

Code cleanup
ls1intum · Oct 10, 2024 · 2a25afc · 2a25afc
2 parents 9fdfb4c + e6c2e91
commit 2a25afc
Show file tree

Hide file tree

Showing 30 changed files with 75 additions and 75 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -57,7 +57,7 @@
     "eslint-plugin-prettier": "5.2.1",
     "eslint-plugin-react": "7.37.1",
     "fork-ts-checker-webpack-plugin": "9.0.2",
-    "globals": "15.10.0",
+    "globals": "15.11.0",
     "html-webpack-plugin": "5.6.0",
     "mini-css-extract-plugin": "2.9.1",
     "postcss": "8.4.47",

diff --git a/...nts/ThesisWritingSection/components/ThesisPresentationsTable/ThesisPresentationsTable.tsx b/...nts/ThesisWritingSection/components/ThesisPresentationsTable/ThesisPresentationsTable.tsx
@@ -3,7 +3,7 @@ import {
   useLoadedThesisContext,
   useThesisUpdateAction,
 } from '../../../../../../providers/ThesisProvider/hooks'
-import { Button, Center, Group, Stack, Tooltip } from '@mantine/core'
+import { Button, Center, Group, Stack } from '@mantine/core'
 import { Check, Pencil, Trash } from 'phosphor-react'
 import { doRequest } from '../../../../../../requests/request'
 import { IThesis, IThesisPresentation } from '../../../../../../requests/responses/thesis'

diff --git a/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java b/server/src/main/java/thesistrack/ls1/service/ThesisPresentationService.java
@@ -317,7 +317,7 @@ private CalendarService.CalendarEvent createPresentationCalendarEvent(ThesisPres
                         "Details: " + clientHost + "/presentations/" + presentation.getId() + "\n\n" +
                         "Abstract:\n" + presentation.getThesis().getAbstractField(),
                 presentation.getScheduledAt(),
-                presentation.getScheduledAt().plus(60, ChronoUnit.MINUTES),
+                presentation.getScheduledAt().plus(45, ChronoUnit.MINUTES),
                 this.applicationMail,
                 presentation.getThesis().getRoles().stream().map((role) -> role.getUser().getEmail()).toList(),
                 presentation.getInvites().stream().map(ThesisPresentationInvite::getEmail).toList()

diff --git a/server/src/main/resources/mail-templates/application-accepted-no-advisor.html b/server/src/main/resources/mail-templates/application-accepted-no-advisor.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   I am delighted to inform you that I would like to take the next steps in

diff --git a/server/src/main/resources/mail-templates/application-accepted.html b/server/src/main/resources/mail-templates/application-accepted.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   I am delighted to inform you that I would like to take the next steps in

diff --git a/server/src/main/resources/mail-templates/application-created-chair.html b/server/src/main/resources/mail-templates/application-created-chair.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">there is a new thesis application by <strong>[[${application.user.firstName}]]&nbsp;[[${application.user.lastName}]]</strong>.</p>
 <p th:inline="text">We received the following thesis application details:</p>
@@ -62,4 +62,4 @@
 
 <p th:inline="text"><strong>You can find the submitted files in the attachment part of this email.</strong></p>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/application-created-student.html b/server/src/main/resources/mail-templates/application-created-student.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">With this email, we confirm your thesis application.</p>
 <p th:inline="text">We received the following details:</p>

diff --git a/server/src/main/resources/mail-templates/application-rejected-student-requirements.html b/server/src/main/resources/mail-templates/application-rejected-student-requirements.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   Thank you for your interest in pursuing your thesis under my supervision.

diff --git a/server/src/main/resources/mail-templates/application-rejected-title-not-interesting.html b/server/src/main/resources/mail-templates/application-rejected-title-not-interesting.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   Thank you for your interest in pursuing your thesis under my supervision.

diff --git a/server/src/main/resources/mail-templates/application-rejected-topic-filled.html b/server/src/main/resources/mail-templates/application-rejected-topic-filled.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   Thank you for your interest in pursuing your thesis under my supervision.

diff --git a/server/src/main/resources/mail-templates/application-rejected-topic-outdated.html b/server/src/main/resources/mail-templates/application-rejected-topic-outdated.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   Thank you for your interest in pursuing your thesis under my supervision.

diff --git a/server/src/main/resources/mail-templates/application-rejected-topic-requirements.html b/server/src/main/resources/mail-templates/application-rejected-topic-requirements.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   Thank you for your interest in pursuing your thesis under my supervision.

diff --git a/server/src/main/resources/mail-templates/application-rejected.html b/server/src/main/resources/mail-templates/application-rejected.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   Thank you for your interest in pursuing your thesis under my supervision.

diff --git a/server/src/main/resources/mail-templates/application-reminder.html b/server/src/main/resources/mail-templates/application-reminder.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   There are currently <strong>[[${unreviewedApplications}]]</strong> unreviewed thesis applications.
@@ -8,4 +8,4 @@
   Review Applications: <a target="_blank" rel="noopener noreferrer nofollow" th:href="${reviewApplicationsLink}">[[${reviewApplicationsLink}]]</a>
 </p>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-assessment-added.html b/server/src/main/resources/mail-templates/thesis-assessment-added.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${assessment.createdBy.firstName}]] [[${assessment.createdBy.lastName}]] added an assessment to thesis "[[${thesis.title}]]"
@@ -23,6 +23,6 @@
   <strong>Grade Suggestion</strong>: [[${assessment.gradeSuggestion}]]
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-closed.html b/server/src/main/resources/mail-templates/thesis-closed.html
@@ -1,10 +1,10 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${deletingUser.firstName}]] [[${deletingUser.lastName}]] closed thesis "[[${thesis.title}]]".
   Please contact your advisor or supervisor if you think that this was a mistake.
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-comment-posted.html b/server/src/main/resources/mail-templates/thesis-comment-posted.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${comment.createdBy.firstName}]] [[${comment.createdBy.lastName}]] posted a comment on thesis "[[${thesis.title}]]"
@@ -9,6 +9,6 @@
   [[${comment.message}]]
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-created.html b/server/src/main/resources/mail-templates/thesis-created.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${creatingUser.firstName}]] [[${creatingUser.lastName}]] created and assigned a thesis to you: <a target="_blank" rel="noopener noreferrer nofollow" th:href="${thesisUrl}">[[${thesisUrl}]]</a>

diff --git a/server/src/main/resources/mail-templates/thesis-final-grade.html b/server/src/main/resources/mail-templates/thesis-final-grade.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${DataFormatter.formatUsers(thesis.supervisors)}]] added the final grade to your thesis "[[${thesis.title}]]"
@@ -13,6 +13,6 @@
   [[${thesis.grade.feedback}]]
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-final-submission.html b/server/src/main/resources/mail-templates/thesis-final-submission.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${DataFormatter.formatUsers(thesis.students)}]] submitted thesis "[[${thesis.title}]]".
@@ -8,6 +8,6 @@
   The next step is to write an assessment about the thesis.
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-presentation-deleted.html b/server/src/main/resources/mail-templates/thesis-presentation-deleted.html
@@ -1,9 +1,9 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${deletingUser.firstName}]] [[${deletingUser.lastName}]] cancelled the presentation scheduled at [[${DataFormatter.formatDateTime(presentation.scheduledAt)}]] for thesis "[[${thesis.title}]]"
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-presentation-invitation-cancelled.html b/server/src/main/resources/mail-templates/thesis-presentation-invitation-cancelled.html
@@ -1,9 +1,9 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   The [[${DataFormatter.formatConstantName(thesis.type)}]] thesis presentation of
   <strong>[[${DataFormatter.formatUsers(thesis.students)}]]</strong> scheduled at
   [[${DataFormatter.formatDateTime(presentation.scheduledAt)}]] was cancelled.
 </p>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-presentation-invitation-updated.html b/server/src/main/resources/mail-templates/thesis-presentation-invitation-updated.html
@@ -31,4 +31,4 @@ <h2>INVITATION</h2>
   Full Details: <a target="_blank" rel="noopener noreferrer nofollow" th:href="${presentationUrl}">[[${presentationUrl}]]</a>
 </p>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-presentation-invitation.html b/server/src/main/resources/mail-templates/thesis-presentation-invitation.html
@@ -31,4 +31,4 @@ <h2>INVITATION</h2>
   Full Details: <a target="_blank" rel="noopener noreferrer nofollow" th:href="${presentationUrl}">[[${presentationUrl}]]</a>
 </p>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-presentation-scheduled.html b/server/src/main/resources/mail-templates/thesis-presentation-scheduled.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${presentation.createdBy.firstName}]] [[${presentation.createdBy.lastName}]] scheduled a presentation for thesis "[[${thesis.title}]]"
@@ -29,6 +29,6 @@
   [[${DataFormatter.formatDateTime(presentation.scheduledAt)}]]
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-presentation-updated.html b/server/src/main/resources/mail-templates/thesis-presentation-updated.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${presentation.createdBy.firstName}]] [[${presentation.createdBy.lastName}]] updated a presentation for thesis "[[${thesis.title}]]"
@@ -29,6 +29,6 @@
   [[${DataFormatter.formatDateTime(presentation.scheduledAt)}]]
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-proposal-accepted.html b/server/src/main/resources/mail-templates/thesis-proposal-accepted.html
@@ -1,9 +1,9 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${proposal.approvedBy.firstName}]] [[${proposal.approvedBy.lastName}]] approved the proposal of thesis "[[${thesis.title}]]".
   The next step is to start with the project work and with writing the thesis.
   You can see your submission deadline on <a target="_blank" rel="noopener noreferrer nofollow" th:href="${thesisUrl}">[[${thesisUrl}]]</a>.
 </p>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>
diff --git a/server/src/main/resources/mail-templates/thesis-proposal-rejected.html b/server/src/main/resources/mail-templates/thesis-proposal-rejected.html
@@ -1,4 +1,4 @@
-<div th:replace="fragments/salutation :: main"></div>
+<div th:replace="~{fragments/salutation :: main}"></div>
 
 <p th:inline="text">
   [[${reviewingUser.firstName}]] [[${reviewingUser.lastName}]] reviewed your proposal for thesis "[[${thesis.title}]]".
@@ -11,6 +11,6 @@
   </ul>
 </p>
 
-<div th:replace="fragments/thesis-link :: main"></div>
+<div th:replace="~{fragments/thesis-link :: main}"></div>
 
-<div th:replace="fragments/notification-settings :: main"></div>
+<div th:replace="~{fragments/notification-settings :: main}"></div>