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

Removes Sidebar and ensuring correct behaviour of event and members in Navbar #1394

Merged
merged 5 commits into from
Jan 7, 2024
Merged

Removes Sidebar and ensuring correct behaviour of event and members in Navbar #1394

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55074a5
Fixed postion of 'All Organizations' button and changed its name
Dec 16, 2023
823c75b
Changed 'Organizations' to 'My Organizations' and added translations
Dec 21, 2023
ae8c853
Merge branch 'develop' into fixes-#1199
Jan 6, 2024
7f59faa
Removed sidebar and checked the functionality
Jan 6, 2024
df4e6bd
Removed async
Jan 7, 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
2 changes: 1 addition & 1 deletion src/components/LeftDrawer/LeftDrawer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ afterEach(() => {
});

describe('Testing Left Drawer component for SUPERADMIN', () => {
test('Component should be rendered properly', () => {
test('Component should be rendered properly', async () => {
rishav-jha-mech marked this conversation as resolved.
Show resolved Hide resolved
localStorage.setItem('UserImage', '');
localStorage.setItem('UserType', 'SUPERADMIN');
render(
Expand Down
2 changes: 0 additions & 2 deletions src/screens/UserPortal/Home/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import type { ChangeEvent } from 'react';
import OrganizationNavbar from 'components/UserPortal/OrganizationNavbar/OrganizationNavbar';
import styles from './Home.module.css';
import UserSidebar from 'components/UserPortal/UserSidebar/UserSidebar';
import OrganizationSidebar from 'components/UserPortal/OrganizationSidebar/OrganizationSidebar';
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
import {
Button,
Expand Down Expand Up @@ -391,7 +390,6 @@ export default function home(): JSX.Element {
</>
)}
</div>
<OrganizationSidebar />
<Modal
size="lg"
show={showStartPost}
Expand Down
Loading