Skip to content

Commit 6a4c716

Browse files
committed
FEAT ui 스타일링 관련 수정 (#develop)
1 parent ab085da commit 6a4c716

File tree

10 files changed

+63
-30
lines changed

10 files changed

+63
-30
lines changed

services/ahhachul.com/src/components/common/comment/commentActions/CommentActions.styled.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ export const DefaultViewHeader = styled.header`
107107
display: flex;
108108
height: 72px;
109109
align-items: center;
110-
border-bottom: 1px solid #f7f7f7;
111110
padding-left: 8px;
112111
margin-bottom: 16px;
113112
`;

services/ahhachul.com/src/components/common/filter/drawerFilter/DrawerFilter.component.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ const DrawerFilter: React.FC<DrawerFilterProps> = ({ label, drawerTitle }) => {
4848
<S.SearchIconWrapper>
4949
<SearchIcon />
5050
</S.SearchIconWrapper>
51-
<S.SearchInput placeholder="사용자 필터링" />
51+
<S.SearchInput placeholder="사용자 검색" />
5252
</S.SearchContainer>
53-
<S.ContentArea />
53+
<S.ContentArea>
54+
<span>검색중...</span>
55+
</S.ContentArea>
5456
</S.ContentWrapper>
5557
</Drawer.Content>
5658
</Drawer.Portal>

services/ahhachul.com/src/components/common/filter/drawerFilter/DrawerFilter.styled.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export const SearchInput = styled.input`
107107
color: ${theme.colors.gray[90]};
108108
background-color: ${theme.colors.gray[20]};
109109
padding: 0 12px 0 30px;
110-
font-size: 16px;
110+
font-size: 14px;
111111
caret-color: ${theme.colors['key-color']};
112112
border-radius: 12px;
113113
@@ -125,6 +125,12 @@ export const SearchInput = styled.input`
125125

126126
export const ContentArea = styled.div`
127127
background-color: ${({ theme }) => theme.colors.gray[20]};
128-
height: 500px;
128+
height: 360px;
129129
border-radius: 12px;
130+
padding: 24px;
131+
132+
& > span {
133+
${({ theme }) => theme.fonts.labelMedium};
134+
color: ${({ theme }) => theme.colors.gray[90]};
135+
}
130136
`;

services/ahhachul.com/src/components/common/subwayLinePicker/SubwayLinePicker.component.tsx

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,30 @@ import React, { useReducer } from 'react';
33
import { Drawer } from 'vaul';
44

55
import { ChevronIcon } from '@/assets/icons/system';
6-
import { subwayLineOptions } from '@/constants';
76
import type { SubwayLineType } from '@/types';
87

98
import * as S from './SubwayLinePicker.styled';
109

1110
import { SelectMolecules } from '../form/molecules';
1211

12+
const subwayLineOptions = {
13+
'1': '1호선',
14+
'2': '2호선',
15+
'3': '3호선',
16+
'4': '4호선',
17+
'5': '5호선',
18+
'6': '6호선',
19+
'7': '7호선',
20+
'8': '8호선',
21+
'9': '9호선',
22+
'11': '경의중앙선',
23+
'13': '공항철도',
24+
'15': '서해선',
25+
'16': '수인분당선',
26+
'18': '신분당선',
27+
'20': '우이신설경전철',
28+
};
29+
1330
interface SubwayLinePickerProps {
1431
name: string;
1532
title: string;
@@ -36,13 +53,17 @@ const SubwayLinePicker: React.FC<SubwayLinePickerProps> = ({
3653
return (
3754
<Drawer.Root
3855
open={isOpen}
39-
shouldScaleBackground
56+
shouldScaleBackground={false}
4057
repositionInputs={false}
4158
onOpenChange={toggleOpen}
4259
>
4360
<Drawer.Trigger asChild>
4461
<S.SelectButton isActive={!!selectedLine} aria-invalid={!!errorMsg}>
45-
<span>{selectedLine ? subwayLineOptions[selectedLine] : buttonLabel}</span>
62+
<span>
63+
{selectedLine
64+
? subwayLineOptions[selectedLine as keyof typeof subwayLineOptions]
65+
: buttonLabel}
66+
</span>
4667
<ChevronIcon />
4768
</S.SelectButton>
4869
</Drawer.Trigger>

services/ahhachul.com/src/components/common/subwayLinePicker/SubwayLinePicker.styled.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export const overlay = css`
2828
bottom: 0;
2929
left: 0;
3030
background-color: rgba(0, 0, 0, 0.4);
31+
z-index: 999999990;
3132
`;
3233

3334
export const drawerContainer = css`
@@ -85,4 +86,8 @@ export const subwayList = css`
8586
gap: 8px;
8687
justify-items: center;
8788
padding: 16px 0;
89+
90+
& > button {
91+
min-width: 109px;
92+
}
8893
`;

services/ahhachul.com/src/components/layout/ComposedLayout.component.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,18 @@ interface ComposedLayoutProps extends ComponentProps<typeof AppScreen> {
99
children: ReactNode;
1010
outerChildren?: ReactNode;
1111
navigationSlot?: boolean;
12+
shouldShowBackground?: boolean;
1213
}
1314

1415
const ComposedLayout = ({
1516
children,
1617
outerChildren,
1718
navigationSlot = true,
19+
shouldShowBackground = true,
1820
...props
1921
}: ComposedLayoutProps) => {
2022
return (
21-
<S.ComposedLayout data-vaul-drawer-wrapper="true">
23+
<S.ComposedLayout data-vaul-drawer-wrapper={shouldShowBackground}>
2224
{outerChildren}
2325
<LayoutComponent.Base navigationSlot={navigationSlot} {...props}>
2426
{children}

services/ahhachul.com/src/pages/community/new.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const NewCommunityPage: ActivityComponentType = () => {
1515
const { methods, isPending, handleImageUpload, handleImageDelete, submit } = useCommunityForm();
1616

1717
return (
18-
<LayoutComponent.Composed>
18+
<LayoutComponent.Composed navigationSlot={false}>
1919
<FormProvider {...methods}>
2020
<S.FormContainer onSubmit={submit}>
2121
<FormComponent.ImageUpload

services/ahhachul.com/src/pages/complaint/new.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const NewComplaintPage: ActivityComponentType<ComplaintFormProps> = ({
2929
useComplaintForm(slug);
3030

3131
return (
32-
<LayoutComponent.Composed>
32+
<LayoutComponent.Composed navigationSlot={false} shouldShowBackground={false}>
3333
<FormProvider {...methods}>
3434
<S.FormContainer onSubmit={submit}>
3535
<FormComponent.ImageUpload

services/ahhachul.com/src/pages/lostFound/new.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const NewLostFoundPage: ActivityComponentType = () => {
1515
const { methods, isPending, handleImageUpload, handleImageDelete, submit } = useLostFoundForm();
1616

1717
return (
18-
<LayoutComponent.Composed>
18+
<LayoutComponent.Composed navigationSlot={false}>
1919
<FormProvider {...methods}>
2020
<S.FormContainer onSubmit={submit}>
2121
<FormComponent.ImageUpload

services/ahhachul.com/src/pages/my/setting.tsx

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -103,23 +103,22 @@ const SettingPage: ActivityComponentType = () => {
103103

104104
return (
105105
<LayoutComponent.Base>
106+
<S.Fixed>
107+
<S.Headline>
108+
<b>즐겨찾는 역</b>을 설정해주세요
109+
</S.Headline>
110+
<S.Desc>최대 4개까지 등록할 수 있어요</S.Desc>
111+
112+
<SearchWrapper>
113+
<SearchInputIcon />
114+
<SearchInput
115+
placeholder="검색어를 입력해주세요"
116+
value={searchTerm}
117+
onChange={handleSearchChange}
118+
/>
119+
</SearchWrapper>
120+
</S.Fixed>
106121
<S.Container>
107-
<S.Fixed>
108-
<S.Headline>
109-
<b>즐겨찾는 역</b>을 설정해주세요
110-
</S.Headline>
111-
<S.Desc>최대 4개까지 등록할 수 있어요</S.Desc>
112-
113-
<SearchWrapper>
114-
<SearchInputIcon />
115-
<SearchInput
116-
placeholder="검색어를 입력해주세요"
117-
value={searchTerm}
118-
onChange={handleSearchChange}
119-
/>
120-
</SearchWrapper>
121-
</S.Fixed>
122-
123122
<SearchResults $isPending={isPending}>
124123
{displayStations.map((name, idx) => (
125124
<StationContainer key={`${name}_${idx}`}>
@@ -249,10 +248,9 @@ const S = {
249248
`,
250249
Fixed: styled.div`
251250
position: fixed;
252-
top: 0;
251+
top: 20px;
253252
left: 0;
254253
width: 100%;
255-
padding-top: 20px;
256254
background-color: white;
257255
`,
258256
Headline: styled.h1`

0 commit comments

Comments
 (0)