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

fix: QA #46

Merged
merged 2 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 4 additions & 1 deletion src/app/activity/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,10 @@ export default function ActivityPage() {
</h3>

<Image
src="/images/NATURE_result.png"
src={
selectedActivityData?.keyword.image ||
'/images/NATURE_result.png'
}
alt="NATURE"
width={256}
height={256}
Expand Down
3 changes: 2 additions & 1 deletion src/app/home/components/TimePiece.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import TimeCard from './TimeCard'
import { transKeyword } from '@/app/archive/components/Treemap/Treemap'
import { useHomeContext } from '../fast/components/Fetcher'

export default function TimePiece() {
Expand All @@ -11,7 +12,7 @@ export default function TimePiece() {
key={id}
time={savedTime}
title={title}
category={keyword.category}
category={transKeyword(keyword.category)}
/>
))}
</div>
Expand Down
1 change: 1 addition & 0 deletions src/app/home/sg-activity/components/ChoiceSuggestions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ export default function ChoiceSuggestion({
fetchData()

return () => {
setIsSuggestLoading(false)
setText('다음')
}
}, [])
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default function Home() {
{!isSplash && (
<>
<p className="z-50 font-semibold absolute top-[388px]">
여기에는 캐치프레이즈가 들어갑니다
흘려보내는 시간의 조각, 이제는 모아봐요!
</p>

<motion.div
Expand Down
6 changes: 3 additions & 3 deletions src/components/MobileWrapper/MobileWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ export default function MobileWrapper({ children }: { children: ReactNode }) {
return (
<div className="flex justify-center h-[100vh]">
<aside className="hidden min-w-380 mr-[5%] min-[800px]:block">
<div className="flex flex-col h-full justify-center items-center">
<SplashLogoNew className="my-auto" />
<div className="flex flex-col h-full justify-center items-center fixed">
<SplashLogoNew />
</div>
</aside>
<div className="relative flex flex-col min-w-390 border-1 overflow-y-auto scrollbar-hide overflow-x-hidden">
<div className="relative flex flex-col min-w-390 min-h-844 border-1 overflow-y-auto overflow-x-hidden scrollbar-hide my-auto">
{children}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/HomeHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function HomeHeader({ children, title }: HomeHeaderProps) {
<div className="flex w-full flex-col">
<header
className={cn(
'fixed z-10 max-w-[388px] w-full font-semibold flex items-center justify-between py-10 h-52 px-24 transition-colors duration-300 font-wavvepado bg-white',
'fixed z-10 max-w-[389px] w-full font-semibold flex items-center justify-between py-10 h-52 px-24 transition-colors duration-300 font-wavvepado bg-white',
)}
>
<button
Expand Down
Loading