updated to latest Luminus template

Author: yogthos

Procfile

@@ -1 +1 @@
-web: java $JVM_OPTS -cp target/kata.jar clojure.main -m kata.core
+web: java $JVM_OPTS -cp target/uberjar/kata.jar clojure.main -m kata.core

env/dev/clj/kata/config.clj

@@ -3,116 +3,128 @@
   :description "FIXME: write description"
   :url "http://example.com/FIXME"
 
-  :dependencies [[org.clojure/clojure "1.7.0"]
-                 [selmer "0.9.5"]
-                 [markdown-clj "0.9.82"]
-                 [environ "1.0.1"]
-                 [metosin/ring-middleware-format "0.6.0"]
+  :dependencies [[org.clojure/clojure "1.8.0"]
+                 [selmer "1.0.4"]
+                 [markdown-clj "0.9.87"]
+                 [ring-middleware-format "0.7.0"]
                  [metosin/ring-http-response "0.6.5"]
-                 [bouncer "0.3.3"]
-                 [org.clojure/tools.nrepl "0.2.12"]
-                 [org.webjars/bootstrap "3.3.5"]
-                 [org.webjars/jquery "2.1.4"]
-                 [com.taoensso/tower "3.0.2"]
-                 [com.taoensso/timbre "4.1.4"]
-                 [com.fzakaria/slf4j-timbre "0.2.1"]
-                 [compojure "1.4.0"]
+                 [bouncer "1.0.0"]
+                 [org.webjars/bootstrap "4.0.0-alpha.2"]
+                 [org.webjars/font-awesome "4.5.0"]
+                 [org.webjars.bower/tether "1.1.1"]
+                 [org.clojure/tools.logging "0.3.1"]
+                 [compojure "1.5.0"]
                  [ring-webjars "0.1.1"]
-                 [ring/ring-defaults "0.1.5"]
-                 [ring "1.4.0" :exclusions [ring/ring-jetty-adapter]]
+                 [ring/ring-defaults "0.2.0"]
                  [mount "0.1.10"]
-                 [migratus "0.8.7"]
-                 [org.postgresql/postgresql "9.3-1102-jdbc41"]
-                 [conman "0.4.5"]
-                 [com.h2database/h2 "1.4.188"]
-                 [org.clojure/clojurescript "1.7.170" :scope "provided"]
+                 [cprop "0.1.7"]
+                 [org.clojure/tools.cli "0.3.3"]
+                 [luminus-nrepl "0.1.4"]
+                 [org.webjars/webjars-locator-jboss-vfs "0.1.0"]
+                 [luminus-immutant "0.1.9"]
+                 [luminus-migrations "0.1.0"]
+                 [conman "0.4.9"]
+                 [com.h2database/h2 "1.4.191"]
+                 [org.clojure/clojurescript "1.8.40" :scope "provided"]
                  [reagent "0.5.1"]
-                 [reagent-forms "0.5.13"]
-                 [reagent-utils "0.1.5"]
+                 [reagent-forms "0.5.22"]
+                 [reagent-utils "0.1.7"]
                  [secretary "1.2.3"]
-                 [org.clojure/core.async "0.2.374"]
-                 [cljs-ajax "0.5.1"]
+                 [cljs-ajax "0.5.4"]
+                 [metosin/compojure-api "1.0.2"]
+                 [luminus-log4j "0.1.3"]
                  [clojail "1.0.6"]
-                 [re-com "0.8.0"]
-                 [metosin/compojure-api "0.24.0"]
-                 [metosin/ring-swagger-ui "2.1.3-2"]
-                 [org.immutant/web "2.1.1" :exclusions [ch.qos.logback/logback-classic]]]
+                 [re-com "0.8.0"]]
 
   :min-lein-version "2.0.0"
-  :uberjar-name "kata.jar"
-  ;; needed for evaluating code
-  :jvm-opts ["-server" "-Djava.security.policy=sandbox.policy"]
+
+  :jvm-opts ["-server" "-Dconf=.lein-env" "-Djava.security.policy=sandbox.policy"]
+  :source-paths ["src/clj" "src/cljc"]
   :resource-paths ["resources" "target/cljsbuild"]
 
   :main kata.core
