refactor to move to darksky.net weather data; requiring a full-stack setup including a proxy

.gitignore

@@ -1,8 +1,11 @@
 .nrepl-port
+.lein*
+.rebel_readline_history
 /*.log
 /target
 /*-init.clj
 /resources/public/js/compiled
 /resources/public/css
 out
 environ.cljs
+profiles.clj

README.md

@@ -4,23 +4,27 @@ ccclock — cord cutters clock — is a clock for "cord cutters" who miss the al
 
 ccclock is built with [re-frame](https://github.com/Day8/re-frame) and intended to run locally on a raspberry pi with attached lcd; but can run in any browser anywhere.
 
+This current iteration as powered by darksky.net and requires a free account and api key.
+
 ![ccclock demo](ccclock-demo.png)
 
 ## Development Mode
 
+**Note:** When doing full stack development, start the ring server first and start figwheel last (via emacs or terminal).
+
 ### Set Environment Variables & Secrets
 
-Copy the example file, and update the values; this file is ignored by git for safety.
+Copy the example file, and update the values.  A darksky.net free account and api key is required for the `weather-apikey` value.  This file is ignored by git for safety.
 
-```
-cp src/cljs/ccclock/environ.cljs.example src/cljs/ccclock/environ.cljs
+```sh
+cp profiles-example.clj profiles.clj
 ```
 
-### Start Cider from Emacs:
+### Start Cider + Figwheel from Emacs
 
 Put this in your Emacs config file:
 
-```
+```emacs-lisp
 (setq cider-cljs-lein-repl
 	"(do (require 'figwheel-sidecar.repl-api)
          (figwheel-sidecar.repl-api/start-figwheel!)
@@ -29,36 +33,49 @@ Put this in your Emacs config file:
 
 Navigate to a clojurescript file and start a figwheel REPL with `cider-jack-in-clojurescript` or (`C-c M-J`)
 
-### Compile css:
-
-Compile css file once.
+### Start Fighweel from Terminal:
 
-```
-lein garden once
+```sh
+lein do clean, garden once, figwheel dev
 ```
 
-Automatically recompile css file on change.
+### Start Ring Backend from Terminal
 
-```
-lein garden auto
+```sh
+lein ring server
 ```
 
-### Run application:
+### Automatically Recompile CSS File on Changes
 
+```sh
+lein garden auto
 ```
-lein clean
-lein figwheel dev
-```
+
+### See Changes Live in Your Browser
 
 Figwheel will automatically push cljs changes to the browser.
 
 Wait a bit, then browse to [http://localhost:3449](http://localhost:3449).
 
 ## Production Build
 
+To compile clojurescript to javascript, compile css, and build jar file which serves the api-proxy and index.html:
 
-To compile clojurescript to javascript:
-
+```sh
+lein with-profile prod uberjar
 ```
-lein do clean, cljsbuild once, garden once
+
+To run in production set the `WEATHER_APIKEY` environment variable and then run
+
+```sh
+java -jar target/ccclock.jar
 ```
+
+## Notes
+
+To deploy to a raspberry pi, I recommend the following:
+
+- have rc.local launch your production jar
+- set to boot to desktop and launch chromium in kiosk mode launching http://localhost:8000/index.html
+
+Your browser may sit with a "cannot load page" or other such error for a couple minutes if it opens before the jvm launches your jar.

profiles-example.clj

@@ -0,0 +1,10 @@
+{:profiles/dev
+ {:env
+  {:weather-apikey "00000000000000000000000000000000"
+   :lat-lon        "43.038902,-87.906471"
+   :proxy-port     "8000"}}
+ :profiles/test
+ {:env
+  {:weather-apikey "00000000000000000000000000000000"
+   :lat-lon        "43.038902,-87.906471"
+   :proxy-port     "8000"}}}

project.clj

@@ -1,41 +1,59 @@
-(defproject ccclock "0.5.1-SNAPSHOT"
-  :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/clojurescript "1.9.908"]
+(defproject ccclock "0.6.1-SNAPSHOT"
+  :dependencies [[org.clojure/clojure "1.9.0"]
+                 [org.clojure/clojurescript "1.10.312"]
                  [reagent "0.7.0"]
                  [re-frame "0.10.5"]
-                 [garden "1.3.2"]
-                 [ns-tracker "0.3.0"]
-                 [cljs-ajax "0.7.3"]]
+                 [garden "1.3.5"]
+                 [ns-tracker "0.3.1"]
+                 [cljs-ajax "0.7.3"]
+                 ;; server side libraries
+                 [ring "1.6.3"]
+                 [compojure "1.6.1"]
+                 [environ "1.1.0"]
+                 [ring/ring-defaults "0.3.2"]
+                 [clj-http "3.9.0"]
+                 [cheshire "5.8.0"]]
 
-  :plugins [[lein-cljsbuild "1.1.5"]
-            [lein-garden "0.2.8"]]
+  :plugins [[lein-cljsbuild "1.1.7"]
+            [lein-garden "0.3.0"]
+            ;; server side plugins
+            [lein-ring "0.12.4"]
+            [lein-environ "1.1.0"]]
 
   :min-lein-version "2.5.3"
 
-  :source-paths ["src/clj"]
+  :source-paths ["src/clj" "src/cljs"]
 
-  :clean-targets ^{:protect false} ["resources/public/js/compiled" "target"
+  :clean-targets ^{:protect false} ["resources/public/js/compiled"
                                     "resources/public/css"]
 
-  :figwheel {:css-dirs ["resources/public/css"]}
+  :ring {:handler ccclock.core/app
+         :port 8000}
 
   :garden {:builds [{:id           "screen"
                      :source-paths ["src/clj"]
                      :stylesheet   ccclock.css/screen
                      :compiler     {:output-to     "resources/public/css/screen.css"
                                     :pretty-print? true}}]}
 
-  :repl-options {:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
+  :repl-options  {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]}
 
   :profiles
-  {:dev
-   {:dependencies [[binaryage/devtools "0.9.4"]
-                   [figwheel-sidecar "0.5.13"]
-                   [com.cemerick/piggieback "0.2.2"]
-                   [day8.re-frame/re-frame-10x "0.3.3"]]
-
-    :plugins      [[lein-figwheel "0.5.13"]]}
-   :prod { }}
+  ;; composite profiles are being used
+  ;; all lein configuration should be in :project/<profile> sections below
+  ;; DO NOT edit :profiles/<profile> below, to add profile config edit profiles.clj
+  {:dev           [:project/dev :profiles/dev]
+   :test          [:project/test :profiles/test]
+   :profiles/dev  {}
+   :profiles/test {}
+   :project/dev   {:dependencies [[binaryage/devtools "0.9.10"]
+                                  [day8.re-frame/re-frame-10x "0.3.3"]
+                                  [figwheel-sidecar "0.5.16"]
+                                  [cider/piggieback "0.3.6"]]
+                   :plugins       [[lein-figwheel "0.5.16"]]
+                   :figwheel      {:css-dirs ["resources/public/css"]}}
+   :project/test {}
+   :prod         {}}
 
   :cljsbuild
   {:builds
@@ -47,20 +65,24 @@
                     :output-dir           "resources/public/js/compiled/out"
                     :asset-path           "js/compiled/out"
                     :source-map-timestamp true
+                    :preloads             [devtools.preload
+                                           day8.re-frame-10x.preload]
                     :closure-defines      {"re_frame.trace.trace_enabled_QMARK_" true}
-                    :preloads             [devtools.preload day8.re-frame-10x.preload]
-                    :external-config      {:devtools/config {:features-to-install :all}}
-                    }}
+                    :external-config      {:devtools/config {:features-to-install :all}}}}
 
     {:id           "min"
      :source-paths ["src/cljs"]
      :compiler     {:main            ccclock.core
                     :output-to       "resources/public/js/compiled/app.js"
                     :optimizations   :advanced
                     :closure-defines {goog.DEBUG false}
-                    :pretty-print    false}}
+                    :pretty-print    false}}]}
+
+  ;; server side settings
+  :main ccclock.core
 
+  :aot [ccclock.core]
 
-    ]}
+  :uberjar-name "ccclock.jar"
 
-  )
+  :prep-tasks ["clean" ["cljsbuild" "once" "min"]["garden" "once"] "compile"])

src/clj/ccclock/core.clj

@@ -1 +1,23 @@
-(ns ccclock.core)
+(ns ccclock.core
+  (:require [ccclock.route            :as    route])
+  (:require [ring.middleware.defaults :refer [wrap-defaults site-defaults]]
+            [ring.middleware.reload   :refer [wrap-reload]]
+            [environ.core             :as    environ]
+            [ring.adapter.jetty       :refer [run-jetty]])
+  (:gen-class))
+
+
+(def dev-app
+  (-> #'route/app-routes
+      (wrap-defaults site-defaults)
+      wrap-reload))
+
+
+(def app
+  (-> route/app-routes
+      (wrap-defaults site-defaults)))
+
+
+(defn -main [& args]
+  (let [port (Integer/parseInt (or (environ/env :proxy-port) "8000"))]
+    (run-jetty app {:port port :join? false})))

src/clj/ccclock/css.clj

@@ -1,10 +1,12 @@
 (ns ccclock.css
   (:require [garden.def :refer [defstyles]]))
 
+
 (def colors
   {:default-text       "#6A5ACD"
    :default-background "#000"})
 
+
 (defstyles screen
   [:*
    {:margin "0"
@@ -44,7 +46,7 @@
    {:font-size "7vw"}]
 
   [:.cond-display
-   {:font-size "19vw"
+   {:font-size "17vw"
     :text-align "center"
     :letter-spacing "1vw"
     :padding-top "6vw"

src/clj/ccclock/handler.clj

@@ -0,0 +1,25 @@
+(ns ccclock.handler
+  (:require [ring.util.response :as response]
+            [environ.core       :as environ]
+            [clj-http.client    :as client]))
+
+
+(defn handle-index [req]
+  ;; NOTE: this will deliver your index.html
+  (-> (response/resource-response "index.html" {:root "public"})
+      (response/content-type "text/html")))
+
+
+(defn handle-proxy [req]
+  (let [weather-url    "https://api.darksky.net/forecast"
+        weather-apikey (environ/env :weather-apikey)
+        lat-lon        (environ/env :lat-lon)
+        result         (client/get
+                        (str weather-url "/"
+                             weather-apikey "/"
+                             lat-lon))]
+    {:status  200
+     :headers {"Access-Control-Allow-Origin" "*"
+               "Access-Control-Allow-Headers" "Content-Type"
+               "Content-Type" "application/json"}
+     :body    (get result :body)}))

src/clj/ccclock/route.clj

@@ -0,0 +1,13 @@
+(ns ccclock.route
+  (:require [ccclock.handler :as    handler])
+  (:require [compojure.core  :refer [defroutes GET]]
+            [compojure.route :as    route]))
+
+
+(defroutes app-routes
+  ;; NOTE: this will deliver all of your assets from the public directory
+  ;; of resources i.e. resources/public
+  (route/resources "/" {:root "public"})
+  (GET "/"         [] handler/handle-index)
+  (GET "/weather"  [] handler/handle-proxy)
+  (route/not-found    "Page not found"))

src/cljs/ccclock/config.cljs

@@ -1,10 +1,5 @@
-(ns ccclock.config
-  (:require [ccclock.environ :as environ]))
+(ns ccclock.config)
 
 
 (def debug?
   ^boolean goog.DEBUG)
-
-
-(def secrets
-  environ/secrets)

src/cljs/ccclock/db.cljs

@@ -2,6 +2,5 @@
 
 
 (def default-db
-  {:time     (js/Date.)
-   :weather  {}
-   :forecast {}})
+  {:time    (js/Date.)
+   :weather {}})