And add another fallback in the frontend

Phaetec · Dec 15, 2016 · 22d9386 · 22d9386
1 parent d447bad
commit 22d9386
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/frontend/project.clj b/frontend/project.clj
@@ -1,4 +1,4 @@
-(defproject cruncher "0.3.1"
+(defproject cruncher "0.3.2"
   :description "FIXME: write this!"
   :url "http://example.com/FIXME"
   :license {:name "Eclipse Public License"

diff --git a/frontend/src/cruncher/core.cljs b/frontend/src/cruncher/core.cljs
@@ -13,7 +13,7 @@
 
 (enable-console-print!)
 
-(.log js/console "Started Cruncher Version 0.3.1")
+(.log js/console "Started Cruncher Version 0.3.2")
 
 (om/add-root! lib/reconciler views/Main (gdom/getElement "cruncher-main"))
 

diff --git a/frontend/src/cruncher/utils/lib.cljs b/frontend/src/cruncher/utils/lib.cljs
@@ -126,7 +126,9 @@
 (defn get-pokemon-by-id
   "Look up database to return complete pokemon by its id."
   [pokemon-id]
-  (get pokemon/all pokemon-id))
+  (if-let [mon (get pokemon/all pokemon-id)]
+    mon
+    {:pokemon-id -1, :name "not-in-database", :weaknesses ["nil" "nil"], :type-1 ["nil"], :classification "nil", :fast-attacks ["-1" "-1"], :weight "-1 kg", :previous-evolutions [-1], :height "-1 m"}))
 
 (defn playerinfo
   "Return the stored Playerinformation"