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.

Sign up for GitHub

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

[Feat] 툴리스트페이지 QA 반영 #139

Merged
merged 1 commit into from
Jan 24, 2025
Merged

[Feat] 툴리스트페이지 QA 반영 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions public/svgs/bigtext.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/assets/svgs/Bigtext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import * as React from 'react';
Copy link
Collaborator

Choose a reason for hiding this comment

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

p1: 지워줘요

import type { SVGProps } from 'react';

const SvgBigtext = (props: SVGProps<SVGSVGElement>) => (
<svg xmlns="http://www.w3.org/2000/svg" width={106} height={24} fill="none" {...props}>
<path
fill="#fff"
d="M96.36 24q-2.37 0-4.09-1.164t-2.661-3.105q-.909-1.973-.909-4.334 0-2.458 1.039-4.399a7.87 7.87 0 0 1 3.018-3.105q1.98-1.164 4.707-1.164 2.694 0 4.576 1.164a7.5 7.5 0 0 1 2.921 3.105q1.04 1.941 1.039 4.334v8.28h-3.733V20.54h-.065a7.8 7.8 0 0 1-1.265 1.714q-.78.777-1.915 1.262Q97.885 24 96.36 24m1.006-3.17q1.461 0 2.532-.71a4.84 4.84 0 0 0 1.688-1.974q.616-1.26.616-2.814 0-1.552-.584-2.749-.584-1.23-1.655-1.94-1.071-.745-2.564-.745-1.558 0-2.662.744a4.6 4.6 0 0 0-1.687 1.941q-.585 1.23-.585 2.782 0 1.52.584 2.781.585 1.23 1.656 1.973 1.104.712 2.661.712M77.672 24q-1.98 0-3.603-.615a7.7 7.7 0 0 1-2.726-1.843 8.7 8.7 0 0 1-1.72-2.814q-.585-1.65-.585-3.623 0-2.523 1.006-4.399a7.4 7.4 0 0 1 2.856-2.91q1.818-1.068 4.155-1.068 1.17 0 2.207.356a6.6 6.6 0 0 1 1.883 1.002 5.4 5.4 0 0 1 1.363 1.52h.032V0h3.733v15.17q0 2.716-1.104 4.722a7.44 7.44 0 0 1-3.018 3.04Q80.236 24 77.67 24m0-3.17q1.428 0 2.499-.68a4.84 4.84 0 0 0 1.72-1.94q.617-1.23.617-2.846t-.617-2.847q-.615-1.228-1.72-1.908-1.071-.711-2.532-.711-1.395 0-2.499.711a4.84 4.84 0 0 0-1.72 1.94q-.617 1.23-.617 2.815 0 1.617.617 2.846a4.84 4.84 0 0 0 1.72 1.94q1.135.68 2.532.68M58.556 24q-2.401 0-4.187-.939-1.785-.97-2.759-2.652-.973-1.682-.973-3.784v-9.51h3.732v9.477q0 1.262.552 2.232.585.938 1.526 1.488.973.517 2.11.517a4.24 4.24 0 0 0 2.077-.517 4.04 4.04 0 0 0 1.525-1.488q.585-.97.584-2.232V7.115h3.733v9.51q0 2.102-.974 3.784-.973 1.681-2.759 2.652-1.785.939-4.187.938M40.323 23.611V11.805q0-2.2 1.234-3.428 1.265-1.262 3.473-1.262h3.992v3.17h-3.31q-.78 0-1.234.453-.422.453-.422 1.229v11.644zM27.321 24q-2.37 0-4.09-1.164t-2.661-3.105q-.909-1.973-.909-4.334 0-2.458 1.039-4.399a7.87 7.87 0 0 1 3.018-3.105q1.98-1.164 4.707-1.164 2.694 0 4.576 1.164a7.5 7.5 0 0 1 2.921 3.105q1.04 1.941 1.039 4.334v8.28h-3.733V20.54h-.065a7.8 7.8 0 0 1-1.265 1.714q-.78.777-1.915 1.262Q28.846 24 27.32 24m1.006-3.17q1.461 0 2.532-.71a4.84 4.84 0 0 0 1.688-1.974q.615-1.26.616-2.814 0-1.552-.584-2.749-.584-1.23-1.655-1.94-1.071-.745-2.564-.745-1.558 0-2.662.744a4.6 4.6 0 0 0-1.688 1.941q-.585 1.23-.584 2.782 0 1.52.584 2.781.585 1.23 1.656 1.973 1.103.712 2.661.712M8.634 24q-1.98 0-3.603-.615a7.7 7.7 0 0 1-2.727-1.843 8.7 8.7 0 0 1-1.72-2.814Q0 17.078 0 15.105q0-2.523 1.006-4.399a7.4 7.4 0 0 1 2.856-2.91Q5.68 6.727 8.017 6.727q1.169 0 2.207.356a6.6 6.6 0 0 1 1.883 1.002 5.4 5.4 0 0 1 1.363 1.52h.032V0h3.733v15.17q0 2.716-1.104 4.722a7.44 7.44 0 0 1-3.018 3.04Q11.198 24 8.633 24m0-3.17q1.428 0 2.499-.68a4.84 4.84 0 0 0 1.72-1.94q.617-1.23.617-2.846t-.617-2.847q-.616-1.228-1.72-1.908-1.071-.711-2.532-.711-1.395 0-2.499.711a4.84 4.84 0 0 0-1.72 1.94q-.617 1.23-.617 2.815 0 1.617.617 2.846a4.84 4.84 0 0 0 1.72 1.94q1.135.68 2.532.68"
/>
</svg>
);
export default SvgBigtext;
1 change: 1 addition & 0 deletions src/assets/svgs/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export { default as Backcards } from './Backcards';
export { default as Bigtext } from './Bigtext';
export { default as BlurLeft } from './BlurLeft';
export { default as BtnWritingArrowleft } from './BtnWritingArrowleft';
export { default as BtnWritingChipx56 } from './BtnWritingChipx56';
Expand Down
4 changes: 4 additions & 0 deletions src/pages/toolList/components/searchBar/SearchBar.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,12 @@ export const Search = styled.input<StickyProps>`
width: ${({ isSticky }) => (isSticky ? '19.5rem' : '78rem')};
margin-right: 2.5rem;

background: ${({ theme }) => theme.colors.white2};

&::placeholder {
color: ${({ theme }) => theme.colors.gray2};

${({ theme }) => theme.fonts.body_16_m};
background: ${({ theme }) => theme.colors.white2};
}
`;
32 changes: 14 additions & 18 deletions src/pages/toolList/components/toolCard/ToolCard.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const CardFront = styled.div<{ bgColor: string }>`
height: 20rem;

background-color: ${({ bgColor }) => bgColor};
border-left: 1px solid ${({ theme }) => theme.colors.gray5};
border-radius: 2rem;

transition:
Expand Down Expand Up @@ -117,10 +118,10 @@ export const ToolNameFront = styled.h1<{ fontColor: boolean; isKorean: boolean }
position: absolute;
top: 3.7rem;
left: 3rem;

align-items: left;
display: flex;
align-items: center;
width: 23.6rem;
height: 7.6rem;
height: 6rem;

color: ${({ fontColor, theme }) => (fontColor ? theme.colors.black : theme.colors.white1)};
${({ isKorean, theme }) => (isKorean ? theme.fonts.head_32_b : theme.fonts.card_36_B)};
Expand All @@ -130,17 +131,11 @@ export const ToolNameFront = styled.h1<{ fontColor: boolean; isKorean: boolean }
overflow-wrap: break-word;
`;

