diff --git a/.gitignore b/.gitignore index 47fed6c..94d24c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ +/target +/lib +/classes +/checkouts pom.xml -pom.xml.asc -*jar -/lib/ -/classes/ -/target/ -/checkouts/ -.lein-deps-sum -.lein-repl-history -.lein-plugins/ -.lein-failures +*.jar +*.class +/.lein-* +profiles.clj +/.env .nrepl-port +/log diff --git a/Capstanfile b/Capstanfile new file mode 100644 index 0000000..e3b3c8e --- /dev/null +++ b/Capstanfile @@ -0,0 +1,28 @@ + +# +# Name of the base image. Capstan will download this automatically from +# Cloudius S3 repository. +# +#base: cloudius/osv +base: cloudius/osv-openjdk8 + +# +# The command line passed to OSv to start up the application. +# +cmdline: /java.so -jar /workshop-site/app.jar + +# +# The command to use to build the application. +# You can use any build tool/command (make/rake/lein/boot) - this runs locally on your machine +# +# For Leiningen, you can use: +#build: lein uberjar +# For Boot, you can use: +#build: boot build + +# +# List of files that are included in the generated image. +# +files: + /workshop-site/app.jar: ./target/uberjar/workshop-site.jar + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c097e1e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM java:8-alpine +MAINTAINER Your Name + +ADD target/uberjar/workshop-site.jar /workshop-site/app.jar + +EXPOSE 3000 + +CMD ["java", "-jar", "/workshop-site/app.jar"] diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..2110faf --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: java $JVM_OPTS -cp target/uberjar/workshop-site.jar clojure.main -m workshop-site.core diff --git a/README.md b/README.md index 599d2c4..e575976 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,21 @@ # workshop-site -If you have any suggestions, feel free to add them under "Issues". +generated using Luminus version "2.9.11.02" + +FIXME + +## Prerequisites + +You will need [Leiningen][1] 2.0 or above installed. + +[1]: https://github.com/technomancy/leiningen + +## Running + +To start a web server for the application, run: + + lein run + +## License + +Copyright © 2016 FIXME diff --git a/env/dev/clj/user.clj b/env/dev/clj/user.clj new file mode 100644 index 0000000..9795586 --- /dev/null +++ b/env/dev/clj/user.clj @@ -0,0 +1,16 @@ +(ns user + (:require [mount.core :as mount] + [workshop-site.figwheel :refer [start-fw stop-fw cljs]] + workshop-site.core)) + +(defn start [] + (mount/start-without #'workshop-site.core/repl-server)) + +(defn stop [] + (mount/stop-except #'workshop-site.core/repl-server)) + +(defn restart [] + (stop) + (start)) + + diff --git a/env/dev/clj/workshop_site/dev_middleware.clj b/env/dev/clj/workshop_site/dev_middleware.clj new file mode 100644 index 0000000..6df43ac --- /dev/null +++ b/env/dev/clj/workshop_site/dev_middleware.clj @@ -0,0 +1,10 @@ +(ns workshop-site.dev-middleware + (:require [ring.middleware.reload :refer [wrap-reload]] + [selmer.middleware :refer [wrap-error-page]] + [prone.middleware :refer [wrap-exceptions]])) + +(defn wrap-dev [handler] + (-> handler + wrap-reload + wrap-error-page + wrap-exceptions)) diff --git a/env/dev/clj/workshop_site/env.clj b/env/dev/clj/workshop_site/env.clj new file mode 100644 index 0000000..acea292 --- /dev/null +++ b/env/dev/clj/workshop_site/env.clj @@ -0,0 +1,14 @@ +(ns workshop-site.env + (:require [selmer.parser :as parser] + [clojure.tools.logging :as log] + [workshop-site.dev-middleware :refer [wrap-dev]])) + +(def defaults + {:init + (fn [] + (parser/cache-off!) + (log/info "\n-=[workshop-site started successfully using the development profile]=-")) + :stop + (fn [] + (log/info "\n-=[workshop-site has shut down successfully]=-")) + :middleware wrap-dev}) diff --git a/env/dev/clj/workshop_site/figwheel.clj b/env/dev/clj/workshop_site/figwheel.clj new file mode 100644 index 0000000..4f30896 --- /dev/null +++ b/env/dev/clj/workshop_site/figwheel.clj @@ -0,0 +1,12 @@ +(ns workshop-site.figwheel + (:require [figwheel-sidecar.repl-api :as ra])) + +(defn start-fw [] + (ra/start-figwheel!)) + +(defn stop-fw [] + (ra/stop-figwheel!)) + +(defn cljs [] + (ra/cljs-repl)) + diff --git a/env/dev/cljs/workshop_site/dev.cljs b/env/dev/cljs/workshop_site/dev.cljs new file mode 100644 index 0000000..b907ef9 --- /dev/null +++ b/env/dev/cljs/workshop_site/dev.cljs @@ -0,0 +1,14 @@ +(ns ^:figwheel-no-load workshop-site.app + (:require [workshop-site.core :as core] + [devtools.core :as devtools] + [figwheel.client :as figwheel :include-macros true])) + +(enable-console-print!) + +(figwheel/watch-and-reload + :websocket-url "ws://localhost:3449/figwheel-ws" + :on-jsload core/mount-components) + +(devtools/install!) + +(core/init!) diff --git a/env/dev/resources/config.edn b/env/dev/resources/config.edn new file mode 100644 index 0000000..6f14c22 --- /dev/null +++ b/env/dev/resources/config.edn @@ -0,0 +1,4 @@ +{:dev true + :port 3000 + ;; when :nrepl-port is set the application starts the nREPL server on load + :nrepl-port 7000} diff --git a/env/dev/resources/logback.xml b/env/dev/resources/logback.xml new file mode 100644 index 0000000..26b30b1 --- /dev/null +++ b/env/dev/resources/logback.xml @@ -0,0 +1,43 @@ + + + + + + + UTF-8 + %date{ISO8601} [%thread] %-5level %logger{36} - %msg %n + + + + log/workshop-site.log + + log/workshop-site.%d{yyyy-MM-dd}.%i.log + + 100MB + + + 30 + + + UTF-8 + %date{ISO8601} [%thread] %-5level %logger{36} - %msg %n + + + + + + + + + + + + + + + + + + + diff --git a/env/prod/clj/workshop_site/env.clj b/env/prod/clj/workshop_site/env.clj new file mode 100644 index 0000000..20b25c3 --- /dev/null +++ b/env/prod/clj/workshop_site/env.clj @@ -0,0 +1,11 @@ +(ns workshop-site.env + (:require [clojure.tools.logging :as log])) + +(def defaults + {:init + (fn [] + (log/info "\n-=[workshop-site started successfully]=-")) + :stop + (fn [] + (log/info "\n-=[workshop-site has shut down successfully]=-")) + :middleware identity}) diff --git a/env/prod/cljs/workshop_site/prod.cljs b/env/prod/cljs/workshop_site/prod.cljs new file mode 100644 index 0000000..6243555 --- /dev/null +++ b/env/prod/cljs/workshop_site/prod.cljs @@ -0,0 +1,7 @@ +(ns workshop-site.app + (:require [workshop-site.core :as core])) + +;;ignore println statements in prod +(set! *print-fn* (fn [& _])) + +(core/init!) diff --git a/env/prod/resources/config.edn b/env/prod/resources/config.edn new file mode 100644 index 0000000..b48cfbd --- /dev/null +++ b/env/prod/resources/config.edn @@ -0,0 +1,2 @@ +{:production true + :port 3000} diff --git a/env/prod/resources/logback.xml b/env/prod/resources/logback.xml new file mode 100644 index 0000000..41bb04a --- /dev/null +++ b/env/prod/resources/logback.xml @@ -0,0 +1,31 @@ + + + + + log/workshop-site.log + + log/workshop-site.%d{yyyy-MM-dd}.%i.log + + 100MB + + + 30 + + + UTF-8 + %date{ISO8601} [%thread] %-5level %logger{36} - %msg %n + + + + + + + + + + + + + + + diff --git a/env/test/resources/config.edn b/env/test/resources/config.edn new file mode 100644 index 0000000..9a4fb7e --- /dev/null +++ b/env/test/resources/config.edn @@ -0,0 +1,3 @@ +{:test true + :port 3001 + :nrepl-port 7001} ;; when :nrepl-port is set the application starts the nREPL server on load diff --git a/project.clj b/project.clj new file mode 100644 index 0000000..6b76c40 --- /dev/null +++ b/project.clj @@ -0,0 +1,142 @@ +(defproject workshop-site "0.1.0-SNAPSHOT" + + :description "FIXME: write description" + :url "http://example.com/FIXME" + + :dependencies [[re-frame "0.8.0"] + [cljs-ajax "0.5.8"] + [secretary "1.2.3"] + [reagent-utils "0.2.0"] + [reagent "0.6.0"] + [org.clojure/clojurescript "1.9.229" :scope "provided"] + [org.clojure/clojure "1.8.0"] + [selmer "1.0.9"] + [markdown-clj "0.9.89"] + [ring-middleware-format "0.7.0"] + [metosin/ring-http-response "0.8.0"] + [bouncer "1.0.0"] + [org.webjars/bootstrap "4.0.0-alpha.3"] + [org.webjars/font-awesome "4.6.3"] + [org.webjars.bower/tether "1.3.3"] + [org.clojure/tools.logging "0.3.1"] + [compojure "1.5.1"] + [ring-webjars "0.1.1"] + [ring/ring-defaults "0.2.1"] + [mount "0.1.10"] + [cprop "0.1.9"] + [org.clojure/tools.cli "0.3.5"] + [luminus-nrepl "0.1.4"] + [buddy "1.1.0"] + [cider/cider-nrepl "0.14.0-SNAPSHOT"] + [luminus-migrations "0.2.7"] + [conman "0.6.1"] + [org.postgresql/postgresql "9.4.1209"] + [org.webjars/webjars-locator-jboss-vfs "0.1.0"] + [luminus-immutant "0.2.2"]] + + :min-lein-version "2.0.0" + + :jvm-opts ["-server" "-Dconf=.lein-env"] + :source-paths ["src/clj" "src/cljc"] + :resource-paths ["resources" "target/cljsbuild"] + :target-path "target/%s/" + :main workshop-site.core + :migratus {:store :database :db ~(get (System/getenv) "DATABASE_URL")} + + :plugins [[lein-cprop "1.0.1"] + [migratus-lein "0.4.2"] + [lein-cljsbuild "1.1.4"] + [lein-immutant "2.1.0"] + [lein-sassc "0.10.4"] + [lein-auto "0.1.2"]] + :sassc + [{:src "resources/scss/screen.scss" + :output-to "resources/public/css/screen.css" + :style "nested" + :import-path "resources/scss"}] + + :auto + {"sassc" {:file-pattern #"\.(scss|sass)$" :paths ["resources/scss"]}} + + :hooks [leiningen.sassc] + :clean-targets ^{:protect false} + [:target-path [:cljsbuild :builds :app :compiler :output-dir] [:cljsbuild :builds :app :compiler :output-to]] + :figwheel + {:http-server-root "public" + :nrepl-port 7002 + :css-dirs ["resources/public/css"] + :nrepl-middleware + [cemerick.piggieback/wrap-cljs-repl cider.nrepl/cider-middleware]} + + + :profiles + {:uberjar {:omit-source true + :prep-tasks ["compile" ["cljsbuild" "once" "min"]] + :cljsbuild + {:builds + {:min + {:source-paths ["src/cljc" "src/cljs" "env/prod/cljs"] + :compiler + {:output-to "target/cljsbuild/public/js/app.js" + :externs ["react/externs/react.js"] + :optimizations :advanced + :pretty-print false + :closure-warnings + {:externs-validation :off :non-standard-jsdoc :off}}}}} + + + :aot :all + :uberjar-name "workshop-site.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 "1.1.2"] + [ring/ring-mock "0.3.0"] + [ring/ring-devel "1.5.0"] + [pjstadig/humane-test-output "0.8.1"] + [doo "0.1.7"] + [binaryage/devtools "0.8.2"] + [figwheel-sidecar "0.5.7"] + [com.cemerick/piggieback "0.2.2-SNAPSHOT"]] + :plugins [[com.jakemccrary/lein-test-refresh "0.14.0"] + [lein-doo "0.1.7"] + [lein-figwheel "0.5.7"] + [org.clojure/clojurescript "1.9.229"]] + :cljsbuild + {:builds + {:app + {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] + :compiler + {:main "workshop-site.app" + :asset-path "/js/out" + :output-to "target/cljsbuild/public/js/app.js" + :output-dir "target/cljsbuild/public/js/out" + :source-map true + :optimizations :none + :pretty-print true}}}} + + + + :doo {:build "test"} + :source-paths ["env/dev/clj" "test/clj"] + :resource-paths ["env/dev/resources"] + :repl-options {:init-ns user} + :injections [(require 'pjstadig.humane-test-output) + (pjstadig.humane-test-output/activate!)]} + :project/test {:resource-paths ["env/dev/resources" "env/test/resources"] + :cljsbuild + {:builds + {:test + {:source-paths ["src/cljc" "src/cljs" "test/cljs"] + :compiler + {:output-to "target/test.js" + :main "workshop-site.doo-runner" + :optimizations :whitespace + :pretty-print true}}}} + + } + :profiles/dev {} + :profiles/test {}}) diff --git a/resources/docs/docs.md b/resources/docs/docs.md new file mode 100644 index 0000000..6f9f421 --- /dev/null +++ b/resources/docs/docs.md @@ -0,0 +1,77 @@ +
+ +### Database Configuration is Required + +If you haven't already, then please follow the steps below to configure your database connection and run the necessary migrations. + +* Create the database for your application. +* Update the connection URL in the `profiles.clj` file with your database name and login. +* Run `lein run migrate` in the root of the project to create the tables. +* Let `mount` know to start the database connection by `require`-ing workshop-site.db.core in some other namespace. +* Restart the application. + +
+ +
+ +### SassC libsass command-line compiler is required + +You must have the SassC command-line compiler installed to use this feature. + +Please follow the instructions at: http://github.com/sass/sassc +to install the compiler for your platform. + +### Usage +Compile your files once: +``` +$ lein sassc once +``` + +To delete all the files generated by lein-sassc: +``` +$ lein sassc clean +``` + +To recompile when any changes are made: + +``` +$ lein auto sassc once +``` + +### Hooks +The following hooks are supported by lein-sassc: +``` +$ lein compile +$ lein clean +``` + +Because lein-sassc requires a binary to compile Sass, it often won't work on platforms like Heroku which compile the application on their servers. To get around this limitation, commit the generated CSS files and remove + +``` +:hooks [leiningen.sassc] +``` + +from project.clj. + +
+ +### Managing Your Middleware + +Request middleware functions are located under the `workshop-site.middleware` namespace. + +This namespace is reserved for any custom middleware for the application. Some default middleware is +already defined here. The middleware is assembled in the `wrap-base` function. + +Middleware used for development is placed in the `workshop-site.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. [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) diff --git a/resources/migrations/20160928194414-add-users-table.down.sql b/resources/migrations/20160928194414-add-users-table.down.sql new file mode 100644 index 0000000..cc1f647 --- /dev/null +++ b/resources/migrations/20160928194414-add-users-table.down.sql @@ -0,0 +1 @@ +DROP TABLE users; diff --git a/resources/migrations/20160928194414-add-users-table.up.sql b/resources/migrations/20160928194414-add-users-table.up.sql new file mode 100644 index 0000000..05ad4af --- /dev/null +++ b/resources/migrations/20160928194414-add-users-table.up.sql @@ -0,0 +1,9 @@ +CREATE TABLE users +(id VARCHAR(20) PRIMARY KEY, + first_name VARCHAR(30), + last_name VARCHAR(30), + email VARCHAR(30), + admin BOOLEAN, + last_login TIME, + is_active BOOLEAN, + pass VARCHAR(300)); diff --git a/resources/public/css/screen.css b/resources/public/css/screen.css new file mode 100644 index 0000000..534309c --- /dev/null +++ b/resources/public/css/screen.css @@ -0,0 +1,68 @@ +html, +body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + height: 100%; +} +.navbar { + margin-bottom: 10px; +} +.navbar-brand { + float: none; +} +.navbar-nav .nav-item { + float: none; +} +.navbar-divider, +.navbar-nav .nav-item+.nav-item, +.navbar-nav .nav-link + .nav-link { + margin-left: 0; +} +@media (min-width: 34em) { + .navbar-brand { + float: left; + } + .navbar-nav .nav-item { + float: left; + } + .navbar-divider, + .navbar-nav .nav-item+.nav-item, + .navbar-nav .nav-link + .nav-link { + margin-left: 1rem; + } +} + +@-moz-keyframes three-quarters-loader { + 0% { + -moz-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(360deg); + transform: rotate(360deg); + } +} +@-webkit-keyframes three-quarters-loader { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} +@keyframes three-quarters-loader { + 0% { + -moz-transform: rotate(0deg); + -ms-transform: rotate(0deg); + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(360deg); + -ms-transform: rotate(360deg); + -webkit-transform: rotate(360deg); + transform: rotate(360deg); + } +} + diff --git a/resources/public/favicon.ico b/resources/public/favicon.ico new file mode 100644 index 0000000..e69de29 diff --git a/resources/scss/screen.scss b/resources/scss/screen.scss new file mode 100644 index 0000000..7f38ace --- /dev/null +++ b/resources/scss/screen.scss @@ -0,0 +1,5 @@ +html, body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + height: 100%; + padding-top: 40px; +} diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql new file mode 100644 index 0000000..4191f67 --- /dev/null +++ b/resources/sql/queries.sql @@ -0,0 +1,21 @@ +-- :name create-user! :! :n +-- :doc creates a new user record +INSERT INTO users +(id, first_name, last_name, email, pass) +VALUES (:id, :first_name, :last_name, :email, :pass) + +-- :name update-user! :! :n +-- :doc update an existing user record +UPDATE users +SET first_name = :first_name, last_name = :last_name, email = :email +WHERE id = :id + +-- :name get-user :? :1 +-- :doc retrieve a user given the id. +SELECT * FROM users +WHERE id = :id + +-- :name delete-user! :! :n +-- :doc delete a user given the id +DELETE FROM users +WHERE id = :id diff --git a/resources/templates/error.html b/resources/templates/error.html new file mode 100644 index 0000000..6fcd237 --- /dev/null +++ b/resources/templates/error.html @@ -0,0 +1,56 @@ + + + + Something bad happened + + + {% style "/assets/bootstrap/css/bootstrap.min.css" %} + {% style "/assets/bootstrap/css/bootstrap-theme.min.css" %} + + + +
+
+
+
+
+

