From f2ee1b630bc7a5078ca9a22898042693e03f321b Mon Sep 17 00:00:00 2001
From: PriyadharshiniNagarathinam <priyaradha29@gmail.com>
Date: Sat, 6 Jan 2024 15:09:13 +0530
Subject: [PATCH] align buttons of edit event

---
 package-lock.json                             |  3 +
 .../EventListCard/EventListCard.module.css    | 16 +++-
 .../EventListCard/EventListCard.tsx           | 90 ++++++++++---------
 src/screens/LoginPage/LoginPage.tsx           | 10 ++-
 .../UserLoginPage/UserLoginPage.tsx           | 23 +++--
 5 files changed, 86 insertions(+), 56 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 24265fce6d..fae5984b43 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -95,6 +95,9 @@
         "jest-preview": "^0.3.1",
         "jquery": "^3.2.1",
         "postcss-modules": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=20.x"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
diff --git a/src/components/EventListCard/EventListCard.module.css b/src/components/EventListCard/EventListCard.module.css
index 09f4b5fcdd..8921f14289 100644
--- a/src/components/EventListCard/EventListCard.module.css
+++ b/src/components/EventListCard/EventListCard.module.css
@@ -88,13 +88,18 @@
   padding-right: 5px;
   padding-left: 5px;
 }
