Skip to content
Merged
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
bb346f7
feat: 온보딩 퍼널
Youjiiin Feb 27, 2025
01edf48
fix: motion의존성 중복 제거
Youjiiin Feb 27, 2025
1cda67d
feat: 온보딩 다시보기
Youjiiin Feb 27, 2025
07bd001
feat: 온보딩 다시보기
Youjiiin Feb 27, 2025
c19a125
feat: 온보딩 배경색
Youjiiin Feb 27, 2025
f384414
fix: 온보딩 퍼널 safeArea 수정
Youjiiin Feb 27, 2025
d6e402d
fix: 온보딩 퍼널 safeArea 수정
Youjiiin Feb 27, 2025
1b01c61
feat: 온보딩 퍼널 분리
Youjiiin Feb 27, 2025
f79c1d8
feat: 온보딩 퍼널 이미지 aspectratio
Youjiiin Feb 27, 2025
ca05706
fix: 온보딩 퍼널 QA 반영
Youjiiin Feb 28, 2025
87cad38
fix: navigate위치 수정
Youjiiin Feb 28, 2025
0fa9c72
fix: 게이지 이미지 수정
Youjiiin Feb 28, 2025
f84eeb0
fix: 독서기록 로그인 시 렌더링 오류 해결
Youjiiin Feb 28, 2025
a62463d
fix: 메모 detail 접속 오류 수정
Youjiiin Feb 28, 2025
7097df6
fix: 검색 시 저자 1줄로만
Youjiiin Mar 3, 2025
b2f0da1
fix: 메모 작성 페이지 뷰 어색함 해결
Youjiiin Mar 3, 2025
50608e9
fix: 메모 줄바꿈 적용
Youjiiin Mar 3, 2025
7a79d01
chore: merge
Youjiiin Mar 3, 2025
d067726
fix: memoDetail에서 뒤로가기 커스텀
Youjiiin Mar 3, 2025
65cfaca
fix: 타이머 재설정 시, 일시정지 후 바텀시트 오픈
Youjiiin Mar 3, 2025
53c0b1b
feat: memo입력 디자인 변경
Youjiiin Mar 3, 2025
285b7ac
fix: 잃어버린 textCount 복구
Youjiiin Mar 3, 2025
3213c72
fix: 잃어버린 textCount 복구
Youjiiin Mar 3, 2025
73fcb01
feat: 게이지 페이지 스크롤없애기
Youjiiin Mar 3, 2025
e630524
chore: merge
Youjiiin Mar 4, 2025
876d066
fix: 독서기록 빈페이지 글자 잘리는 문제
Youjiiin Mar 4, 2025
5c2c34e
feat: habitbar클릭시에도 오늘 스트릭 확인
Youjiiin Mar 4, 2025
b013669
fix: 온보딩 레이아웃 수정
Youjiiin Mar 5, 2025
86e7d35
chore: 온보딩 이미지 정리
Youjiiin Mar 5, 2025
c5e4233
chore: 온보딩 화면 사진 이름 변경
Youjiiin Mar 5, 2025
e68774d
feat: 마이페이지 습관 확인 바텀시트 뒤로가기 눌러도 닫히도록
Youjiiin Mar 5, 2025
6b8e37f
feat: 타이머 바텀시트 오픈시, 뒤로가기 해도 닫히도록
Youjiiin Mar 5, 2025
404a298
feat: 바텀시트 뒤로가기 눌러도 닫히기
Youjiiin Mar 5, 2025
3c44a70
fix: 문자 제거
Youjiiin Mar 5, 2025
9896ed3
fix: 게스트 책 선택 오류 해결
Youjiiin Mar 6, 2025
7c5b126
style: 게이지 디자인 오류 해결
Youjiiin Mar 6, 2025
9d01374
style: 미니 슬라이더 디자인 수정
Youjiiin Mar 6, 2025
9a0723b
style: 습관 바텀시트 캐릭터 이미지 수정
Youjiiin Mar 6, 2025
d767505
fix: 플로팅 버튼 위치 수정
Youjiiin Mar 6, 2025
d9fea48
chore: 온보딩 파일명 변경
Youjiiin Mar 6, 2025
1b8c586
style: 마이페이지 스크롤 방지
Youjiiin Mar 6, 2025
a0aa358
feat: 설정메뉴 오픈방식 변경
Youjiiin Mar 6, 2025
af45be6
style: 검색창 아래 패딩
Youjiiin Mar 6, 2025
4f971e1
style: 검색창 아래 패딩
Youjiiin Mar 6, 2025
b5d1f3e
style: 플로팅 버튼 위치 조정
Youjiiin Mar 6, 2025
bbabc31
feat: 독서기록 위로 스크롤시 헤더 사라짐
Youjiiin Mar 6, 2025
90e4696
style: 0.4초 변경
Youjiiin Mar 7, 2025
eeb97e8
feat: 로깅툴 주석 해제
Youjiiin Mar 8, 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
77 changes: 39 additions & 38 deletions src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import "./index.css";
import "../packages/design-system/iosTimePicker.css";
import { Analytics, MercuryPostHogProvider, PostHogPageView } from "@repo/analytics/index.tsx";
import { SafeAreaEffector } from "@repo/bridge-web/SafeArea.tsx";
import { MobileLayout } from "@repo/design-system/MobileLayout.tsx";
import { Providers } from "@repo/providers";
Expand Down Expand Up @@ -34,50 +35,50 @@ createRoot(document.getElementById("root")!).render(
<StrictMode>
<MobileLayout maxWidth={MAX_WIDTH}>
<Providers>
{/* <MercuryPostHogProvider> */}
<BrowserRouter>
{/* <PostHogPageView /> */}
<AppSocialLoginProcessor />
<OverlayProvider>
<Routes>
<Route element={<BottomNavigationLayout />}>
<Route path="home" element={<HomePage />} />
<Route path="timer" element={<TimerPage />} />
<Route path="book-record" element={<BookRecordPage />} />
<Route path="profile" element={<ProfilePage />} />
</Route>
<MercuryPostHogProvider>
<BrowserRouter>
<PostHogPageView />
<AppSocialLoginProcessor />
<OverlayProvider>
<Routes>
<Route element={<BottomNavigationLayout />}>
<Route path="home" element={<HomePage />} />
<Route path="timer" element={<TimerPage />} />
<Route path="book-record" element={<BookRecordPage />} />
<Route path="profile" element={<ProfilePage />} />
</Route>

<Route path="book-record/write" element={<BookRecordWritePage />} />
<Route path="book-record/:recordId" element={<BookRecordDetailPage />} />
<Route path="book-record/write" element={<BookRecordWritePage />} />
<Route path="book-record/:recordId" element={<BookRecordDetailPage />} />

<Route
path="book-record/:recordId/:memoId/modify"
element={<BookRecordModifyPage />}
/>
<Route
path="book-record/:recordId/:memoId/modify"
element={<BookRecordModifyPage />}
/>

<Route path="add-memo/:recordId" element={<BookRecordMemoAddPage />} />
<Route path="add-memo/:recordId" element={<BookRecordMemoAddPage />} />

<Route path="notification" element={<Notification />} />
<Route path="settings" element={<SettingPage />} />
<Route path="" element={<FirstOnBoardingPage />} />
<Route
path="onboarding"
element={
<NotSigned fallback={<Navigate to={"/book-record"} replace={true} />}>
<OnBoardingPage />
</NotSigned>
}
/>
<Route path="login" element={<LoginPage />} />
<Route path="login/success" element={<LoginSuccessPage />} />
<Route path="login/agree" element={<TermsPrivacyConsentPage />} />
</Routes>
</OverlayProvider>
</BrowserRouter>
{/* </MercuryPostHogProvider> */}
<Route path="notification" element={<Notification />} />
<Route path="settings" element={<SettingPage />} />
<Route path="" element={<FirstOnBoardingPage />} />
<Route
path="onboarding"
element={
<NotSigned fallback={<Navigate to={"/book-record"} replace={true} />}>
<OnBoardingPage />
</NotSigned>
}
/>
<Route path="login" element={<LoginPage />} />
<Route path="login/success" element={<LoginSuccessPage />} />
<Route path="login/agree" element={<TermsPrivacyConsentPage />} />
</Routes>
</OverlayProvider>
</BrowserRouter>
</MercuryPostHogProvider>

<SafeAreaEffector />
{/* <Analytics /> */}
<Analytics />
</Providers>
</MobileLayout>
</StrictMode>,
Expand Down
Loading