Merge branch 'master' of github.com:tracim/tracim_front

dist/index.html

       */
       GLOBAL_renderApp = app => {
         const selectedApp = (() => {
-          switch (app.appConfig.name) {
+          switch (app.config.name) {
             case 'PageHtml':
               return appPageHtml
             case 'Thread':
         if (selectedApp.isRendered) {
           GLOBAL_dispatchEvent(`${app.appConfig.name}_showApp`, app)
         } else {
-          selectedApp.renderApp('appContainer', app)
+          selectedApp.renderApp(app)
           selectedApp.isRendered = true
           prevSelectedApp.isRendered = false
           prevSelectedApp = selectedApp

jsonserver/static_db.json

     "componentRight": "Timeline",
     "customClass": "wsContentPageHtml",
     "icon": "fa fa-fw fa-file-word-o",
-    "color": "#65c7f2"
+    "color": "#65c7f2",
+    "domContainer": "appContainer"
   }, {
     "name": "PageMarkdown",
     "label": {
     "componentRight": "undefined",
     "customClass": "wsContentPageMarkdown",
     "icon": "fa fa-fw fa-file-code-o",
-    "color": "#e0082b"
+    "color": "#e0082b",
+    "domContainer": "appContainer"
   }, {
     "name": "File",
     "label": {
     "componentRight": "undefined",
     "customClass": "wsContentFile",
     "icon": "fa fa-fw fa-file-text-o",
-    "color": "#263462"
+    "color": "#263462",
+    "domContainer": "appContainer"
   }, {
     "name": "Thread",
     "label": {
     "componentRight": "undefined",
     "customClass": "wsContentThread",
     "icon": "fa fa-fw fa-comments-o",
-    "color": "#2674d3"
+    "color": "#2674d3",
+    "domContainer": "appContainer"
   }, {
     "name": "Task",
     "label": {
     "componentRight": "undefined",
     "customClass": "wsContentTask",
     "icon": "fa fa-fw fa-list-ul",
-    "color": "#2d5a88"
+    "color": "#2d5a88",
+    "domContainer": "appContainer"
   }, {
     "name": "Issue",
     "label": {
     "componentRight": "undefined",
     "customClass": "wsContentIssue",
     "icon": "fa fa-fw fa-ticket",
-    "color": "#a4835e"
+    "color": "#a4835e",
+    "domContainer": "appContainer"
   }],
   "workspace_detail": {
     "id": 1,
     "title": "La programmation fonctionnelle",
     "status": "validated",
     "version": "3",
-    "text": "<h1>Mon titre nul</h1>Je suis le contenu de cette fameuse <b>page HTML</b><br /> sur la programmation fonctionnelle"
+    "text": "<h1>Mon titre nul</h1>Je suis le contenu de cette fameuse <b>page HTML</b><br /> sur la programmation fonctionnelle",
+    "workspace": {
+      "id": 1,
+      "title": "Mission interne - développement",
+      "owner_id": 5
+    }
   },
   "content_data_thread": {
     "id": 2,

src/appFactory.js

 
 export function appFactory (WrappedComponent) {
   return class AppFactory extends React.Component {
-    renderApp = (user, workspace, app, content) => GLOBAL_renderApp({
+    renderApp = (appConfig, user, content) => GLOBAL_renderApp({
       loggedUser: user.isLoggedIn ? user : {},
-      workspace: {
-        id: workspace.id,
-        title: workspace.title
-      },
-      appConfig: {
-        ...app[content.type],
+      config: {
+        ...appConfig,
         apiUrl: FETCH_CONFIG.apiUrl
       },
       content

src/component/Account/PersonalData.jsx

 
       <div className='personaldata__form'>
         <div className='personaldata__form__title'>
-          Changer le mot de passe :
+          Mot de passe :
         </div>
         <input className='personaldata__form__txtinput form-control' type='password' placeholder='Ancien mot de passe' />
         <input className='personaldata__form__txtinput form-control' type='password' placeholder='Nouveau mot de passe' />
-        <div className='personaldata__form__button btn btn-primary'>
-          Envoyer
-        </div>
       </div>
 
       <div className='personaldata__form'>
         <div className='personaldata__form__title'>
-          Changer d'adresse mail :
+          Adresse mail :
         </div>
         <input className='personaldata__form__txtinput form-control' type='email' placeholder='Ancienne adresse mail' />
         <input className='personaldata__form__txtinput form-control' type='email' placeholder='Nouvelle adresse mail' />

src/component/Workspace/Folder.jsx

 import classnames from 'classnames'
 import FileItem from './FileItem.jsx'
 
-// @TODO set Folder as a component, state open will come from parent container (which will come from redux) // update: or not ?
-
 class Folder extends React.Component {
   constructor (props) {
     super(props)

src/container/WorkspaceContent.jsx

   }
 
   handleClickContentItem = content => {
-    this.props.renderApp(this.props.user, this.props.workspace, this.props.app, content)
+    this.props.renderApp(this.props.app[content.type], this.props.user, {...content, workspace: this.props.workspace})
     // Côme - 2018/03/08 - line bellow is useless because we cannot call the reducer again when hiding app since the call comes from the app
     // dispatch(setActiveFileContentActive(content))
   }

src/css/Sidebar.styl

       border-bottom-right-radius 0
   &__expand
     position absolute
-    top -1px
-    right -39px
+    top 1px
+    right -44px
     padding 5px 8px
-    border 1px solid white
+    border 3px solid transparent
     border-bottom-right-radius 15px
     cursor pointer
     background-color blue

src/css/index.styl

 @import 'FileItemHeader.styl'
 @import 'Folder.styl'
 
-// @import 'Timeline.styl'
 @import 'File.styl'
 
 @import 'Dashboard.styl'
 @import 'AccountPage.styl'
-@import 'btnSwtich.styl'
 
 @import 'UploadPopup'
 @import 'ProgressBar'