Merge branch 'develop' of github.com:tracim/tracim_v2 into fix/742_backend_should_generate_index.html

build_full_frontend.sh

@@ -8,7 +8,10 @@ if  [[ $1 = "-w" ]]; then
     windoz="windoz"
 fi
 
-echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\ ${NC}it also assumes your webpack dev server of frontend is running"
+echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\ ${NC}"
+
+# get the new sources
+git pull origin develop
 
 # Tracim Lib
 (
@@ -44,4 +47,10 @@ echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\
   ./build_admin_workspace_user.sh
 )
 
+# build Tracim
+(
+  cd frontend || exit
+  npm run build
+)
+
 log "-- frontend build successful."

color.json.sample

@@ -0,0 +1,6 @@
+{
+  "primary": "#7d4e24",
+  "html-document": "#3f52e3",
+  "thread": "#ad4cf9",
+  "file": "#ff9900"
+}

frontend/src/container/AppFullscreenManager.jsx

@@ -9,11 +9,11 @@ class AppFullscreenManager extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
-      AmIMounted: false
+      isMounted: false
     }
   }
 
-  componentDidMount = () => this.setState({AmIMounted: true})
+  componentDidMount = () => this.setState({isMounted: true})
 
   render () {
     const { props } = this
@@ -22,7 +22,7 @@ class AppFullscreenManager extends React.Component {
       <div className='AppFullScreenManager'>
         <div id='appFullscreenContainer' />
 
-        {this.state.AmIMounted && (// we must wait for the component to be fully mounted to be sure the div#appFullscreenContainer exists in DOM
+        {this.state.isMounted && (// we must wait for the component to be fully mounted to be sure the div#appFullscreenContainer exists in DOM
           <div className='emptyDiForRoute'>
             <Route path={PAGE.ADMIN.WORKSPACE} render={() => {
               props.renderAppFullscreen({slug: 'admin_workspace_user', hexcolor: '#7d4e24', type: 'workspace'}, props.user, {})

frontend/src/container/Tracim.jsx

@@ -115,9 +115,19 @@ class Tracim extends React.Component {
             </div>
           } />
 
-          <Route path={PAGE.ACCOUNT} component={Account} />
+          <Route path={PAGE.ACCOUNT} render={() =>
+            <div className='sidebarpagecontainer'>
+              <Sidebar />
+              <Account />
+            </div>
+          } />
 
-          <Route path={PAGE.ADMIN.ROOT} component={AppFullscreenManager} />
+          <Route path={PAGE.ADMIN.ROOT} render={() =>
+            <div className='sidebarpagecontainer'>
+              <Sidebar />
+              <AppFullscreenManager />
+            </div>
+          } />
 
           <Route path='/admin_temp/workspace' component={AdminWorkspacePage} />
 

frontend/webpack.config.js

@@ -30,8 +30,8 @@ module.exports = {
   output: {
     path: path.resolve(__dirname, 'dist/asset'),
     filename: 'tracim.app.entry.js',
-    pathinfo: !isProduction
-    // publicPath: '/'
+    pathinfo: !isProduction,
+    publicPath: '/asset/'
   },
   devServer: {
     contentBase: path.join(__dirname, 'dist/'),