Matthias-Claudius-Schule/borrow-system
4
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'demoDev' into debian12Demo

Browse Source
This commit is contained in:
Theis Gaedigk
2026-02-07 17:44:12 +01:00
parent 776fab749d dc0a68f7f1
commit c97cc8b538
7 changed files with 42 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backendV2/info.json
View File

@@ -1,11 +1,11 @@
{
"backend-info": {
"version": "v2.0.1 (demo)"
"version": "v2.1 (demo)"
},
"frontend-info": {
"version": "v2.0 (demo)"
"version": "v2.1 (demo)"
},
"admin-panel-info": {
"version": "v1.3 (demo)"
"version": "v1.3.2 (demo)"
}
}

12
backendV2/routes/app/services/mailer.js
View File

@@ -41,7 +41,7 @@ function buildLoanEmail({ user, items, startDate, endDate, createdDate }) {
? `<ul style="margin:4px 0 0 18px; padding:0;">${items
.map(
(i) =>
`<li style="margin:2px 0; color:#111827; line-height:1.3;">${i}</li>`
`<li style="margin:2px 0; color:#111827; line-height:1.3;">${i}</li>`,
)
.join("")}</ul>`
: "<span style='color:#111827;'>N/A</span>";
@@ -101,19 +101,19 @@ function buildLoanEmail({ user, items, startDate, endDate, createdDate }) {
<tr>
<td style="padding:10px 14px; color:#6b7280; border-bottom:1px solid #ececec;">Startdatum</td>
<td style="padding:10px 14px; font-weight:600; border-bottom:1px solid #ececec; color:#111827;">${formatDateTime(
startDate
startDate,
)}</td>
</tr>
<tr>
<td style="padding:10px 14px; color:#6b7280; border-bottom:1px solid #ececec;">Enddatum</td>
<td style="padding:10px 14px; font-weight:600; border-bottom:1px solid #ececec; color:#111827;">${formatDateTime(
endDate
endDate,
)}</td>
</tr>
<tr>
<td style="padding:10px 14px; color:#6b7280;">Erstellt am</td>
<td style="padding:10px 14px; font-weight:600; color:#111827;">${formatDateTime(
createdDate
createdDate,
)}</td>
</tr>
</tbody>
@@ -174,8 +174,6 @@ export function sendMailLoan(user, items, startDate, endDate, createdDate) {
html: buildLoanEmail({ user, items, startDate, endDate, createdDate }),
});
// debugging logs
// console.log("Message sent:", info.messageId);
console.log("Loan message sent:", info.messageId);
})();
// console.log("sendMailLoan called");
}

4
backendV2/routes/app/services/mailer_v2.js
View File

@@ -38,8 +38,6 @@ export function sendMail(username, message) {
html: mailHtml,
});
// debugging logs
// console.log("Message sent:", info.messageId);
console.log("Contact message sent: %s", info.messageId);
})();
// console.log("sendMailLoan called");
}