more uncommitted stuff

Author: fabstr

products.sql

@@ -0,0 +1,44 @@
+INSERT INTO products (id, name, price) VALUES
+('13371018', 'Läsk', 5),
+('13371026', 'Godis', 4),
+('20005825', 'Lidl Mjölkchoklad', 5),
+('20029838', 'Lidl Mjölkchoklad med hasselnötter', 5),
+('20449100', 'Lidl Mjölkchoklad frukt och nötter', 5),
+('20543372', 'Freeway Orange', 4),
+('40111216', 'Bounty', 7),
+('76145759', 'Toblerone', 4),
+('5000112579321', 'Fanta', 5),
+('5000112579376', 'Fanta Lemon', 5),
+('5000112579390', 'Fanta Exotic', 5),
+('5000112579758', 'Cola', 5),
+('5000112579826', 'Cola Zero', 5),
+('5000112579925', 'Sprite', 5),
+('5000159407236', 'Mars', 7),
+('5000159459228', 'Twix', 7),
+('5000159461122', 'Snickers', 4),
+('5449000009500', 'Cola Cherry', 7),
+('5449000096982', 'Cola Vanilj', 7),
+('7040110663200', 'Japp', 4),
+('7310040018341', 'Guld Nougat', 7),
+('7310040020719', 'Center', 7),
+('7310040020726', 'Plopp', 7),
+('7310040027602', 'Kexchoklad', 4),
+('7310040028746', 'Sport Lunch', 7),
+('7310070000057', 'Apotekarnes julmust', 6),
+('7310070000361', 'Mountain Dew', 7),
+('7310070765802', 'Apotekarnes julmust', 4),
+('7310070766007', 'Pepsi', 5),
+('7310070766090', 'Trocadero (burk),', 5),
+('7310070766113', 'Zingo', 5),
+('7310350117482', 'Kexchoklad Choklad & Yoghurt', 4),
+('7310350117512', 'Sport Lunch Power Break', 3),
+('7310350118342', 'Kexchoklad', 6),
+('7310401009933', 'Trocadero', 5),
+('7310511251604', 'Pigall', 4),
+('7310511257507', 'Daim', 4),
+('7340131603002', 'NOCCO Citrus/Fläder', 20),
+('7340131606003', 'NOCCO Citron/Lime', 20),
+('7340131611106', 'NOCCO Apelsin', 20),
+('7393714236036', 'Frank', 9),
+('7622210406873', 'Japp all nuts', 4),
+('7622300386719', 'Dubbelnougat', 4);

project.clj

@@ -12,6 +12,7 @@
                  [ring/ring-defaults "0.2.3"]
                  [ring/ring-json "0.4.0"]
                  [ring/ring-anti-forgery "1.1.0"]
+                 [digest "1.4.6"]
                  [compojure "1.5.2"]
                  [hiccup "1.0.5"]
                  [garden "1.3.2"]
@@ -24,6 +25,7 @@
                  [venantius/accountant "0.2.0"
                   :exclusions [org.clojure/tools.reader]]
                  [datascript "0.16.1"]
+                 [environ "1.1.0"]
                  [cljs-http "0.1.43"]]
 
   :plugins [[lein-environ "1.0.2"]

src/clj/frontend/db.clj

@@ -1,10 +1,12 @@
 (ns frontend.db
-  (require [yesql.core :refer [defqueries]]))
+  (require [yesql.core :refer [defqueries]]
+           [environ.core :refer [env]]))
 
 (def db-spec {:classname "org.postgresql.Driver"
               :subprotocol "postgresql"
-              :subname "//localhost:5432/fabian"
-              :user "fabian"})
+              :subname (env :stackomat-subname)
+              :user (env :stackomat-user)
+              :password (env :stackomat-password)})
 
 (defqueries "sql/queries.sql"
   {:connection db-spec})

src/clj/frontend/handler.clj

@@ -6,15 +6,13 @@
             [ring.middleware.json :refer [wrap-json-response wrap-json-body]]
             [ring.middleware.anti-forgery :refer [*anti-forgery-token*]]
             [ring.util.response :refer [response content-type status]]