-  :migratus {:store :database}
+  :migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")}
 
-  :plugins [[lein-environ "1.0.1"]
-            [migratus-lein "0.2.0"]
+  :plugins [[lein-cprop "1.0.1"]
+            [migratus-lein "0.2.6"]
             [lein-cljsbuild "1.1.1"]]
-  :clean-targets ^{:protect false} [:target-path [:cljsbuild :builds :app :compiler :output-dir] [:cljsbuild :builds :app :compiler :output-to]]
+  :clean-targets ^{:protect false}
+  [:target-path
+   [:cljsbuild :builds :app :compiler :output-dir]
+   [:cljsbuild :builds :app :compiler :output-to]]
   :cljsbuild
   {:builds
    {:app
-    {:source-paths ["src-cljs"]
+    {:source-paths ["src/cljc" "src/cljs"]
      :compiler
-                   {:output-to "target/cljsbuild/public/js/app.js"
-                    :output-dir "target/cljsbuild/public/js/out"
-                    :externs ["resources/externs.js"
-                              "react/externs/react.js"]
-                    :pretty-print true}}}}
+     {:output-to "target/cljsbuild/public/js/app.js"
+      :output-dir "target/cljsbuild/public/js/out"
+      :externs ["resources/externs.js"
+                "react/externs/react.js"]
+      :pretty-print true}}}}
 
+  :target-path "target/%s/"
   :profiles
   {:uberjar {:omit-source true
-             :env {:production true}
-             :prep-tasks ["compile" ["cljsbuild" "once"]]
-             :cljsbuild
-                          {:builds
-                           {:app
-                            {:source-paths ["env/prod/cljs"]
-                             :compiler
-                                           {:optimizations :simple
-                                            :pretty-print false
-                                            :closure-warnings
-                                                           {:externs-validation :off :non-standard-jsdoc :off}}}}}
+
+              :prep-tasks ["compile" ["cljsbuild" "once"]]
+              :cljsbuild
+              {:builds
+               {:app
+                {:source-paths ["env/prod/cljs"]
+                 :compiler
+                 {:optimizations :advanced
+                  :pretty-print false
+                  :closure-warnings
+                  {:externs-validation :off :non-standard-jsdoc :off}}}}}
 
              :aot :all
-             :source-paths ["env/prod/clj"]}
+             :uberjar-name "kata.jar"
+             :source-paths ["env/prod/clj"]
+             :resource-paths ["env/prod/resources"]}
    :dev           [:project/dev :profiles/dev]
    :test          [:project/test :profiles/test]