export const ToolFront = styled.div`
export const ToolBackTitle = styled.h2<{ isKorean: boolean }>`
display: flex;
align-items: center;
justify-content: center;
width: 23.6rem;
height: 7.6rem;
`;

export const ToolBackTitle = styled.h2<{ isKorean: boolean }>`
width: 15.6rem;
height: auto;
height: 4rem;

color: ${({ theme }) => theme.colors.black};
${({ isKorean, theme }) => (isKorean ? theme.fonts.body_20_b : theme.fonts.card_18_B_20)};
Expand All @@ -157,7 +152,6 @@ export const ToolNameBack = styled.h2`
justify-content: space-between;
width: 20rem;
height: 4rem;
margin-bottom: 0.4rem;

${({ theme }) => theme.fonts.head_28_b};
color: ${({ theme }) => theme.colors.black};
Expand All @@ -168,17 +162,17 @@ export const Description = styled.p`
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
align-items: center;
width: 16rem;
height: 3.2rem;
margin-top: 0.4rem;
overflow: hidden;

${({ theme }) => theme.fonts.caption_12_r};
color: ${({ theme }) => theme.colors.gray2};
text-align: left;
text-align: left !important;
text-overflow: ellipsis;
`;
//사파리에서 정렬 확인해보기

Comment on lines 174 to 176
Copy link
Collaborator

Choose a reason for hiding this comment

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

p1: 이건 찬영언니가 해줄거임 @shroqkf

export const Keywords = styled.div`
display: flex;
Expand All @@ -187,7 +181,7 @@ export const Keywords = styled.div`

export const KeywordsFront = styled.div`
position: absolute;
bottom: 3.3rem;
bottom: 2.9rem;
left: 3rem;
display: flex;
gap: 0.8rem;
Expand All @@ -197,8 +191,8 @@ export const LicenseBadge = styled.span`
display: flex;
gap: 0.6rem;
align-items: center;
margin-top: 0.6rem;
margin-bottom: 0.6rem;
margin-top: 1rem;
margin-bottom: 1rem;

color: ${({ theme }) => theme.colors.orange1};
${({ theme }) => theme.fonts.body_16_b_2};
Expand All @@ -216,7 +210,9 @@ export const CardBackBox = styled.div`
flex-direction: column;
align-items: flex-start;
width: 20rem;
height: 13.4rem;
height: 14.2rem;

