From c49a6729c2d26076e23f05a791ab2eb48e5040c7 Mon Sep 17 00:00:00 2001
From: dishafaujdar <dishachoudhary1102@gmail.com>
Date: Wed, 16 Oct 2024 19:21:19 +0530
Subject: [PATCH 1/7] height

---
 components/Calendar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Calendar.tsx b/components/Calendar.tsx
index 2805abf2f7c..c34dfbff38f 100644
--- a/components/Calendar.tsx
+++ b/components/Calendar.tsx
@@ -30,7 +30,7 @@ export default function Calendar({ className = '', size }: ICalendarProps) {
   const eventsExist = eventsData.length > 0;
 
   return (
-    <div className={twMerge('overflow-hidden rounded-md border border-gray-200 bg-white p-4', className)}>
+    <div className={twMerge('overflow-hidden rounded-md border border-gray-200 bg-white p-4 h-full', className)}>
       <Heading level={HeadingLevel.h2} typeStyle={HeadingTypeStyle.mdSemibold}>
         {t('calendar.title')}
       </Heading>

From 0021c7c86e5adae5f102c871ef5b4c3cee0f1673 Mon Sep 17 00:00:00 2001
From: dishafaujdar <dishachoudhary1102@gmail.com>
Date: Fri, 18 Oct 2024 14:40:29 +0530
Subject: [PATCH 2/7] content

---
 pages/[lang]/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/[lang]/index.tsx b/pages/[lang]/index.tsx
index ad5fe83ba6c..806d7bd67a4 100644
--- a/pages/[lang]/index.tsx
+++ b/pages/[lang]/index.tsx
@@ -108,7 +108,7 @@ export default function HomePage() {
 
               <div className='mt-12 lg:flex lg:flex-row-reverse'>
                 <section className='mt-10 lg:mt-0 lg:flex-1'>
-                  <Calendar size={2} className='float-left' />
+                  <Calendar size={2} className='content-center' />
                 </section>
                 <section className='lg:mr-12 lg:max-w-xl lg:text-left'>
                   <div className='mt-5 lg:mr-12'>

From 38d074d2e44dbc2c8302308f75cfa9066f3ced74 Mon Sep 17 00:00:00 2001
From: dishafaujdar <dishachoudhary1102@gmail.com>
Date: Sun, 20 Oct 2024 19:46:28 +0530
Subject: [PATCH 3/7] css

---
 components/Calendar.tsx       | 11 +++++------
 pages/[lang]/index.tsx        |  2 +-
 public/locales/de/common.json |  2 +-
 public/locales/en/common.json |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/components/Calendar.tsx b/components/Calendar.tsx
index c34dfbff38f..099d946a7c8 100644
--- a/components/Calendar.tsx
+++ b/components/Calendar.tsx
@@ -27,7 +27,7 @@ export default function Calendar({ className = '', size }: ICalendarProps) {
 
   const CALENDAR_URL =
     'https://calendar.google.com/calendar/embed?src=c_q9tseiglomdsj6njuhvbpts11c%40group.calendar.google.com&ctz=UTC';
-  const eventsExist = eventsData.length > 0;
+  const eventsExist = eventsData.length = 0;
 
   return (
     <div className={twMerge('overflow-hidden rounded-md border border-gray-200 bg-white p-4 h-full', className)}>
@@ -52,13 +52,12 @@ export default function Calendar({ className = '', size }: ICalendarProps) {
           </li>
         ))}
       </ul>
-      {eventsExist ? (
-        <div className='pt-4' data-testid='Calendar-button'>
+      <div className='h-full content-center'>
+        {!eventsExist && <div className='lg:pb-8 font-bold text-gray-700'>{t('calendar.noMeetingsMessage')}</div>}
+        <div className='sm:pt-0 md:pt-2 lg:pt-0 lg:pb-8' data-testid='Calendar-button'>
           <GoogleCalendarButton href={CALENDAR_URL} text={t('calendar.viewCalendarBtn')} />
         </div>
-      ) : (
-        <div className='mt-2 text-gray-700'>{t('calendar.noMeetingsMessage')}</div>
-      )}
+      </div>
     </div>
   );
 }
diff --git a/pages/[lang]/index.tsx b/pages/[lang]/index.tsx
index 806d7bd67a4..634982c9ee2 100644
--- a/pages/[lang]/index.tsx
+++ b/pages/[lang]/index.tsx
@@ -108,7 +108,7 @@ export default function HomePage() {
 
               <div className='mt-12 lg:flex lg:flex-row-reverse'>
                 <section className='mt-10 lg:mt-0 lg:flex-1'>
-                  <Calendar size={2} className='content-center' />
+                  <Calendar size={2} />
                 </section>
                 <section className='lg:mr-12 lg:max-w-xl lg:text-left'>
                   <div className='mt-5 lg:mr-12'>
diff --git a/public/locales/de/common.json b/public/locales/de/common.json
index 04d3c5c5398..3b88c00fa20 100644
--- a/public/locales/de/common.json
+++ b/public/locales/de/common.json
@@ -23,6 +23,6 @@
     "calendar": {
         "title": "Kommende Veranstaltungen",
         "viewCalendarBtn": "Kalender ansehen",
-        "noMettingsMessage": "In den nächsten Tagen sind keine Sitzungen geplant."
+        "noMeetingsMessage": "In den nächsten Tagen sind keine Sitzungen geplant."
     }
 }
\ No newline at end of file
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 28fc28df539..264267f94ba 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -23,6 +23,6 @@
     "calendar": {
         "title": "Upcoming events",
         "viewCalendarBtn": "View Calendar",
-        "noMettingsMessage": "There are no meetings scheduled for next few days."
+        "noMeetingsMessage": "There are no meetings scheduled for next few days."
     }
 }
