소스 검색

refactored FileItem into ContentItem + fixed sidebar expand btn + deprecated workspace/filetype folder

Skylsmoi 6 년 전
부모
커밋
3386f9466c

+ 1 - 0
src/component/Workspace/BtnExtandedAction.jsx 파일 보기

15
       >
15
       >
16
         <i className='fa fa-fw fa-ellipsis-h' />
16
         <i className='fa fa-fw fa-ellipsis-h' />
17
       </button>
17
       </button>
18
+
18
       <div className='extandedaction__subdropdown dropdown-menu' aria-labelledby='dropdownMenuButton'>
19
       <div className='extandedaction__subdropdown dropdown-menu' aria-labelledby='dropdownMenuButton'>
19
         <div className='subdropdown__item dropdown-item d-flex align-items-center' onClick={props.onClickExtendedAction.edit}>
20
         <div className='subdropdown__item dropdown-item d-flex align-items-center' onClick={props.onClickExtendedAction.edit}>
20
           <div className='subdropdown__item__icon mr-3'>
21
           <div className='subdropdown__item__icon mr-3'>

src/component/Workspace/FileItem.jsx → src/component/Workspace/ContentItem.jsx 파일 보기

53
         <div className='file__name__text'>
53
         <div className='file__name__text'>
54
           { props.name }
54
           { props.name }
55
         </div>
55
         </div>
56
-
57
-
58
-        {/*
59
-          <div className='file__name__icons d-none d-md-flex'>
60
-            <div className='file__name__icons__download'>
61
-              <i className='fa fa-download' />
62
-            </div>
63
-            <div className='file__name__icons__archive'>
64
-              <i className='fa fa-archive' />
65
-            </div>
66
-            <div className='file__name__icons__delete'>
67
-              <i className='fa fa-trash-o' />
68
-            </div>
69
-          </div>
70
-        */ }
71
       </div>
56
       </div>
72
 
57
 
73
       <div className='d-none d-md-flex'>
58
       <div className='d-none d-md-flex'>
74
         <BtnExtandedAction onClickExtendedAction={props.onClickExtendedAction} />
59
         <BtnExtandedAction onClickExtendedAction={props.onClickExtendedAction} />
75
       </div>
60
       </div>
61
+
76
       <div className={classnames('file__status d-flex align-items-center justify-content-start') + colorStatus}>
62
       <div className={classnames('file__status d-flex align-items-center justify-content-start') + colorStatus}>
77
         <div className='file__status__icon d-block '>
63
         <div className='file__status__icon d-block '>
78
           <i className={iconStatus} />
64
           <i className={iconStatus} />

src/component/Workspace/FileItemHeader.jsx → src/component/Workspace/ContentItemHeader.jsx 파일 보기


+ 2 - 0
src/component/Workspace/FileType/deprecated_folder 파일 보기

1
+this folder is deprecated.
2
+content types are handled by respective apps

+ 1 - 1
src/component/Workspace/Folder.jsx 파일 보기

2
 import { translate } from 'react-i18next'
2
 import { translate } from 'react-i18next'
3
 import PropTypes from 'prop-types'
3
 import PropTypes from 'prop-types'
4
 import classnames from 'classnames'
4
 import classnames from 'classnames'
5
-import FileItem from './FileItem.jsx'
5
+import FileItem from './ContentItem.jsx'
6
 // import PopupExtandedAction from '../../container/PopupExtandedAction.jsx'
6
 // import PopupExtandedAction from '../../container/PopupExtandedAction.jsx'
7
 import BtnExtandedAction from './BtnExtandedAction.jsx'
7
 import BtnExtandedAction from './BtnExtandedAction.jsx'
8
 
8
 

+ 4 - 4
src/container/Sidebar.jsx 파일 보기

64
 
64
 
65
     return (
65
     return (
66
       <div className={classnames('sidebar', {'sidebarclose': sidebarClose})}>
66
       <div className={classnames('sidebar', {'sidebarclose': sidebarClose})}>
67
-        <div className='sidebar__expand' onClick={this.handleClickToggleSidebar}>
68
-          <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
69
-        </div>
70
-
71
         <div className='sidebarSticky'>
67
         <div className='sidebarSticky'>
68
+          <div className='sidebar__expand' onClick={this.handleClickToggleSidebar}>
69
+            <i className={classnames('fa fa-chevron-left', {'fa-chevron-right': sidebarClose, 'fa-chevron-left': !sidebarClose})} />
70
+          </div>
71
+
72
           <nav className='sidebar__navigation'>
72
           <nav className='sidebar__navigation'>
73
             <ul className='sidebar__navigation__workspace'>
73
             <ul className='sidebar__navigation__workspace'>
74
               { workspaceList.map((ws, i) =>
74
               { workspaceList.map((ws, i) =>

+ 4 - 4
src/container/WorkspaceContent.jsx 파일 보기

3
 import appFactory from '../appFactory.js'
3
 import appFactory from '../appFactory.js'
4
 import Sidebar from './Sidebar.jsx'
4
 import Sidebar from './Sidebar.jsx'
5
 import Folder from '../component/Workspace/Folder.jsx'
5
 import Folder from '../component/Workspace/Folder.jsx'
6
-import FileItem from '../component/Workspace/FileItem.jsx'
7
-import FileItemHeader from '../component/Workspace/FileItemHeader.jsx'
6
+import ContentItem from '../component/Workspace/ContentItem.jsx'
7
+import ContentItemHeader from '../component/Workspace/ContentItemHeader.jsx'
8
 import PageWrapper from '../component/common/layout/PageWrapper.jsx'
8
 import PageWrapper from '../component/common/layout/PageWrapper.jsx'
9
 import PageTitle from '../component/common/layout/PageTitle.jsx'
9
 import PageTitle from '../component/common/layout/PageTitle.jsx'
10
 import PageContent from '../component/common/layout/PageContent.jsx'
10
 import PageContent from '../component/common/layout/PageContent.jsx'
98
 
98
 
99
           <PageContent parentClass='workspace__content'>
99
           <PageContent parentClass='workspace__content'>
100
             <div className='workspace__content__fileandfolder folder__content active'>
100
             <div className='workspace__content__fileandfolder folder__content active'>
101
-              <FileItemHeader />
101
+              <ContentItemHeader />
102
 
102
 
103
               { filteredWorkspaceContent.map((c, i) => c.type === 'folder'
103
               { filteredWorkspaceContent.map((c, i) => c.type === 'folder'
104
                 ? (
104
                 ? (
119
                   />
119
                   />
120
                 )
120
                 )
121
                 : (
121
                 : (
122
-                  <FileItem
122
+                  <ContentItem
123
                     name={c.title}
123
                     name={c.title}
124
                     type={c.type}
124
                     type={c.type}
125
                     icon={(app[c.type] || {icon: ''}).icon}
125
                     icon={(app[c.type] || {icon: ''}).icon}