Merge branch 'develop-build' of github.com:Diebbo/proj-tw202425 into …

…develop-build
Diebbo · Jan 7, 2025 · eb760d7 · eb760d7
2 parents bd7a2c7 + 60c71a5
commit eb760d7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/client/components/calendar/calendar.tsx b/client/components/calendar/calendar.tsx
@@ -1,4 +1,3 @@
-//client/components/calendar/calendar.tsx
 "use client";
 
 import { Chip, Button, Tooltip, Switch } from "@nextui-org/react";

diff --git a/client/components/calendar/eventAdder.tsx b/client/components/calendar/eventAdder.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useState, useEffect, ReactElement } from "react";
+import React, { useState, useEffect } from "react";
 import { areIntervalsOverlapping, parseISO } from "date-fns";
 import { Interval } from "date-fns";
 import {

diff --git a/client/components/calendar/showEvent.tsx b/client/components/calendar/showEvent.tsx
@@ -1054,8 +1054,8 @@ const ShowEvent: React.FC<ShowEventProps> = ({
 
                   <DatePicker
                     defaultValue={getDateParsed(
-                      displayEvent.dtstart,
-                      displayEvent.allDay,
+                      displayEvent.notification.fromDate,
+                      displayEvent.notification.repetition.freq === 'minutley',
                     )}
                     maxValue={getDateParsed(
                       displayEvent.dtstart,

diff --git a/client/public/song/21stschizoidman.mp3 b/client/public/song/21stschizoidman.mp3
diff --git a/server/src/pushNotificationWorker.js b/server/src/pushNotificationWorker.js
@@ -25,23 +25,6 @@ export default function createNotificationWorker(db) {
           continue;
         }
 
-        // send notifications for user
-        if (user?.inbox?.length > 0) {
-          while (user.inbox.length > 0) {
-            const notification = user.inbox[0];
-            try {
-              await sendNotification(user, notification);
-              user.inbox.shift();
-            } catch (error) {
-              console.error(
-                `Error sending notification to user ${user.username}:`,
-                error,
-              );
-              // Continue with next notification
-            }
-          }
-        }
-
         for (const event of user.events || []) {
           if (!event?.notification) {
             console.log(
@@ -208,7 +191,7 @@ export default function createNotificationWorker(db) {
       from: "selfie.notification@gmail.com",
       to: payload.email,
       subject: payload.title,
-      text: payload.body,
+      html: payload.body,
     };
 
     if (process.env.NODE_ENV !== "production") {
@@ -264,7 +247,7 @@ export default function createNotificationWorker(db) {
         const emailPayload = {
           email: user.email,
           title: payload.title,
-          body: `${payload.body}\n\n<a href="http://site232454.tw.cs.unibo/${payload.link}>Click here to view</a>`,
+          body: `${payload.body}\n\n<a href="https://site232454.tw.cs.unibo.it/${payload.link}">Click here to view</a>`,
         };
 
         await sendEmailNotification(emailPayload);