chore(release): v0.6.0

Merge pull request #412 from qri-io/release
qri-io · Nov 12, 2018 · ce498e1 · ce498e1
2 parents 2ab09c6 + 7aecb0a
commit ce498e1
Show file tree

Hide file tree

Showing 12 changed files with 333 additions and 1,483 deletions.
diff --git a/app/dist/renderer.prod.js b/app/dist/renderer.prod.js
diff --git a/app/dist/style.css b/app/dist/style.css
diff --git a/app/main.prod.js b/app/main.prod.js
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "qri-webapp",
   "productName": "qri",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "qri (\"query\") frontend application",
   "main": "./main.prod.js",
   "author": {

diff --git a/lib/components/AppLoading.js b/lib/components/AppLoading.js
@@ -1,15 +1,13 @@
-/* globals __BUILD__ */
 import React from 'react'
 import Base from './Base'
 import Spinner from './chrome/Spinner'
 import AppDrag from './AppDrag'
+import version from '../../version'
 
 import { defaultPalette } from '../propTypes/palette'
 
 export default class AppLoading extends Base {
   template (css) {
-    const version = __BUILD__.VERSION
-
     return (
       <div className={css('page')}>
         <AppDrag />

diff --git a/lib/components/ExternalLink.electron.js b/lib/components/ExternalLink.electron.js
@@ -1,7 +1,7 @@
-import React from 'react'
+import React, { Component } from 'react'
 import { shell } from 'electron'
 
-export default class ExternalLink extends React.Component {
+export default class ExternalLink extends Component {
   render () {
     return (<a href={this.props.href} onClick={(e) => {
       e.preventDefault()

diff --git a/lib/components/ExternalLink.web.js b/lib/components/ExternalLink.web.js
@@ -1,6 +1,6 @@
-import React from 'react'
+import React, { Component } from 'react'
 
-export default class ExternalLink extends React.Component {
+export default class ExternalLink extends Component {
   render () {
     return <a {...this.props} target='_blank'>{this.props.children}</a>
   }

diff --git a/lib/components/chrome/TopBar.js b/lib/components/chrome/TopBar.js
@@ -1,4 +1,3 @@
-
 /* globals __BUILD__ */
 import React from 'react'
 import { Link } from 'react-router-dom'
@@ -78,6 +77,9 @@ export default class TopBar extends Base {
 
     return (
       <div className={css('topbar')} style={layout}>
+        {__BUILD__.ELECTRON && <div className={css('titlebar')}>
+          <p>qri</p>
+        </div>}
         <div className={css('no_shrink')}>
           {__BUILD__.ELECTRON && <div className={css('item_spacing')}>
             <a className={css('nav_button', 'first_item')} onClick={this.handleGoBack}>left</a>
@@ -109,9 +111,16 @@ export default class TopBar extends Base {
         boxShadow: '0 0px 4px rgba(0, 0, 0, 0.35)',
         '-webkit-app-region': 'drag',
         display: 'flex',
+        flexWrap: 'wrap',
         alignItems: 'center',
         justifyContent: 'space-between'
       },
+      titlebar: {
+        flex: '1 0 100%',
+        width: '100%',
+        height: 20,
+        textAlign: 'center'
+      },
       first_item: {
         marginRight: 10,
         marginLeft: 0

diff --git a/lib/reducers/layout.js b/lib/reducers/layout.js
@@ -4,7 +4,7 @@ import { SESSION_PROFILE_SUCCESS, SESSION_PROFILE_FAILURE } from '../constants/s
 
 let topbarHeight = 55
 if (__BUILD__.ELECTRON) {
-  topbarHeight = 55
+  topbarHeight = 75
 }
 
 const initialState = {

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "qri",
   "private": true,
   "productName": "qri",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "qri (\"query\") frontend application",
   "keywords": [],
   "homepage": "https://qri.io",

diff --git a/resources/qri b/resources/qri
diff --git a/version.js b/version.js
@@ -1 +1 @@
-export default '0.5.2'
+export default '0.6.0'