Merge pull request #111 from cozy/fix-bar

Fix bar

.transifexrc.tpl

@@ -0,0 +1,4 @@
+[https://www.transifex.com]
+hostname = https://www.transifex.com
+username = cozy
+token =

.travis.yml

@@ -7,6 +7,12 @@ cache:
   - node_modules
 script:
 - yarn build
+addons:
+  apt:
+    sources:
+    - deadsnakes
+    packages:
+    - python3.5
 deploy:
   provider: npm
   email: [email protected]
@@ -17,4 +23,12 @@ deploy:
     tags: true
     repo: cozy/cozy-bar
 before_deploy:
-  - touch .npmignore # do not honor .gitignore since it ignores `dist/`
+- touch .npmignore
+before_install:
+- curl -fsSL https://bootstrap.pypa.io/get-pip.py | python3.5 - --user
+- travis_retry pip3.5 install --user transifex-client
+- install -m0644 .transifexrc.tpl ~/.transifexrc
+- echo "password = $TX_PASSWORD" >> ~/.transifexrc
+env:
+  global:
+    secure: ESL2AFj2ER9Smf+BsInpq7/Q0Z3LWbvwzgbCd4S4XxVCU8XM17aKYf+3ypRe0djxsezqX48RKF5DBTZWNNrb0/ey8/saNlBw7FDafi6kkxtTl8j2wvOwkLmqnVFSzj3P5f8jfmFPPbjy1Myzw8q8nkeg68iS+vCc86P8PeOjlFqifNcb7dnM+EBH8FmYk78pUkBo62dn16RlqpdcSh1f1Ywa/kXkgl+hmjnkcLz6W8FYG2H9fveixK/uMFtXeQ4SXMobNh5KGwFNi9jbyOcwVHUMp3h1W8qPXM9J4It5MUvmFRprjDl7xX58TzpGzCdzqezVOG7CgZd8DCOTgroakRtqWBOctf+oWVqplP8N4+pggYyRcbQdv7CXdOm/3K+relR/MKB6QeQ2Iey2FI/v73CcvAi60bJM8plsV/GogTT39jGLzbjGL5WZPr+gIMshKtiEXD5mt9kq/hdJS1heSg/F9Eh2Rtluo+3rgSNfbm2XdMDmHXeZT1Z5vCoY+ekKhfqrIYt//DrH1+QAPl5WL3nJSDz/b9S4GM1G/3ZptxGYt99hzm9NSTfCGHIlhUcJs2qDENWM14HRVhjKoh8MPo5NeVpT2nLAsNGYA9iW4lZMxDRBcV1hsdA9JHj8MCKINldp9Mr0qHRYR7NrSuThU5iZW1C4IwbLYNzF+A/tqd4=

src/components/Bar.jsx

@@ -102,9 +102,8 @@ class Bar extends Component {
   renderRight() {
     const { usageTracker, claudyOpened,
       enableClaudy, fireClaudy, onDrawer, displayOnMobile, isPublic } = this.props
-    const { drawerVisible } = this.store
+    const { drawerVisible } = this.state
     return (__TARGET__ !== 'mobile' || displayOnMobile) && !isPublic ? <div className='coz-bar-flex-container' key='nav'>
-      <Drawer visible={drawerVisible} onClose={this.toggleDrawer} onClaudy={(enableClaudy && (() => this.toggleClaudy(true))) || false} isClaudyLoading={fireClaudy} drawerListener={() => onDrawer(this.state.drawerVisible)} toggleSupport={this.toggleSupport} />
       <Nav toggleSupport={this.toggleSupport} />
       {enableClaudy &&
         <Claudy
@@ -121,6 +120,8 @@ class Bar extends Component {
     const { t } = this.props
     const { fireClaudy, displaySupport, enableSearchBar } = this.state
     const { barLeft, barRight, barCenter } = this.props
+    const { enableClaudy, onDrawer, displayOnMobile, isPublic } = this.props
+    const { drawerVisible } = this.state
     return (
       <div className='coz-bar-container'>
         { barLeft || this.renderLeft() }
@@ -130,7 +131,14 @@ class Bar extends Component {
           : <hr className='coz-sep-flex' key='separator'/>
         }
         { barRight || this.renderRight() }
-        {displaySupport && <SupportModal onClose={this.toggleSupport} />}
+        { displaySupport && <SupportModal onClose={this.toggleSupport} /> }
+        { (__TARGET__ !== 'mobile' || displayOnMobile) && !isPublic ?
+          <Drawer visible={drawerVisible}
+            onClose={this.toggleDrawer}
+            onClaudy={(enableClaudy && (() => this.toggleClaudy(true))) || false}
+            isClaudyLoading={fireClaudy}
+            drawerListener={() => onDrawer(this.state.drawerVisible)}
+            toggleSupport={this.toggleSupport} /> : null }
       </div>
     )
   }