added PAGE_NAME var + now send logged user info to App

.gitignore

@@ -3,5 +3,7 @@
 .git/
 node_modules/
 /dist/tracim.app.entry.js
+/dist/tracim.app.entry.js.map
 /dist/tracim.vendor.bundle.js
+/dist/tracim.vendor.bundle.js.map
 /dist/app/*

src/container/Tracim.jsx

@@ -12,6 +12,7 @@ import {
   withRouter
 } from 'react-router-dom'
 import PrivateRoute from './PrivateRoute.jsx'
+import { PAGE_NAME } from '../helper.js'
 import { getIsUserConnected } from '../action-creator.async.js'
 
 class Tracim extends React.Component {
@@ -22,16 +23,14 @@ class Tracim extends React.Component {
   render () {
     const { user, location } = this.props
 
-    const SidebarWrapper = props => {
-      if (props.locationPath !== '/login') {
-        return (
-          <div className='sidebarpagecontainer'>
-            <Sidebar />
-            {props.children}
-          </div>
-        )
-      } else return props.children
-    }
+    const SidebarWrapper = props => props.locationPath !== '/login'
+      ? (
+        <div className='sidebarpagecontainer'>
+          <Sidebar />
+          {props.children}
+        </div>
+      )
+      : props.children
 
     return (
       <div>
@@ -41,13 +40,13 @@ class Tracim extends React.Component {
           ? (<div />) // while we dont know if user is connected, display nothing but the header @TODO show loader
           : (
             <div>
-              <Route path='/login' component={Login} />
+              <Route path={PAGE_NAME.LOGIN} component={Login} />
 
               <SidebarWrapper locationPath={location.pathname}>
 
-                <PrivateRoute exact path='/' component={WorkspaceContent} />
-                <PrivateRoute exact path='/account' component={AccountPage} />
-                <PrivateRoute exact path='/dashboard' component={Dashboard} />
+                <PrivateRoute exact path={PAGE_NAME.HOME} component={WorkspaceContent} />
+                <PrivateRoute exact path={PAGE_NAME.ACCOUNT} component={AccountPage} />
+                <PrivateRoute exact path={PAGE_NAME.DASHBOARD} component={Dashboard} />
 
               </SidebarWrapper>
 

src/container/WorkspaceContent.jsx

@@ -7,6 +7,7 @@ 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 { FETCH_CONFIG } from '../helper.js'
 import {
   getAppList,
   getWorkspaceContent
@@ -27,17 +28,18 @@ class WorkspaceContent extends React.Component {
   }
 
   handleClickContentItem = content => {
-    const { workspace } = this.props
+    const { user, workspace } = this.props
     GLOBAL_renderApp({
       workspace: {
         id: workspace.id,
         title: workspace.title
       },
-      content,
       appConfig: {
         ...this.props.app[content.type],
-        apiUrl: 'http://localhost:3001'
-      }
+        apiUrl: FETCH_CONFIG.apiUrl
+      },
+      loggedUser: user.isLoggedIn ? user : {},
+      content,
     })
   }
 
@@ -87,5 +89,5 @@ class WorkspaceContent extends React.Component {
   }
 }
 
-const mapStateToProps = ({ workspace, activeFileContent, app }) => ({ workspace, activeFileContent, app })
+const mapStateToProps = ({ user, workspace, activeFileContent, app }) => ({ user, workspace, activeFileContent, app })
 export default connect(mapStateToProps)(WorkspaceContent)

src/css/UploadPopup.styl

@@ -25,5 +25,3 @@
     &__filename
       margin-top 30px
       font-size 25px
-
-

src/helper.js

@@ -2,5 +2,14 @@ export const FETCH_CONFIG = {
   headers: {
     'Accept': 'application/json',
     'Content-Type': 'application/json'
-  }
+  },
+  apiUrl: 'http://localhost:3001'
+}
+
+export const PAGE_NAME = {
+  HOME: '/',
+  WS_CONTENT: '/',
+  LOGIN: '/login',
+  DASHBOARD: '/dashboard',
+  ACCOUNT: '/account'
 }

src/reducer/user.js

@@ -9,7 +9,8 @@ const serializeUser = data => ({
   username: data.user.username,
   firstname: data.user.firstname,
   lastname: data.user.lastname,
-  email: data.user.email
+  email: data.user.email,
+  avatar: data.user.avatar
 })
 
 export default function user (state = {
@@ -18,7 +19,8 @@ export default function user (state = {
   username: '',
   firstname: '',
   lastname: '',
-  email: ''
+  email: '',
+  avatar: ''
 }, action) {
   switch (action.type) {
     case `Update/${USER_CONNECTED}`: