Skip to content

Commit 95b9563

Browse files
author
Jeongbowoon
committed
Merge branch 'develop' of https://github.com/Team-Tiki/TIKI_CLIENT into feature/showcase/#47-Club-Profile-Card
2 parents 69028fd + 37a8842 commit 95b9563

File tree

20 files changed

+198
-66
lines changed

20 files changed

+198
-66
lines changed

‎src/common/asset/svg/eclipse.svg‎

Lines changed: 11 additions & 0 deletions
Loading

‎src/common/component/Button/Button.style.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const variantStyle = (variant: Required<ButtonProps>['variant']) => {
3636
}),
3737
text: css({
3838
backgroundColor: 'transparent',
39-
...theme.label.label01,
39+
...theme.text.body04,
4040
}),
4141
action: css({
4242
color: theme.colors.white,
@@ -49,13 +49,13 @@ export const variantStyle = (variant: Required<ButtonProps>['variant']) => {
4949
export const sizeStyle = (size: Required<ButtonProps>['size']) => {
5050
const style = {
5151
large: css({
52-
...theme.text.body02,
52+
...theme.text.body03,
5353
}),
5454
medium: css({
55-
...theme.text.body04,
55+
...theme.text.body05,
5656
}),
5757
small: css({
58-
...theme.text.body05,
58+
...theme.text.body06,
5959
}),
6060
};
6161
return style[size];

‎src/common/component/Heading/Heading.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ComponentPropsWithoutRef } from 'react';
22

33
import { headingStyle } from './heading.style';
44

5-
type HeadingType = 'H1' | 'H2' | 'H3' | 'H4' | 'H5' | 'H6' | 'H7';
5+
type HeadingType = 'H1' | 'H2' | 'H3' | 'H4' | 'H5' | 'H6';
66

77
interface HeadingProps extends ComponentPropsWithoutRef<'h3'> {
88
tag?: HeadingType;
@@ -15,7 +15,6 @@ const HeadingTag = {
1515
H4: 'h4',
1616
H5: 'h5',
1717
H6: 'h6',
18-
H7: 'h6',
1918
} as const;
2019

2120
const Heading = ({ tag = 'H3', ...props }: HeadingProps) => {

‎src/common/component/Heading/heading.style.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ export const headingStyle = {
99
H4: css(theme.heading.heading04),
1010
H5: css(theme.heading.heading05),
1111
H6: css(theme.heading.heading06),
12-
H7: css(theme.heading.heading07),
1312
};

‎src/common/component/Label/Label.style.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { css } from '@emotion/react';
33
import { theme } from '@/common/style/theme/theme';
44

55
export const textStyle = css({
6-
fontSize: theme.label.label01.fontSize,
7-
lineHeight: theme.label.label01.lineHeight,
6+
fontSize: theme.text.body04.fontSize,
7+
lineHeight: theme.text.body04.lineHeight,
88

99
fontWeight: 600,
1010
});

‎src/common/component/Select/Select.style.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ export const itemStyle = css({
1616
margin: '0.4rem 1.2rem',
1717
borderRadius: '8px',
1818

19-
fontSize: theme.text.body04.fontSize,
20-
lineHeight: theme.text.body04.lineHeight,
19+
fontSize: theme.text.body05.fontSize,
20+
lineHeight: theme.text.body05.lineHeight,
2121

2222
'&:hover, &:focus': {
2323
backgroundColor: theme.colors.blue_100,

‎src/common/component/Text/Text.style.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ export const textStyle = (tag: Required<TextProps>['tag']) => {
3030
fontSize: theme.text.body06.fontSize,
3131
lineHeight: theme.text.body06.lineHeight,
3232
}),
33+
body7: css({
34+
fontSize: theme.text.body07.fontSize,
35+
lineHeight: theme.text.body07.lineHeight,
36+
}),
37+
body8: css({
38+
fontSize: theme.text.body08.fontSize,
39+
lineHeight: theme.text.body08.lineHeight,
40+
}),
3341
};
3442
return style[tag];
3543
};

‎src/common/router/Router.tsx‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import App from '@/App';
2+
3+
import { RouterProvider, createBrowserRouter } from 'react-router-dom';
4+
5+
const router = createBrowserRouter([
6+
{
7+
path: '/',
8+
element: <App />,
9+
children: [
10+
{ path: 'showcase', element: <p>showcase</p> },
11+
{ path: 'archiving', element: <p>archiving</p> },
12+
{
13+
path: 'signin',
14+
element: <p>terms</p>,
15+
},
16+
{
17+
path: 'signin/info',
18+
element: <p>info</p>,
19+
},
20+
{
21+
path: 'password/auth',
22+
element: <p>인증</p>,
23+
},
24+
{
25+
path: 'password/reset',
26+
element: <p>재설정</p>,
27+
},
28+
],
29+
},
30+
]);
31+
32+
export const AppRouter = () => {
33+
return <RouterProvider router={router} />;
34+
};

‎src/common/style/theme/theme.ts‎

Lines changed: 9 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
const colors = {
22
black: '#2C3030',
3+
black_shade: 'linear-gradient(270deg, rgba(0, 0, 0, 0.00) 0%, rgba(0, 0, 0, 0.70) 100%))',
4+
dimmed: 'rgba(0, 0, 0, 0.40)',
35
gray_800: '#56585D',
46
gray_700: '#6B6B6B',
57
gray_600: '#909090',
@@ -38,10 +40,6 @@ const heading = {
3840
lineHeight: '2rem',
3941
},
4042
heading06: {
41-
fontSize: '1.8rem',
42-
lineHeight: '1.8rem',
43-
},
44-
heading07: {
4543
fontSize: '1.6rem',
4644
lineHeight: '1.6rem',
4745
},
@@ -54,56 +52,34 @@ const text = {
5452
},
5553
body02: {
5654
fontSize: '2rem',
57-
lineHeight: '2rem',
55+
lineHeight: '3.36rem',
5856
},
5957
body03: {
60-
fontSize: '1.6rem',
61-
lineHeight: '1.6rem',
58+
fontSize: '2rem',
59+
lineHeight: '2rem',
6260
},
6361
body04: {
6462
fontSize: '1.6rem',
65-
lineHeight: '2.24rem',
63+
lineHeight: '1.6rem',
6664
},
6765
body05: {
6866
fontSize: '1.4rem',
69-
lineHeight: '1.4rem',
67+
lineHeight: '2.24rem',
7068
},
7169
body06: {
7270
fontSize: '1.4rem',
73-
lineHeight: '1.96rem',
71+
lineHeight: '1.4rem',
7472
},
7573
body07: {
7674
fontSize: '1.4rem',
7775
lineHeight: '1.68rem',
7876
},
79-
} as const;
80-
81-
const label = {
82-
label01: {
83-
fontSize: '1.6rem',
84-
lineHeight: '1.6rem',
85-
},
86-
label02: {
87-
fontSize: '1.4rem',
88-
lineHeight: '1.4rem',
89-
},
90-
label03: {
77+
body08: {
9178
fontSize: '1.2rem',
9279
lineHeight: '1.2rem',
9380
},
9481
} as const;
9582

96-
const button = {
97-
button01: {
98-
fontsize: '1.6rem',
99-
lineHeight: '1.6rem',
100-
},
101-
button02: {
102-
fontSize: '1.4rem',
103-
lineHeight: '1.4rem',
104-
},
105-
} as const;
106-
10783
const zIndex = {
10884
overlayTop: 4,
10985
overlayHigh: 3,
@@ -115,7 +91,5 @@ export const theme = {
11591
colors,
11692
heading,
11793
text,
118-
label,
119-
button,
12094
zIndex,
12195
};

‎src/main.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ import { createRoot } from 'react-dom/client';
66
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
77
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
88

9+
import { AppRouter } from '@/common/router/Router';
910
import { globalStyle } from '@/common/style/globalStyle';
1011
import { theme } from '@/common/style/theme/theme';
1112

1213
import { worker } from '@/mock/browser';
1314

14-
import App from './App';
15-
1615
const queryClient = new QueryClient();
1716

1817
const main = async () => {
@@ -31,7 +30,7 @@ const main = async () => {
3130
<QueryClientProvider client={queryClient}>
3231
<ThemeProvider theme={theme}>
3332
<Global styles={globalStyle} />
34-
<App />
33+
<AppRouter />
3534
</ThemeProvider>
3635
<ReactQueryDevtools initialIsOpen={false} />
3736
</QueryClientProvider>

0 commit comments

Comments
 (0)