+            [digest :refer [sha-256]]
             [frontend.db :as db]
             [config.core :refer [env]]))
 
 (def mount-target
   [:div#app
-      [:h3 "ClojureScript has not been compiled!"]
-      [:p "please run "
-       [:b "lein figwheel"]
-       " in order to start the compiler"]])
+      [:h3 "Loading..."]])
 
 (defn head []
   [:head
@@ -44,8 +42,9 @@
 (defn list-products []
   (make-response (db/list-products)))
 
+
 (defn handle-pay [request]
-  (let [user-id (get-in request [:params :user-id])
+  (let [user-id (sha-256 (get-in request [:params :user-id]))
         amount (get-in request [:body :amount])
         balance (db/get-balance {:id user-id})]
     (if (and (not (nil? balance)) ; check the user exists
@@ -56,7 +55,7 @@
       (make-response 403 {:message "Du har inte råd."}))))
 
 (defn handle-add-money [request]
-  (let [user-id (get-in request [:params :user-id])
+  (let [user-id (sha-256 (get-in request [:params :user-id]))
         amount (get-in request [:body :amount])]
     (let [user (db/select-user {:id user-id})]
       (if (empty? user)
@@ -66,7 +65,7 @@
                       :balance (db/get-balance {:id user-id})}))))
 
 (defn get-balance [user-id]
-  (let [balance (db/get-balance {:id user-id})]
+  (let [balance (db/get-balance {:id (sha-256 user-id)})]
     (make-response {:balance balance})))
 
 (defroutes routes

src/cljc/frontend/#util.cljc#

@@ -0,0 +1,6 @@
+x(ns frontend.util)
+
+(defn foo-cljc [x]
+  "I don't do a whole lot."
+  [x]
+  (println x "Hello, World!"))

src/cljs/frontend/components/cart.cljs

@@ -1,7 +1,12 @@
 (ns frontend.components.cart
   (:require [frontend.events :as events]
+            [frontend.state :as state]
             [frontend.components.message :refer [message]]))
 
+(defn message-empty? [state]
+  (or (nil? (:message state))
+      false))
+
 (defn cart-table-head []
   [:thead
    [:tr

src/cljs/frontend/components/login.cljs

@@ -2,13 +2,22 @@
   (:require [frontend.events :as events]
             [reagent.core :as r]))
 
+(defn focus-login! []
+  (->> "login"
+       (.getElementById js/document)
+       .focus))
+
 (defn login-input [state]
-  (let [user-id (r/atom "")]
+  (let [user-id (r/atom "")
+        loginInterval (r/atom nil)]
     (r/create-class 
-      {:component-did-mount (fn [e]
-                              (->> "login"
-                                   (.getElementById js/document)
-                                   .focus))
+      {:component-did-mount (fn [e] 
+                              (reset! loginInterval (.setInterval js/window focus-login! 1000))
+                              (focus-login!))
+
+       :component-will-unmount
+       (reset! loginInterval (.clearInterval js/window loginInterval))
+
        :render (fn [] 
                  [:form {:class "login-form"
                          :on-submit (fn [event]

src/cljs/frontend/components/message.cljs

@@ -1,5 +1,6 @@
 (ns frontend.components.message
-  (:require [frontend.events :as events]))
+  (:require [clojure.string :as string]
+            [frontend.events :as events]))
 
 (defn close-message-button [state]
   [:a {:class "btn btn-default" 
@@ -14,7 +15,8 @@
         enabled (:enabled msg)
         title (:title msg)
         type (:type msg)]
-    (if enabled
+    (if (and enabled (or (not (string/blank? text))
+                         (not (string/blank? title))))
       [:div {:class "message-background row"}
        [:div {:class "message-content col-sm-8 col-sm-offset-2"}
           [:h2 {:class (cond (= :success type) "text-success"

src/cljs/frontend/components/product-list.cljs

@@ -48,7 +48,6 @@
    [:div {:class "form-group"}
     [show-all-products should-show-all-products]
     [:input {:type "text"
-             :style {:width "660px" :height "47px"}
              :id "barcodeInput"
              :class "form-control"
              :value @value 
@@ -80,11 +79,18 @@
 
 (defn product-list [state]
   (let [search-value (r/atom "")
-        should-show-all-products (r/atom false)]
+        should-show-all-products (r/atom false)
+        selectBarcodeInterval (r/atom nil)]
     (r/create-class
       {:display-name "product-list-with-atom"
+
        :component-did-mount 
-       (fn [e] (.focus (.getElementById js/document "barcodeInput")))
+       (fn [e] 
+         (reset! selectBarcodeInterval (.setInterval js/window focus-barcode-input! 1000))
+         (.focus (.getElementById js/document "barcodeInput")))
+
+       :component-will-unmount
+       (reset! selectBarcodeInterval (.clearInterval js/window selectBarcodeInterval))
 
        :reagent-render 
        (fn [state]

src/cljs/frontend/handlers.cljs

@@ -108,12 +108,12 @@
              [?id :body ?response]]
     :function (fn ([state response]
                    (events/send-event (:channel state)
-                                      :pay-not-enough-money
+                                      :paid-successfully
                                       :set-message 
                                       {:type :success
                                        :title "Betalat!"
                                        :message (str "Du betalade " (.toFixed (:amount response) 2) " ☂")})
-                   state))}
+                   (state/remove-all-chosen-products state)))}
 
    {:name "pay-not-enough-money"
     :query '[:find ?response
@@ -184,7 +184,8 @@
                                 {:amount amount}
                                 (events/make-event :add-money :set-message {:title "Laddad!"
                                                                             :message (str "Du har laddad " amount ".")
-                                                                            :type :success}))
+                                                                            :type :success})
+                                (events/make-event :add-money :change-page {:page :purchase}))
                 state))}
 
 {:name "set-message"