From 8162d813615c5dd89c3e81a39f9e95075d3e0b4d Mon Sep 17 00:00:00 2001
From: Propo41 <aliahnaf327@gmail.com>
Date: Sun, 12 Jan 2025 10:09:06 +0600
Subject: [PATCH] excluded out-of-office events from calender events list

---
 client/generate-manifest.js                  | 2 +-
 client/src/context/PreferencesContext.tsx    | 4 ++++
 client/src/pages/Home/MyEventsView/index.tsx | 1 +
 server/src/google-api/google-api.service.ts  | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/generate-manifest.js b/client/generate-manifest.js
index e990ca5..e2576d8 100644
--- a/client/generate-manifest.js
+++ b/client/generate-manifest.js
@@ -9,7 +9,7 @@ const appTitle = process.env.VITE_APP_TITLE;
 
 const manifest = {
   name: appTitle,
-  version: '1.0.3',
+  version: '1.0.4',
   description: appDescription,
   manifest_version: 3,
   key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAstDgQFGfJrfxo3id/1KTHVZpKbsCRMKZJXDUsDT8JRfasB/CeDGmuVs1hFYBJcGgn9PbK/mnE9hzWERVFpa4sfGZ3o0lvyfPLUfJd7PmfZ/4PQvE4+GfVQPAz/p4OVtP1WtbN4DED3jmrXiSrZ72paioz/ydVOSRDfo8m3+s9K92LcraYXHItvs+rSKXgfKxflfGzByme/fVO2V4yvE6T0YOqdLDc2USF4KGx0llHvqnmtB2K+rLr3V1/UcM1b4fP6kCiZAo7K2Tngpqa8DxgLVp8GYZ7NPPFJqu4tG1G1iRjtwk8Qblqmw+jmH+qZ2WguGtFpxU7P2JD8znPu//OwIDAQAB',
diff --git a/client/src/context/PreferencesContext.tsx b/client/src/context/PreferencesContext.tsx
index a647ff3..3fb3e8d 100644
--- a/client/src/context/PreferencesContext.tsx
+++ b/client/src/context/PreferencesContext.tsx
@@ -50,6 +50,10 @@ export const PreferencesProvider = ({ children }: PreferencesProviderProps) => {
   }, []);
 
   useEffect(() => {
+    if (!preferences.title) {
+      preferences.title = defaultPreferences.title;
+    }
+
     cacheService.save('preferences', JSON.stringify(preferences));
   }, [preferences]);
 
diff --git a/client/src/pages/Home/MyEventsView/index.tsx b/client/src/pages/Home/MyEventsView/index.tsx
index 241b14f..9b1b859 100644
--- a/client/src/pages/Home/MyEventsView/index.tsx
+++ b/client/src/pages/Home/MyEventsView/index.tsx
@@ -186,6 +186,7 @@ export default function MyEventsView() {
         display: 'flex',
         overflow: 'hidden',
         justifyContent: 'center',
+        flexDirection: 'column',
       }}
     >
       {events.length === 0 ? (
diff --git a/server/src/google-api/google-api.service.ts b/server/src/google-api/google-api.service.ts
index ae16199..8302b19 100644
--- a/server/src/google-api/google-api.service.ts
+++ b/server/src/google-api/google-api.service.ts
@@ -152,12 +152,15 @@ export class GoogleApiService implements IGoogleApiService {
   async getCalenderEvents(oauth2Client: OAuth2Client, start: string, end: string, timeZone: string, limit: number = 30): Promise<calendar_v3.Schema$Event[]> {
     const calendar = google.calendar({ version: 'v3', auth: oauth2Client });
 
+    // https://developers.google.com/calendar/api/v3/reference/events/list
+    const eventTypes = ['workingLocation', 'default', 'fromGmail'];
     const [err, result]: [GaxiosError, GaxiosResponse<calendar_v3.Schema$Events>] = await to(
       calendar.events.list({
         calendarId: 'primary',
         timeMin: start,
         timeMax: end,
         timeZone,
+        eventTypes,
         maxResults: limit,
         singleEvents: true,
         orderBy: 'startTime',