real integration of plugin pageHtml

dist/index.html

@@ -32,10 +32,9 @@
     <script src="./dev/bootstrap-4.0.0-beta.2.js"></script>
 
     <script type='text/javascript'>
-      GLOBAL_renderPlugin = pluginName => {
-        if (pluginName === 'PageHtml') {
-          pluginPageHtml.renderPlugin('pluginContainer')
-          console.log('plugin pagehtml rendered')
+      GLOBAL_renderPlugin = data => {
+        if (data.file.type === 'PageHtml') {
+          pluginPageHtml.renderPlugin('pluginContainer', data)
         }
       }
 

package.json

@@ -39,10 +39,10 @@
     "style-loader": "^0.19.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.1",
+    "tracim_lib": "git://github.com/Skylsmoi/tracim_lib.git",
     "url-loader": "^0.6.2",
     "webpack": "^3.8.1",
-    "whatwg-fetch": "^2.0.3",
-    "tracim_lib": "git://github.com/Skylsmoi/tracim_lib.git"
+    "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
     "json-server": "^0.12.0",

src/component/Header/Logo.jsx

@@ -10,7 +10,7 @@ const Logo = props => {
 }
 export default Logo
 
-Logo.PropTypes = {
+Logo.propTypes = {
   logoSrc: PropTypes.string.isRequired,
   onClickImg: PropTypes.func.isRequired
 }

src/component/Header/MenuActionListItem/DropdownLang.jsx

@@ -30,7 +30,7 @@ const DropdownLang = props => {
 }
 export default DropdownLang
 
-DropdownLang.PropTypes = {
+DropdownLang.propTypes = {
   langList: PropTypes.array.isRequired,
   onChangeLang: PropTypes.func.isRequired
 }

src/component/Header/MenuActionListItem/Help.jsx

@@ -16,6 +16,6 @@ const Help = props => {
 }
 export default Help
 
-Help.PropTypes = {
+Help.propTypes = {
   onClickHelp: PropTypes.func.isRequired
 }

src/component/Header/MenuActionListItem/MenuProfil.jsx

@@ -24,7 +24,7 @@ const MenuProfil = props => {
 }
 export default MenuProfil
 
-MenuProfil.PropTypes = {
+MenuProfil.propTypes = {
   user: PropTypes.object.isRequired,
   onClickMyProfil: PropTypes.func.isRequired,
   onClickLogout: PropTypes.func.isRequired

src/component/Header/MenuActionListItem/Search.jsx

@@ -25,7 +25,7 @@ const Search = props => {
 }
 export default Search
 
-Search.PropTypes = {
+Search.propTypes = {
   onChangeInput: PropTypes.func.isRequired,
   onClickSubmit: PropTypes.func.isRequired
 }

src/component/Header/MenuLinkList.jsx

@@ -18,7 +18,7 @@ const MenuLinkList = props => {
 }
 export default MenuLinkList
 
-MenuLinkList.PropTypes = {
+MenuLinkList.propTypes = {
   onClickFeature: PropTypes.func.isRequired,
   onClickExplore: PropTypes.func.isRequired,
   onClickAbout: PropTypes.func.isRequired

src/component/common/Card/CardBody.jsx

@@ -14,7 +14,7 @@ const CardBody = props => {
 
 export default CardBody
 
-CardBody.PropTypes = {
+CardBody.propTypes = {
   children: PropTypes.element.isRequired,
   formClass: PropTypes.string
 }

src/component/common/Card/CardHeader.jsx

@@ -12,7 +12,7 @@ const CardHeader = props => {
 
 export default CardHeader
 
-CardHeader.PropTypes = {
+CardHeader.propTypes = {
   children: PropTypes.element.isRequired,
   customClass: PropTypes.string
 }

src/component/common/Input/Button.jsx

@@ -16,7 +16,7 @@ const Button = props => {
 
 export default Button
 
-Button.PropTypes = {
+Button.propTypes = {
   htmlType: PropTypes.oneOf(['button', 'submit', 'reset']).isRequired,
   bootstrapType: PropTypes.oneOf(
     ['primary', 'default', 'default', 'success', 'danger', 'warning', 'info', 'light', 'dark']

src/component/common/Input/InputCheckbox.jsx

@@ -21,7 +21,7 @@ const InputGroupText = props => {
 
 export default InputGroupText
 
-InputGroupText.PropTypes = {
+InputGroupText.propTypes = {
   parentClassName: PropTypes.string.isRequired,
   checked: PropTypes.bool.isRequired,
   onChange: PropTypes.func.isRequired,

src/component/common/Input/InputGroupText.jsx

@@ -24,7 +24,7 @@ const InputGroupText = props => {
 
 export default InputGroupText
 
-InputGroupText.PropTypes = {
+InputGroupText.propTypes = {
   parentClassName: PropTypes.string.isRequired,
   value: PropTypes.string.isRequired,
   type: PropTypes.oneOf(['text', 'email', 'password', 'tel']).isRequired,

src/container/PrivateRoute.jsx

@@ -17,10 +17,8 @@ const PrivateRoute = ({ component: Component, ...rest }) => (
 const mapStateToProps = ({ user }) => ({ user })
 export default withRouter(connect(mapStateToProps)(PrivateRoute))
 
-PrivateRoute.PropTypes = {
-  component: PropTypes.shape({
-    Component: PropTypes.object.isRequired
-  }),
+PrivateRoute.propTypes = {
+  component: PropTypes.func.isRequired,
   user: PropTypes.shape({ // user is get with redux connect
     isLoggedIn: PropTypes.bool.isRequired
   })

src/container/WorkspaceContent.jsx

@@ -7,13 +7,11 @@ import PageWrapper from '../component/common/layout/PageWrapper.jsx'
 import PageTitle from '../component/common/layout/PageTitle.jsx'
 import PageContent from '../component/common/layout/PageContent.jsx'
 import DropdownCreateButton from '../component/common/Input/DropdownCreateButton.jsx'
-// import pluginDatabase from '../plugin/index.js'
 import {
   getPluginList,
   getWorkspaceContent
 } from '../action-creator.async.js'
-import { setActiveFileContent } from '../action-creator.sync.js'
-import { bonjour } from 'tracim_lib'
+// import pluginDatabase from '../plugin/index.js'
 
 class WorkspaceContent extends React.Component {
   constructor (props) {
@@ -29,17 +27,10 @@ class WorkspaceContent extends React.Component {
   }
 
   handleClickFileItem = file => {
-    // this.props.dispatch(setActiveFileContent(file))
-    GLOBAL_renderPlugin(file.type)
-  }
-
-  handleDummyBtn = () => {
-    // GLOBAL_dispatchEvent({
-    //   source: 'Tracim',
-    //   type: 'PageHtml_showMsg',
-    //   content: 'Bonjour ?'
-    // })
-    bonjour()
+    GLOBAL_renderPlugin({
+      file,
+      pluginData: this.props.plugin[file.type]
+    })
   }
 
   render () {
@@ -58,8 +49,6 @@ class WorkspaceContent extends React.Component {
         </PageTitle>
 
         <PageContent parentClass='workspace__content'>
-          <button onClick={this.handleDummyBtn}>Click Me</button>
-
           <div className='workspace__content__fileandfolder folder__content active'>
             <FileItemHeader />
 

src/css/Generic.styl

@@ -161,108 +161,3 @@
       border 1px solid grey
       border-radius 10px
       padding 15px 25px
-
-/********************/
-
-/*** PAGE FILE, THREAD, HTML, MARKDOWN, ISSUE ***/
-
-.wsFileGeneric
-  position fixed
-  top 85px
-  right 0
-  border 1px solid grey
-  height 100%
-  background-color lightGrey
-  box-shadow shadow-page
-  visibility hidden
-  z-index 1
-  &.visible
-    visibility visible
-  &__header
-    display flex
-    align-items center
-    padding 15px
-    height 64px
-    &__icon
-      margin-right 15px
-      font-size 22px
-      color white
-    &__title
-      margin-right 15px
-      color white
-      text-overflow ellipsis
-      overflow hidden
-      white-space nowrap
-    &__edittitle
-      margin 0 15px
-      color white
-      font-size 20px
-      cursor pointer
-      &:hover , &:focus
-        border 1px solid off-white
-        padding 0 10px
-        border-radius 5px
-    &__close
-      border 1px solid white
-      border-radius 5px
-      padding 2px 5px
-      cursor pointer
-      & > i
-        color white
-        font-size 20px
-  &__option
-    border-bottom 1px solid grey
-    padding 10px
-    height 58px
-    background-color off-white
-    & > i
-      vertical-align middle
-      margin-right 15px
-      font-size 25px
-      cursor pointer
-    &__menu
-      display flex
-      align-items center
-      &__status
-        margin-right 20px
-        .current
-          color blue
-        .check
-          color green
-        .invalid
-          color red
-        .ban
-          color grey
-        &__dropdownbtn
-          border 1px solid grey
-          width 150px
-          background-color transparent
-          cursor pointer
-          &::after
-            color fontColor
-          &:hover
-            background-color transparent
-          &__icon
-            display inline-block
-            margin 0 15px
-        &__submenu
-          &__item
-            display flex
-            justify-content space-between
-            margin 5px 0
-            cursor pointer
-            &:active
-              background-color transparent
-      &__action
-        margin 5px 10px 0 0
-        font-size 18px
-        cursor pointer
-        &:hover , &:focus
-          font-size 22px
-          color blue
-  &__content
-    display flex
-    &__left
-      width 55%
-    &__right
-      width 45%

src/css/Variable.styl

@@ -1,3 +1,5 @@
+// Côme - 2018/02/27 - DEPRECATED : now using Variable.styl from tracim_lib
+
 /**** VARIABLES ****/
 /*** COULEURS ****/
 

src/css/index.styl

@@ -3,7 +3,9 @@ body
 html, body, #content, #content > div
   height 100%
 
-@import 'Variable.styl'
+// @TODO Côme - 2018/02/27 - do not manually import from node_module relative path
+@import '../../node_modules/tracim_lib/src/css/Variable.styl'
+
 @import 'Generic.styl'
 
 @import 'Sidebar.styl'

src/plugin/ContentType/PageHtml/PageHtmlContainer.jsx

@@ -1,9 +1,15 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import PopinFixed from '../../../component/common/PopinFixed/PopinFixed.jsx'
-import PopinFixedHeader from '../../../component/common/PopinFixed/PopinFixedHeader.jsx'
-import PopinFixedOption from '../../../component/common/PopinFixed/PopinFixedOption.jsx'
-import PopinFixedContent from '../../../component/common/PopinFixed/PopinFixedContent.jsx'
+// import PopinFixed from '../../../component/common/PopinFixed/PopinFixed.jsx'
+// import PopinFixedHeader from '../../../component/common/PopinFixed/PopinFixedHeader.jsx'
+// import PopinFixedOption from '../../../component/common/PopinFixed/PopinFixedOption.jsx'
+// import PopinFixedContent from '../../../component/common/PopinFixed/PopinFixedContent.jsx'
+import {
+  PopinFixed,
+  PopinFixedHeader,
+  PopinFixedOption,
+  PopinFixedContent
+} from 'tracim_lib'
 import PageHtmlComponent from './PageHtmlComponent.jsx'
 import Timeline from '../../../component/Timeline.jsx'
 import { hideActiveFileContent } from '../../../action-creator.sync.js'

src/plugin/ContentType/PageHtml/index.js

@@ -1,11 +1,11 @@
 import reducer from './pageHtml.js'
-import container from './PageHtmlContainer.jsx'
-import component from './PageHtmlComponent.jsx'
+// import container from './PageHtmlContainer.jsx'
+// import component from './PageHtmlComponent.jsx'
 
 const PageHtml = {
   name: 'PageHtml',
-  container,
-  component,
+  // container,
+  // component,
   reducer
 }
 

src/plugin/ContentType/Thread/index.js

@@ -1,7 +1,12 @@
 import reducer from './thread.js'
-import component from './Thread.jsx'
-import style from './Thread.styl'
+// import container from './ThreadContainer.jsx'
+// import component from './ThreadComponent.jsx'
 
-const Thread = { name: 'Thread', component, reducer, style }
+const Thread = {
+  name: 'Thread',
+  // container,
+  // component,
+  reducer
+}
 
 export default Thread