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

Add Side Navigation to Event Dashboard #981

Merged
merged 8 commits into from
Oct 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/GraphQl/Queries/Queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export const USER_LIST = gql`
export const EVENT_DETAILS = gql`
query Event($id: ID!) {
event(id: $id) {
_id
title
description
startDate
Expand Down
1 change: 1 addition & 0 deletions src/assets/svgs/addEventProject.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/svgs/checkInRegistrants.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/svgs/eventStats.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/svgs/listEventRegistrants.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions src/components/CheckIn/CheckInWrapper.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
button .iconWrapper {
width: 32px;
padding-right: 4px;
margin-right: 4px;
transform: translateY(4px);
}

button .iconWrapperSm {
width: 32px;
display: flex;
justify-content: center;
align-items: center;
}
15 changes: 11 additions & 4 deletions src/components/CheckIn/CheckInWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { useState } from 'react';
import { CheckInModal } from './CheckInModal';
import { Button } from 'react-bootstrap';
import IconComponent from 'components/IconComponent/IconComponent';
import styles from './CheckInWrapper.module.css';

type PropType = {
eventId: string;
Expand All @@ -12,14 +14,19 @@ export const CheckInWrapper = (props: PropType): JSX.Element => {
return (
<>
<Button
type="button"
className="mt-3"
variant="success"
aria-label="checkInAttendees"
variant="light"
className="text-secondary"
aria-label="checkInRegistrants"
onClick={(): void => {
setShowModal(true);
}}
>
<div className={styles.iconWrapper}>
<IconComponent
name="Check In Registrants"
fill="var(--bs-secondary)"
/>
</div>
Check In Registrants
</Button>
{showModal && (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
button .iconWrapper {
width: 36px;
padding-right: 4px;
margin-right: 4px;
transform: translateY(4px);
}

button .iconWrapperSm {
width: 36px;
display: flex;
justify-content: center;
align-items: center;
}
18 changes: 13 additions & 5 deletions src/components/EventRegistrantsModal/EventRegistrantsWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { useState } from 'react';
import { EventRegistrantsModal } from './EventRegistrantsModal';
import { Button } from 'react-bootstrap';
import IconComponent from 'components/IconComponent/IconComponent';
import styles from './EventRegistrantsWrapper.module.css';

type PropType = {
eventId: string;
Expand All @@ -13,17 +15,23 @@ export const EventRegistrantsWrapper = (props: PropType): JSX.Element => {
return (
<>
<Button
type="button"
className="mt-3"
variant="success"
variant="light"
className="text-secondary"
aria-label="showAttendees"
onClick={(): void => {
setShowModal(true);
}}
>
<div className={styles.iconWrapper}>
<IconComponent
name="List Event Registrants"
fill="var(--bs-secondary)"
/>
</div>
Show Registrants
</Button>
{showModal ? (

{showModal && (
<EventRegistrantsModal
show={showModal}
handleClose={(): void => {
Expand All @@ -32,7 +40,7 @@ export const EventRegistrantsWrapper = (props: PropType): JSX.Element => {
eventId={props.eventId}
orgId={props.orgId}
/>
) : null}
)}
</>
);
};
13 changes: 13 additions & 0 deletions src/components/EventStats/EventStatsWrapper.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
button .iconWrapper {
width: 32px;
padding-right: 4px;
margin-right: 4px;
transform: translateY(4px);
}

button .iconWrapperSm {
width: 32px;
display: flex;
justify-content: center;
align-items: center;
}
25 changes: 14 additions & 11 deletions src/components/EventStats/EventStatsWrapper.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React, { useState } from 'react';
import { EventStats } from './EventStats';
import { Button } from 'react-bootstrap';
import IconComponent from 'components/IconComponent/IconComponent';
import styles from './EventStatsWrapper.module.css';

type PropType = {
eventId: string;
Expand All @@ -12,23 +14,24 @@ export const EventStatsWrapper = (props: PropType): JSX.Element => {
return (
<>
<Button
type="button"
className="mt-3"
variant="success"
aria-label="eventStatistics"
variant="light"
className="text-secondary"
aria-label="checkInRegistrants"
onClick={(): void => {
setShowModal(true);
}}
>
<div className={styles.iconWrapper}>
<IconComponent name="Event Stats" fill="var(--bs-secondary)" />
</div>
View Event Statistics
</Button>
{showModal && (
<EventStats
show={showModal}
handleClose={(): void => setShowModal(false)}
eventId={props.eventId}
/>
)}
<EventStats
show={showModal}
handleClose={(): void => setShowModal(false)}
key={props.eventId || 'eventStatsDetails'}
eventId={props.eventId}
/>
</>
);
};
80 changes: 25 additions & 55 deletions src/components/IconComponent/IconComponent.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { render, screen } from '@testing-library/react';
import IconComponent from './IconComponent';

const screenTestIdMap = {
const screenTestIdMap: Record<string, Record<string, string>> = {
Dashboard: {
name: 'Dashboard',
testId: 'Icon-Component-DashboardIcon',
Expand Down Expand Up @@ -35,65 +35,35 @@ const screenTestIdMap = {
name: 'All Organizations',
testId: 'Icon-Component-AllOrganizationsIcon',
},
EventProject: {
name: 'Add Event Project',
testId: 'Icon-Component-Add-Event-Project',
},
ListEventRegistrant: {
name: 'List Event Registrants',
testId: 'Icon-Component-List-Event-Registrants',
},
CheckInRegistrants: {
name: 'Check In Registrants',
testId: 'Icon-Component-Check-In-Registrants',
},
EventStats: {
name: 'Event Stats',
testId: 'Icon-Component-Event-Stats',
},
default: {
name: 'default',
testId: 'Icon-Component-DefaultIcon',
},
};

describe('Testing CollapsibleDropdown component', () => {
it('renders the Dashboard icon', () => {
render(<IconComponent name="Dashboard" />);
expect(
screen.getByTestId(`${screenTestIdMap.Dashboard.testId}`)
).toBeInTheDocument();
});
it('renders the People icon', () => {
render(<IconComponent name="People" />);
expect(
screen.getByTestId(`${screenTestIdMap.People.testId}`)
).toBeInTheDocument();
});
it('renders the Events icon', () => {
render(<IconComponent name="Events" />);
expect(
screen.getByTestId(`${screenTestIdMap.Events.testId}`)
).toBeInTheDocument();
});
it('renders the Posts icon', () => {
render(<IconComponent name="Posts" />);
expect(
screen.getByTestId(`${screenTestIdMap.Posts.testId}`)
).toBeInTheDocument();
});
it('renders the Block/Unblock icon', () => {
render(<IconComponent name="Block/Unblock" />);
expect(
screen.getByTestId(`${screenTestIdMap.BlockUnblock.testId}`)
).toBeInTheDocument();
});
it('renders the Plugins icon', () => {
render(<IconComponent name="Plugins" />);
expect(
screen.getByTestId(`${screenTestIdMap.Plugins.testId}`)
).toBeInTheDocument();
});
it('renders the Settings icon', () => {
render(<IconComponent name="Settings" />);
expect(
screen.getByTestId(`${screenTestIdMap.Settings.testId}`)
).toBeInTheDocument();
});
it('renders the All Organizations icon', () => {
render(<IconComponent name="All Organizations" />);
expect(
screen.getByTestId(`${screenTestIdMap.AllOrganizations.testId}`)
).toBeInTheDocument();
});
it('renders the default icon', () => {
render(<IconComponent name="default" />);
expect(
screen.getByTestId(`${screenTestIdMap.default.testId}`)
).toBeInTheDocument();
describe('Testing Collapsible Dropdown component', () => {
it('Renders the correct icon according to the component', () => {
for (const component in screenTestIdMap) {
render(<IconComponent name={screenTestIdMap[component].name} />);
expect(
screen.getByTestId(screenTestIdMap[component].testId)
).toBeInTheDocument();
}
});
});
32 changes: 32 additions & 0 deletions src/components/IconComponent/IconComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import { ReactComponent as PeopleIcon } from 'assets/svgs/people.svg';
import { ReactComponent as PluginsIcon } from 'assets/svgs/plugins.svg';
import { ReactComponent as PostsIcon } from 'assets/svgs/posts.svg';
import { ReactComponent as SettingsIcon } from 'assets/svgs/settings.svg';
import { ReactComponent as AddEventProjectIcon } from 'assets/svgs/addEventProject.svg';
import { ReactComponent as ListEventRegistrantsIcon } from 'assets/svgs/listEventRegistrants.svg';
import { ReactComponent as CheckInRegistrantsIcon } from 'assets/svgs/checkInRegistrants.svg';
import { ReactComponent as EventStatsIcon } from 'assets/svgs/eventStats.svg';

export interface InterfaceIconComponent {
name: string;
Expand Down Expand Up @@ -56,6 +60,34 @@ const iconComponent = (props: InterfaceIconComponent): JSX.Element => {
data-testid="Icon-Component-AllOrganizationsIcon"
/>
);
case 'Add Event Project':
return (
<AddEventProjectIcon
data-testid="Icon-Component-Add-Event-Project"
stroke={props.fill}
/>
);
case 'List Event Registrants':
return (
<ListEventRegistrantsIcon
data-testid="Icon-Component-List-Event-Registrants"
stroke={props.fill}
/>
);
case 'Check In Registrants':
return (
<CheckInRegistrantsIcon
data-testid="Icon-Component-Check-In-Registrants"
stroke={props.fill}
/>
);
case 'Event Stats':
return (
<EventStatsIcon
data-testid="Icon-Component-Event-Stats"
stroke={props.fill}
/>
);
default:
return (
<QuestionMarkOutlined
Expand Down
2 changes: 1 addition & 1 deletion src/components/LeftDrawer/LeftDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const leftDrawer = ({
<img src={userImage} alt={`profile picture`} />
) : (
<img
src={`https://api.dicebear.com/5.x/initials/svg?seed=${firstName} ${lastName}`}
src={`https://api.dicebear.com/5.x/initials/svg?seed=${firstName}%20${lastName}`}
alt={`dummy picture`}
/>
)}
Expand Down
Loading