moved pagehtml and thread into a specific folder + removed linting warning

src/container/PageText.jsx → src/container/FileType/PageHtml.jsx

@@ -1,11 +1,11 @@
 import React, { Component } from 'react'
-import PopinFixed from '../component/common/PopinFixed/PopinFixed'
-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 Timeline from '../component/Timeline.jsx'
+import PopinFixed from '../../component/common/PopinFixed/PopinFixed'
+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 Timeline from '../../component/Timeline.jsx'
 
-class PageText extends Component {
+class PageHtml extends Component {
   render () {
     return (
       <PopinFixed customClass={'wsFileText'}>
@@ -25,7 +25,7 @@ class PageText extends Component {
   }
 }
 
-export default PageText
+export default PageHtml
 
 /*
       <div className={classnames('wsFileText wsFileGeneric', {'visible': this.props.visible})}>

src/container/Thread.jsx → src/container/FileType/Thread.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import classnames from 'classnames'
-import imgProfil from '../img/imgProfil.png'
+import imgProfil from '../../img/imgProfil.png'
 
 class Thread extends Component {
   render () {

src/container/Login.jsx

@@ -26,86 +26,88 @@ class Login extends React.Component {
   handleChangePassword = e => this.setState({inputPassword: e.target.value})
   handleChangeRememberMe = () => this.setState(prev => ({inputRememberMe: !prev.inputRememberMe}))
 
-  handleClickSubmit = () => {
+  handleClickSubmit = async () => {
     const { history, dispatch } = this.props
     const { inputLogin, inputPassword, inputRememberMe } = this.state
 
-    dispatch(userLogin(inputLogin, inputPassword, inputRememberMe))
-    .then(() => history.push('/'))
+    await dispatch(userLogin(inputLogin, inputPassword, inputRememberMe))
+    history.push('/')
   }
 
   render () {
     if (this.props.user.isLoggedIn) return <Redirect to={{pathname: '/'}} />
-    else return (
-      <section className='loginpage'>
-        <div className='container-fluid'>
-
-          <LoginLogo customClass='loginpage__logo' logoSrc={LoginLogoImg} />
-
-          <div className='row justify-content-center'>
-            <div className='col-12 col-sm-11 col-md-8 col-lg-6 col-xl-5'>
-
-              <Card customClass='loginpage__connection'>
-                <CardHeader customClass='connection__header text-center'>{'Connexion'}</CardHeader>
-
-                <CardBody formClass='connection__form'>
-                  <InputGroupText
-                    parentClassName='connection__form__groupemail'
-                    customClass='mb-3 mt-4'
-                    icon='fa-envelope-open-o'
-                    type='email'
-                    placeHolder='Adresse Email'
-                    invalidMsg='Email invalide.'
-                    value={this.state.inputLogin}
-                    onChange={this.handleChangeLogin}
-                  />
-
-                  <InputGroupText
-                    parentClassName='connection__form__groupepw'
-                    customClass=''
-                    icon='fa-lock'
-                    type='password'
-                    placeHolder='Mot de passe'
-                    invalidMsg='Mot de passe invalide.'
-                    value={this.state.inputPassword}
-                    onChange={this.handleChangePassword}
-                  />
-
-                  <div className='row mt-4 mb-4'>
-                    <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
-                      <InputCheckbox
-                        parentClassName='connection__form__rememberme'
-                        customClass=''
-                        label='Se souvenir de moi'
-                        checked={this.state.inputRememberMe}
-                        onChange={this.handleChangeRememberMe}
-                      />
+    else {
+      return (
+        <section className='loginpage'>
+          <div className='container-fluid'>
+
+            <LoginLogo customClass='loginpage__logo' logoSrc={LoginLogoImg} />
+
+            <div className='row justify-content-center'>
+              <div className='col-12 col-sm-11 col-md-8 col-lg-6 col-xl-5'>
+
+                <Card customClass='loginpage__connection'>
+                  <CardHeader customClass='connection__header text-center'>{'Connexion'}</CardHeader>
+
+                  <CardBody formClass='connection__form'>
+                    <InputGroupText
+                      parentClassName='connection__form__groupemail'
+                      customClass='mb-3 mt-4'
+                      icon='fa-envelope-open-o'
+                      type='email'
+                      placeHolder='Adresse Email'
+                      invalidMsg='Email invalide.'
+                      value={this.state.inputLogin}
+                      onChange={this.handleChangeLogin}
+                    />
+
+                    <InputGroupText
+                      parentClassName='connection__form__groupepw'
+                      customClass=''
+                      icon='fa-lock'
+                      type='password'
+                      placeHolder='Mot de passe'
+                      invalidMsg='Mot de passe invalide.'
+                      value={this.state.inputPassword}
+                      onChange={this.handleChangePassword}
+                    />
+
+                    <div className='row mt-4 mb-4'>
+                      <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
+                        <InputCheckbox
+                          parentClassName='connection__form__rememberme'
+                          customClass=''
+                          label='Se souvenir de moi'
+                          checked={this.state.inputRememberMe}
+                          onChange={this.handleChangeRememberMe}
+                        />
+                      </div>
+
+                      <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6 text-sm-right'>
+                        <LoginBtnForgotPw
+                          customClass='connection__form__pwforgot'
+                          label='Mot de passe oublié ?'
+                        />
+                      </div>
                     </div>
 
-                    <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6 text-sm-right'>
-                      <LoginBtnForgotPw
-                        customClass='connection__form__pwforgot'
-                        label='Mot de passe oublié ?'
-                      />
-                    </div>
-                  </div>
-
-                  <Button
-                    htmlType='button'
-                    bootstrapType='primary'
-                    customClass='connection__form__btnsubmit'
-                    label='Connexion'
-                    onClick={this.handleClickSubmit}
-                  />
-                </CardBody>
-              </Card>
-
+                    <Button
+                      htmlType='button'
+                      bootstrapType='primary'
+                      customClass='connection__form__btnsubmit'
+                      label='Connexion'
+                      onClick={this.handleClickSubmit}
+                    />
+                  </CardBody>
+                </Card>
+
+              </div>
             </div>
-          </div>
 
-        </div>
-      </section>
-    )
+          </div>
+        </section>
+      )
+    }
   }
 }
 

src/container/Page.jsx

@@ -1,16 +0,0 @@
-import React from 'react'
-import { connect } from 'react-redux'
-
-class Page extends React.Component {
-  render () {
-    const { user } = this.props
-    return (
-      <div>
-        Page ! user Logged in : {user.isLoggedIn.toString()}
-      </div>
-    )
-  }
-}
-
-const mapStateToProps = ({ user }) => ({ user })
-export default connect(mapStateToProps)(Page)

src/container/PrivateRoute.jsx

@@ -7,15 +7,12 @@ import { Route, Redirect, withRouter } from 'react-router-dom'
 
 // /!\ you shall destruct props.component otherwise you get a warning:
 // "You should not use <Route component> and <Route render> in the same route; <Route render> will be ignored
-const PrivateRoute = ({ component: Component, ...rest }) => {
-  if (rest.user.isLoggedIn === undefined) return <div />
-  else return (
-    <Route {...rest} render={props => rest.user.isLoggedIn
-      ? <Component {...props} />
-      : <Redirect to={{pathname: '/login', state: {from: props.location}}} />
-    } />
-  )
-}
+const PrivateRoute = ({ component: Component, ...rest }) => (
+  <Route {...rest} render={props => rest.user.isLoggedIn
+    ? <Component {...props} />
+    : <Redirect to={{pathname: '/login', state: {from: props.location}}} />
+  } />
+)
 
 const mapStateToProps = ({ user }) => ({ user })
 export default withRouter(connect(mapStateToProps)(PrivateRoute))

src/container/Tracim.jsx

@@ -4,7 +4,6 @@ import Footer from '../component/Footer.jsx'
 import Header from './Header.jsx'
 import Sidebar from './Sidebar.jsx'
 import Login from './Login.jsx'
-import Page from './Page.jsx'
 import WorkspaceContent from './WorkspaceContent.jsx'
 import {
   Route,
@@ -13,16 +12,6 @@ import {
 import PrivateRoute from './PrivateRoute.jsx'
 import { getIsUserConnected } from '../action-creator.async.js'
 
-const SidebarWrapper = props => {
-  if (props.locationPath !== '/login') return (
-    <div className='sidebarpagecontainer'>
-      <Sidebar />
-      {props.children}
-    </div>
-  )
-  else return props.children
-}
-
 class Tracim extends React.Component {
   componentDidMount = () => {
     this.props.dispatch(getIsUserConnected())
@@ -31,6 +20,17 @@ 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
+    }
+
     return (
       <div>
         <Header />
@@ -44,7 +44,6 @@ class Tracim extends React.Component {
               <SidebarWrapper locationPath={location.pathname}>
 
                 <PrivateRoute exact path='/' component={WorkspaceContent} />
-                <PrivateRoute path='/page' component={Page} />
 
               </SidebarWrapper>
 

src/container/WorkspaceContent.jsx

@@ -3,8 +3,8 @@ import { connect } from 'react-redux'
 import Folder from '../component/Workspace/Folder.jsx'
 import FileItem from '../component/Workspace/FileItem.jsx'
 import FileItemHeader from '../component/Workspace/FileItemHeader.jsx'
-// import Thread from './Thread.jsx'
-import PageText from './PageText.jsx'
+// import Thread from './FileType/Thread.jsx'
+import PageHtml from './FileType/PageHtml.jsx'
 import PageWrapper from '../component/common/layout/PageWrapper.jsx'
 import PageTitle from '../component/common/layout/PageTitle.jsx'
 import PageContent from '../component/common/layout/PageContent.jsx'
@@ -57,7 +57,7 @@ class WorkspaceContent extends React.Component {
 
           <DropdownCreateButton customClass='workspace__content__button mb-5' />
 
-          <PageText visible={this.state.activeFileType === 'file'} />
+          <PageHtml visible={this.state.activeFileType === 'file'} />
           {/*
           <Thread visible={this.state.activeFileType === 'chat'} />
           */}

src/css/index.styl

@@ -18,5 +18,5 @@ html, body, #content, #content > div
 @import 'Folder'
 
 @import 'Thread'
-@import 'PageText'
+@import 'PageHtml'
 @import 'Timeline'