Skip to content
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
4 changes: 2 additions & 2 deletions public/app.js

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions src/components/Link.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { formatUrl } from '../helpers';
import { useFilter, useInput, useSettings } from '../hooks';
import type { Meeting } from '../types';

export default function Link({ meeting }: { meeting: Meeting }) {
const { meeting: thisMeeting } = useFilter();
const { settings, strings } = useSettings();
const { setInput } = useInput();
const { input, setInput } = useInput();

const flags =
settings.flags
Expand All @@ -27,7 +28,11 @@ export default function Link({ meeting }: { meeting: Meeting }) {
return (
<>
<a
onClick={() => setInput(input => ({ ...input, meeting: meeting.slug }))}
href={formatUrl({ ...input, meeting: meeting.slug }, settings)}
onClick={e => {
e.preventDefault();
setInput(input => ({ ...input, meeting: meeting.slug }));
}}
>
{meeting.name}
</a>
Expand Down
9 changes: 7 additions & 2 deletions src/components/Meeting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
formatDirectionsUrl,
formatFeedbackEmail,
formatIcs,
formatUrl,
formatString as i18n,
} from '../helpers';
import {
Expand All @@ -28,7 +29,7 @@ import type { Meeting as MeetingType } from '../types';

export default function Meeting({ meeting }: { meeting: MeetingType }) {
const { settings, strings } = useSettings();
const { setInput } = useInput();
const { input, setInput } = useInput();

// open types
const [define, setDefine] = useState<string | undefined>();
Expand Down Expand Up @@ -258,7 +259,11 @@ export default function Meeting({ meeting }: { meeting: MeetingType }) {
<div css={meetingBackCss}>
<Icon icon="back" />
<a
onClick={() => setInput(input => ({ ...input, meeting: undefined }))}
href={formatUrl({ ...input, meeting: undefined }, settings)}
onClick={e => {
e.preventDefault();
setInput(input => ({ ...input, meeting: undefined }));
}}
>
{strings.back_to_meetings}
</a>
Expand Down