From 72458e5810e14610bfb1781dc2bcd149e08bbdff Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Sun, 17 Feb 2019 21:33:49 +0000
Subject: [PATCH] OK, I *think* that will do for now

---
 src/clj/ireadit/routes/home.clj     |  1 -
 src/clj/ireadit/routes/services.clj |  2 +-
 src/cljs/ireadit/events.cljs        |  5 +++--
 src/cljs/ireadit/views/form.cljs    | 23 +++++++++++++++--------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/clj/ireadit/routes/home.clj b/src/clj/ireadit/routes/home.clj
index c811afe..fcbf44d 100644
--- a/src/clj/ireadit/routes/home.clj
+++ b/src/clj/ireadit/routes/home.clj
@@ -1,6 +1,5 @@
 (ns ireadit.routes.home
   (:require [ireadit.layout :as layout]
-            [ireadit.views.form :refer :all]
             [compojure.core :refer [defroutes GET]]
             [ring.util.http-response :as response]
             [clojure.java.io :as io]))
diff --git a/src/clj/ireadit/routes/services.clj b/src/clj/ireadit/routes/services.clj
index d08cfdd..ed9d789 100644
--- a/src/clj/ireadit/routes/services.clj
+++ b/src/clj/ireadit/routes/services.clj
@@ -19,4 +19,4 @@
             (POST "/ocr/:uri" []
                   :return       String
                   :path-params [uri :- String]
-                  {:i-read (ocr (url-decode uri))}))))
+                  (ok (ocr (url-decode uri)))))))
diff --git a/src/cljs/ireadit/events.cljs b/src/cljs/ireadit/events.cljs
index a4245c4..cead295 100644
--- a/src/cljs/ireadit/events.cljs
+++ b/src/cljs/ireadit/events.cljs
@@ -22,8 +22,9 @@
 
 (rf/reg-event-db
   :set-transcription
-  (fn [db [_ transcription]]
-    (assoc db :transcription transcription)))
+  (fn [db [_ response]]
+    (js/console.log (str "Failed to fetch transcription data" response))
+    (assoc db :transcription response)))
 
 (rf/reg-event-fx
   :fetch-docs
diff --git a/src/cljs/ireadit/views/form.cljs b/src/cljs/ireadit/views/form.cljs
index 0399e21..0814982 100644
--- a/src/cljs/ireadit/views/form.cljs
+++ b/src/cljs/ireadit/views/form.cljs
@@ -13,15 +13,22 @@
 
 
 (defn form-page []
-   [:div.container {:id "main-container"}
+  [:div.container-fluid {:id "main-container"}
    [:h1 "Transcribe the text of an image"]
-    [:div
-     [:p.widget
-      [b/Label {:for "image-url" :title "URL of the image you wish to transcribe"}"Image URL"]
+   [:div
+    [b/Row
+     [:div.col-sm-3
+      [b/Label {:for "image-url" :title "URL of the image you wish to transcribe"}"Image URL"]]
+     [:div.col-sm-9
       [b/Input {:id "image-url" :type "text" :size "80"
-                :on-change #(rf/dispatch [:set-url (.-value (.-target %))])}]]
-     [:p.widget
-      [b/Label {:for "send"} "To transcribe the image"]
+                :on-change #(rf/dispatch [:set-url (.-value (.-target %))])}]]]
+    [b/Row
+     [:div.col-sm-3
+      [b/Label {:for "send"} "To transcribe the image"]]
+     [:div.col-sm-9
       [b/Button {:id "send" :on-click #(rf/dispatch [:fetch-transcription])} "Transcribe!"]]]
-    [:div.transcription @(rf/subscribe [:transcription])]])
+    [b/Row]
+    [b/Row
+     [:div.col-sm-12
+      [b/Alert {:color "success"} @(rf/subscribe [:transcription])]]]]])