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

Jump to bottom

Add confirmation before attending events you cannot unnattend #704

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Add confirmation before attending events you cannot unnattend #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10cc495
Add confirmation before attending events you cannot unnatend
jotjern Nov 10, 2023
384e87e
Remove debug code
jotjern Nov 10, 2023
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
28 changes: 27 additions & 1 deletion src/events/components/Attendance/AttendButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@ import { Button } from '@dotkomonline/design-system';
import { useToast } from 'core/utils/toast/useToast';
import { unwrapResult } from '@reduxjs/toolkit';
import style from './attendance.less';
import { ConfirmModal } from '../../../common/components/Modal';

interface IAttendButtonProps {
eventId: number;
isEventFull: boolean;
cannotUnattend?: boolean;
}

const AttendButton: FC<IAttendButtonProps> = (props: IAttendButtonProps) => {
const dispatch = useDispatch();
const { eventId, isEventFull } = props;
const [showModal, setShowModal] = useState<boolean>(false);
const [showConfirmModal, setShowConfirmModal] = useState<boolean>(false);
const [addToast] = useToast({ type: 'success', duration: 5000 });

const signUp = async (token: string | null) => {
Expand All @@ -31,10 +34,33 @@ const AttendButton: FC<IAttendButtonProps> = (props: IAttendButtonProps) => {
};
const toggleModal = () => setShowModal(!showModal);
const modal = <CaptchaModal showModal={showModal} toggleModal={toggleModal} setRecaptcha={signUp} />;
const onConfirmModalClose = (retValue: boolean) => {
setShowConfirmModal(false);

if (retValue) {
toggleModal();
}
};

return (
<>
<Button color={isEventFull ? 'secondary' : 'success'} onClick={toggleModal} className={style.button}>
<ConfirmModal
message="Avmeldingsfristen er utløpt så du vil ikke kunne melde deg av igjen."
title="Bekreft påmelding"
open={showConfirmModal}
onClose={onConfirmModalClose}
></ConfirmModal>
<Button
color={isEventFull ? 'secondary' : 'success'}
onClick={() => {
if (props.cannotUnattend) {
setShowConfirmModal(true);
} else {
toggleModal();
}
}}
className={style.button}
>
Meld meg på {isEventFull ? 'venteliste' : null}
</Button>
{modal}
Expand Down
8 changes: 7 additions & 1 deletion src/events/components/Attendance/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ const Attendance: FC<IAttendButtonProps> = (props: IAttendButtonProps) => {
if (!canAttend.status) return <p>{canAttend.message}</p>;

// Base-case: The user is logged in and can attend!
return <AttendButton eventId={id} isEventFull={max_capacity <= number_of_seats_taken} />;
return (
<AttendButton
eventId={id}
isEventFull={max_capacity <= number_of_seats_taken}
cannotUnattend={unattendDeadline < currentTime}
/>
);
};

export default Attendance;
Loading