Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2020-1-CloudComputing-E
/
E_Team_KhuBox
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Authored by
Woojin Lee
2020-05-03 21:53:10 +0900
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
6b2bed4d24b31db74f79df4ebb1ee65b9bfe18cb
6b2bed4d
1 parent
16fa916d
Create drive view(working)
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
25 additions
and
25 deletions
khubox-front/src/Routes.js
khubox-front/src/layouts/Main/components/Sidebar/components/Profile/Profile.js
khubox-front/src/views/UserList/UserList.js → khubox-front/src/views/FileList/FileList.js
khubox-front/src/views/UserList/components/UsersToolbar/UsersToolbar.js → khubox-front/src/views/FileList/components/DriveToolbar/DriveToolbar.js
khubox-front/src/views/FileList/components/DriveToolbar/index.js
khubox-front/src/views/UserList/components/UsersTable/UsersTable.js → khubox-front/src/views/FileList/components/FileTable/FileTable.js
khubox-front/src/views/FileList/components/FileTable/index.js
khubox-front/src/views/FileList/components/index.js
khubox-front/src/views/UserList/data.js → khubox-front/src/views/FileList/data.js
khubox-front/src/views/FileList/index.js
khubox-front/src/views/UserList/components/UsersTable/index.js
khubox-front/src/views/UserList/components/UsersToolbar/index.js
khubox-front/src/views/UserList/components/index.js
khubox-front/src/views/UserList/index.js
khubox-front/src/views/index.js
khubox-front/src/Routes.js
View file @
6b2bed4
...
...
@@ -7,7 +7,7 @@ import { Main as MainLayout, Minimal as MinimalLayout } from './layouts';
import
{
Dashboard
as
DashboardView
,
ProductList
as
ProductListView
,
UserList
as
User
ListView
,
FileList
as
File
ListView
,
Typography
as
TypographyView
,
Icons
as
IconsView
,
Account
as
AccountView
,
...
...
@@ -26,13 +26,13 @@ const Routes = () => {
to
=
"/my-drive"
/>
<
RouteWithLayout
component
=
{
Dashboard
View
}
component
=
{
FileList
View
}
exact
layout
=
{
MainLayout
}
path
=
"/my-drive"
/>
<
RouteWithLayout
component
=
{
User
ListView
}
component
=
{
File
ListView
}
exact
layout
=
{
MainLayout
}
path
=
"/share"
...
...
khubox-front/src/layouts/Main/components/Sidebar/components/Profile/Profile.js
View file @
6b2bed4
...
...
@@ -28,7 +28,7 @@ const Profile = props => {
const
user
=
{
name
:
'엄준식'
,
avatar
:
'/images/avatars/avatar_1
1
.png'
,
avatar
:
'/images/avatars/avatar_1.png'
,
membership
:
'Basic Plan'
};
...
...
khubox-front/src/views/
UserList/User
List.js
→
khubox-front/src/views/
FileList/File
List.js
View file @
6b2bed4
import
React
,
{
useState
}
from
'react'
;
import
{
makeStyles
}
from
'@material-ui/styles'
;
import
{
UsersToolbar
,
Users
Table
}
from
'./components'
;
import
{
DriveToolbar
,
File
Table
}
from
'./components'
;
import
mockData
from
'./data'
;
const
useStyles
=
makeStyles
(
theme
=>
({
...
...
@@ -13,19 +13,19 @@ const useStyles = makeStyles(theme => ({
}
}));
const
User
List
=
()
=>
{
const
File
List
=
()
=>
{
const
classes
=
useStyles
();
const
[
users
]
=
useState
(
mockData
);
return
(
<
div
className
=
{
classes
.
root
}
>
<
Users
Toolbar
/>
<
Drive
Toolbar
/>
<
div
className
=
{
classes
.
content
}
>
<
Users
Table
users
=
{
users
}
/
>
<
File
Table
users
=
{
users
}
/
>
<
/div
>
<
/div
>
);
};
export
default
User
List
;
export
default
File
List
;
...
...
khubox-front/src/views/
UserList/components/UsersToolbar/Users
Toolbar.js
→
khubox-front/src/views/
FileList/components/DriveToolbar/Drive
Toolbar.js
View file @
6b2bed4
...
...
@@ -28,7 +28,7 @@ const useStyles = makeStyles(theme => ({
}
}));
const
Users
Toolbar
=
props
=>
{
const
Drive
Toolbar
=
props
=>
{
const
{
className
,
...
rest
}
=
props
;
const
classes
=
useStyles
();
...
...
@@ -40,27 +40,27 @@ const UsersToolbar = props => {
>
<
div
className
=
{
classes
.
row
}
>
<
span
className
=
{
classes
.
spacer
}
/
>
<
Button
className
=
{
classes
.
importButton
}
>
Import
<
/Button
>
<
Button
className
=
{
classes
.
exportButton
}
>
Export
<
/Button
>
<
Button
className
=
{
classes
.
importButton
}
>
새
폴더
<
/Button
>
<
Button
className
=
{
classes
.
exportButton
}
>
폴더
업로드
<
/Button
>
<
Button
color
=
"primary"
variant
=
"contained"
>
Add
user
파일
업로드
<
/Button
>
<
/div
>
<
div
className
=
{
classes
.
row
}
>
<
SearchInput
className
=
{
classes
.
searchInput
}
placeholder
=
"
Search user
"
placeholder
=
"
파일, 폴더 검색
"
/>
<
/div
>
<
/div
>
);
};
Users
Toolbar
.
propTypes
=
{
Drive
Toolbar
.
propTypes
=
{
className
:
PropTypes
.
string
};
export
default
Users
Toolbar
;
export
default
Drive
Toolbar
;
...
...
khubox-front/src/views/FileList/components/DriveToolbar/index.js
0 → 100644
View file @
6b2bed4
export
{
default
}
from
'./DriveToolbar'
;
khubox-front/src/views/
UserList/components/UsersTable/Users
Table.js
→
khubox-front/src/views/
FileList/components/FileTable/File
Table.js
View file @
6b2bed4
...
...
@@ -41,7 +41,7 @@ const useStyles = makeStyles(theme => ({
}
}));
const
Users
Table
=
props
=>
{
const
File
Table
=
props
=>
{
const
{
className
,
users
,
...
rest
}
=
props
;
const
classes
=
useStyles
();
...
...
@@ -179,9 +179,9 @@ const UsersTable = props => {
);
};
Users
Table
.
propTypes
=
{
File
Table
.
propTypes
=
{
className
:
PropTypes
.
string
,
users
:
PropTypes
.
array
.
isRequired
};
export
default
Users
Table
;
export
default
File
Table
;
...
...
khubox-front/src/views/FileList/components/FileTable/index.js
0 → 100644
View file @
6b2bed4
export
{
default
}
from
'./FileTable'
;
khubox-front/src/views/FileList/components/index.js
0 → 100644
View file @
6b2bed4
export
{
default
as
FileTable
}
from
'./FileTable'
;
export
{
default
as
DriveToolbar
}
from
'./DriveToolbar'
;
khubox-front/src/views/
User
List/data.js
→
khubox-front/src/views/
File
List/data.js
View file @
6b2bed4
File moved
khubox-front/src/views/FileList/index.js
0 → 100644
View file @
6b2bed4
export
{
default
}
from
'./FileList'
;
khubox-front/src/views/UserList/components/UsersTable/index.js
deleted
100644 → 0
View file @
16fa916
export
{
default
}
from
'./UsersTable'
;
khubox-front/src/views/UserList/components/UsersToolbar/index.js
deleted
100644 → 0
View file @
16fa916
export
{
default
}
from
'./UsersToolbar'
;
khubox-front/src/views/UserList/components/index.js
deleted
100644 → 0
View file @
16fa916
export
{
default
as
UsersTable
}
from
'./UsersTable'
;
export
{
default
as
UsersToolbar
}
from
'./UsersToolbar'
;
khubox-front/src/views/UserList/index.js
deleted
100644 → 0
View file @
16fa916
export
{
default
}
from
'./UserList'
;
khubox-front/src/views/index.js
View file @
6b2bed4
...
...
@@ -7,4 +7,4 @@ export { default as Settings } from './Settings';
export
{
default
as
SignIn
}
from
'./SignIn'
;
export
{
default
as
SignUp
}
from
'./SignUp'
;
export
{
default
as
Typography
}
from
'./Typography'
;
export
{
default
as
UserList
}
from
'./User
List'
;
export
{
default
as
FileList
}
from
'./File
List'
;
...
...
Please
register
or
login
to post a comment