\ No newline at end of file

From c136e362740198d6f5f2c85773a4bbf7cc85916e Mon Sep 17 00:00:00 2001
From: dishafaujdar <dishachoudhary1102@gmail.com>
Date: Sun, 20 Oct 2024 19:48:57 +0530
Subject: [PATCH 4/7] change

---
 components/Calendar.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Calendar.tsx b/components/Calendar.tsx
index 099d946a7c8..5e2ccdc3ffd 100644
--- a/components/Calendar.tsx
+++ b/components/Calendar.tsx
@@ -27,7 +27,7 @@ export default function Calendar({ className = '', size }: ICalendarProps) {
 
   const CALENDAR_URL =
     'https://calendar.google.com/calendar/embed?src=c_q9tseiglomdsj6njuhvbpts11c%40group.calendar.google.com&ctz=UTC';
-  const eventsExist = eventsData.length = 0;
+  const eventsExist = eventsData.length > 0;
 
   return (
     <div className={twMerge('overflow-hidden rounded-md border border-gray-200 bg-white p-4 h-full', className)}>

From 62f32c17a738fe205dcf021318f8659c0cc4d86b Mon Sep 17 00:00:00 2001
From: dishafaujdar <dishachoudhary1102@gmail.com>
Date: Mon, 21 Oct 2024 12:54:27 +0530
Subject: [PATCH 5/7] lint:fix

---
 components/Calendar.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/Calendar.tsx b/components/Calendar.tsx
index 5e2ccdc3ffd..2d6d317fa87 100644
--- a/components/Calendar.tsx
+++ b/components/Calendar.tsx
@@ -53,8 +53,8 @@ export default function Calendar({ className = '', size }: ICalendarProps) {
         ))}
       </ul>
       <div className='h-full content-center'>
-        {!eventsExist && <div className='lg:pb-8 font-bold text-gray-700'>{t('calendar.noMeetingsMessage')}</div>}
-        <div className='sm:pt-0 md:pt-2 lg:pt-0 lg:pb-8' data-testid='Calendar-button'>
+        {!eventsExist && <div className='font-bold text-gray-700 lg:pb-8'>{t('calendar.noMeetingsMessage')}</div>}
+        <div className='sm:pt-0 md:pt-2 lg:pb-8 lg:pt-0' data-testid='Calendar-button'>
           <GoogleCalendarButton href={CALENDAR_URL} text={t('calendar.viewCalendarBtn')} />
         </div>
       </div>

