Merge pull request #909 from culturecreates/develop

Develop
culturecreates · Jan 18, 2024 · 2d07e79 · 2d07e79
2 parents cba3cbb + 756e26c
commit 2d07e79
Show file tree

Hide file tree

Showing 63 changed files with 1,773 additions and 659 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,6 +16,7 @@
     "localforage": "^1.10.0",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.41",
+    "rc-calendar": "^9.15.11",
     "rc-year-calendar": "^1.0.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/src/App.css b/src/App.css
@@ -0,0 +1,30 @@
+.ant-pagination-item {
+  background-color: #fff;
+  border: none;
+  font-weight: 400;
+}
+
+.ant-pagination-item > a {
+  color: #222732;
+}
+
+.ant-pagination-item-active {
+  border-radius: 4px;
+  background: var(--content-action-default, #1b3de6);
+  font-weight: 700;
+}
+
+.ant-pagination-item-active > a {
+  color: #fff;
+}
+
+.ant-pagination-prev .ant-pagination-item-link,
+.ant-pagination-next .ant-pagination-item-link {
+  border: none;
+}
+
+.ant-pagination-jump-prev .ant-pagination-item-container .ant-pagination-item-ellipsis,
+.ant-pagination-jump-next .ant-pagination-item-container .ant-pagination-item-ellipsis {
+  color: #222732;
+  font-size: 12px;
+}
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import './App.css';
 import { RouterProvider } from 'react-router-dom';
 import { router } from './router/index';
 

diff --git a/src/components/Button/AddEvent/addEvent.css b/src/components/Button/AddEvent/addEvent.css
@@ -8,3 +8,7 @@
   font-weight: 600;
   font-size: 16px;
 }
+.add-event-button:hover {
+  background-color: #0f0e98;
+  border-color: #0f0e98;
+}
diff --git a/src/components/Button/Auth/auth.css b/src/components/Button/Auth/auth.css
@@ -22,3 +22,8 @@
   color: #ffffff;
   cursor: pointer;
 }
+
+.login-form-button:hover {
+  background-color: #0f0e98;
+  border-color: #0f0e98;
+}
diff --git a/src/components/Button/Primary/primary.css b/src/components/Button/Primary/primary.css
@@ -9,3 +9,8 @@
   font-size: 16px;
   color: #ffffff;
 }
+
+.primary-button:hover {
+  background-color: #0f0e98;
+  border-color: #0f0e98;
+}
diff --git a/src/components/Card/Common/Event.jsx b/src/components/Card/Common/Event.jsx
@@ -3,29 +3,33 @@ import { Row, Col } from 'antd';
 import './event.css';
 
 function Event(props) {
-  const { title, required, hidden } = props;
+  const { title, required, hidden, marginTop } = props;
   return (
-    <Col
-      className="add-event-section-col"
-      flex={'780px'}
-      style={{ display: hidden && 'none', borderRadius: '4px', backgroundColor: '#ffffff', margin: '0 16px' }}>
-      <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }} className="events-content" justify="space-between">
-        <Col flex={'423px'}>
-          <div className="add-event-section-wrapper">
-            {title && (
-              <Row>
-                <Col>
-                  <div className={`add-event-date-wrap ${required && 'title-required'}`} data-cy="section-title">
-                    {title}
-                  </div>
-                </Col>
-              </Row>
-            )}
-            {props?.children[0] ?? props?.children}
-          </div>
-        </Col>
-        <Col flex={'253px'}>
-          <div style={{ width: '100%', marginTop: '35%' }}>{props?.children[1]}</div>
+    <Col span={24}>
+      <Row>
+        <Col
+          className="add-event-section-col"
+          flex={'780px'}
+          style={{ display: hidden && 'none', borderRadius: '4px', backgroundColor: '#ffffff', margin: '0 16px' }}>
+          <Row gutter={{ xs: 8, sm: 16, md: 24, lg: 32 }} className="events-content" justify="space-between">
+            <Col flex={'423px'}>
+              <div className="add-event-section-wrapper">
+                {title && (
+                  <Row>
+                    <Col>
+                      <div className={`add-event-date-wrap ${required && 'title-required'}`} data-cy="section-title">
+                        {title}
+                      </div>
+                    </Col>
+                  </Row>
+                )}
+                {props?.children[0] ?? props?.children}
+              </div>
+            </Col>
+            <Col flex={'253px'}>
+              <div style={{ width: '100%', marginTop: marginTop ? marginTop : '35%' }}>{props?.children[1]}</div>
+            </Col>
+          </Row>
         </Col>
       </Row>
     </Col>

diff --git a/src/components/ChangeType/ChangeType.jsx b/src/components/ChangeType/ChangeType.jsx
@@ -6,24 +6,25 @@ function ChangeType(props) {
   const { primaryIcon, disabled, label, secondaryIcon, promptText, onClick } = props;
   return (
     <div className="change-type-wrapper">
-      <Button
-        type="primary"
-        icon={primaryIcon}
-        disabled={disabled}
-        size="small"
-        className="first-button"
-        onClick={onClick}
-        data-cy="button-select-change-type"
-      />
+      <TooltipStyled title={promptText}>
+        <Button
+          type="primary"
+          icon={primaryIcon}
+          disabled={disabled}
+          size="small"
+          className="first-button"
+          onClick={onClick}
+          data-cy="button-select-change-type"
+        />
+      </TooltipStyled>
+
       <Button
         type="text"
         disabled={disabled}
         className="second-button"
         onClick={onClick}
         data-cy="button-select-change-type">
         {label}
-      </Button>
-      <TooltipStyled title={promptText}>
         <Button
           type="text"
           icon={secondaryIcon}
@@ -32,7 +33,7 @@ function ChangeType(props) {
           className="third-button"
           data-cy="button-select-change-type"
         />
-      </TooltipStyled>
+      </Button>
     </div>
   );
 }

diff --git a/src/components/Dropdown/Calendar/Calendar.jsx b/src/components/Dropdown/Calendar/Calendar.jsx
@@ -50,7 +50,6 @@ function Calendar({ children, allCalendarsData, setPageNumber }) {
       setPageNumber(1);
       sessionStorage.clear();
       setOpen(false);
-      console.log(window.location.origin);
       const origin = window.location.origin;
       const newUrl = `${origin}${PathName.Dashboard}/${key}${PathName.Events}`;
       window.location.href = newUrl;
@@ -68,7 +67,8 @@ function Calendar({ children, allCalendarsData, setPageNumber }) {
       }}
       open={open}
       onOpenChange={handleOpenChange}
-      trigger={['click']}>
+      trigger={['click']}
+      overlayClassName="calendar-dropdown">
       {children}
     </Dropdown>
   );

diff --git a/src/components/Dropdown/Calendar/calendar.css b/src/components/Dropdown/Calendar/calendar.css
@@ -20,3 +20,8 @@
 .calendar-name-wrapper:hover {
   color: #0f0e98;
 }
+
+.calendar-dropdown .ant-dropdown-menu-item:hover {
+  background-color: #eff2ff;
+  color: #0f0e98;
+}