Merge branch 'Saga' of https://git.e-declic.net/talents-tube/app into Saga

nextjs/components/atoms/ChatCard.js

@@ -24,6 +24,9 @@ export default function ChatCard(props) {
                     videoId={Ar.last(_.split(props.message.video.cdn_url, '/'))}
                 />
             }
+            <Fragment>
+                {/* {props.message.} */}
+            </Fragment>
             <Fragment>
                 <Typography variant="headline"
                     variant="subtitle1"

nextjs/components/organisms/AnswerRow.js

@@ -209,7 +209,7 @@ class AnswerRowComponent extends React.Component {
                 variant="h6"
                 component="h4"
                 className={classes.companyTitle}>
-                {rowData.ad.company.brand_name&&rowData.ad.company.brand_name}
+                {rowData.ad.company.business_name&&rowData.ad.company.business_name}
               </Typography>
               <div className={ classes.bottomCard }>
                 <Chip size="small" label={status.get(rowData.status)} className={classes.chip} />

nextjs/components/organisms/Header.js

@@ -479,7 +479,6 @@ class Header extends React.Component {
                 </Link>
                 <Link href="/" prefetch>
                   <a onClick={() => {
-                    if (!_.isEmpty(nextProps.errors))
                       localStorage.removeItem("ttJWT");
                     return this.props.requestLogout();
                   }} className={classes.lightMenuItem}><ListItem classes={{ root: classes.rootListItemIcon }}>

nextjs/components/organisms/OffreDetail.js

@@ -274,7 +274,7 @@ function OffreDetail(props) {
                                     <Link href={`/Entreprise/${offre.company.id}`} prefetch >
                                         <a>
                                             <Typography gutterBottom variant="subtitle1" className={classes.companyName}>
-                                                {offre.company.brand_name && offre.company.brand_name}
+                                            {offre.company.business_name&&offre.company.business_name}
                                             </Typography>
                                         </a>
                                     </Link>
@@ -319,7 +319,7 @@ function OffreDetail(props) {
                                     <Link href={`/Entreprise/${offre.company.id}`} prefetch >
                                         <a>
                                             <Typography gutterBottom variant="subtitle1" className={classes.text}>
-                                                {offre.company.brand_name && offre.company.brand_name}
+                                            {offre.company.business_name&&offre.company.business_name}
                                             </Typography>
                                         </a>
                                     </Link>
@@ -377,7 +377,7 @@ function OffreDetail(props) {
                             {!offre.is_promoted && (
                                 <section>
                                     <Typography gutterBottom className={classes.title + ' ' + classes.discoverTitle} align="center">
-                                        Découvrir l'entreprise <span className={classes.primary}>{offre.company.brand_name && offre.company.brand_name}</span>
+                                        Découvrir l'entreprise <span className={classes.primary}>{offre.company.business_name&&offre.company.business_name}</span>
                                     </Typography>
 
                                     <Link href={`/Entreprise/${offre.company.id}`} prefetch >

nextjs/package.json

@@ -72,7 +72,7 @@
     "bs": "yarn build && yarn start",
     "copysw": "cp -R static/js .next/static/",
     "cypress": "cypress open",
-    "restoredb":"cat cypress/postgres.sql | docker exec -i tt-website.postgres.dev psql --dbname database -U user"
+    "restoredb": "cat cypress/postgres.sql | docker exec -i tt-website.postgres.dev psql --dbname database -U user"
   },
   "devDependencies": {
     "webpack-bundle-analyzer": "^3.3.2"

nextjs/pages/Entreprise.js

@@ -341,7 +341,7 @@ class Entreprise extends React.Component {
                                     </div>
                                     <div className={classes.infoContainer}>
                                         <Typography gutterBottom className={classes.text}>
-                                            {company.brand_name && company.brand_name}
+                                            {company.business_name&&company.business_name}
                                         </Typography>
 
                                         {(nbOffre != 'Candidature spontanée') ?
@@ -377,7 +377,7 @@ class Entreprise extends React.Component {
                                     </div>
                                     <div className={classes.infoContainer}>
                                         <Typography gutterBottom className={classes.text}>
-                                            {company.brand_name && company.brand_name}
+                                        {company.business_name&&company.business_name}
                                         </Typography>
                                         {(nbOffre != 'Candidature spontanée') ?
                                             (
@@ -464,7 +464,7 @@ class Entreprise extends React.Component {
 
                         <div className={classes.container + ' ' + classes.discoverContainer} id="discover">
                             <Typography gutterBottom className={classes.title + ' ' + classes.discoverTitle}>
-                                Les offres d'emploi pour <span>{company.brand_name && company.brand_name}</span>
+                                Les offres d'emploi pour <span>{company.business_name&&company.business_name}</span>
                             </Typography>
                             {company.loading ?
                                 (<Loader />)

nextjs/pages/Reponse.js

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, {Fragment} from 'react'
 import { connect } from "react-redux";
 import getConfig from 'next/config'
 import PropTypes from 'prop-types';
@@ -210,7 +210,7 @@ const steps = ["", ""]
 const { publicRuntimeConfig } = getConfig()
 class Reponse extends React.Component {
   state = {
-    loading: false,
+    loading: true,
     activeStep: 0,
     data:{},
     openSnack: false,
@@ -226,6 +226,8 @@ class Reponse extends React.Component {
     {
       Router.push("/Login")
     }
+    else
+      this.setState({loading: false})
   }
 
   componentWillReceiveProps(nextProps) {
@@ -233,7 +235,7 @@ class Reponse extends React.Component {
     console.log(nextProps)
 
     this.setState({
-        loading: nextProps.loading,
+       // loading: nextProps.loading,
         openSnack: !!!_.isEmpty(nextProps.errors),
         errors: !!!nextProps.errors ? { errors: { message: "" } } : nextProps.errors,
     })
@@ -289,7 +291,8 @@ class Reponse extends React.Component {
           <link rel="canonical" href="https://app.talentstube.com" />
         </Head>
         {/* https://codesandbox.io/s/ii0us */}
-
+       { loading ?  <Loader /> :
+       <Fragment>
         <section className={classes.headerContainer}>
           <div className={classes.logoContainer}>
             <Avatar className={classes.logo} classes={{ img: classes.MuiAvatarImg }} src={logoUrl} />
@@ -384,7 +387,10 @@ class Reponse extends React.Component {
           )}
            <Snack variant="error" message={!!!_.isEmpty(this.state.errors) && this.state.errors.message }
                     openSnack={this.state.openSnack} onClose={this.handleClose} />
-      </LayoutBack>
+          
+          </Fragment>
+        }
+          </LayoutBack>
     )
 
   }
@@ -407,7 +413,7 @@ Reponse.getInitialProps = function (context) {
 function mapStateToProps(state) {
   
   return {
-    loading: !!state.answer.loading,
+    //loading: !!state.answer.loading,
     media: state.media,
     offre: state.ad,
     errors: state.answer.errors,

nextjs/pages/_error.js

@@ -3,9 +3,11 @@ import LayoutBack from '../components/templates/LayoutBack'
 
 class Error extends React.Component {
     static getInitialProps({ res, err }) {
-        console.log("**** (*)ERROR(*) *****")
-        console.log(err)
-        console.log("************************")
+        if (err !== null) {
+            console.log("**** (*)ERROR(*) *****")
+            console.log(err)
+            console.log("************************")
+        }
         const statusCode = res ? res.statusCode : err ? err.statusCode : null
         return { statusCode }
     }