Release v1.8.0

vinnymac · Jan 3, 2017 · 03c318d · 03c318d
2 parents 87cd0d4 + 423365d
commit 03c318d
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -8,12 +8,12 @@
 
 **PokéNurse** is a desktop application for Windows and Mac that allows you to manage your pokémon from Pokémon Go without the need for a mobile device. You can now favorite, transfer, and evolve from the comfort of your own home!
 
-## Downloads for v1.7.2
+## Downloads for v1.8.0
 You may view all the releases [here](https://github.com/vinnymac/PokeNurse/releases)
-* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse.dmg)
-* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse.exe)
-* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse-ia32.deb)
-* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.7.2/PokeNurse-x64.deb)
+* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v1.8.0/PokeNurse.dmg)
+* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v1.8.0/PokeNurse.exe)
+* [Linux 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.8.0/PokeNurse-ia32.deb)
+* [Linux 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v1.8.0/PokeNurse-x64.deb)
 
 ## Examples
 ![Login Window](app/loginExample.png)

diff --git a/app/app.global.css b/app/app.global.css
@@ -139,8 +139,26 @@
 }
 
 .search {
-  margin-right: .5em;
+  margin-right: 2.5em;
   background-color:rgba(0, 0, 0, 0.5);
+  border-left: 1px solid #000;
+  border-radius: 4px;
+}
+
+.search .input-group {
+  display: flex;
+}
+
+.search .input-group-addon {
+  background-color: transparent;
+  border: 1px solid;
+}
+
+.search .input-group-addon, .input-group-btn {
+  margin: 0;
+  padding-left: .3em;
+  padding-right: .3em;
+  color: rgba(255, 255, 255, .5);
 }
 
 .search label {
@@ -150,6 +168,14 @@
   color: rgba(255, 255, 255, .5);
 }
 
+.search label button {
+  background: transparent;
+  border: none;
+  font-size: 18px;
+  font-weight: 300;
+  line-height: 1;
+}
+
 .header {
   background-image: url('./imgs/bg.jpg');
   background-position: center top;

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "PokeNurse",
   "productName": "PokeNurse",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon",
   "main": "./main.js",
   "author": {

diff --git a/app/screens/Table/index.js b/app/screens/Table/index.js
@@ -4,6 +4,11 @@ import React, {
 import {
   ipcRenderer
 } from 'electron'
+import {
+  InputGroup,
+  FormControl,
+  Button,
+} from 'react-bootstrap'
 import $ from 'jquery'
 import { connect } from 'react-redux'
 import { bindActionCreators } from 'redux'
@@ -130,13 +135,23 @@ const Table = React.createClass({
                 <label htmlFor="search">
                   <i className="fa fa-search" aria-hidden="true" />
                 </label>
+
                 <input
                   type="search"
                   id="search"
                   placeholder="Search…"
                   ref={(c) => { this.search = c }}
                   onChange={this.onFilterChange}
                 />
+
+                <label htmlFor="search">
+                  <button
+                    alt="Clear search field"
+                    onClick={this.handleClearSearch}
+                  >
+                    x
+                  </button>
+                </label>
               </div>
 
               <div>
@@ -322,6 +337,12 @@ const Table = React.createClass({
   handleAllComplete() {
     running = false
   },
+
+  handleClearSearch() {
+    this.search.value = ''
+    this.onFilterChange({ target: this.search })
+    this.search.focus()
+  }
 })
 
 export default connect((state => ({

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "PokeNurse",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "description": "A tool for Pokémon Go to aid in transferring and evolving Pokémon",
   "main": "main.js",
   "scripts": {