Skip to content

Commit b852512

Browse files
authored
Merge branch 'dev' into 13-password-function-์ ์šฉ
2 parents 222e021 + d02b92c commit b852512

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed
Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
import React from 'react';
2-
import { toast } from 'react-toastify';
32

43
import * as S from './styled';
54

65
export const Navbar: React.FC = () => (
76
<S.NavbarContainer>
87
<S.Nav to={'/'}>Upload</S.Nav>
9-
<S.Nav
10-
to={'/'}
11-
onClick={() => {
12-
toast.success('์ œ์ž‘์ค‘!', {
13-
autoClose: 1000,
14-
position: toast.POSITION.BOTTOM_RIGHT,
15-
});
16-
}}
17-
>
18-
API
19-
</S.Nav>
8+
<S.Nav to={'/'}>API</S.Nav>
209
<S.Nav to={'/filelist'}>File list</S.Nav>
2110
</S.NavbarContainer>
2211
);

โ€Žsrc/pages/main/index.tsxโ€Ž

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,30 +102,21 @@ export const MainPage: React.FC = () => {
102102
<S.MainPageCheckBoxSection>
103103
<CheckBox
104104
click={() => {
105-
setRetentionPeriod(false);
106-
toast.success('์ œ์ž‘์ค‘!', {
107-
autoClose: 1000,
108-
position: toast.POSITION.BOTTOM_RIGHT,
109-
});
105+
setRetentionPeriod(!retentionPeriod);
110106
}}
111107
isCheck={retentionPeriod}
112108
label={'์œ ์ง€๊ธฐ๊ฐ„'}
113109
/>
114110
<CheckBox
115-
click={() => {
116-
setDownloadCount(false);
117-
toast.success('์ œ์ž‘์ค‘!', {
118-
autoClose: 1000,
119-
position: toast.POSITION.BOTTOM_RIGHT,
120-
});
121-
}}
111+
click={() => setDownloadCount(!downloadCount)}
122112
isCheck={downloadCount}
123113
label={'๋‹ค์šด๋กœ๋“œ ํšŸ์ˆ˜'}
124114
/>
125115
<CheckBox
126116
click={() => {
127117
setPasswordBoolean(!passwordBoolean);
128118
}}
119+
click={() => setPasswordBoolean(!passwordBoolean)}
129120
isCheck={passwordBoolean}
130121
label={'๋น„๋ฐ€๋ฒˆํ˜ธ'}
131122
/>

0 commit comments

Comments
ย (0)