Skip to content

Commit 6ac0e4b

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 86f60d1 + 3d04e38 commit 6ac0e4b

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/pages/Session/list.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const SessionItem: React.FC<{ session: APIPretalxSessions[0] }> = ({ session })
2020
|| R.isArray(session.speakers) && !R.isEmpty(session.speakers) && session.speakers[0].avatar
2121
|| ""
2222
)
23+
const urlSafeTitle = session.title.replace(/ /g, "-").replace(/(?![A-Za-z---])./g, "")
2324

2425
return (
2526
<SessionItemEl>
@@ -31,7 +32,7 @@ const SessionItem: React.FC<{ session: APIPretalxSessions[0] }> = ({ session })
3132
/>
3233
</SessionItemImgContainer>
3334
<SessionItemInfoContainer>
34-
<h4 onClick={() => navigate(`/session/${session.code}`)}>{session.title}</h4>
35+
<h4 onClick={() => navigate(`/session/${session.code}#${urlSafeTitle}`)}>{session.title}</h4>
3536
<p>{session.abstract}</p>
3637
<SessionSpeakerContainer>
3738
by{" "}

src/pages/Session/timetable.tsx

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { wrap } from "@suspensive/react";
2-
import React from "react";
3-
import * as R from "remeda";
4-
import styled from "styled-components";
1+
import { wrap } from "@suspensive/react"
2+
import React from "react"
3+
import * as R from "remeda"
4+
import styled from "styled-components"
55

6-
import Page from "components/common/Page";
7-
import { APIPretalxSessions } from "models/api/session";
8-
import { useNavigate } from "react-router";
9-
import { useListSessionsQuery } from "utils/hooks/useAPI";
10-
import useTranslation from "utils/hooks/useTranslation";
6+
import Page from "components/common/Page"
7+
import { APIPretalxSessions } from "models/api/session"
8+
import { useNavigate } from "react-router"
9+
import { useListSessionsQuery } from "utils/hooks/useAPI"
10+
import useTranslation from "utils/hooks/useTranslation"
1111

1212
const TD_HEIGHT = 2.5;
1313
const TD_WIDTH = 12.5;
@@ -110,10 +110,11 @@ const SessionColumn: React.FC<{
110110
const clickable = R.isArray(session.speakers) && !R.isEmpty(session.speakers);
111111
// Firefox는 rowSpan된 td의 height를 계산할 때 rowSpan을 고려하지 않습니다. 따라서 직접 계산하여 height를 설정합니다.
112112
const sessionBoxHeight = `${TD_HEIGHT * rowSpan}rem`;
113+
const urlSafeTitle = session.title.replace(/ /g, "-").replace(/(?![A-Za-z---])./g, "")
113114
return (
114115
<td rowSpan={rowSpan} colSpan={colSpan}>
115116
<SessionBox
116-
onClick={() => clickable && navigate(`/session/${session.code}`)}
117+
onClick={() => clickable && navigate(`/session/${session.code}#${urlSafeTitle}`)}
117118
className={clickable ? "clickable" : ""}
118119
style={{ height: sessionBoxHeight }}
119120
>

0 commit comments

Comments
 (0)