From e9b0c45e82102b68e66d1ef2d4790826ef8c7be4 Mon Sep 17 00:00:00 2001
From: gxnca <fl11gg20@gmail.com>
Date: Sat, 25 Oct 2025 23:46:44 +0100
Subject: [PATCH 1/2] fix: wrong types & render

---
 .../(app)/settings/backoffice/events/page.tsx | 48 +++++++++++++++++++
 src/components/calendar/event-modal.tsx       | 15 +++---
 src/components/events-calendar.tsx            |  4 +-
 src/lib/types.ts                              |  4 +-
 4 files changed, 61 insertions(+), 10 deletions(-)
 create mode 100644 src/app/(app)/settings/backoffice/events/page.tsx

diff --git a/src/app/(app)/settings/backoffice/events/page.tsx b/src/app/(app)/settings/backoffice/events/page.tsx
new file mode 100644
index 0000000..204932f
--- /dev/null
+++ b/src/app/(app)/settings/backoffice/events/page.tsx
@@ -0,0 +1,48 @@
+import { AuthCheck } from "@/components/auth-check";
+import SettingsWrapper from "@/components/settings-wrapper";
+
+export default function EventsManagement() {
+  return (
+    <>
+      <title>Jobs | Pombo</title>
+      <AuthCheck userTypes={["admin", "professor"]}>
+        <SettingsWrapper title="Events & Categories">
+          <div className="flex h-full flex-col gap-8">
+            <section className="h-1/2">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <h2 className="text-2xl font-semibold">Event Categories</h2>
+                  <p>Manage categories for your calendar events</p>
+                </div>
+
+                <button className="bg-primary-400 hover:bg-primary-400/95 inline-flex h-fit cursor-pointer items-center justify-center space-x-1.5 rounded-lg px-3 py-2 text-white transition-all duration-200 hover:scale-95">
+                  <span className="material-symbols-outlined text-xl">add</span>
+                  <p className="text-sm font-semibold">New Category</p>
+                </button>
+              </div>
+            </section>
+
+            <section className="h-1/2">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <h2 className="text-2xl font-semibold">Calendar Events</h2>
+                  <p>Create and manage events for your calendar</p>
+                </div>
+
+                <button className="bg-primary-400 hover:bg-primary-400/95 inline-flex h-fit cursor-pointer items-center justify-center space-x-0.5 rounded-lg px-3 py-2 text-white transition-all duration-200 hover:scale-95">
+                  <span
+                    className="material-symbols-outlined-filled"
+                    style={{ fontSize: "20px" }}
+                  >
+                    add
+                  </span>
+                  <p className="text-sm font-semibold">New Event</p>
+                </button>
+              </div>
+            </section>
+          </div>
+        </SettingsWrapper>
+      </AuthCheck>
+    </>
+  );
+}
diff --git a/src/components/calendar/event-modal.tsx b/src/components/calendar/event-modal.tsx
index cb76062..0a9809a 100644
--- a/src/components/calendar/event-modal.tsx
+++ b/src/components/calendar/event-modal.tsx
@@ -157,13 +157,14 @@ export default function EventModal({
                   />
                 )}
                 <ModalItem icon="schedule" label="Hora" value={eventTime} />