-   :project/dev  {:dependencies [[prone "0.8.2"]
+   :project/dev  {:dependencies [[prone "1.1.1"]
                                  [ring/ring-mock "0.3.0"]
                                  [ring/ring-devel "1.4.0"]
-                                 [pjstadig/humane-test-output "0.7.0"]
-                                 [com.cemerick/piggieback "0.2.2-SNAPSHOT"]
-                                 [lein-figwheel "0.5.0-2"]
-                                 [mvxcvi/puget "1.0.0"]]
-                  :plugins [[lein-figwheel "0.5.0-2"]]
-                  :cljsbuild
-                                {:builds
-                                 {:app
-                                  {:source-paths ["env/dev/cljs"]
-                                   :compiler
-                                                 {:main "kata.app" :asset-path "/js/out" :source-map true}}}}
+                                 [pjstadig/humane-test-output "0.8.0"]
+                                 [lein-figwheel "0.5.2"]
+                                 [lein-doo "0.1.6"]
+                                 [com.cemerick/piggieback "0.2.2-SNAPSHOT"]]
+                  :plugins      [[com.jakemccrary/lein-test-refresh "0.14.0"]
+                                 [lein-figwheel "0.5.2"]
+                                 [lein-doo "0.1.6"]
+                                 [org.clojure/clojurescript "1.8.40"]]
 
-                  :figwheel
-                                {:http-server-root "public"
-                                 :nrepl-port 7002
-                                 :nrepl-middleware ["cemerick.piggieback/wrap-cljs-repl"]
-                                 :css-dirs ["resources/public/css"]}
+                   :cljsbuild
+                   {:builds
+                    {:app
+                     {:source-paths ["env/dev/cljs"]
+                      :compiler
+                      {:main "kata.app"
+                       :asset-path "/js/out"
+                       :optimizations :none
+                       :source-map true}}
+                     :test
+                     {:source-paths ["src/cljc" "src/cljs" "test/cljs"]
+                      :compiler
+                      {:output-to "target/test.js"
+                       :main "kata.doo-runner"
+                       :optimizations :whitespace
+                       :pretty-print true}}}}
 
-                  :source-paths ["env/dev/clj"]
-                  :repl-options {:init-ns kata.core}
+                  :figwheel
+                  {:http-server-root "public"
+                   :nrepl-port 7002
+                   :css-dirs ["resources/public/css"]}
+                  :doo {:build "test"}
+                  :source-paths ["env/dev/clj" "test/clj"]
+                  :resource-paths ["env/dev/resources"]
+                  :repl-options {:init-ns user
+                                 :nrepl-middleware
+                                 [cemerick.piggieback/wrap-cljs-repl]}
                   :injections [(require 'pjstadig.humane-test-output)
-                               (pjstadig.humane-test-output/activate!)]
-                  ;;when :nrepl-port is set the application starts the nREPL server on load
-                  :env {:dev        true
-                        :port       3000
-                        :nrepl-port 7000
-                        :log-level  :trace}}
-   :project/test {:env {:test       true
-                        :port       3001
-                        :nrepl-port 7001
-                        :log-level  :trace}}
+                               (pjstadig.humane-test-output/activate!)]}
+   :project/test {:resource-paths ["env/dev/resources" "env/test/resources"]}
    :profiles/dev {}
    :profiles/test {}})

env/prod/clj/kata/.DS_Store

@@ -15,21 +15,18 @@ If you haven't already, then please follow the steps below to configure your dat
 Request middleware functions are located under the `kata.middleware` namespace.
 
 This namespace is reserved for any custom middleware for the application. Some default middleware is
-already defined here.
+already defined here. The middleware is assembled in the `wrap-base` function.
 