text-align: left;
`;

export const BookMark = styled(NotFill)<{ bookmarked: boolean }>`
Expand Down
9 changes: 3 additions & 6 deletions src/pages/toolList/components/toolCard/ToolCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const ToolCard = ({ selectedCategory, isFree, criteria }: ToolCardProps) => {
try {
const response = await fetchToolsByCategory(selectedCategory, isFree, criteria, isReset ? null : cursor);
const { tools: newTools, scrollPaginationDto } = response.data as FetchToolsResponse;

const formattedTools: Tool[] = newTools.map((tool) => ({
toolId: tool.toolId,
toolLogo: tool.toolLogo,
Expand Down Expand Up @@ -93,11 +92,9 @@ const ToolCard = ({ selectedCategory, isFree, criteria }: ToolCardProps) => {
<S.Card key={tool.toolId} onClick={() => navigateToDetail(tool.toolId)}>
<S.CardFront bgColor={tool.bgColor}>
<S.ToolLogo src={tool.toolLogo} alt={`${tool.toolName} 로고`} />
<S.ToolFront>
<S.ToolNameFront fontColor={tool.fontColor} isKorean={isKorean(tool.toolName)}>
{tool.toolName}
</S.ToolNameFront>
</S.ToolFront>
<S.ToolNameFront fontColor={tool.fontColor} isKorean={isKorean(tool.toolName)}>
{tool.toolName}
</S.ToolNameFront>
<S.KeywordsFront>
{tool.keywords?.map((keyword, index) => (
<Chip
Expand Down
4 changes: 2 additions & 2 deletions src/pages/toolList/components/topBanner/TopBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ImgTextlogo } from '@assets/svgs';
import { Bigtext } from '@assets/svgs';

import * as S from './TopBanner.styled';

Expand All @@ -8,7 +8,7 @@ const TopBanner = () => {
<S.BackCards />
<S.BannerContainer>
<S.BannerTitle>
대학생활에 필요한 툴을 다루다, <ImgTextlogo />{' '}
대학생활에 필요한 툴을 다루다, <Bigtext />{' '}
</S.BannerTitle>
공부, 과제, 팀플, 동아리, 대외활동에서 주로 사용하는 인기 툴부터 무료 툴까지 <br />
한눈에 파악하고 지금 내게 필요한 툴을 선택하세요.
Expand Down
Loading