Skip to content

Commit 57df22a

Browse files
authored
restore link hrefs (#467)
1 parent a4b318c commit 57df22a

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

public/app.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/Link.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
import { formatUrl } from '../helpers';
12
import { useFilter, useInput, useSettings } from '../hooks';
23
import type { Meeting } from '../types';
34

45
export default function Link({ meeting }: { meeting: Meeting }) {
56
const { meeting: thisMeeting } = useFilter();
67
const { settings, strings } = useSettings();
7-
const { setInput } = useInput();
8+
const { input, setInput } = useInput();
89

910
const flags =
1011
settings.flags
@@ -27,7 +28,11 @@ export default function Link({ meeting }: { meeting: Meeting }) {
2728
return (
2829
<>
2930
<a
30-
onClick={() => setInput(input => ({ ...input, meeting: meeting.slug }))}
31+
href={formatUrl({ ...input, meeting: meeting.slug }, settings)}
32+
onClick={e => {
33+
e.preventDefault();
34+
setInput(input => ({ ...input, meeting: meeting.slug }));
35+
}}
3136
>
3237
{meeting.name}
3338
</a>

src/components/Meeting.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
formatDirectionsUrl,
77
formatFeedbackEmail,
88
formatIcs,
9+
formatUrl,
910
formatString as i18n,
1011
} from '../helpers';
1112
import {
@@ -28,7 +29,7 @@ import type { Meeting as MeetingType } from '../types';
2829

2930
export default function Meeting({ meeting }: { meeting: MeetingType }) {
3031
const { settings, strings } = useSettings();
31-
const { setInput } = useInput();
32+
const { input, setInput } = useInput();
3233

3334
// open types
3435
const [define, setDefine] = useState<string | undefined>();
@@ -258,7 +259,11 @@ export default function Meeting({ meeting }: { meeting: MeetingType }) {
258259
<div css={meetingBackCss}>
259260
<Icon icon="back" />
260261
<a
261-
onClick={() => setInput(input => ({ ...input, meeting: undefined }))}
262+
href={formatUrl({ ...input, meeting: undefined }, settings)}
263+
onClick={e => {
264+
e.preventDefault();
265+
setInput(input => ({ ...input, meeting: undefined }));
266+
}}
262267
>
263268
{strings.back_to_meetings}
264269
</a>

0 commit comments

Comments
 (0)