Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manage button fixes #2438

Closed
wants to merge 33 commits into from
Closed

Manage button fixes #2438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
65a766e
Updated branching strategy
DangaRanga May 23, 2021
0a6d4d6
Removed duplicate entry
DangaRanga May 23, 2021
e16a3ad
Updated contributing.md
DangaRanga May 23, 2021
653345e
Added extra markdown styling to contribute.md
DangaRanga May 23, 2021
13180c2
Merge pull request #54 from DangaRanga/master
DangaRanga May 23, 2021
07f4465
Bump dns-packet from 1.3.1 to 1.3.4
dependabot[bot] May 30, 2021
f9d7eae
Merge pull request #60 from PalisadoesFoundation/dependabot/npm_and_y…
palisadoes May 30, 2021
1a57176
Update pull_request_template.md
palisadoes May 30, 2021
c4580fa
disabled CodeQL cron jobs and push actions (#72)
akshatgarg12 Jun 6, 2021
f71bc11
Merge Develop into Main (#1099)
noman2002 Nov 30, 2023
1fd4105
[#1123] Changes position and text of "All Organizations" button (#1124)
adi790uu Dec 10, 2023
9ff2924
Revert "[#1123] Changes position and text of "All Organizations" butt…
noman2002 Dec 12, 2023
a320d35
Added Base branch check to main (#1515)
palisadoes Jan 29, 2024
42633e2
Pre-GSoC 2024 - Stable (#1934)
palisadoes Apr 27, 2024
f6c6f03
Update README.md
palisadoes Apr 27, 2024
423b990
Merge develop - 20240504 (#1956)
palisadoes May 4, 2024
7befb35
Merge develop - 20240504 (#1957)
palisadoes May 4, 2024
a4d2a07
Bump follow-redirects from 1.15.5 to 1.15.6 (#1960)
dependabot[bot] May 5, 2024
9b5d158
Bump tar from 6.1.15 to 6.2.1 (#1959)
dependabot[bot] May 5, 2024
389ac01
Bump tj-actions/changed-files from 40 to 41 in /.github/workflows (#1…
dependabot[bot] May 5, 2024
d3d681f
Bump express from 4.18.2 to 4.19.2 (#1962)
dependabot[bot] May 5, 2024
7091c76
Bump ejs from 3.1.9 to 3.1.10 (#1963)
dependabot[bot] May 5, 2024
bf9852d
coderabbit yaml file (#1991)
pranshugupta54 May 19, 2024
f661cc9
Updating the main branch to the latest develop code (#2020)
palisadoes Jun 2, 2024
5010350
Latest Develop 20240724 (#2127)
palisadoes Jul 27, 2024
b991d54
Update README.md
palisadoes Aug 11, 2024
f358420
Update CONTRIBUTING.md
palisadoes Aug 11, 2024
15c8753
Update CONTRIBUTING.md
palisadoes Aug 11, 2024
30c1d18
Merge with Develop 20240924 (#2306)
palisadoes Sep 29, 2024
6fbba6e
Bump tj-actions/changed-files from 40 to 41 in /.github/workflows (#2…
dependabot[bot] Sep 29, 2024
e828b78
Bump rollup from 4.21.3 to 4.22.5 (#2308)
dependabot[bot] Sep 29, 2024
d01b5d2
Merge with Develop 2024-1-14 (#2432)
palisadoes Nov 14, 2024
9033ef8
button fixed
utkarshpra78 Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check if the target branch is develop
if: github.event.pull_request.base.ref != 'develop-postgres'
if: github.event.pull_request.base.ref != 'develop'
run: |
echo "Error: Pull request target branch must be 'develop-postgres'. Please refer PR_GUIDELINES.md"
echo "Error: Pull request target branch must be 'develop'. Please refer PR_GUIDELINES.md"
exit 1
5 changes: 0 additions & 5 deletions .idea/.gitignore
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/talawa-admin.iml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml
View file
Open in desktop

This file was deleted.

45 changes: 22 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@mui/material": "^6.1.6",
"@mui/private-theming": "^6.1.6",
"@mui/system": "^6.1.6",
"@mui/x-charts": "^7.22.2",
"@mui/x-charts": "^7.22.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

⚠️ Potential issue

Unnecessary dependency downgrades should be reverted

The downgraded versions don't have any security vulnerabilities, but these changes are:

  • Unrelated to the PR's objective of fixing CSS overlap in orgListCard
  • Not justified by any compatibility requirements (peer dependencies are compatible)
  • Introducing potential regression risks without clear benefits

Please revert the following downgrades to maintain the latest stable versions:

  • @mui/x-charts: ^7.22.1 → ^7.22.2
  • @types/react: ^18.3.3 → ^18.3.12
  • eslint-plugin-import: ^2.30.0 → ^2.31.0
  • sass: ^1.80.6 → ^1.80.7
🔗 Analysis chain

Unnecessary dependency downgrades detected.

These dependency downgrades seem unrelated to the PR's objective of fixing the CSS overlap issue in the orgListCard component:

  • @mui/x-charts: ^7.22.2 → ^7.22.1
  • @types/react: ^18.3.12 → ^18.3.3
  • eslint-plugin-import: ^2.31.0 → ^2.30.0
  • sass: ^1.80.7 → ^1.80.6

Please keep the changes focused on addressing the CSS overlap issue. If these downgrades are intentional, provide the rationale for making these changes.

Let's verify if the downgraded versions have any known security issues:

Also applies to: 122-122, 136-136, 149-149

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for security advisories for the downgraded packages

# Check for security advisories
for package in "@mui/x-charts" "@types/react" "eslint-plugin-import" "sass"; do
  echo "Checking $package..."
  gh api graphql -f query="
    query {
      securityVulnerabilities(first: 5, ecosystem: NPM, package: \"${package}\") {
        nodes {
          advisory {
            summary
            severity
            publishedAt
          }
          vulnerableVersionRange
          firstPatchedVersion {
            identifier
          }
        }
      }
    }"
done

# Check package compatibility
echo "Checking package compatibility..."
npm info "@mui/[email protected]" peerDependencies
npm info "@types/[email protected]" peerDependencies

Length of output: 2582

"@mui/x-data-grid": "^7.22.1",
"@mui/x-date-pickers": "^7.22.1",
"@pdfme/schemas": "^5.1.6",
Expand Down Expand Up @@ -119,7 +119,7 @@
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.5.4",
"@types/node-fetch": "^2.6.10",
"@types/react": "^18.3.12",
"@types/react": "^18.3.3",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-chartjs-2": "^2.5.7",
"@types/react-bootstrap": "^0.32.37",
Expand All @@ -133,7 +133,7 @@
"babel-jest": "^29.7.0",
"cross-env": "^7.0.3",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-import": "^2.30.0",
"eslint-plugin-jest": "^28.8.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react": "^7.37.1",
Expand All @@ -146,7 +146,7 @@
"jest-preview": "^0.3.1",
"lint-staged": "^15.2.8",
"postcss-modules": "^6.0.0",
"sass": "^1.80.7",
"sass": "^1.80.6",
"tsx": "^4.19.1",
"vite-plugin-svgr": "^4.2.0",
"whatwg-fetch": "^3.6.20"
Expand Down
2 changes: 1 addition & 1 deletion src/components/OrgListCard/OrgListCard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.orgCard {
background-color: var(--bs-white);
margin: 0.5rem;
height: calc(120px + 2rem);
height: calc(120px + 2.55rem);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

While this fixes the immediate issue, consider a more flexible solution.

The height increase prevents overlap but might not scale well with varying address lengths. A more maintainable approach would be to use flexbox for dynamic content flow.

Consider this alternative implementation:

.orgCard {
  background-color: var(--bs-white);
  margin: 0.5rem;
-  height: calc(120px + 2.55rem);
+  display: flex;
+  flex-direction: column;
+  min-height: calc(120px + 2rem);
  padding: 1rem;
  border-radius: 8px;
  outline: 1px solid var(--bs-gray-200);
  position: relative;
}

.orgCard .innerContainer {
  display: flex;
+  flex: 1;
}

.orgCard .innerContainer .content {
  flex: 1;
  margin-left: 1rem;
  width: 70%;
  margin-top: 0.7rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
}

.address {
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 1;
-  line-clamp: 1;
-  -webkit-box-orient: vertical;
+  display: flex;
+  flex-direction: column;
  align-items: center;
+  margin-bottom: 2rem;  /* Ensure space for button */
}

.orgCard button {
  position: absolute;
  bottom: 1rem;
  right: 1rem;
  z-index: 1;
+  margin-top: auto;  /* Push button to bottom */
}

This solution:

  1. Uses flexbox for dynamic content flow
  2. Allows address to wrap naturally
  3. Maintains consistent spacing between elements
  4. Scales better with different content lengths

Committable suggestion skipped: line range outside the PR's diff.

padding: 1rem;
border-radius: 8px;
outline: 1px solid var(--bs-gray-200);
Expand Down