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

[혜수] - 둘러보기 페이지 UI 수정 & 홈 설문조사 링크 추가 #367

Merged
merged 4 commits into from
Dec 30, 2023
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
27 changes: 9 additions & 18 deletions src/app/(header)/explore/_components/Card/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default function Card({ plan }: CardProps) {
)}>
<Image
src={`/animal/${planIcons[plan.iconNumber]}.png`}
width={60}
height={60}
width={64}
height={64}
alt="animal icon"
className={classNames('card__wrapper--image')}
/>
Expand All @@ -41,23 +41,14 @@ export default function Card({ plan }: CardProps) {
disabled
/>
<div className={classNames('card__contents--tags')}>
{plan.tags.length ? (
<>
{plan.tags.map((tag, index) => {
return (
<Tag key={index} style={{ padding: ' 0 0.25rem' }}>
{tag}
</Tag>
);
})}
</>
) : (
<p className={classNames('font-size-sm', 'color-origin-secondary')}>
태그가 없습니다.
</p>
)}
{plan.tags.map((tag, index) => {
return (
<Tag key={index} style={{ padding: ' 0 0.25rem' }}>
{tag}
</Tag>
);
})}
</div>
{/* </div> */}
</div>
</div>
);
Expand Down
3 changes: 2 additions & 1 deletion src/app/(header)/explore/_components/Card/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
$card_width: 19rem;
$card_height: 12rem;
$card_margin: 0.5rem;
$card_image_margin: 1rem;

@mixin ellipsis($line) {
text-overflow: ellipsis;
Expand All @@ -20,7 +21,7 @@ $card_margin: 0.5rem;
box-shadow: var(--origin-shadow);
margin-bottom: 1rem;
&--image {
margin: 0 $card_margin 0 $card_margin;
margin: 0 $card_image_margin 0 $card_image_margin;
}
}
&__contents {
Expand Down
6 changes: 3 additions & 3 deletions src/app/(header)/explore/_components/Tab/Tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export default function Tab({ handleSort, handleYear }: TabProps) {

const yearMenu = [
{ name: '새해' },
{
name: '지난해',
},
// {
// name: '지난해',
// },
];
const sortMenu = [{ name: '최신순' }, { name: '인기순' }];

Expand Down
9 changes: 9 additions & 0 deletions src/app/(header)/home/_components/NewPlan/NewPlan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@ export default function NewPlan() {

return (
<>
<div className={classNames('new-plan__servey')}>
<p>서비스를 잘 이용하고 계신가요?</p>
<a
href="https://forms.gle/VW5xBbAErQWqmdxv6"
className={classNames('color-origin-primary', 'new-plan__servey-a')}>
서비스 만족도 조사 하러가기
</a>
</div>

<Link
href={checkIsSeason() && canMakeNewPlan ? '/create' : {}}
className={classNames('new-plan__wrapper')}
Expand Down
10 changes: 10 additions & 0 deletions src/app/(header)/home/_components/NewPlan/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,14 @@
gap: 0.25rem;
box-shadow: var(--origin-shadow);
}
&__servey {
display: flex;
flex-direction: column;
align-items: center;
margin: 0.5rem 0;
gap: 0.25rem;
&-a {
text-decoration-line: none;
}
}
}