Woojin Lee

Create drive view(working)

...@@ -7,7 +7,7 @@ import { Main as MainLayout, Minimal as MinimalLayout } from './layouts'; ...@@ -7,7 +7,7 @@ import { Main as MainLayout, Minimal as MinimalLayout } from './layouts';
7 import { 7 import {
8 Dashboard as DashboardView, 8 Dashboard as DashboardView,
9 ProductList as ProductListView, 9 ProductList as ProductListView,
10 - UserList as UserListView, 10 + FileList as FileListView,
11 Typography as TypographyView, 11 Typography as TypographyView,
12 Icons as IconsView, 12 Icons as IconsView,
13 Account as AccountView, 13 Account as AccountView,
...@@ -26,13 +26,13 @@ const Routes = () => { ...@@ -26,13 +26,13 @@ const Routes = () => {
26 to="/my-drive" 26 to="/my-drive"
27 /> 27 />
28 <RouteWithLayout 28 <RouteWithLayout
29 - component={DashboardView} 29 + component={FileListView}
30 exact 30 exact
31 layout={MainLayout} 31 layout={MainLayout}
32 path="/my-drive" 32 path="/my-drive"
33 /> 33 />
34 <RouteWithLayout 34 <RouteWithLayout
35 - component={UserListView} 35 + component={FileListView}
36 exact 36 exact
37 layout={MainLayout} 37 layout={MainLayout}
38 path="/share" 38 path="/share"
......
...@@ -28,7 +28,7 @@ const Profile = props => { ...@@ -28,7 +28,7 @@ const Profile = props => {
28 28
29 const user = { 29 const user = {
30 name: '엄준식', 30 name: '엄준식',
31 - avatar: '/images/avatars/avatar_11.png', 31 + avatar: '/images/avatars/avatar_1.png',
32 membership: 'Basic Plan' 32 membership: 'Basic Plan'
33 }; 33 };
34 34
......
1 import React, { useState } from 'react'; 1 import React, { useState } from 'react';
2 import { makeStyles } from '@material-ui/styles'; 2 import { makeStyles } from '@material-ui/styles';
3 3
4 -import { UsersToolbar, UsersTable } from './components'; 4 +import { DriveToolbar, FileTable } from './components';
5 import mockData from './data'; 5 import mockData from './data';
6 6
7 const useStyles = makeStyles(theme => ({ 7 const useStyles = makeStyles(theme => ({
...@@ -13,19 +13,19 @@ const useStyles = makeStyles(theme => ({ ...@@ -13,19 +13,19 @@ const useStyles = makeStyles(theme => ({
13 } 13 }
14 })); 14 }));
15 15
16 -const UserList = () => { 16 +const FileList = () => {
17 const classes = useStyles(); 17 const classes = useStyles();
18 18
19 const [users] = useState(mockData); 19 const [users] = useState(mockData);
20 20
21 return ( 21 return (
22 <div className={classes.root}> 22 <div className={classes.root}>
23 - <UsersToolbar /> 23 + <DriveToolbar />
24 <div className={classes.content}> 24 <div className={classes.content}>
25 - <UsersTable users={users} /> 25 + <FileTable users={users} />
26 </div> 26 </div>
27 </div> 27 </div>
28 ); 28 );
29 }; 29 };
30 30
31 -export default UserList; 31 +export default FileList;
......
...@@ -28,7 +28,7 @@ const useStyles = makeStyles(theme => ({ ...@@ -28,7 +28,7 @@ const useStyles = makeStyles(theme => ({
28 } 28 }
29 })); 29 }));
30 30
31 -const UsersToolbar = props => { 31 +const DriveToolbar = props => {
32 const { className, ...rest } = props; 32 const { className, ...rest } = props;
33 33
34 const classes = useStyles(); 34 const classes = useStyles();
...@@ -40,27 +40,27 @@ const UsersToolbar = props => { ...@@ -40,27 +40,27 @@ const UsersToolbar = props => {
40 > 40 >
41 <div className={classes.row}> 41 <div className={classes.row}>
42 <span className={classes.spacer} /> 42 <span className={classes.spacer} />
43 - <Button className={classes.importButton}>Import</Button> 43 + <Button className={classes.importButton}> 폴더</Button>
44 - <Button className={classes.exportButton}>Export</Button> 44 + <Button className={classes.exportButton}>폴더 업로드</Button>
45 <Button 45 <Button
46 color="primary" 46 color="primary"
47 variant="contained" 47 variant="contained"
48 > 48 >
49 - Add user 49 + 파일 업로드
50 </Button> 50 </Button>
51 </div> 51 </div>
52 <div className={classes.row}> 52 <div className={classes.row}>
53 <SearchInput 53 <SearchInput
54 className={classes.searchInput} 54 className={classes.searchInput}
55 - placeholder="Search user" 55 + placeholder="파일, 폴더 검색"
56 /> 56 />
57 </div> 57 </div>
58 </div> 58 </div>
59 ); 59 );
60 }; 60 };
61 61
62 -UsersToolbar.propTypes = { 62 +DriveToolbar.propTypes = {
63 className: PropTypes.string 63 className: PropTypes.string
64 }; 64 };
65 65
66 -export default UsersToolbar; 66 +export default DriveToolbar;
......
...@@ -41,7 +41,7 @@ const useStyles = makeStyles(theme => ({ ...@@ -41,7 +41,7 @@ const useStyles = makeStyles(theme => ({
41 } 41 }
42 })); 42 }));
43 43
44 -const UsersTable = props => { 44 +const FileTable = props => {
45 const { className, users, ...rest } = props; 45 const { className, users, ...rest } = props;
46 46
47 const classes = useStyles(); 47 const classes = useStyles();
...@@ -179,9 +179,9 @@ const UsersTable = props => { ...@@ -179,9 +179,9 @@ const UsersTable = props => {
179 ); 179 );
180 }; 180 };
181 181
182 -UsersTable.propTypes = { 182 +FileTable.propTypes = {
183 className: PropTypes.string, 183 className: PropTypes.string,
184 users: PropTypes.array.isRequired 184 users: PropTypes.array.isRequired
185 }; 185 };
186 186
187 -export default UsersTable; 187 +export default FileTable;
......
1 +export { default as FileTable } from './FileTable';
2 +export { default as DriveToolbar } from './DriveToolbar';
1 +export { default } from './FileList';
1 -export { default as UsersTable } from './UsersTable';
2 -export { default as UsersToolbar } from './UsersToolbar';
1 -export { default } from './UserList';
...@@ -7,4 +7,4 @@ export { default as Settings } from './Settings'; ...@@ -7,4 +7,4 @@ export { default as Settings } from './Settings';
7 export { default as SignIn } from './SignIn'; 7 export { default as SignIn } from './SignIn';
8 export { default as SignUp } from './SignUp'; 8 export { default as SignUp } from './SignUp';
9 export { default as Typography } from './Typography'; 9 export { default as Typography } from './Typography';
10 -export { default as UserList } from './UserList'; 10 +export { default as FileList } from './FileList';
......