Skip to content

Commit 006bc5f

Browse files
committed
app qa (#develop)
1 parent 87e4f08 commit 006bc5f

File tree

20 files changed

+240
-5024
lines changed

20 files changed

+240
-5024
lines changed

services/ahhachul.com/src/components/common/list/listItem/ListItem.styled.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,25 @@ import styled from '@emotion/styled';
77
import { DotIcon } from '@/assets/icons/system';
88

99
export const Article = styled.article`
10-
padding: 20px 0;
10+
padding: 14px 0;
1111
border-bottom: 1px solid #f5f5f5;
1212
`;
1313

1414
export const Container = styled.div`
1515
display: flex;
1616
flex-direction: column;
17-
gap: 12px;
17+
gap: 14px;
1818
`;
1919

2020
export const ContentWrapper = styled.div`
2121
display: flex;
22-
gap: 6px;
22+
gap: 8px;
2323
`;
2424

2525
export const TextContainer = styled.div`
2626
width: 100%;
2727
display: flex;
2828
flex-direction: column;
29-
gap: 6px;
3029
`;
3130

3231
export const Title = styled.div`
@@ -107,7 +106,7 @@ export const lexicalContentStyle = css`
107106
& > div > div {
108107
padding: 0;
109108
border: none;
110-
max-height: 46px;
109+
max-height: 18px;
111110
overflow: hidden;
112111
}
113112
`;

services/ahhachul.com/src/components/domain/community/searchResults/searchedList/SearchedList.component.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ interface CommunitySearchedListProps {
1515

1616
const CommunitySearchedList = ({
1717
keyword,
18-
filters: { communityType, subwayLineId },
18+
filters: { communityType, subwayLineId, hashTag },
1919
isScale,
2020
}: CommunitySearchedListProps) => {
2121
const { data, hasNextPage, isFetchingNextPage, fetchNextPage } = useFetchCommunityList({
22+
hashTag,
2223
subwayLineId,
2324
content: keyword,
2425
categoryType: communityType,

services/ahhachul.com/src/components/domain/community/searchResults/skeleton/SearchedList.skeleton.styled.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const SectionWrapper = styled.section<SectionWrapperProps>`
2727
`;
2828

2929
export const ArticleItem = styled.article<{ delay: number }>`
30-
padding: 20px;
30+
padding: 14px 20px;
3131
opacity: 0;
3232
animation: fadeIn 0.5s ease-in-out forwards;
3333
border-bottom: 1px solid ${({ theme }) => theme.colors.gray[20]};

services/ahhachul.com/src/components/domain/community/searchResults/skeleton/SearchedList.skeleton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const SearchedListSkeleton = ({ isScale }: SearchedListSkeletonProps) => {
1414
<S.ContentWrapper>
1515
<S.TopSection>
1616
<S.TextSection>
17-
<BaseSkeleton width={100} height={23} radius={6} />
18-
<BaseSkeleton width={170} height={21} radius={6} />
17+
<BaseSkeleton width={100} height={20} radius={6} />
18+
<BaseSkeleton width={170} height={16} radius={6} />
1919
</S.TextSection>
2020
{/* 이미지 스켈레톤 */}
2121
<S.ImageSection>

services/ahhachul.com/src/components/domain/home/panel/rankHashtag/RankHashtag.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const RankHashtag = () => {
6565
<StackFlow.Link
6666
key={item.id}
6767
activityName="HashtagPage"
68-
activityParams={{ keyword: item.title }}
68+
activityParams={{ tag: item.title }}
6969
>
7070
<S.RankContent>
7171
<div>

services/ahhachul.com/src/components/domain/home/stations/subwayLineFilter/SubwayLineFilter.styled.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ import { Interpolation, Theme } from '@emotion/react';
33
import { subwayLineHexColors } from '@/constants/subway';
44
import { mixins } from '@/styles';
55

6-
export const filters = [
6+
export const container = [
77
mixins.fullWidth,
8-
mixins.flexAlignCenter,
8+
mixins.flexJustifySpaceBetween,
99
({ colors: { gray } }: Theme) => ({
1010
backgroundColor: gray[100],
1111
marginBottom: '32px',
1212
}),
13-
] as Interpolation<Theme>;
13+
];
14+
15+
export const filters = [mixins.flexAlignCenter, { flex: 1 }] as Interpolation<Theme>;
1416

1517
export const inherit = (line: number) => ({
1618
display: 'flex',
@@ -34,3 +36,13 @@ export const filterBtn = (length: number) => ({
3436
fontWeight: 600,
3537
letterSpacing: '-0.2px',
3638
});
39+
40+
export const link = [
41+
mixins.flexAlignCenter,
42+
mixins.flexJustifySpaceBetween,
43+
{
44+
fontSize: '14px',
45+
fontWeight: 500,
46+
color: '#e6e6e6',
47+
},
48+
];

services/ahhachul.com/src/components/domain/home/stations/subwayLineFilter/SubwayLineFilter.tsx

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22

33
import { subwayLineOptions } from '@/constants';
4+
import { StackFlow } from '@/stackflow';
45
import type { IUserStationStore } from '@/stores/subway';
56
import type { UserStation } from '@/types';
67

@@ -38,28 +39,42 @@ const SubwayLineFilter = ({
3839
};
3940

4041
return (
41-
<ul css={S.filters}>
42-
{activatedStation.subwayLineInfoList.map(info => (
43-
<React.Fragment key={info.subwayLineId}>
44-
<li css={S.inherit(info.subwayLineId)} onClick={reorderStationInfos(info.subwayLineId)}>
45-
<button
46-
type="button"
47-
css={S.filterBtn(
48-
subwayLineOptions[
49-
info.subwayLineId as unknown as keyof typeof subwayLineOptions
50-
].replace('선', '').length,
51-
)}
52-
>
53-
{info.subwayLineId > 9
54-
? subwayLineOptions[
42+
<div css={S.container}>
43+
<ul css={S.filters}>
44+
{activatedStation.subwayLineInfoList.map(info => (
45+
<React.Fragment key={info.subwayLineId}>
46+
<li css={S.inherit(info.subwayLineId)} onClick={reorderStationInfos(info.subwayLineId)}>
47+
<button
48+
type="button"
49+
css={S.filterBtn(
50+
subwayLineOptions[
5551
info.subwayLineId as unknown as keyof typeof subwayLineOptions
56-
].replace('선', '')
57-
: info.subwayLineId}
58-
</button>
59-
</li>
60-
</React.Fragment>
61-
))}
62-
</ul>
52+
].replace('선', '').length,
53+
)}
54+
>
55+
{info.subwayLineId > 9
56+
? subwayLineOptions[
57+
info.subwayLineId as unknown as keyof typeof subwayLineOptions
58+
].replace('선', '')
59+
: info.subwayLineId}
60+
</button>
61+
</li>
62+
</React.Fragment>
63+
))}
64+
</ul>
65+
<StackFlow.Link activityName="SubwayMapPage" activityParams={{}} css={S.link}>
66+
<span>전체 노선도 보기</span>
67+
<svg
68+
width="24"
69+
height="24"
70+
viewBox="0 0 24 24"
71+
fill="none"
72+
xmlns="http://www.w3.org/2000/svg"
73+
>
74+
<path d="M10 8L14 12L10 16" stroke="white" strokeLinecap="round" strokeLinejoin="round" />
75+
</svg>
76+
</StackFlow.Link>
77+
</div>
6378
);
6479
};
6580

services/ahhachul.com/src/components/domain/lostFound/searchResults/skeleton/SearchedList.skeleton.styled.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export const SectionWrapper = styled.section<SectionWrapperProps>`
2727
`;
2828

2929
export const ArticleItem = styled.article<{ delay: number }>`
30-
padding: 20px;
30+
padding: 14px 20px;
3131
opacity: 0;
3232
animation: fadeIn 0.5s ease-in-out forwards;
3333
border-bottom: 1px solid ${({ theme }) => theme.colors.gray[20]};

services/ahhachul.com/src/components/domain/lostFound/searchResults/skeleton/SearchedList.skeleton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const SearchedListSkeleton = ({ isScale }: SearchedListSkeletonProps) => {
1414
<S.ContentWrapper>
1515
<S.TopSection>
1616
<S.TextSection>
17-
<BaseSkeleton width={100} height={23} radius={6} />
18-
<BaseSkeleton width={170} height={21} radius={6} />
17+
<BaseSkeleton width={100} height={20} radius={6} />
18+
<BaseSkeleton width={170} height={16} radius={6} />
1919
</S.TextSection>
2020
{/* 이미지 스켈레톤 */}
2121
<S.ImageSection>

services/ahhachul.com/src/components/layout/BaseLayout.styled.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ export const Scrollable = styled.div<ScrollableProps>`
1919
${mixins.overflowYScroll}
2020
2121
padding-bottom: ${({ theme, navigationSlot }) =>
22-
navigationSlot ? theme.size.navbar.height_m : 0};
22+
navigationSlot ? `calc(${theme.size.navbar.height_m} + 32px)` : 0};
2323
`;

0 commit comments

Comments
 (0)