Error: {{status}}

+
+ {% if title %} +

{{title}}

+ {% endif %} + {% if message %} +

{{message}}

+ {% endif %} +
+
+
+
+
+ + diff --git a/resources/templates/home.html b/resources/templates/home.html new file mode 100644 index 0000000..c3a2aec --- /dev/null +++ b/resources/templates/home.html @@ -0,0 +1,46 @@ + + + + + + Welcome to workshop-site + + + +
+
+
+
+

Welcome to workshop-site

+

If you're seeing this message, that means you haven't yet compiled your ClojureScript!

+

Please run lein figwheel to start the ClojureScript compiler and reload the page.

+

For better ClojureScript development experience in Chrome follow these steps:

+
    +
  • Open DevTools +
  • Go to Settings ("three dots" icon in the upper right corner of DevTools > Menu > Settings F1 > General > Console) +
  • Check-in "Enable custom formatters" +
  • Close DevTools +
  • Open DevTools +
+

See ClojureScript documentation for further details.

+
+
+
+
+ + + {% style "/assets/bootstrap/css/bootstrap.min.css" %} + {% style "/assets/font-awesome/css/font-awesome.min.css" %} + {% style "/css/screen.css" %} + + + {% script "/js/app.js" %} + + + + + + diff --git a/src/clj/workshop_site/config.clj b/src/clj/workshop_site/config.clj new file mode 100644 index 0000000..745ae7f --- /dev/null +++ b/src/clj/workshop_site/config.clj @@ -0,0 +1,10 @@ +(ns workshop-site.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)])) diff --git a/src/clj/workshop_site/core.clj b/src/clj/workshop_site/core.clj new file mode 100644 index 0000000..04287e6 --- /dev/null +++ b/src/clj/workshop_site/core.clj @@ -0,0 +1,59 @@ +(ns workshop-site.core + (:require [workshop-site.handler :as handler] + [luminus.repl-server :as repl] + [luminus.http-server :as http] + [luminus-migrations.core :as migrations] + [workshop-site.config :refer [env]] + [cider.nrepl :refer [cider-nrepl-handler]] + [clojure.tools.cli :refer [parse-opts]] + [clojure.tools.logging :as log] + [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 :handler cider-nrepl-handler})) + :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")) + (.addShutdownHook (Runtime/getRuntime) (Thread. stop-app))) + +(defn -main [& args] + (cond + (some #{"migrate" "rollback"} args) + (do + (mount/start #'workshop-site.config/env) + (migrations/migrate args (select-keys env [:database-url])) + (System/exit 0)) + :else + (start-app args))) + diff --git a/src/clj/workshop_site/db/core.clj b/src/clj/workshop_site/db/core.clj new file mode 100644 index 0000000..625c3c4 --- /dev/null +++ b/src/clj/workshop_site/db/core.clj @@ -0,0 +1,71 @@ +(ns workshop-site.db.core + (:require + [cheshire.core :refer [generate-string parse-string]] + [clojure.java.jdbc :as jdbc] + [conman.core :as conman] + [workshop-site.config :refer [env]] + [mount.core :refer [defstate]]) + (:import org.postgresql.util.PGobject + java.sql.Array + clojure.lang.IPersistentMap + clojure.lang.IPersistentVector + [java.sql + BatchUpdateException + Date + Timestamp + PreparedStatement])) + +(defstate ^:dynamic *db* + :start (conman/connect! {:jdbc-url (env :database-url)}) + :stop (conman/disconnect! *db*)) + +(conman/bind-connection *db* "sql/queries.sql") + +(defn to-date [^java.sql.Date sql-date] + (-> sql-date (.getTime) (java.util.Date.))) + +(extend-protocol jdbc/IResultSetReadColumn + Date + (result-set-read-column [v _ _] (to-date v)) + + Timestamp + (result-set-read-column [v _ _] (to-date v)) + + Array + (result-set-read-column [v _ _] (vec (.getArray v))) + + PGobject + (result-set-read-column [pgobj _metadata _index] + (let [type (.getType pgobj) + value (.getValue pgobj)] + (case type + "json" (parse-string value true) + "jsonb" (parse-string value true) + "citext" (str value) + value)))) + +(extend-type java.util.Date + jdbc/ISQLParameter + (set-parameter [v ^PreparedStatement stmt ^long idx] + (.setTimestamp stmt idx (Timestamp. (.getTime v))))) + +(defn to-pg-json [value] + (doto (PGobject.) + (.setType "jsonb") + (.setValue (generate-string value)))) + +(extend-type clojure.lang.IPersistentVector + jdbc/ISQLParameter + (set-parameter [v ^java.sql.PreparedStatement stmt ^long idx] + (let [conn (.getConnection stmt) + meta (.getParameterMetaData stmt) + type-name (.getParameterTypeName meta idx)] + (if-let [elem-type (when (= (first type-name) \_) (apply str (rest type-name)))] + (.setObject stmt idx (.createArrayOf conn elem-type (to-array v))) + (.setObject stmt idx (to-pg-json v)))))) + +(extend-protocol jdbc/ISQLValue + IPersistentMap + (sql-value [value] (to-pg-json value)) + IPersistentVector + (sql-value [value] (to-pg-json value))) diff --git a/src/clj/workshop_site/handler.clj b/src/clj/workshop_site/handler.clj new file mode 100644 index 0000000..e401e7d --- /dev/null +++ b/src/clj/workshop_site/handler.clj @@ -0,0 +1,25 @@ +(ns workshop-site.handler + (:require [compojure.core :refer [routes wrap-routes]] + [workshop-site.layout :refer [error-page]] + [workshop-site.routes.home :refer [home-routes]] + [compojure.route :as route] + [workshop-site.env :refer [defaults]] + [mount.core :as mount] + [workshop-site.middleware :as middleware])) + +(mount/defstate init-app + :start ((or (:init defaults) identity)) + :stop ((or (:stop defaults) identity))) + +(def app-routes + (routes + (-> #'home-routes + (wrap-routes middleware/wrap-csrf) + (wrap-routes middleware/wrap-formats)) + (route/not-found + (:body + (error-page {:status 404 + :title "page not found"}))))) + + +(defn app [] (middleware/wrap-base #'app-routes)) diff --git a/src/clj/workshop_site/layout.clj b/src/clj/workshop_site/layout.clj new file mode 100644 index 0000000..516e321 --- /dev/null +++ b/src/clj/workshop_site/layout.clj @@ -0,0 +1,39 @@ +(ns workshop-site.layout + (:require [selmer.parser :as parser] + [selmer.filters :as filters] + [markdown.core :refer [md-to-html-string]] + [ring.util.http-response :refer [content-type ok]] + [ring.util.anti-forgery :refer [anti-forgery-field]] + [ring.middleware.anti-forgery :refer [*anti-forgery-token*]])) + +(declare ^:dynamic *identity*) +(declare ^:dynamic *app-context*) +(parser/set-resource-path! (clojure.java.io/resource "templates")) +(parser/add-tag! :csrf-field (fn [_ _] (anti-forgery-field))) +(filters/add-filter! :markdown (fn [content] [:safe (md-to-html-string content)])) + +(defn render + "renders the HTML template located relative to resources/templates" + [template & [params]] + (content-type + (ok + (parser/render-file + template + (assoc params + :page template + :csrf-token *anti-forgery-token* + :servlet-context *app-context*))) + "text/html; charset=utf-8")) + +(defn error-page + "error-details should be a map containing the following keys: + :status - error status + :title - error title (optional) + :message - detailed error message (optional) + + returns a response map with the error page as the body + and the status specified by the status key" + [error-details] + {:status (:status error-details) + :headers {"Content-Type" "text/html; charset=utf-8"} + :body (parser/render-file "error.html" error-details)}) diff --git a/src/clj/workshop_site/middleware.clj b/src/clj/workshop_site/middleware.clj new file mode 100644 index 0000000..8e0a50c --- /dev/null +++ b/src/clj/workshop_site/middleware.clj @@ -0,0 +1,93 @@ +(ns workshop-site.middleware + (:require [workshop-site.env :refer [defaults]] + [clojure.tools.logging :as log] + [workshop-site.layout :refer [*app-context* error-page]] + [ring.middleware.anti-forgery :refer [wrap-anti-forgery]] + [ring.middleware.webjars :refer [wrap-webjars]] + [ring.middleware.format :refer [wrap-restful-format]] + [workshop-site.config :refer [env]] + [ring.middleware.flash :refer [wrap-flash]] + [immutant.web.middleware :refer [wrap-session]] + [ring.middleware.defaults :refer [site-defaults wrap-defaults]] + [buddy.auth.middleware :refer [wrap-authentication wrap-authorization]] + [buddy.auth.accessrules :refer [restrict]] + [buddy.auth :refer [authenticated?]] + [buddy.auth.backends.session :refer [session-backend]] + [workshop-site.layout :refer [*identity*]]) + (:import [javax.servlet ServletContext])) + +(defn wrap-context [handler] + (fn [request] + (binding [*app-context* + (if-let [context (:servlet-context request)] + ;; If we're not inside a servlet environment + ;; (for example when using mock requests), then + ;; .getContextPath might not exist + (try (.getContextPath ^ServletContext context) + (catch IllegalArgumentException _ context)) + ;; if the context is not specified in the request + ;; we check if one has been specified in the environment + ;; instead + (:app-context env))] + (handler request)))) + +(defn wrap-internal-error [handler] + (fn [req] + (try + (handler req) + (catch Throwable t + (log/error t) + (error-page {:status 500 + :title "Something very bad has happened!" + :message "We've dispatched a team of highly trained gnomes to take care of the problem."}))))) + +(defn wrap-csrf [handler] + (wrap-anti-forgery + handler + {:error-response + (error-page + {:status 403 + :title "Invalid anti-forgery token"})})) + +(defn wrap-formats [handler] + (let [wrapped (wrap-restful-format + handler + {:formats [:json-kw :transit-json :transit-msgpack]})] + (fn [request] + ;; disable wrap-formats for websockets + ;; since they're not compatible with this middleware + ((if (:websocket? request) handler wrapped) request)))) + +(defn on-error [request response] + (error-page + {:status 403 + :title (str "Access to " (:uri request) " is not authorized")})) + +(defn wrap-restricted [handler] + (restrict handler {:handler authenticated? + :on-error on-error})) + +(defn wrap-identity [handler] + (fn [request] + (binding [*identity* (get-in request [:session :identity])] + (handler request)))) + +(defn wrap-auth [handler] + (let [backend (session-backend)] + (-> handler + wrap-identity + (wrap-authentication backend) + (wrap-authorization backend)))) + +(defn wrap-base [handler] + (-> ((:middleware defaults) handler) + wrap-auth + wrap-webjars + wrap-flash + (wrap-session {:cookie-attrs {:http-only true}}) + (wrap-defaults + (-> site-defaults + (assoc-in [:security :anti-forgery] false) + (dissoc :session))) + wrap-context + wrap-internal-error)) diff --git a/src/clj/workshop_site/routes/home.clj b/src/clj/workshop_site/routes/home.clj new file mode 100644 index 0000000..eb90ca5 --- /dev/null +++ b/src/clj/workshop_site/routes/home.clj @@ -0,0 +1,14 @@ +(ns workshop-site.routes.home + (:require [workshop-site.layout :as layout] + [compojure.core :refer [defroutes GET]] + [ring.util.http-response :as response] + [clojure.java.io :as io])) + +(defn home-page [] + (layout/render "home.html")) + +(defroutes home-routes + (GET "/" [] (home-page)) + (GET "/docs" [] (-> (response/ok (-> "docs/docs.md" io/resource slurp)) + (response/header "Content-Type" "text/plain; charset=utf-8")))) + diff --git a/src/cljc/workshop_site/validation.cljc b/src/cljc/workshop_site/validation.cljc new file mode 100644 index 0000000..49e3715 --- /dev/null +++ b/src/cljc/workshop_site/validation.cljc @@ -0,0 +1,3 @@ +(ns workshop-site.validation + (:require [bouncer.core :as b] + [bouncer.validators :as v])) diff --git a/src/cljs/workshop_site/ajax.cljs b/src/cljs/workshop_site/ajax.cljs new file mode 100644 index 0000000..e264095 --- /dev/null +++ b/src/cljs/workshop_site/ajax.cljs @@ -0,0 +1,22 @@ +(ns workshop-site.ajax + (:require [ajax.core :as ajax])) + +(defn local-uri? [{:keys [uri]}] + (not (re-find #"^\w+?://" uri))) + +(defn default-headers [request] + (if (local-uri? request) + (-> request + (update :uri #(str js/context %)) + (update + :headers + #(merge {"x-csrf-token" js/csrfToken} %))) + request)) + +(defn load-interceptors! [] + (swap! ajax/default-interceptors + conj + (ajax/to-interceptor {:name "default headers" + :request default-headers}))) + + diff --git a/src/cljs/workshop_site/core.cljs b/src/cljs/workshop_site/core.cljs new file mode 100644 index 0000000..f596ae9 --- /dev/null +++ b/src/cljs/workshop_site/core.cljs @@ -0,0 +1,97 @@ +(ns workshop-site.core + (:require [reagent.core :as r] + [re-frame.core :as rf] + [secretary.core :as secretary] + [goog.events :as events] + [goog.history.EventType :as HistoryEventType] + [markdown.core :refer [md->html]] + [ajax.core :refer [GET POST]] + [workshop-site.ajax :refer [load-interceptors!]] + [workshop-site.handlers] + [workshop-site.subscriptions]) + (:import goog.History)) + +(defn nav-link [uri title page collapsed?] + (let [selected-page (rf/subscribe [:page])] [:li.nav-item + {:class (when (= page @selected-page) "active")} + [:a.nav-link + {:href uri + :on-click #(reset! collapsed? true)} title]])) + +(defn navbar [] + (r/with-let [collapsed? (r/atom true)] + [:nav.navbar.navbar-light.bg-faded + [:button.navbar-toggler.hidden-sm-up + {:on-click #(swap! collapsed? not)} "☰"] + [:div.collapse.navbar-toggleable-xs + (when-not @collapsed? {:class "in"}) + [:a.navbar-brand {:href "#/"} "workshop-site"] + [:ul.nav.navbar-nav + [nav-link "#/" "Home" :home collapsed?] + [nav-link "#/about" "About" :about collapsed?]]]])) + +(defn about-page [] + [:div.container + [:div.row + [:div.col-md-12 + "this is the story of workshop-site... work in progress"]]]) + +(defn home-page [] + [:div.container + [:div.jumbotron + [:h1 "Welcome to workshop-site"] + [:p "Time to start building your site!"] + [:p [:a.btn.btn-primary.btn-lg {:href "http://luminusweb.net"} "Learn more »"]]] + [:div.row + [:div.col-md-12 + [:h2 "Welcome to ClojureScript"]]] + (when-let [docs @(rf/subscribe [:docs])] + [:div.row + [:div.col-md-12 + [:div {:dangerouslySetInnerHTML + {:__html (md->html docs)}}]]])]) + +(def pages + {:home #'home-page + :about #'about-page}) + +(defn page [] + [:div + [navbar] + [(pages @(rf/subscribe [:page]))]]) + +;; ------------------------- +;; Routes +(secretary/set-config! :prefix "#") + +(secretary/defroute "/" [] + (rf/dispatch [:set-active-page :home])) + +(secretary/defroute "/about" [] + (rf/dispatch [:set-active-page :about])) + +;; ------------------------- +;; History +;; must be called after routes have been defined +(defn hook-browser-navigation! [] + (doto (History.) + (events/listen + HistoryEventType/NAVIGATE + (fn [event] + (secretary/dispatch! (.-token event)))) + (.setEnabled true))) + +;; ------------------------- +;; Initialize app +(defn fetch-docs! [] + (GET (str js/context "/docs") {:handler #(rf/dispatch [:set-docs %])})) + +(defn mount-components [] + (r/render [#'page] (.getElementById js/document "app"))) + +(defn init! [] + (rf/dispatch-sync [:initialize-db]) + (load-interceptors!) + (fetch-docs!) + (hook-browser-navigation!) + (mount-components)) diff --git a/src/cljs/workshop_site/db.cljs b/src/cljs/workshop_site/db.cljs new file mode 100644 index 0000000..a1361d0 --- /dev/null +++ b/src/cljs/workshop_site/db.cljs @@ -0,0 +1,4 @@ +(ns workshop-site.db) + +(def default-db + {:page :home}) diff --git a/src/cljs/workshop_site/handlers.cljs b/src/cljs/workshop_site/handlers.cljs new file mode 100644 index 0000000..cce21de --- /dev/null +++ b/src/cljs/workshop_site/handlers.cljs @@ -0,0 +1,18 @@ +(ns workshop-site.handlers + (:require [workshop-site.db :as db] + [re-frame.core :refer [dispatch reg-event-db]])) + +(reg-event-db + :initialize-db + (fn [_ _] + db/default-db)) + +(reg-event-db + :set-active-page + (fn [db [_ page]] + (assoc db :page page))) + +(reg-event-db + :set-docs + (fn [db [_ docs]] + (assoc db :docs docs))) diff --git a/src/cljs/workshop_site/subscriptions.cljs b/src/cljs/workshop_site/subscriptions.cljs new file mode 100644 index 0000000..bede01b --- /dev/null +++ b/src/cljs/workshop_site/subscriptions.cljs @@ -0,0 +1,12 @@ +(ns workshop-site.subscriptions + (:require [re-frame.core :refer [reg-sub]])) + +(reg-sub + :page + (fn [db _] + (:page db))) + +(reg-sub + :docs + (fn [db _] + (:docs db))) diff --git a/test/clj/workshop_site/test/db/core.clj b/test/clj/workshop_site/test/db/core.clj new file mode 100644 index 0000000..91b1901 --- /dev/null +++ b/test/clj/workshop_site/test/db/core.clj @@ -0,0 +1,36 @@ +(ns workshop-site.test.db.core + (:require [workshop-site.db.core :refer [*db*] :as db] + [luminus-migrations.core :as migrations] + [clojure.test :refer :all] + [clojure.java.jdbc :as jdbc] + [workshop-site.config :refer [env]] + [mount.core :as mount])) + +(use-fixtures + :once + (fn [f] + (mount/start + #'workshop-site.config/env + #'workshop-site.db.core/*db*) + (migrations/migrate ["migrate"] (select-keys env [:database-url])) + (f))) + +(deftest test-users + (jdbc/with-db-transaction [t-conn *db*] + (jdbc/db-set-rollback-only! t-conn) + (is (= 1 (db/create-user! + t-conn + {:id "1" + :first_name "Sam" + :last_name "Smith" + :email "sam.smith@example.com" + :pass "pass"}))) + (is (= {:id "1" + :first_name "Sam" + :last_name "Smith" + :email "sam.smith@example.com" + :pass "pass" + :admin nil + :last_login nil + :is_active nil} + (db/get-user t-conn {:id "1"}))))) diff --git a/test/clj/workshop_site/test/handler.clj b/test/clj/workshop_site/test/handler.clj new file mode 100644 index 0000000..b51f44e --- /dev/null +++ b/test/clj/workshop_site/test/handler.clj @@ -0,0 +1,13 @@ +(ns workshop-site.test.handler + (:require [clojure.test :refer :all] + [ring.mock.request :refer :all] + [workshop-site.handler :refer :all])) + +(deftest test-app + (testing "main route" + (let [response ((app) (request :get "/"))] + (is (= 200 (:status response))))) + + (testing "not-found route" + (let [response ((app) (request :get "/invalid"))] + (is (= 404 (:status response)))))) diff --git a/test/cljs/workshop_site/core_test.cljs b/test/cljs/workshop_site/core_test.cljs new file mode 100644 index 0000000..fa1f668 --- /dev/null +++ b/test/cljs/workshop_site/core_test.cljs @@ -0,0 +1,8 @@ +(ns workshop-site.core-test + (:require [cljs.test :refer-macros [is are deftest testing use-fixtures]] + [reagent.core :as reagent :refer [atom]] + [workshop-site.core :as rc])) + +(deftest test-home + (is (= true true))) + diff --git a/test/cljs/workshop_site/doo_runner.cljs b/test/cljs/workshop_site/doo_runner.cljs new file mode 100644 index 0000000..5b8e0f9 --- /dev/null +++ b/test/cljs/workshop_site/doo_runner.cljs @@ -0,0 +1,6 @@ +(ns workshop-site.doo-runner + (:require [doo.runner :refer-macros [doo-tests]] + [workshop-site.core-test])) + +(doo-tests 'workshop-site.core-test) +