-                {event.building && event.room && (
-                  <ModalItem
-                    icon="location_on"
-                    label="Local"
-                    value={eventLocation}
-                  />
-                )}
+                {(event.building && event.room) ||
+                  (event.place && (
+                    <ModalItem
+                      icon="location_on"
+                      label="Local"
+                      value={eventLocation}
+                    />
+                  ))}
                 {type === "calendar" && event.link && (
                   <ModalItem
                     icon="explore"
diff --git a/src/components/events-calendar.tsx b/src/components/events-calendar.tsx
index 974afb4..54f01d6 100644
--- a/src/components/events-calendar.tsx
+++ b/src/components/events-calendar.tsx
@@ -15,7 +15,9 @@ export default function EventsCalendar() {
   // Converts an IEvent to an Event
   const formattedEvents = activeEvents.map((event): Event => {
     return {
-      title: event.title,
+      title: event.category.course
+        ? `[${event.category.course?.shortname}] ${event.title}`
+        : event.title,
       start: moment(event.start).toDate(),
       end: moment(event.end).toDate(),
       allDay: event.allDay,
diff --git a/src/lib/types.ts b/src/lib/types.ts
index 5dfc575..50de85c 100644
--- a/src/lib/types.ts
+++ b/src/lib/types.ts
@@ -85,7 +85,7 @@ export interface IEvent {
   category: IEventCategory;
   start: string;
   end: string;
-  place: string;
+  place?: string;
   link?: string;
   eventColor: string;
   textColor: string;
@@ -98,7 +98,7 @@ export interface IEventResponse {
   category: IEventCategory;
   start: string;
   end: string;
-  place: string;
+  place?: string;
   link?: string;
 }
 

From 0c3f7032256a66189371efaa719dc23ab9a76fca Mon Sep 17 00:00:00 2001
From: gxnca <fl11gg20@gmail.com>
Date: Sat, 25 Oct 2025 23:52:54 +0100
Subject: [PATCH 2/2] fix: language

---
 .../(app)/settings/backoffice/events/page.tsx | 48 -------------------
 src/components/calendar/event-modal.tsx       |  6 +--
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 src/app/(app)/settings/backoffice/events/page.tsx

diff --git a/src/app/(app)/settings/backoffice/events/page.tsx b/src/app/(app)/settings/backoffice/events/page.tsx
deleted file mode 100644
index 204932f..0000000
--- a/src/app/(app)/settings/backoffice/events/page.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { AuthCheck } from "@/components/auth-check";
-import SettingsWrapper from "@/components/settings-wrapper";
-
-export default function EventsManagement() {
-  return (
-    <>
-      <title>Jobs | Pombo</title>
-      <AuthCheck userTypes={["admin", "professor"]}>
-        <SettingsWrapper title="Events & Categories">
-          <div className="flex h-full flex-col gap-8">
-            <section className="h-1/2">
-              <div className="flex items-center justify-between">
-                <div className="space-y-1">
-                  <h2 className="text-2xl font-semibold">Event Categories</h2>
-                  <p>Manage categories for your calendar events</p>
-                </div>
-
-                <button className="bg-primary-400 hover:bg-primary-400/95 inline-flex h-fit cursor-pointer items-center justify-center space-x-1.5 rounded-lg px-3 py-2 text-white transition-all duration-200 hover:scale-95">
-                  <span className="material-symbols-outlined text-xl">add</span>
-                  <p className="text-sm font-semibold">New Category</p>
-                </button>
-              </div>
-            </section>
-
-            <section className="h-1/2">
-              <div className="flex items-center justify-between">
-                <div className="space-y-1">
-                  <h2 className="text-2xl font-semibold">Calendar Events</h2>
-                  <p>Create and manage events for your calendar</p>
-                </div>
-
-                <button className="bg-primary-400 hover:bg-primary-400/95 inline-flex h-fit cursor-pointer items-center justify-center space-x-0.5 rounded-lg px-3 py-2 text-white transition-all duration-200 hover:scale-95">
-                  <span
-                    className="material-symbols-outlined-filled"
-                    style={{ fontSize: "20px" }}
-                  >
-                    add
-                  </span>
-                  <p className="text-sm font-semibold">New Event</p>
-                </button>
-              </div>
-            </section>
-          </div>
-        </SettingsWrapper>
-      </AuthCheck>
-    </>
-  );
-}
diff --git a/src/components/calendar/event-modal.tsx b/src/components/calendar/event-modal.tsx
index 0a9809a..798f5bc 100644
--- a/src/components/calendar/event-modal.tsx
+++ b/src/components/calendar/event-modal.tsx
@@ -152,16 +152,16 @@ export default function EventModal({
                 {type === "calendar" && (
                   <ModalItem
                     icon="calendar_today"
-                    label="Data"
+                    label="Date"
                     value={eventDate}
                   />
                 )}
-                <ModalItem icon="schedule" label="Hora" value={eventTime} />
+                <ModalItem icon="schedule" label="Time" value={eventTime} />
                 {(event.building && event.room) ||
                   (event.place && (
                     <ModalItem
                       icon="location_on"
-                      label="Local"
+                      label="Place"
                       value={eventLocation}
                     />
                   ))}