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
325 changes: 157 additions & 168 deletions package-lock.json

Large diffs are not rendered by default.

Binary file removed src/assets/patchNote/0001.png
Binary file not shown.
Binary file added src/assets/patchNote/0002.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/UpdateModal/UpdateModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function UpdateModal({
{isPredefinedPatchNote(data) ? (
<>
{/* 메인 컨텐츠 */}
<div className="flex h-[60%] w-full flex-col gap-[2%] bg-[#EFF0F4] p-[4.5%]">
<div className="flex h-[59.5%] w-full flex-col gap-[clamp(36px,2.75vw,44px)] bg-[#EFF0F4] p-[4.5%]">
<div className="flex h-[clamp(72px,6vh,96px)] w-full flex-row items-center gap-[1%]">
<div className="h-full w-[15.7%] shrink-0">
<MegaphoneAsset className="my-[8px] h-[80px] w-[93px]" />
Expand Down
4 changes: 2 additions & 2 deletions src/constants/patch_note.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 이미지 임포트는 아래와 같이
import PatchNoteImage from '../assets/patchNote/0001.png';
import PatchNoteImage from '../assets/patchNote/0002.png';

// 기본적인 패치 노트 인터페이스
interface BasePatchNoteData {
Expand Down Expand Up @@ -34,7 +34,7 @@ export function isPredefinedPatchNote(
// 현재 활성화된 업데이트 데이터 (이 부분만 수정해서 배포하면 됨)
export const LATEST_PATCH_NOTE: PredefinedPatchNoteData = {
mode: 'predefined',
version: '0001',
version: '0002',
title: '피드백 & 투표',
description:
'토론 종료 후 피드백 & 투표 기능으로 다양한 서비스를 이용하세요!',
Expand Down
4 changes: 3 additions & 1 deletion src/page/DebateVotePage/DebateVotePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ export default function DebateVotePage() {
return (
<DefaultLayout>
<DefaultLayout.ContentContainer>
<ErrorIndicator onClickRetry={() => navigate(buildLangPath('/', lang))}>
<ErrorIndicator
onClickRetry={() => navigate(buildLangPath('/', lang))}
>
{t('유효하지 않은 투표 링크입니다.')}
</ErrorIndicator>
</DefaultLayout.ContentContainer>
Expand Down
79 changes: 42 additions & 37 deletions src/page/LandingPage/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import ReportSection from './components/ReportSection';
import useLandingPageHandlers from './hooks/useLandingPageHandlers';
import TemplateSelection from './components/TemplateSelection';
import ScrollHint from './components/ScrollHint';
import UpdateModalWrapper from '../../components/UpdateModal/UpdateModalWrapper';
export default function LandingPage() {
const {
handleStartWithoutLogin,
Expand All @@ -17,46 +18,50 @@ export default function LandingPage() {
} = useLandingPageHandlers();

return (
<div className="flex h-full w-full items-center justify-center bg-default-white">
{/* 헤더 */}
<Header onLoginButtonClicked={handleHeaderLoginButtonClick} />
<>
<div className="flex h-full w-full items-center justify-center bg-default-white">
{/* 헤더 */}
<Header onLoginButtonClicked={handleHeaderLoginButtonClick} />

<main className="flex w-full flex-col items-center">
{/* 흰색 배경 */}
<div className="flex w-[95%] max-w-[1226px] flex-col gap-96 pb-48 pt-20 md:w-[64%]">
{/* 메인 화면 */}
<MainSection
onStartWithoutLogin={handleStartWithoutLogin}
onDashboardButtonClicked={handleDashboardButtonClick}
/>
<ScrollHint />
{/*템플릿 선택 화면 */}
<TemplateSelection />
<main className="flex w-full flex-col items-center">
{/* 흰색 배경 */}
<div className="flex w-[95%] max-w-[1226px] flex-col gap-96 pb-48 pt-20 md:w-[64%]">
{/* 메인 화면 */}
<MainSection
onStartWithoutLogin={handleStartWithoutLogin}
onDashboardButtonClicked={handleDashboardButtonClick}
/>
<ScrollHint />
{/*템플릿 선택 화면 */}
<TemplateSelection />

{/* 시간표 설정화면 */}
<TimeTableSection />
</div>
{/* 시간표 설정화면 */}
<TimeTableSection />
</div>

{/* 회색 배경 */}
<div className="flex w-full flex-col items-center bg-default-disabled/hover py-48">
{/* 타이머 화면 */}
<TimerSection />
</div>
{/* 회색 배경 */}
<div className="flex w-full flex-col items-center bg-default-disabled/hover py-48">
{/* 타이머 화면 */}
<TimerSection />
</div>

{/* 흰색 배경 */}
<div className="flex w-[95%] max-w-[1226px] flex-col gap-96 py-48 md:w-[64%]">
{/* 홈 설정 */}
<TableSection onLogin={handleTableSectionLoginButtonClick} />
</div>
<div className="flex w-full flex-col items-center bg-black py-48">
{/* 리뷰 */}
<ReviewSection onStartWithoutLogin={handleStartWithoutLogin} />
</div>
<div className="flex w-[95%] max-w-[1226px] flex-col gap-96 py-48 md:w-[64%]">
{/* 버그 및 불편사항 제보 */}
<ReportSection />
</div>
</main>
</div>
{/* 흰색 배경 */}
<div className="flex w-[95%] max-w-[1226px] flex-col gap-96 py-48 md:w-[64%]">
{/* 홈 설정 */}
<TableSection onLogin={handleTableSectionLoginButtonClick} />
</div>
<div className="flex w-full flex-col items-center bg-black py-48">
{/* 리뷰 */}
<ReviewSection onStartWithoutLogin={handleStartWithoutLogin} />
</div>
<div className="flex w-[95%] max-w-[1226px] flex-col gap-96 py-48 md:w-[64%]">
{/* 버그 및 불편사항 제보 */}
<ReportSection />
</div>
</main>
</div>

<UpdateModalWrapper />
</>
);
}
3 changes: 3 additions & 0 deletions src/page/TableListPage/TableListPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import HeaderTitle from '../../components/HeaderTitle/HeaderTitle';
import { Suspense } from 'react';
import LoadingIndicator from '../../components/LoadingIndicator/LoadingIndicator';
import TableListPageContent from './components/TableListPageContent';
import UpdateModalWrapper from '../../components/UpdateModal/UpdateModalWrapper';

export default function TableListPage() {
const { t } = useTranslation();
Expand All @@ -20,6 +21,8 @@ export default function TableListPage() {
<DefaultLayout.ContentContainer>
<Suspense fallback={<LoadingIndicator />}>
<TableListPageContent />

<UpdateModalWrapper />
</Suspense>
</DefaultLayout.ContentContainer>
</DefaultLayout>
Expand Down
8 changes: 6 additions & 2 deletions src/page/TableSharingPage/TableSharingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@
(value: PostDebateTableResponseType) => {
closeModal();
sessionDebateTableRepository.deleteTable();
navigate(buildLangPath(`/overview/customize/${value.id}`, lang));
navigate(
buildLangPath(`/overview/customize/${value.id}`, lang),
);
},
// 저장 실패 시
() => {
Expand Down Expand Up @@ -114,7 +116,7 @@
},
);
}
}, [decodedData, navigate, openModal, closeModal, encodedData, lang]);

Check warning on line 119 in src/page/TableSharingPage/TableSharingPage.tsx

View workflow job for this annotation

GitHub Actions / test

React Hook useEffect has a missing dependency: 't'. Either include it or remove the dependency array

return (
<>
Expand All @@ -137,7 +139,9 @@
(value) => {
closeModal();
sessionDebateTableRepository.deleteTable();
navigate(buildLangPath(`/overview/customize/${value.id}`, lang));
navigate(
buildLangPath(`/overview/customize/${value.id}`, lang),
);
},
() => {
closeModal();
Expand Down
2 changes: 0 additions & 2 deletions src/routes/routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import VoteParticipationPage from '../page/VoteParticipationPage/VoteParticipati
import VoteCompletePage from '../page/VoteCompletePage/VoteCompletePage';
import DebateVoteResultPage from '../page/DebateVoteResultPage/DebateVoteResultPage';
import LanguageWrapper from './LanguageWrapper';
import UpdateModalWrapper from '../components/UpdateModal/UpdateModalWrapper';

const appRoutes = [
{
Expand Down Expand Up @@ -110,7 +109,6 @@ const router = createBrowserRouter(
<>
<ErrorBoundaryWrapper />
<BackActionHandler />
<UpdateModalWrapper />
</>
),
children: [
Expand Down