From e30750636ac696b2245ee922a0373d7b12daf423 Mon Sep 17 00:00:00 2001
From: akshatnema <akshatnema.school@gmail.com>
Date: Fri, 25 Oct 2024 23:18:35 +0530
Subject: [PATCH 6/7] fixed no meetings fallback state

---
 components/Calendar.tsx       | 12 +++++++++---
 public/locales/en/common.json |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/components/Calendar.tsx b/components/Calendar.tsx
index 1308ead1f75..5a5bfd2ba13 100644
--- a/components/Calendar.tsx
+++ b/components/Calendar.tsx
@@ -28,10 +28,16 @@ export default function Calendar({ className = '', size }: ICalendarProps) {
 
   const CALENDAR_URL =
     'https://calendar.google.com/calendar/embed?src=c_q9tseiglomdsj6njuhvbpts11c%40group.calendar.google.com&ctz=UTC';
-  const eventsExist = eventsData.length > 0;
+  const currentDate = new Date();
+  const eventsExist = eventsData?.filter((event: IEvent) => moment(event.date).isAfter(currentDate)).length > 0;
 
   return (
-    <div className={twMerge('overflow-hidden rounded-md border border-gray-200 bg-white p-4 h-full', className)}>
+    <div
+      className={twMerge(
+        'overflow-hidden rounded-md border border-gray-200 bg-white p-4 h-full flex flex-col gap-2',
+        className
+      )}
+    >
       <Heading level={HeadingLevel.h2} typeStyle={HeadingTypeStyle.mdSemibold}>
         {t('calendar.title')}
       </Heading>
@@ -43,7 +49,7 @@ export default function Calendar({ className = '', size }: ICalendarProps) {
                 <span className='flex-1 self-center text-center'>{moment(event.date).format('D')}</span>
               </div>
               <div className='grow text-left sm:mt-0 sm:pl-6'>
-                <h2 className='title-font text-xl font-medium text-gray-900 hover:text-gray-500'>{event.title}</h2>
+                <h2 className='title-font font-medium text-gray-900 hover:text-gray-500'>{event.title}</h2>
                 <p className='text-gray-600'>
                   {moment(event.date).local().format('LLLL')} UTC
                   {moment(event.date).local().format('Z')}
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 264267f94ba..8ac45ed2d0e 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -23,6 +23,6 @@
     "calendar": {
         "title": "Upcoming events",
         "viewCalendarBtn": "View Calendar",
-        "noMeetingsMessage": "There are no meetings scheduled for next few days."
+        "noMeetingsMessage": "There are no meetings scheduled for next few days. You can check upcoming events by clicking the button below."
     }
-}
\ No newline at end of file
+}

From d7ad6314e5f61a84c0e8e3297fe3cdbacbf2a13b Mon Sep 17 00:00:00 2001
From: dishafaujdar <dishachoudhary1102@gmail.com>
Date: Sat, 2 Nov 2024 23:01:15 +0530
Subject: [PATCH 7/7] german common.json

---
 public/locales/de/common.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/locales/de/common.json b/public/locales/de/common.json
index 3b88c00fa20..d4b611fef9c 100644
--- a/public/locales/de/common.json
+++ b/public/locales/de/common.json
@@ -23,6 +23,6 @@
     "calendar": {
         "title": "Kommende Veranstaltungen",
         "viewCalendarBtn": "Kalender ansehen",
-        "noMeetingsMessage": "In den nächsten Tagen sind keine Sitzungen geplant."
+        "noMeetingsMessage": "In den nächsten Tagen sind keine Sitzungen geplant. Sie können bevorstehende Veranstaltungen überprüfen, indem Sie auf die Schaltfläche unten klicken."    
     }
 }
\ No newline at end of file