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.

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

Feature Added: An option for users to leave the Organization (Fixes #1873) #2629

Merged
Merged
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
eae5b1a
Fixed: issue-#1873
raggettii Dec 9, 2024
c971387
Fixed: issue-#1873
raggettii Dec 9, 2024
f28688d
Fixed: issue-#1873
raggettii Dec 9, 2024
0af5351
Fixed: issue-#1873
raggettii Dec 9, 2024
43ec4b2
Not title changed to title
raggettii Dec 9, 2024
da0b9c0
Ensure case-insensitive email verification for leaving organization
raggettii Dec 9, 2024
ef9bef6
Null check for organization data added
raggettii Dec 9, 2024
1228beb
Refetching of orgs added after leaving org
raggettii Dec 10, 2024
b806e2d
GraphQL error scenarios to test cases Added
raggettii Dec 10, 2024
31a9950
GraphQL error scenarios to test cases Added 1
raggettii Dec 10, 2024
c8ac9d8
Downgrade vitest to 2.1.5 to resolve peer dependency conflict
raggettii Dec 10, 2024
e2ea39a
fixed parsing error 1
raggettii Dec 10, 2024
6baab67
TSDoc comment added in LeaveOrganization.tsx 5
raggettii Dec 10, 2024
d7c1c93
LeaveOrganization.test.tsx file updated 1
raggettii Dec 11, 2024
8bb7424
suggested changes are made
raggettii Dec 11, 2024
90d9bf8
suggested changes are made 2
raggettii Dec 11, 2024
667877d
optimizing testing file 1
raggettii Dec 14, 2024
de74847
Merge branch 'develop-postgres' into issue-#1873
raggettii Dec 14, 2024
c55a941
optimizing testing file 2
raggettii Dec 15, 2024
ac92643
optimizing testing file 2-a
raggettii Dec 15, 2024
e271c1f
Fixed: issue-#1873
raggettii Dec 9, 2024
a957eb6
Fixed: issue-#1873
raggettii Dec 9, 2024
43c5ca3
Fixed: issue-#1873
raggettii Dec 9, 2024
d83260e
Fixed: issue-#1873
raggettii Dec 9, 2024
6337243
Not title changed to title
raggettii Dec 9, 2024
435d8f4
Ensure case-insensitive email verification for leaving organization
raggettii Dec 9, 2024
8ab66a1
Null check for organization data added
raggettii Dec 9, 2024
fb8f809
Refetching of orgs added after leaving org
raggettii Dec 10, 2024
025e50b
GraphQL error scenarios to test cases Added
raggettii Dec 10, 2024
f486fc4
GraphQL error scenarios to test cases Added 1
raggettii Dec 10, 2024
52ecfc1
Downgrade vitest to 2.1.5 to resolve peer dependency conflict
raggettii Dec 10, 2024
7f38ddd
fixed parsing error 1
raggettii Dec 10, 2024
dc1fd7e
TSDoc comment added in LeaveOrganization.tsx 5
raggettii Dec 10, 2024
f74071b
LeaveOrganization.test.tsx file updated 1
raggettii Dec 11, 2024
ff04ef6
suggested changes are made
raggettii Dec 11, 2024
de8fe01
suggested changes are made 2
raggettii Dec 11, 2024
b0632b8
optimizing testing file 1
raggettii Dec 14, 2024
c5edb91
optimizing testing file 2
raggettii Dec 15, 2024
5e799d0
optimizing testing file 2-a
raggettii Dec 15, 2024
574ccc7
suggested changes are made 3
raggettii Dec 15, 2024
6da2076
Merge branch 'develop-postgres' into issue-#1873
raggettii Dec 15, 2024
c2739a8
suggested changes are made 3
raggettii Dec 15, 2024
a629942
Merge branch 'develop-postgres' into issue-#1873
raggettii Dec 21, 2024
621ee29
optimizing test file 3
raggettii Dec 21, 2024
10a0807
Merge branch 'issue-#1873' of https://github.com/raggettii/talawa-adm…
raggettii Dec 21, 2024
46f9225
optimizing test file 3-a
raggettii Dec 21, 2024
f3a9d26
optimizing test file 3-b
raggettii Dec 21, 2024
df1bf67
Merge branch 'develop-postgres' into issue-#1873
raggettii Dec 21, 2024
1b586c0
optimizing test file 3-c
raggettii Dec 21, 2024
77a5fba
Merge branch 'issue-#1873' of https://github.com/raggettii/talawa-adm…
raggettii Dec 21, 2024
0f07ed8
Merge branch 'develop-postgres' into issue-#1873
raggettii Dec 21, 2024
48d9bc7
optimizing test file 3-d
raggettii Dec 21, 2024
d81b5b8
Merge branch 'issue-#1873' of https://github.com/raggettii/talawa-adm…
raggettii Dec 21, 2024
489160c
optimizing test file 3-e
raggettii Dec 21, 2024
9011e73
Merge branch 'develop-postgres' into issue-#1873
raggettii Dec 22, 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
26 changes: 26 additions & 0 deletions package-lock.json

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

3 changes: 3 additions & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "My Pledges"
},
"leaveOrganization": {
"title": "Leave Organization"
},
"eventVolunteers": {
"volunteers": "Volunteers",
"volunteer": "Volunteer",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "Mes Promesses"
},
"leaveOrganization": {
"title": "Quitter l'organisation"
},
"eventVolunteers": {
"volunteers": "Bénévoles",
"volunteer": "Bénévole",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "मेरी प्रतिज्ञाएँ"
},
"leaveOrganization": {
"title": "संगठन छोड़ें"
},
"eventVolunteers": {
"volunteers": "स्वयंसेवक",
"volunteer": "स्वयंसेवक",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/sp/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1407,6 +1407,9 @@
"userPledges": {
"title": "Mis Promesas"
},
"leaveOrganization": {
"title": "Dejar la organización"
},
"eventVolunteers": {
"volunteers": "Voluntarios",
"volunteer": "Voluntario",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/zh/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "我的承诺"
},
"leaveOrganization": {
"title": "离开组织"
},
"eventVolunteers": {
"volunteers": "志愿者",
"volunteer": "志愿者",
Expand Down
5 changes: 5 additions & 0 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import EventDashboardScreen from 'components/EventDashboardScreen/EventDashboard
import Campaigns from 'screens/UserPortal/Campaigns/Campaigns';
import Pledges from 'screens/UserPortal/Pledges/Pledges';
import VolunteerManagement from 'screens/UserPortal/Volunteer/VolunteerManagement';
import LeaveOrganization from 'screens/UserPortal/LeaveOrganization/LeaveOrganization';

const { setItem } = useLocalStorage();

Expand Down Expand Up @@ -198,6 +199,10 @@ function app(): JSX.Element {
<Route path="/user/events/:orgId" element={<Events />} />
<Route path="/user/campaigns/:orgId" element={<Campaigns />} />
<Route path="/user/pledges/:orgId" element={<Pledges />} />
<Route
path="/user/leaveOrg/:orgId"
element={<LeaveOrganization />}
/>
<Route
path="/user/volunteer/:orgId"
element={<VolunteerManagement />}
Expand Down
8 changes: 8 additions & 0 deletions src/components/IconComponent/IconComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import PostsIcon from 'assets/svgs/posts.svg?react';
import SettingsIcon from 'assets/svgs/settings.svg?react';
import VenueIcon from 'assets/svgs/venues.svg?react';
import RequestsIcon from 'assets/svgs/requests.svg?react';
import ExitToAppIcon from '@mui/icons-material/ExitToApp';
import { MdOutlineVolunteerActivism } from 'react-icons/md';

import React from 'react';
Expand Down Expand Up @@ -134,6 +135,13 @@ const iconComponent = (props: InterfaceIconComponent): JSX.Element => {
stroke={props.fill}
/>
);
case 'Leave Organization':
return (
<ExitToAppIcon
data-testid="Icon-Component-Leave-Organization"
stroke={props.fill}
/>
);
case 'Volunteer':
return (
<MdOutlineVolunteerActivism
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.modal-dialog {
display: flex;
justify-content: center;
align-items: center;
min-height: 100vh;
margin: 0;
}

.modal-content {
width: 100%;
max-width: 500px;
}

.modal-body {
text-align: center;
}

.modal-header,
.modal-footer {
justify-content: center;
text-align: center;
}

.confirmation {
text-align: center;
margin-top: 30px;
}
Loading
Loading