Merge branch 'master' of github.com:Phaetec/pogo-cruncher

README.md

@@ -5,7 +5,7 @@
 [![Github All Releases](https://img.shields.io/github/downloads/phaetec/pogo-cruncher/total.svg?maxAge=60)](https://github.com/Phaetec/pogo-cruncher/releases)
 [![Docker Pulls](https://img.shields.io/docker/pulls/phaetec/pogo-cruncher.svg?maxAge=60)](https://hub.docker.com/r/phaetec/pogo-cruncher/)
 
-This tool lets you send away multiple Pokemon at once in Pokemon GO, you can also see all IV Values.  
+This tool lets you send away multiple Pokemon at once in Pokemon GO, you can also see all IV Values.
 The tool runs locally on your PC and the Login-Details are not leaving your computer. Feel free to check the source code or contribute.
 
 *This tool is not an official production of Niantic or the Pokemon Company. Use at own risk.*
@@ -15,12 +15,14 @@ The tool runs locally on your PC and the Login-Details are not leaving your comp
 It is a work in progress, so please report all bugs to the issue page.
 
 
-## New Features
-  * **Simplifed [installation using pre-build image on DockerHub](https://github.com/Phaetec/pogo-cruncher/wiki/Installation:-Docker-version)**
-  * Progress bar
+## Main Features
+  * **[Installation using pre-build image on DockerHub](https://github.com/Phaetec/pogo-cruncher/wiki/Installation:-Docker-version)**
+  * Mass send-away Pokemon
   * Select all Pokemon except your favorites
   * Select all Pokemon below a specified IV % Perfect threshold
   * Select all Pokemon below a CP threshold
+  * Evolve Pokemon
+  * Mark Pokemon as favorite
 
 For more upcoming features, see the
 [Changelog](https://github.com/Phaetec/pogo-cruncher/blob/master/CHANGELOG.md),

frontend/project.clj

@@ -1,4 +1,4 @@
-(defproject cruncher "0.2.1"
+(defproject cruncher "0.2.5"
   :description "FIXME: write this!"
   :url "http://example.com/FIXME"
   :license {:name "Eclipse Public License"

frontend/src/cruncher/communication/favorites.cljs

@@ -12,10 +12,6 @@
           new-col (update-in (vec (get-in @lib/app-state [:pokemon])) [index :favorite] (constantly (:set_favorite res)))]
       (lib/update-pokemon! new-col))))
 
-(defn error-handler [response]
-  (let [res (com/process-response response)]
-    (lib/error! (:message res))))
-
 (defn post-favorite
   "Get cleaned data and send ajax request."
   [id favorite]
@@ -25,7 +21,7 @@
           {:body            (clib/clj->json {:id id
                                              :set_favorite favorite})
            :handler         success-handler
-           :error-handler   error-handler
+           :error-handler   com/error-handler
            :response-format :json
            :headers         {"Content-Type" "application/json"}
            :keywords?       true})))