Skip to content
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.

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

Hotfix/final #36

Merged
merged 19 commits into from
Aug 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
45d7eee
πŸ›  fix : ν¬μ¦ˆν†‘ ν…μŠ€νŠΈ 잘림 이슈
seondal Aug 25, 2023
72dc0b1
πŸ’„ style : 포즈 μƒμ„ΈνŽ˜μ΄μ§€ 슀크둀
seondal Aug 25, 2023
0bfe043
πŸ›  fix : BottomFixedDiv...
seondal Aug 25, 2023
bd57e5f
πŸ’„ style : νŒ¨λ”© μ—†μ• μ‹ κ±° 볡ꡬ
seondal Aug 25, 2023
57b6f63
πŸ›  fix : imgκ°€ 속도가 훨씬 λΉ¨λΌμ„œ μ‚¬μš©ν–ˆμ—ˆμŠ΅λ‹ˆλ‹€...!
seondal Aug 25, 2023
d260c9f
✨ feat : 이미지 λ‘œλ”© 속도 ν–₯상
seondal Aug 25, 2023
ed3ebe8
πŸ›  fix : 이미지 상세보기 λΉ„μœ¨ κΉ¨μ§€λŠ” 문제
seondal Aug 25, 2023
c434407
πŸ’„ style : νƒœκ·Έ X μ•„μ΄μ½˜ 색과 크기
seondal Aug 25, 2023
d32025c
πŸ“¦ add : close icon
seondal Aug 25, 2023
c4cf3b7
πŸ›  fix : icon.close.gray
seondal Aug 25, 2023
5c106b4
πŸ›  fix : ν¬μ¦ˆν”½ λ ˆμ΄μ•„μ›ƒ
seondal Aug 25, 2023
eb69b80
fix : νœ΄λŒ€ν° 이슈 ν•΄κ²°
guesung Aug 26, 2023
29653b6
refactor : 이미지 이슈 ν•΄κ²°
guesung Aug 26, 2023
4fdadc1
feat : νƒœκ·Έ 클릭 μ‹œ params둜 필터링 κ΅¬ν˜„
guesung Aug 26, 2023
51d7fab
refactor : νŽ˜μ΄μ§€μ—μ„œ μ¦‰μ‹œ λ¦¬λΌμš°νŒ…
guesung Aug 26, 2023
f885603
feat : 폼 λΌμš°νŒ… κ΅¬ν˜„
guesung Aug 26, 2023
015be67
feat : 넓이, 높이 κ³ μ •
guesung Aug 26, 2023
c6aee91
design : 이미지 슀크둀 λ˜λ„λ‘ κ΅¬ν˜„
guesung Aug 26, 2023
5dc8963
refactor : Image > imgνƒœκ·Έλ‘œ ꡐ체
guesung Aug 26, 2023
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
3 changes: 3 additions & 0 deletions public/icons/carat_down_gray.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions public/icons/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icons/close_gray.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/workbox-e34f44db.js.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion src/app/(Main)/feed/components/FilterTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,13 @@ export default function FilterTab() {
onClick={openBottomSheet}
>
<h5 id="subtitle-2">ν•„ν„°</h5>
<Image src={ICON.carat.down} alt="β–Ύ" width={16} height={16} priority />
<Image
src={isFiltered ? ICON.carat.down_purple : ICON.carat.down}
alt="β–Ύ"
width={16}
height={16}
priority
/>
</button>
{isFiltered && (
<>
Expand Down
8 changes: 1 addition & 7 deletions src/app/(Main)/feed/components/Photo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,7 @@ export default function Photo({ imageKey, source, id }: Photo) {
<div className={`relative z-0 mb-16 inline-block h-fit w-full rounded-8`}>
{imageKey && (
<>
<Image
src={imageKey}
alt={source || ''}
width={200}
height={100}
className="rounded-8"
/>
<img src={imageKey} alt={source || ''} className="rounded-8" />
<div className="absolute bottom-6 right-6 h-36 w-36 rounded-24 bg-white bg-opacity-30 p-6">
<Image
src={ICON.bookmark.empty}
Expand Down
2 changes: 1 addition & 1 deletion src/app/(Main)/feed/components/PhotoList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface PhotoList {

export default function PhotoList({ data }: PhotoList) {
return (
<div className="columns-2 overflow-y-scroll">
<div className="columns-2 overflow-y-scroll py-16">
{data ? (
data.map((item) => (
<Photo
Expand Down
10 changes: 8 additions & 2 deletions src/app/(Main)/feed/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { useSearchParams } from 'next/navigation';
import Link from 'next/link';
import { useRouter, useSearchParams } from 'next/navigation';

import EmptyCase from './components/EmptyCase';
import FilterSheet from './components/FilterSheet';
Expand All @@ -13,6 +14,7 @@ import useFilterState from '@/hooks/useFilterState';

export default function Feed() {
const params = useSearchParams();
const router = useRouter();

const { filterState, updateFilterState } = useFilterState();
const { data, isFetched } = usePoseFeedQuery(filterState);
Expand All @@ -24,6 +26,7 @@ export default function Feed() {
frameCount: 0,
peopleCount: 0,
});
router.replace('/feed');
});

return (
Expand All @@ -37,8 +40,11 @@ export default function Feed() {
title={'μ‹ λΉ„ν•œ 포즈λ₯Ό μ°ΎμœΌμ‹œλŠ”κ΅°μš”!'}
text={'μ°Ύκ³  싢은 포즈λ₯Ό μ €ν¬μ—κ²Œ μ•Œλ €μ£Όμ„Έμš”.'}
button={'λ¬Έμ˜μ‚¬ν•­ 남기기'}
path={''}
path={
'https://docs.google.com/forms/d/e/1FAIpQLSeZuPZTXnO4rZ4k39SzXv96PWAW4gLcTYBrsRUrgRHSVV9Ldg/viewform?usp=sf_link'
}
/>

<h4 className="mb-16">이런 ν¬μ¦ˆλŠ” μ–΄λ•Œμš”?</h4>
<PhotoList data={data.recommendedContents.content} />
</>
Expand Down
54 changes: 28 additions & 26 deletions src/app/(Main)/pick/components/PickSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,32 +45,34 @@ export default function PickSection() {

<Spacing size={16} />

<div className="relative flex h-460 w-300 items-center justify-center">
{true && <Lottie loop animationData={lottiePick} play />}
<Image
src={image || '/images/image-frame.png'}
fill
alt="sample"
priority
loading="eager"
className={clsx({ hidden: isLoading }, 'cursor-pointer')}
onClick={() =>
open(({ exit }) => (
<Popup>
<Image
src={image || '/images/image-frame.png'}
alt="enlargementImage"
priority
loading="eager"
onClick={exit}
width={500}
height={440}
className="cursor-pointer"
/>
</Popup>
))
}
/>
<div className="flex h-460 w-full items-center justify-center bg-black">
<div className="relative flex h-460 w-300 items-center justify-center">
{true && <Lottie loop animationData={lottiePick} play />}
<Image
src={image || '/images/image-frame.png'}
fill
alt="sample"
priority
loading="eager"
className={clsx({ hidden: isLoading }, 'cursor-pointer')}
onClick={() =>
open(({ exit }) => (
<Popup>
<Image
src={image || '/images/image-frame.png'}
alt="enlargementImage"
priority
loading="eager"
onClick={exit}
width={500}
height={440}
className="cursor-pointer"
/>
</Popup>
))
}
/>
</div>
</div>

<BottomFixedButton
Expand Down
5 changes: 2 additions & 3 deletions src/app/(Main)/talk/components/TalkSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ export default function TalkSection() {
onStopLoading: () => data && setTalkWord(data.poseWord.content),
initialState: false,
});
const [talkWord, setTalkWord] = useState<string>(`μ œμ‹œμ–΄μ— 맞좰
포즈λ₯Ό μ·¨ν•΄μš”!`);
const [talkWord, setTalkWord] = useState<string>(`μ œμ‹œμ–΄μ— 맞좰 포즈λ₯Ό μ·¨ν•΄μš”!`);

const handleTalkClick = () => {
if (isFirstLoading) stopFirstLoading();
Expand All @@ -35,7 +34,7 @@ export default function TalkSection() {

return (
<section className="flex flex-col items-center">
<h1 className="text-center">{talkWord}</h1>
<h1 className="max-w-310 break-keep text-center">{talkWord}</h1>

<Spacing size={10} />

Expand Down
16 changes: 15 additions & 1 deletion src/app/(Sub)/detail/[id]/components/DetailHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
'use client';
import Image from 'next/image';
import Link from 'next/link';

import IconButton from '@/components/Button/IconButton';
import { Header } from '@/components/Header';
import { Popup } from '@/components/Modal';
import { useOverlay } from '@/components/Overlay/useOverlay';

export default function DetailHeader() {
const { open } = useOverlay();
return (
<Header
leftNode={
Expand All @@ -15,7 +19,17 @@ export default function DetailHeader() {
</Link>
}
rightNode={
<IconButton size="large">
<IconButton
size="large"
onClick={() =>
open(({ exit }) => (
<Popup onClick={exit} className="cursor-pointer rounded-8" onCloseOutside={exit}>
<p>ν•΄λ‹Ή κΈ°λŠ₯은 아직 μ€€λΉ„μ€‘μ΄μ—μš”!</p>
<p> μ—…λ°μ΄νŠΈλ₯Ό κΈ°λŒ€ν•΄ μ£Όμ„Έμš”.</p>
</Popup>
))
}
>
<Image src="/icons/bookmark.svg" width={24} height={24} alt="bookmark" />
</IconButton>
}
Expand Down
7 changes: 4 additions & 3 deletions src/app/(Sub)/detail/[id]/components/DetailSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default function DetailSection({ poseId }: DetailSectionProps) {
};

return (
<div>
<div className="overflow-y-auto pb-160">
{sourceUrl && (
<Link
href={'https://' + sourceUrl}
Expand All @@ -44,12 +44,13 @@ export default function DetailSection({ poseId }: DetailSectionProps) {
</Link>
)}
<div className="flex justify-center">
<div className="relative h-520 w-440">
<div className="relative">
<Image
src={imageKey}
fill
alt="detailImage"
className="cursor-pointer"
width={450}
height={440}
onClick={() =>
open(({ exit }) => (
<Popup>
Expand Down
6 changes: 5 additions & 1 deletion src/app/(Sub)/menu/components/InqueryModal.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import Link from 'next/link';

import { Button } from '@/components/Button';
import { Popup } from '@/components/Modal';
import { Spacing } from '@/components/Spacing';
Expand All @@ -11,7 +13,9 @@ export default function MenuModal({ onConfirm, onClose }: MenuModalProps) {
return (
<Popup>
<Spacing size={20} />
<div>λ¬Έμ˜μ‚¬ν•­μ„ λ‚¨κΈ°μ‹œκ² μŠ΅λ‹ˆκΉŒ?</div>
<Link href="https://docs.google.com/forms/d/e/1FAIpQLSeZuPZTXnO4rZ4k39SzXv96PWAW4gLcTYBrsRUrgRHSVV9Ldg/viewform?usp=sf_link">
λ¬Έμ˜μ‚¬ν•­μ„ λ‚¨κΈ°μ‹œκ² μŠ΅λ‹ˆκΉŒ?
</Link>
<Spacing size={20} />
<div className="flex w-full justify-evenly gap-8">
<Button className="bg-default" onClick={onClose}>
Expand Down
4 changes: 3 additions & 1 deletion src/components/BottomFixedDiv/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ export default function BottomFixedDiv({
className,
}: StrictPropsWithChildren<BottomFixedDivProps>) {
return (
<div className={`fixed inset-x-0 bottom-20 mx-auto max-w-440 px-20 ${className}`}>
<div
className={`fixed inset-x-0 bottom-0 mx-auto max-w-440 bg-white px-20 pb-20 pt-10 ${className}`}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

μ›ΉμœΌλ‘œ μ ‘μ†ν–ˆμ„ λ•Œ λ„€λΉ„κ²Œμ΄μ…˜ λ°”κ°€ 있기 λ•Œλ¬Έμ— 이미 λ²„νŠΌμ΄ μœ„λ‘œ μ˜¬λΌμ™€ μžˆλŠ” μƒνƒœμž…λ‹ˆλ‹€.

UXλ₯Ό 더 ν—€μΉ˜λŠ” 뢀뢄이라 생각해, pb-20은 μ œκ±°ν•˜λŠ” 게 쒋을 κ±° κ°™μ•„μš”.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

μ—‡ μ•„λ‹™λ‹ˆλ‹€ μžμ„Ένžˆ λ³΄μ‹œλ©΄ bottom20 λŒ€μ‹  bottom0 pb20을 μ μš©ν–ˆμ–΄μš”! λ°”ν…€λ²„νŠΌ μ•„λž˜λ‘œ 투λͺ…ν•˜κ²Œ 뒀에 λ‚΄μš©λ“€μ΄ λ³΄μ΄λŠ”κ²ƒ λ•Œλ¬Έμ— μˆ˜μ •ν–ˆμ–΄μš”γ… γ…œ μƒμ„ΈνŽ˜μ΄μ§€ 확인 λΆ€νƒλ“œλ €μš”... 흑.. μ΄μœ κ°€ μžˆμ–΄μ„œ μˆ˜μ •ν–ˆμŠ΅λ‹ˆλ‹€ πŸ₯Ί

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

μ•„ν•˜ κ·Έλ ‡κ΅°μš” ν™•μΈν–ˆμŠ΅λ‹ˆλ‹€ !!

>
{children}
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/BottomSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function BottomSheet({ children }: StrictPropsWithChildren) {
<div className="fixed inset-x-0 bottom-0 z-30 mx-auto max-w-440 rounded-t-16 bg-white">
<div className="flex justify-end px-8 pt-12">
<button className="p-12" onClick={closeBottomSheet}>
<Image src={ICON.close} width={24} height={24} alt={'x'} />
<Image src={ICON.close.black} width={24} height={24} alt={'x'} />
</button>
</div>
<div className="column flex flex-col gap-20 p-20">{children}</div>
Expand Down
6 changes: 3 additions & 3 deletions src/components/Selection/Tag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ interface Tag {
export default function Tag({ selected, onClick, text }: Tag) {
return (
<div
className={`flex min-w-fit cursor-pointer gap-4 rounded-30 px-12 py-5 ${
className={`flex min-w-fit cursor-pointer gap-6 rounded-30 px-12 py-5 ${
selected ? 'bg-main-violet-bright' : 'bg-sub-white'
}`}
onClick={onClick}
>
<div id="subtitle-2" className={selected ? 'text-main-violet-dark' : 'text-secondary'}>
{text}
</div>
{selected && <Image src={ICON.close} width={12} height={12} alt="x" />}
{selected ?? <Image src={ICON.close} width={12} height={12} alt="x" />}
{selected && <Image src={ICON.close.gray} width={12} height={12} alt="x" />}
{selected ?? <Image src={ICON.close.gray} width={12} height={12} alt="x" />}
</div>
);
}
8 changes: 6 additions & 2 deletions src/constants/icon.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
export const ICON = {
close: '/icons/close.svg',
close: {
black: '/icons/close.svg',
gray: '/icons/close_gray.svg',
},
restart: '/icons/restart.svg',
bookmark: {
fill: '/icons/bookmark_fill.svg',
Expand All @@ -10,6 +13,7 @@ export const ICON = {
},
carat: {
up: '/icons/carat_up.svg',
down: '/icons/carat_down.svg',
down_purple: '/icons/carat_down.svg',
down: '/icons/carat_down_gray.svg',
},
} as const;