-.checkboxdiv > label {
+.checkboxdiv > div label {
   margin-right: 50px;
 }
 .checkboxdiv > label > input {
   margin-left: 10px;
 }
-
+.dispflex {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 5px;
+  margin-right: 5px;
+}
 .dispflex > input {
   width: 20%;
   border: none;
@@ -103,9 +108,14 @@
 }
 .checkboxdiv {
   display: flex;
+  flex-direction: column;
 }
-.checkboxdiv > div {
+/* .checkboxdiv > div {
   width: 50%;
+} */
+.checkboxContainer {
+  display: flex;
+  justify-content: space-between;
 }
 
 .preview {
diff --git a/src/components/EventListCard/EventListCard.tsx b/src/components/EventListCard/EventListCard.tsx
index 9e663b3b3d..f316cc344b 100644
--- a/src/components/EventListCard/EventListCard.tsx
+++ b/src/components/EventListCard/EventListCard.tsx
@@ -376,50 +376,54 @@ function eventListCard(props: InterfaceEventListCardProps): JSX.Element {
                 </div>
               </div>
             )}
-            <div className={styles.checkboxdiv}>
-              <div className={styles.dispflex}>
-                <label htmlFor="allday">{t('allDay')}?</label>
-                <Form.Switch
-                  id="allday"
-                  type="checkbox"
-                  data-testid="updateAllDay"
-                  checked={alldaychecked}
-                  onChange={(): void => setAllDayChecked(!alldaychecked)}
-                />
-              </div>
-              <div className={styles.dispflex}>
-                <label htmlFor="recurring">{t('recurringEvent')}:</label>
-                <Form.Switch
-                  id="recurring"
-                  type="checkbox"
-                  data-testid="updateRecurring"
-                  checked={recurringchecked}
-                  onChange={(): void => setRecurringChecked(!recurringchecked)}
-                />
-              </div>
-            </div>
-            <div className={styles.checkboxdiv}>
-              <div className={styles.dispflex}>
-                <label htmlFor="ispublic">{t('isPublic')}?</label>
-                <Form.Switch
-                  id="ispublic"
-                  type="checkbox"
-                  data-testid="updateIsPublic"
-                  checked={publicchecked}
-                  onChange={(): void => setPublicChecked(!publicchecked)}
-                />
+            <div className={styles.checkboxContainer}>
+              <div className={styles.checkboxdiv}>
+                <div className={styles.dispflex}>
+                  <label htmlFor="allday">{t('allDay')}?</label>
+                  <Form.Switch
+                    id="allday"
+                    type="checkbox"
+                    data-testid="updateAllDay"
+                    checked={alldaychecked}
+                    onChange={(): void => setAllDayChecked(!alldaychecked)}
+                  />
+                </div>
+                <div className={styles.dispflex}>
+                  <label htmlFor="recurring">{t('recurringEvent')}:</label>
+                  <Form.Switch
+                    id="recurring"
+                    type="checkbox"
+                    data-testid="updateRecurring"
+                    checked={recurringchecked}
+                    onChange={(): void =>
+                      setRecurringChecked(!recurringchecked)
+                    }
+                  />
+                </div>
               </div>
-              <div className={styles.dispflex}>
-                <label htmlFor="registrable">{t('isRegistrable')}?</label>
-                <Form.Switch
-                  id="registrable"
-                  type="checkbox"
-                  data-testid="updateRegistrable"
-                  checked={registrablechecked}
-                  onChange={(): void =>
-                    setRegistrableChecked(!registrablechecked)
-                  }
-                />
+              <div className={styles.checkboxdiv}>
+                <div className={styles.dispflex}>
+                  <label htmlFor="ispublic">{t('isPublic')}?</label>
+                  <Form.Switch
+                    id="ispublic"
+                    type="checkbox"
+                    data-testid="updateIsPublic"
+                    checked={publicchecked}
+                    onChange={(): void => setPublicChecked(!publicchecked)}
+                  />
+                </div>
+                <div className={styles.dispflex}>
+                  <label htmlFor="registrable">{t('isRegistrable')}?</label>
+                  <Form.Switch
+                    id="registrable"
+                    type="checkbox"
+                    data-testid="updateRegistrable"
+                    checked={registrablechecked}
+                    onChange={(): void =>
+                      setRegistrableChecked(!registrablechecked)
+                    }
+                  />
+                </div>
               </div>
             </div>
           </Modal.Body>
diff --git a/src/screens/LoginPage/LoginPage.tsx b/src/screens/LoginPage/LoginPage.tsx
index 44afdbacb9..67f5e0301e 100644
--- a/src/screens/LoginPage/LoginPage.tsx
+++ b/src/screens/LoginPage/LoginPage.tsx
@@ -233,8 +233,14 @@ function loginPage(): JSX.Element {
         <Row className={styles.row}>
           <Col sm={0} md={6} lg={7} className={styles.left_portion}>
             <div className={styles.inner}>
-              <PalisadoesLogo className={styles.palisadoes_logo} />
-              <p className="text-center">{t('fromPalisadoes')}</p>
+              <a
+                href="https://www.palisadoes.org/"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                <PalisadoesLogo className={styles.palisadoes_logo} />
+                <p className="text-center">{t('fromPalisadoes')}</p>
+              </a>
             </div>
 
             <div className={styles.socialIcons}>
diff --git a/src/screens/UserPortal/UserLoginPage/UserLoginPage.tsx b/src/screens/UserPortal/UserLoginPage/UserLoginPage.tsx
index 559d088a9e..e8aa947d7c 100644
--- a/src/screens/UserPortal/UserLoginPage/UserLoginPage.tsx
+++ b/src/screens/UserPortal/UserLoginPage/UserLoginPage.tsx
@@ -29,14 +29,21 @@ export default function userLoginPage(): JSX.Element {
   return (
     <div className={styles.mainContainer}>
       <div className={styles.leftPane}>
-        <img
-          className={styles.palisadoesImage}
-          src={PalisadoesImage}
-          alt="Palisadoes Branding"
-        />
-        <h6 style={{ textAlign: `center` }}>
-          <p>{t('fromPalisadoes')}</p>
-        </h6>
+        <a
+          href="https://www.palisadoes.org/"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          <img
+            className={styles.palisadoesImage}
+            src={PalisadoesImage}
+            alt="Palisadoes Branding"
+          />
+
+          <h6 style={{ textAlign: `center` }}>
+            <p>{t('fromPalisadoes')}</p>
+          </h6>
+        </a>
         <div className={styles.socialIcons}>
           <a
             href="https://www.facebook.com/palisadoesproject"