Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
guesung committed Jan 25, 2024
1 parent 688a02d commit 02f7849
Show file tree
Hide file tree
Showing 15 changed files with 5,947 additions and 6,571 deletions.
11,626 changes: 5,611 additions & 6,015 deletions .pnp.cjs

Large diffs are not rendered by default.

846 changes: 323 additions & 523 deletions .pnp.loader.mjs

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
'use client';

import { formatDistanceStrict } from 'date-fns';
import { enUS, ko } from 'date-fns/locale';
import Image from 'next/image';

import { CommunityArticle } from '@/apis/community';
import ArticleBadge from '@/app/[lng]/(main)/community/components/ArticleBadge.client';
import { useTranslation } from '@/app/i18n/client';
Expand All @@ -15,6 +11,9 @@ import { Spacing } from '@/components/Spacing';
import useAppRouter from '@/hooks/useAppRouter';
import cn from '@/utils/cn';
import { currentKoreaTime } from '@/utils/date';
import { formatDistanceStrict } from 'date-fns';
import { enUS, ko } from 'date-fns/locale';
import Image from 'next/image';

interface ArticleItemProps {
articleData: CommunityArticle;
Expand Down Expand Up @@ -54,7 +53,7 @@ export default function ArticleItem({ articleData, onClick }: ArticleItemProps)
const locale = i18n.language === 'ko' ? ko : enUS;

return (
<div className="p-20" onClick={onClick || (() => push(`/community/${articleId}`, false))}>
<div className="p-20" onClick={onClick || (() => push(`/community/${articleId}`))}>
<Flex justify="between" align="center">
<ArticleBadge type={category.name}>{t(`category.${category.name}`)}</ArticleBadge>
<p className="text-caption text-sign-tertiary">
Expand Down
5 changes: 1 addition & 4 deletions src/app/[lng]/(main)/community/page.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import { Suspense } from 'react';

import CommunityHeader from './components/CommunityHeader';
import ContentSection from './components/ContentSection.client';
import { Keys, getCommunityArticles } from '@/apis/community';
import { Footer } from '@/components/Footer';
import { Loading } from '@/components/Loading';
import { HydrationProvider } from '@/components/Provider';
import { Spacing } from '@/components/Spacing';
import { Suspense } from 'react';

interface CommunityPageProps {
params: {
Expand Down Expand Up @@ -38,7 +36,6 @@ export default function CommunityPage({ params: { lng } }: CommunityPageProps) {
</HydrationProvider>
</Suspense>
<Spacing size={60} />
<Footer page="community" lng={lng} />
</>
);
}
8 changes: 1 addition & 7 deletions src/app/[lng]/(main)/error.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
'use client';

import BaseError, { BaseErrorProps } from '@/components/Error/BaseError';
import { Footer } from '@/components/Footer';

interface ErrorProps extends BaseErrorProps {}

export default function Error({ error, reset }: ErrorProps) {
return (
<>
<BaseError error={error} reset={reset} />
<Footer lng="ko" />
</>
);
return <BaseError error={error} reset={reset} />;
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function MemberSection({ memberCount, maxMemberCount }: MemberSec
</p>
<div
className="flex cursor-pointer items-center text-caption text-sign-caption"
onClick={() => push(`${pathname}/members`, false)}
onClick={() => push(`${pathname}/members`)}
>
<p>{t('details.viewAll')}</p>
<Icon id="24-navigate_next" />
Expand Down
2 changes: 0 additions & 2 deletions src/app/[lng]/(main)/grouping/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import CreateGroupButton from './components/CreateGroupButton.client';
import GroupingCardList from './components/GroupingCardList.client';
import GroupingHeader from './components/GroupingHeader';
import { Keys, getGroups } from '@/apis/groups';
import { Footer } from '@/components/Footer';
import { Loading } from '@/components/Loading';
import { HydrationProvider } from '@/components/Provider';
import { Spacing } from '@/components/Spacing';
Expand All @@ -25,7 +24,6 @@ export default function GroupingPage({ params: { lng } }: GroupingPageProps) {
</Suspense>
<CreateGroupButton />
<Spacing size={60} />
<Footer page="grouping" lng={lng} />
</>
);
}
2 changes: 0 additions & 2 deletions src/app/[lng]/(main)/meeting/participate/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
getMeetingRejected,
getMeetingWaiting,
} from '@/apis/meeting';
import { Footer } from '@/components/Footer';
import { Loading } from '@/components/Loading';
import { HydrationProvider } from '@/components/Provider';
import { Suspense } from 'react';
Expand Down Expand Up @@ -43,7 +42,6 @@ export default function MeetingPage({ params: { lng } }: MeetingPageProps) {
<ContentSection />
</HydrationProvider>
</Suspense>
<Footer page="meeting" lng={lng} />
</>
);
}
2 changes: 0 additions & 2 deletions src/app/[lng]/(main)/meeting/scrap/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import ContentSection from './components/ContentSection.client';
import MeetingScrapHeader from './components/MeetingScrapHeader';
import { Keys, getMeetingScrap } from '@/apis/meeting';
import { Footer } from '@/components/Footer';
import { Loading } from '@/components/Loading';
import { HydrationProvider } from '@/components/Provider';
import { Suspense } from 'react';
Expand All @@ -21,7 +20,6 @@ export default function MeetingPage({ params: { lng } }: MeetingPageProps) {
<ContentSection />
</HydrationProvider>
</Suspense>
<Footer page="meeting" lng={lng} />
</>
);
}
2 changes: 0 additions & 2 deletions src/app/[lng]/(main)/profile/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import ProfileDetail from './components/ProfileDetail.client';
import ProfileHeader from './components/ProfileHeader.client';
import { Keys, getProfile } from '@/apis/profile';
import { Footer } from '@/components/Footer';
import { Loading } from '@/components/Loading';
import { HydrationProvider } from '@/components/Provider';
import { Suspense } from 'react';
Expand All @@ -21,7 +20,6 @@ export default function Profile({ params: { lng } }: ProfilePageProps) {
<ProfileDetail />
</HydrationProvider>
</Suspense>
<Footer page="profile" isSpacing={false} lng={lng} />
</>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function Step1InputForm({ onPrev }: Step1InputFormProps) {
control,
});

const { handleFileUploadClick, previewImage, isPending } = useFileUpload((files) =>
const { handleFileUploadClick, previewImage } = useFileUpload((files) =>
onChangeImageUrl(files[0])
);

Expand Down Expand Up @@ -68,11 +68,10 @@ export default function Step1InputForm({ onPrev }: Step1InputFormProps) {
<form onSubmit={handleSubmit(onSubmit)} className="flex flex-col px-20">
<Flex justify="center">
<Avatar
imageUrl={value}
imageUrl={previewImage || value}
size="large"
iconVariant="draft_orders"
onClick={handleFileUploadClick}
isPending={isPending}
/>
</Flex>
<Spacing size={16} />
Expand Down
2 changes: 1 addition & 1 deletion src/app/[lng]/(sub)/admin/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function page() {
imageUrl:
'https://gloddy.s3.ap-northeast-2.amazonaws.com/file/eebb9660-216f-491c-902b-367dd5cc27be.JPG',
maxUser: 3,
meetDate: '2023-12-10',
meetDate: '2024-01-25',
placeAddress: '서울특별시',
placeId: 'ChIJZTibxAqlfDURIeavJisLdqo',
placeLatitude: 37.5131008,
Expand Down
2 changes: 0 additions & 2 deletions src/app/[lng]/not-found.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import NoMeeting from './(main)/meeting/components/NoMeeting';
import { Footer } from '@/components/Footer';

export default function NotFound() {
return (
Expand All @@ -8,7 +7,6 @@ export default function NotFound() {
message={`[404] 페이지를 찾을 수 없습니다.
입력하신 주소를 다시 확인해 주세요.`}
/>
<Footer lng="ko" />
</div>
);
}
2 changes: 1 addition & 1 deletion src/components/NavLink/NavLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function NavLink({
const handleClick = (event: MouseEvent<HTMLAnchorElement>) => {
event.preventDefault();
if (isReplace) replace(href);
else push(href, scroll);
else push(href);
};

return (
Expand Down
3 changes: 2 additions & 1 deletion src/hooks/useAppRouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ const useAppRouter = () => {
const isApp = getIsApp();
const router = useRouter();

const push = (path: string, scroll?: boolean) => {
const push = (path: string, title?: string, scroll?: boolean) => {
if (isApp)
return sendMessageToReactNative({
type: 'ROUTER_EVENT',
data: {
path,
type: 'PUSH',
title,
},
});
return router.push(path, { scroll });
Expand Down

0 comments on commit 02f7849

Please sign in to comment.