diff --git a/resources/public/img/ireadit.png b/resources/public/img/ireadit.png new file mode 100644 index 0000000..10d8616 Binary files /dev/null and b/resources/public/img/ireadit.png differ diff --git a/src/clj/ireadit/routes/services.clj b/src/clj/ireadit/routes/services.clj index 2670f40..da3956d 100644 --- a/src/clj/ireadit/routes/services.clj +++ b/src/clj/ireadit/routes/services.clj @@ -2,6 +2,7 @@ (:require [cemerick.url :refer (url-decode)] [clojure.tools.logging :as log] [compojure.api.sweet :refer :all] + [ireadit.splitter :refer [split-into-tweets]] [ireadit.tesseractor :refer [ocr]] [ring.util.http-response :refer :all] [schema.core :as s])) @@ -42,9 +43,9 @@ :tags ["tesseractor"] (POST "/ocr/:uri" [] - :return String + :return {:tweets [String]} :path-params [uri :- String] (ok (let [decoded (url-decode uri) - text (ocr decoded)] - (log/info (str "ocr '" decoded "' => '" text "'")) - text)))))) + tweets (split-into-tweets (ocr decoded))] + (log/info (str "ocr '" decoded "' => '" tweets "'")) + {:tweets tweets})))))) diff --git a/src/cljs/ireadit/views/form.cljs b/src/cljs/ireadit/views/form.cljs index fda5695..c6418fe 100644 --- a/src/cljs/ireadit/views/form.cljs +++ b/src/cljs/ireadit/views/form.cljs @@ -17,7 +17,6 @@ (assoc m :disabled "disabled") m)) - (defn form-page [] [:div.container-fluid {:id "main-container"} [:h1 "Transcribe the text of an image"] @@ -35,10 +34,20 @@ [:div.col-sm-9 [b/Button (maybe-disable {:id "send" :on-click #(rf/dispatch [:fetch-transcription])}) "Transcribe!"]]] [b/Row] - [b/Row - [:div.col-sm-12 {:class (if @(rf/subscribe [:transcription]) "visible" "hidden")} - [b/Alert {:color "success"} @(rf/subscribe [:transcription])]]] - [b/Row - [:div.col-sm-12 {:class (if @(rf/subscribe [:error]) "visible" "hidden")} - [b/Alert {:color "warning"} @(rf/subscribe [:error])]]]]]) + (map #(vector + :div.tweet {:class "row"} + [:div.col-sm-1 + [:img {:src "/img/ireadit.png" + :width "64" + :height "64" + :class "rounded-circle" + :alt "Please don't post text as images to social media"}]] + [:div.col-sm-1] + [:div.col-sm-10 [:div [:b "IReadIt"]] %]) + (let [m @(rf/subscribe [:transcription])] + (when (map? m) (m "tweets")))) + [b/Collapse {:class (if @(rf/subscribe [:error]) "col-sm-12 show" "hide")} + [b/Alert {:color "warning"} @(rf/subscribe [:error])]]]]) + +(vector 'div.foo "foo")