-The two function for organizing the middleware are called `wrap-dev` and `wrap-base`.
-
-Any middleware that you only wish to run in development mode should be added inside the `wrap-dev` function.
-This middleware will only be invoked when the environment contains the `:dev` key with a truthy value.
+Middleware used for development is placed in the `kata.dev-middleware` namespace found in
+the `env/dev/clj/` source path.
 
 ### Here are some links to get started
 
 1. [HTML templating](http://www.luminusweb.net/docs/html_templating.md)
 2. [Accessing the database](http://www.luminusweb.net/docs/database.md)
-3. [Serving static resources](http://www.luminusweb.net/docs/static_resources.md)
-4. [Setting response types](http://www.luminusweb.net/docs/responses.md)
-5. [Defining routes](http://www.luminusweb.net/docs/routes.md)
-6. [Adding middleware](http://www.luminusweb.net/docs/middleware.md)
-7. [Sessions and cookies](http://www.luminusweb.net/docs/sessions_cookies.md)
-8. [Security](http://www.luminusweb.net/docs/security.md)
-9. [Deploying the application](http://www.luminusweb.net/docs/deployment.md)
+3. [Setting response types](http://www.luminusweb.net/docs/responses.md)
+4. [Defining routes](http://www.luminusweb.net/docs/routes.md)
+5. [Adding middleware](http://www.luminusweb.net/docs/middleware.md)
+6. [Sessions and cookies](http://www.luminusweb.net/docs/sessions_cookies.md)
+7. [Security](http://www.luminusweb.net/docs/security.md)
+8. [Deploying the application](http://www.luminusweb.net/docs/deployment.md)

env/prod/clj/kata/config.clj

@@ -3,8 +3,8 @@ body {
 	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
     height: 100%;
     padding-top: 40px;
-    background-color: #f9f8ee;
 }
+{% if cljs %}
 @-moz-keyframes three-quarters-loader {
     0% {
         -moz-transform: rotate(0deg);

project.clj

@@ -6,4 +6,4 @@ VALUES (:title, :submitter, :description, :code)
 
 -- :name get-examples :? :*
 -- :doc get examples
-SELECT * FROM problems
+SELECT * FROM problems

resources/docs/docs.md

@@ -0,0 +1,10 @@
+(ns kata.config
+  (:require [cprop.core :refer [load-config]]
+            [cprop.source :as source]
+            [mount.core :refer [args defstate]]))
+
+(defstate env :start (load-config
+                       :merge
+                       [(args)
+                        (source/from-system-props)
+                        (source/from-env)]))

resources/public/css/screen.css

@@ -0,0 +1,61 @@
+(ns kata.core
+  (:require [kata.handler :as handler]
+            [luminus.repl-server :as repl]
+            [luminus.http-server :as http]
+            [luminus-migrations.core :as migrations]
+            [kata.config :refer [env]]
+            [clojure.tools.cli :refer [parse-opts]]
+            [clojure.tools.logging :as log]
+            [kata.env :refer [defaults]]
+            [luminus.logger :as logger]
+            [mount.core :as mount])
+  (:gen-class))
+
+(def cli-options
+  [["-p" "--port PORT" "Port number"
+    :parse-fn #(Integer/parseInt %)]])
+
+(mount/defstate ^{:on-reload :noop}
+                http-server
+                :start
+                (http/start
+                  (-> env
+                      (assoc :handler handler/app)
+                      (update :port #(or (-> env :options :port) %))))
+                :stop
+                (http/stop http-server))
+
+(mount/defstate ^{:on-reload :noop}
+                repl-server
+                :start
+                (when-let [nrepl-port (env :nrepl-port)]
+                  (repl/start {:port nrepl-port}))
+                :stop
+                (when repl-server
+                  (repl/stop repl-server)))
+
+(defn stop-app []
+  (doseq [component (:stopped (mount/stop))]
+    (log/info component "stopped"))
+  (shutdown-agents))
+
+(defn start-app [args]
+  (doseq [component (-> args
+                        (parse-opts cli-options)
+                        mount/start-with-args
+                        :started)]
+    (log/info component "started"))
+  (logger/init (:log-config env))
+  ((:init defaults))
+  (.addShutdownHook (Runtime/getRuntime) (Thread. stop-app)))
+
+(defn -main [& args]
+  (cond
+    (some #{"migrate" "rollback"} args)
+    (do
+      (mount/start #'kata.config/env)
+      (migrations/migrate args (env :database-url))
+      (System/exit 0))
+    :else
+    (start-app args)))
+  

resources/sql/queries.sql

@@ -0,0 +1,18 @@
+(ns kata.db.core
+  (:require
+    [conman.core :as conman]
+    [mount.core :refer [defstate]]
+    [kata.config :refer [env]]))
+
+; Example of profile :database-url jdbc:postgresql://localhost/kata_dev?user=username&password=securepassword
+(defstate ^:dynamic *db*
+          :start (conman/connect!
+                   {:datasource
+                    (doto (org.h2.jdbcx.JdbcDataSource.)
+                          (.setURL (env :database-url))
+                          (.setUser "")
+                          (.setPassword ""))})
+          :stop (conman/disconnect! *db*))
+
+(conman/bind-connection *db* "sql/queries.sql")
+

src/clj/kata/config.clj

@@ -0,0 +1,18 @@
+(ns kata.handler
+  (:require [compojure.core :refer [routes wrap-routes]]
+            [kata.layout :refer [error-page]]
+            [kata.routes.home :refer [home-routes]]
+            [kata.routes.services :refer [service-routes]]
+            [compojure.route :as route]
+            [kata.middleware :as middleware]))
+
+(def app-routes
+  (routes
+    #'service-routes
+    (wrap-routes #'home-routes middleware/wrap-csrf)
+    (route/not-found
+      (:body
+        (error-page {:status 404
+                     :title "page not found"})))))
+
+(def app (middleware/wrap-base #'app-routes))