Skip to content

develp branch 작업내용 머지 : develop -> main #269

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

Merged
heeeeyong merged 4 commits into from
Sep 30, 2025
Merged

develp branch 작업내용 머지 : develop -> main #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1373000
Merge pull request #267 from THIP-TextHip/main
ho0010 Sep 26, 2025
3647237
docs: GA 페이지 경로 추가
heeeeyong Sep 30, 2025
ecac20c
docs: 버전 정보 수정
heeeeyong Sep 30, 2025
7b9e1c8
Merge pull request #268 from THIP-TextHip/chore/minor-updates
heeeeyong Sep 30, 2025
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
10 changes: 8 additions & 2 deletions src/components/common/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,22 @@ const Layout = () => {
const location = useLocation();

useEffect(() => {
// 라우트별 페이지 타이틀 설정
// 라우트별 페이지 타이틀 설정 (첫 세그먼트 기준으로 그룹핑)
const path = location.pathname;
const titleRules: Array<[RegExp, string]> = [
[/^\/$/, 'THIP - 로그인'],
[/^\/feed(\/|$)/, 'THIP - 피드'],
[/^\/notice(\/|$)/, 'THIP - 알림'],
[/^\/group(\/|$)/, 'THIP - 모임'],
[/^\/group(\/|$)/, 'THIP - 모임 상세 페이지'],
[/^\/rooms\/[^/]+\/memory(\/|$)/, 'THIP - 기록장'],
[/^\/mypage(\/|$)/, 'THIP - 마이페이지'],
[/^\/search(\/|$)/, 'THIP - 책 검색'],
[/^\/signup(\/|$)/, 'THIP - 회원가입'],
[/^\/post(\/|$)/, 'THIP - 글 작성 및 수정'],
[/^\/otherfeed(\/|$)/, 'THIP - 다른 유저 피드'],
[/^\/myfeed(\/|$)/, 'THIP - 내 피드'],
[/^\/follow(\/|$)/, 'THIP - 팔로워 및 팔로잉 조회'],
[/^\/today-words(\/|$)/, 'THIP - 오늘의 한마디'],
];

const matched = titleRules.find(([regex]) => regex.test(path));
Expand Down
2 changes: 1 addition & 1 deletion src/pages/mypage/Mypage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ const Mypage = () => {
onClick={handleTerms}
/>
<MenuButton src={guide} name="가이드" isButton onClick={handleGuide} />
<MenuButton src={ver} name="버젼 1.0.0" isButton onClick={handleVersion} />
<MenuButton src={ver} name="버젼 1.3.0" isButton onClick={handleVersion} />
</MenuGrid>
</Section>
<BottomMenu>
Expand Down