Merge branch 'develop-postgres' into contributors/anushka-gupta/Issue…

…3316
PalisadoesFoundation · Jan 28, 2025 · 74746f0 · 74746f0
2 parents 8456338 + 3c85403
commit 74746f0
Show file tree

Hide file tree

Showing 8 changed files with 1,311 additions and 124 deletions.
diff --git a/docs/docs/auto-docs/screens/OrgPost/OrgPost/functions/default.md b/docs/docs/auto-docs/screens/OrgPost/OrgPost/functions/default.md
@@ -6,7 +6,7 @@
 
 > **default**(): `JSX.Element`
 
-Defined in: [src/screens/OrgPost/OrgPost.tsx:70](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrgPost/OrgPost.tsx#L70)
+Defined in: [src/screens/OrgPost/OrgPost.tsx:71](https://github.com/PalisadoesFoundation/talawa-admin/blob/main/src/screens/OrgPost/OrgPost.tsx#L71)
 
 This function is used to display the posts of the organization. It displays the posts in a card format.
 It also provides the functionality to create a new post. The user can also sort the posts based on the date of creation.

diff --git a/src/components/CollapsibleDropdown/CollapsibleDropdown.module.css b/src/components/CollapsibleDropdown/CollapsibleDropdown.module.css
diff --git a/src/components/CollapsibleDropdown/CollapsibleDropdown.tsx b/src/components/CollapsibleDropdown/CollapsibleDropdown.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { Button, Collapse } from 'react-bootstrap';
 import type { TargetsType } from 'state/reducers/routesReducer';
-import styles from './CollapsibleDropdown.module.css';
+import styles from '../../style/app.module.css';
 import IconComponent from 'components/IconComponent/IconComponent';
 import { NavLink, useLocation, useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
@@ -48,7 +48,7 @@ const collapsibleDropdown = ({
         aria-expanded={showDropdown}
         data-testid="collapsible-dropdown"
       >
-        <div className={styles.iconWrapper}>
+        <div className={styles.collapsibleDropdownIconWrapper}>
           <IconComponent
             name={name}
             fill={showDropdown ? 'var(--bs-white)' : 'var(--bs-secondary)'}
@@ -73,15 +73,15 @@ const collapsibleDropdown = ({
                       key={name}
                       variant={isActive === true ? 'success' : 'light'}
                       size="sm"
-                      className={`${styles.collapseBtn} ${
+                      className={`${styles.collapsibleDropdownCollapseBtn} ${
                         isActive === true ? 'text-white' : 'text-secondary'
                       }`}
                       onClick={(): void => {
                         navigate(url);
                       }}
                       data-testid={`collapsible-dropdown-btn-${index}`}
                     >
-                      <div className={styles.iconWrapperSm}>
+                      <div className={styles.collapsibleDropdownIconWrapperSm}>
                         <i className={`fa ${stringIcon}`} />
                       </div>
                       {tCommon(name || '')}