From 17fe28a1ac9c16fe05140cf3d6b012c770372fa4 Mon Sep 17 00:00:00 2001 From: flynn Date: Fri, 11 Jan 2019 23:10:58 +0100 Subject: [PATCH] Initial commit --- .gitignore | 15 + .rebel_readline_history | 8 + Capstanfile | 28 + Dockerfile | 7 + Procfile | 1 + README.md | 29 + cat.iml | 220 +++ dev-config.edn_example | 15 + env/dev/clj/cat/dev_middleware.clj | 10 + env/dev/clj/cat/env.clj | 14 + env/dev/clj/cat/figwheel.clj | 12 + env/dev/clj/user.clj | 42 + env/dev/cljs/cat/app.cljs | 13 + env/dev/resources/config.edn | 1 + env/dev/resources/logback.xml | 36 + env/prod/clj/cat/env.clj | 11 + env/prod/cljs/cat/app.cljs | 7 + env/prod/resources/config.edn | 2 + env/prod/resources/logback.xml | 25 + env/test/resources/config.edn | 1 + env/test/resources/logback.xml | 36 + project.clj | 142 ++ resources/docs/docs.md | 97 + resources/html/error.html | 55 + resources/html/home.html | 123 ++ ...109002211-add-users-table.down.sql_example | 1 + ...90109002211-add-users-table.up.sql_example | 9 + .../20190109004458-add-users-table.down.sql | 1 + .../20190109004458-add-users-table.up.sql | 4 + ...20190109005337-add-relation-table.down.sql | 1 + .../20190109005337-add-relation-table.up.sql | 6 + resources/public/css/screen.css | 46 + resources/public/favicon.ico | Bin 0 -> 1150 bytes resources/public/img/warning_clojure.png | Bin 0 -> 21846 bytes resources/public/js/graphing.js | 13 + resources/public/js/spec.json | 325 ++++ resources/public/js/vega_tuto_data.json | 1661 +++++++++++++++++ resources/sql/queries.sql | 34 + src/clj/cat/config.clj | 12 + src/clj/cat/core.clj | 66 + src/clj/cat/db/core.clj | 85 + src/clj/cat/handler.clj | 28 + src/clj/cat/layout.clj | 37 + src/clj/cat/middleware.clj | 73 + src/clj/cat/middleware/formats.clj | 14 + src/clj/cat/nrepl.clj | 26 + src/clj/cat/oauth.clj | 35 + src/clj/cat/routes/home.clj | 88 + src/clj/cat/routes/oauth.clj | 34 + src/cljc/cat/validation.cljc | 2 + src/cljs/cat/core.cljs | 159 ++ test/clj/cat/test/db/core.clj | 36 + test/clj/cat/test/handler.clj | 26 + test/cljs/cat/core_test.cljs | 8 + test/cljs/cat/doo_runner.cljs | 6 + 55 files changed, 3786 insertions(+) create mode 100644 .gitignore create mode 100644 .rebel_readline_history create mode 100644 Capstanfile create mode 100644 Dockerfile create mode 100644 Procfile create mode 100644 README.md create mode 100644 cat.iml create mode 100644 dev-config.edn_example create mode 100644 env/dev/clj/cat/dev_middleware.clj create mode 100644 env/dev/clj/cat/env.clj create mode 100644 env/dev/clj/cat/figwheel.clj create mode 100644 env/dev/clj/user.clj create mode 100644 env/dev/cljs/cat/app.cljs create mode 100644 env/dev/resources/config.edn create mode 100644 env/dev/resources/logback.xml create mode 100644 env/prod/clj/cat/env.clj create mode 100644 env/prod/cljs/cat/app.cljs create mode 100644 env/prod/resources/config.edn create mode 100644 env/prod/resources/logback.xml create mode 100644 env/test/resources/config.edn create mode 100644 env/test/resources/logback.xml create mode 100644 project.clj create mode 100644 resources/docs/docs.md create mode 100644 resources/html/error.html create mode 100644 resources/html/home.html create mode 100644 resources/migrations/20190109002211-add-users-table.down.sql_example create mode 100644 resources/migrations/20190109002211-add-users-table.up.sql_example create mode 100644 resources/migrations/20190109004458-add-users-table.down.sql create mode 100644 resources/migrations/20190109004458-add-users-table.up.sql create mode 100644 resources/migrations/20190109005337-add-relation-table.down.sql create mode 100644 resources/migrations/20190109005337-add-relation-table.up.sql create mode 100644 resources/public/css/screen.css create mode 100644 resources/public/favicon.ico create mode 100644 resources/public/img/warning_clojure.png create mode 100644 resources/public/js/graphing.js create mode 100644 resources/public/js/spec.json create mode 100644 resources/public/js/vega_tuto_data.json create mode 100644 resources/sql/queries.sql create mode 100644 src/clj/cat/config.clj create mode 100644 src/clj/cat/core.clj create mode 100644 src/clj/cat/db/core.clj create mode 100644 src/clj/cat/handler.clj create mode 100644 src/clj/cat/layout.clj create mode 100644 src/clj/cat/middleware.clj create mode 100644 src/clj/cat/middleware/formats.clj create mode 100644 src/clj/cat/nrepl.clj create mode 100644 src/clj/cat/oauth.clj create mode 100644 src/clj/cat/routes/home.clj create mode 100644 src/clj/cat/routes/oauth.clj create mode 100644 src/cljc/cat/validation.cljc create mode 100644 src/cljs/cat/core.cljs create mode 100644 test/clj/cat/test/db/core.clj create mode 100644 test/clj/cat/test/handler.clj create mode 100644 test/cljs/cat/core_test.cljs create mode 100644 test/cljs/cat/doo_runner.cljs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6f7d39d --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +/target +/lib +/classes +/checkouts +pom.xml +dev-config.edn +test-config.edn +*.jar +*.class +/.lein-* +profiles.clj +/.env +.nrepl-port +/log +.idea \ No newline at end of file diff --git a/.rebel_readline_history b/.rebel_readline_history new file mode 100644 index 0000000..74c15a0 --- /dev/null +++ b/.rebel_readline_history @@ -0,0 +1,8 @@ +1547000855890:(append-svg) +1547001941101:(clean-builds) +1547001987967:(reset-autobuild) +1547002493261:cljs:quit +1547049842827:(reset-autobuild) +1547053573677:(reload-config) +1547053584758:(fig-status) +1547053746469:(reload-config) diff --git a/Capstanfile b/Capstanfile new file mode 100644 index 0000000..12e9159 --- /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 /cat/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: + /cat/app.jar: ./target/uberjar/cat.jar + diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..63e88f7 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM openjdk:8-alpine + +COPY target/uberjar/cat.jar /cat/app.jar + +EXPOSE 3000 + +CMD ["java", "-jar", "/cat/app.jar"] diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..3da82eb --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: java -cp target/uberjar/cat.jar clojure.main -m cat.core diff --git a/README.md b/README.md new file mode 100644 index 0000000..d8d85c2 --- /dev/null +++ b/README.md @@ -0,0 +1,29 @@ +# cat + +generated using Luminus version "3.10.29" +init with options: postgres, cljs, auth, oauth, site, kibit + + +## Prerequisites + +You will need [Leiningen][1] 2.0 or above installed. + +[1]: https://github.com/technomancy/leiningen + +## Running + +Copy `dev-config.edn_example` to `dev-config.edn` and fill in the needed fields + +`test-config.edn` is used for test execution. + +To start a web server for the application, run: + + lein run + +To start the ui live rendering, run: + + lein figwheel + +## License + +Copyright © 2019 FIXME \ No newline at end of file diff --git a/cat.iml b/cat.iml new file mode 100644 index 0000000..c1a11cd --- /dev/null +++ b/cat.iml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev-config.edn_example b/dev-config.edn_example new file mode 100644 index 0000000..0cd4687 --- /dev/null +++ b/dev-config.edn_example @@ -0,0 +1,15 @@ +;; WARNING +;; The dev-config.edn file is used for local environment variables, such as database credentials. +;; This file is listed in .gitignore and will be excluded from version control by Git. + +{:dev true + :port 3000 + ;; when :nrepl-port is set the application starts the nREPL server on load + :nrepl-port 7000 + + ;;Twitter used as an example, replace these URIs with the OAuth provider of your choice + :request-token-uri "https://api.twitter.com/oauth/request_token" + :access-token-uri "https://api.twitter.com/oauth/access_token" + :authorize-uri "https://api.twitter.com/oauth/authenticate" + ; set your dev database connection URL here + :database-url "postgresql://localhost:5432/a_db_name?user=a_username&password=a_password"} \ No newline at end of file diff --git a/env/dev/clj/cat/dev_middleware.clj b/env/dev/clj/cat/dev_middleware.clj new file mode 100644 index 0000000..8fc938a --- /dev/null +++ b/env/dev/clj/cat/dev_middleware.clj @@ -0,0 +1,10 @@ +(ns cat.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 {:app-namespaces ['cat]}))) diff --git a/env/dev/clj/cat/env.clj b/env/dev/clj/cat/env.clj new file mode 100644 index 0000000..e690897 --- /dev/null +++ b/env/dev/clj/cat/env.clj @@ -0,0 +1,14 @@ +(ns cat.env + (:require [selmer.parser :as parser] + [clojure.tools.logging :as log] + [cat.dev-middleware :refer [wrap-dev]])) + +(def defaults + {:init + (fn [] + (parser/cache-off!) + (log/info "\n-=[cat started successfully using the development profile]=-")) + :stop + (fn [] + (log/info "\n-=[cat has shut down successfully]=-")) + :middleware wrap-dev}) diff --git a/env/dev/clj/cat/figwheel.clj b/env/dev/clj/cat/figwheel.clj new file mode 100644 index 0000000..e23b001 --- /dev/null +++ b/env/dev/clj/cat/figwheel.clj @@ -0,0 +1,12 @@ +(ns cat.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/clj/user.clj b/env/dev/clj/user.clj new file mode 100644 index 0000000..713596a --- /dev/null +++ b/env/dev/clj/user.clj @@ -0,0 +1,42 @@ +(ns user + (:require [cat.config :refer [env]] + [clojure.spec.alpha :as s] + [expound.alpha :as expound] + [mount.core :as mount] + [cat.figwheel :refer [start-fw stop-fw cljs]] + [cat.core :refer [start-app]] + [cat.db.core] + [conman.core :as conman] + [luminus-migrations.core :as migrations])) + +(alter-var-root #'s/*explain-out* (constantly expound/printer)) + +(defn start [] + (mount/start-without #'cat.core/repl-server)) + +(defn stop [] + (mount/stop-except #'cat.core/repl-server)) + +(defn restart [] + (stop) + (start)) + +(defn restart-db [] + (mount/stop #'cat.db.core/*db*) + (mount/start #'cat.db.core/*db*) + (binding [*ns* 'cat.db.core] + (conman/bind-connection cat.db.core/*db* "sql/queries.sql"))) + +(defn reset-db [] + (migrations/migrate ["reset"] (select-keys env [:database-url]))) + +(defn migrate [] + (migrations/migrate ["migrate"] (select-keys env [:database-url]))) + +(defn rollback [] + (migrations/migrate ["rollback"] (select-keys env [:database-url]))) + +(defn create-migration [name] + (migrations/create name (select-keys env [:database-url]))) + + diff --git a/env/dev/cljs/cat/app.cljs b/env/dev/cljs/cat/app.cljs new file mode 100644 index 0000000..20ad623 --- /dev/null +++ b/env/dev/cljs/cat/app.cljs @@ -0,0 +1,13 @@ +(ns ^:figwheel-no-load cat.app + (:require [cat.core :as core] + [cljs.spec.alpha :as s] + [expound.alpha :as expound] + [devtools.core :as devtools])) + +(set! s/*explain-out* expound/printer) + +(enable-console-print!) + +(devtools/install!) + +(core/init!) diff --git a/env/dev/resources/config.edn b/env/dev/resources/config.edn new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/env/dev/resources/config.edn @@ -0,0 +1 @@ +{} diff --git a/env/dev/resources/logback.xml b/env/dev/resources/logback.xml new file mode 100644 index 0000000..7544e8f --- /dev/null +++ b/env/dev/resources/logback.xml @@ -0,0 +1,36 @@ + + + + + + + UTF-8 + %date{ISO8601} [%thread] %-5level %logger{36} - %msg %n + + + + log/cat.log + + log/cat.%d{yyyy-MM-dd}.%i.log + + 100MB + + + 30 + + + UTF-8 + %date{ISO8601} [%thread] %-5level %logger{36} - %msg %n + + + + + + + + + + + + diff --git a/env/prod/clj/cat/env.clj b/env/prod/clj/cat/env.clj new file mode 100644 index 0000000..7a910cf --- /dev/null +++ b/env/prod/clj/cat/env.clj @@ -0,0 +1,11 @@ +(ns cat.env + (:require [clojure.tools.logging :as log])) + +(def defaults + {:init + (fn [] + (log/info "\n-=[cat started successfully]=-")) + :stop + (fn [] + (log/info "\n-=[cat has shut down successfully]=-")) + :middleware identity}) diff --git a/env/prod/cljs/cat/app.cljs b/env/prod/cljs/cat/app.cljs new file mode 100644 index 0000000..2cb7468 --- /dev/null +++ b/env/prod/cljs/cat/app.cljs @@ -0,0 +1,7 @@ +(ns cat.app + (:require [cat.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..e24ec21 --- /dev/null +++ b/env/prod/resources/config.edn @@ -0,0 +1,2 @@ +{:prod true + :port 3000} diff --git a/env/prod/resources/logback.xml b/env/prod/resources/logback.xml new file mode 100644 index 0000000..e080645 --- /dev/null +++ b/env/prod/resources/logback.xml @@ -0,0 +1,25 @@ + + + + + log/cat.log + + log/cat.%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..0967ef4 --- /dev/null +++ b/env/test/resources/config.edn @@ -0,0 +1 @@ +{} diff --git a/env/test/resources/logback.xml b/env/test/resources/logback.xml new file mode 100644 index 0000000..7544e8f --- /dev/null +++ b/env/test/resources/logback.xml @@ -0,0 +1,36 @@ + + + + + + + UTF-8 + %date{ISO8601} [%thread] %-5level %logger{36} - %msg %n + + + + log/cat.log + + log/cat.%d{yyyy-MM-dd}.%i.log + + 100MB + + + 30 + + + UTF-8 + %date{ISO8601} [%thread] %-5level %logger{36} - %msg %n + + + + + + + + + + + + diff --git a/project.clj b/project.clj new file mode 100644 index 0000000..c96be70 --- /dev/null +++ b/project.clj @@ -0,0 +1,142 @@ +(defproject cat "0.1.0-SNAPSHOT" + + :description "A cuddle graph for zeus people" + ;:url "http://example.com/FIXME" + + :dependencies [[buddy "2.0.0"] + [cheshire "5.8.1"] + [clj-oauth "1.5.5"] + [clojure.java-time "0.3.2"] + [com.cognitect/transit-clj "0.8.313"] + [compojure "1.6.1"] + [conman "0.8.3"] + [cprop "0.1.13"] + [funcool/struct "1.3.0"] + [luminus-immutant "0.2.4"] + [luminus-migrations "0.6.3"] + [luminus-transit "0.1.1"] + [luminus/ring-ttl-session "0.3.2"] + [markdown-clj "1.0.5"] + [metosin/muuntaja "0.6.3"] + [metosin/ring-http-response "0.9.1"] + [mount "0.1.15"] + [nrepl "0.5.3"] + [org.clojure/clojure "1.10.0"] + [org.clojure/clojurescript "1.10.439" :scope "provided"] + [org.clojure/tools.cli "0.4.1"] + [org.clojure/tools.logging "0.4.1"] + [org.postgresql/postgresql "42.2.5"] + [org.webjars.bower/tether "1.4.4"] + [org.webjars/bootstrap "4.2.1"] + [org.webjars/font-awesome "5.6.1"] + [org.webjars/webjars-locator "0.34"] + [ring-webjars "0.2.0"] + [ring/ring-core "1.7.1"] + [ring/ring-defaults "0.3.2"] + [selmer "1.12.5"] + [metosin/vega-tools "0.2.0"] + [funcool/promesa "1.9.0"]] + + + + :min-lein-version "2.0.0" + + :source-paths ["src/clj" "src/cljs" "src/cljc"] + :test-paths ["test/clj"] + :resource-paths ["resources" "target/cljsbuild"] + :target-path "target/%s/" + :main ^:skip-aot cat.core + + :plugins [[lein-cljsbuild "1.1.7"] + [lein-immutant "2.1.0"] + [lein-kibit "0.1.2"]] + :clean-targets ^{:protect false} + [:target-path [:cljsbuild :builds :app :compiler :output-dir] [:cljsbuild :builds :app :compiler :output-to]] + :figwheel + {:http-server-root "public" + :server-logfile "log/figwheel-logfile.log" + :nrepl-port 7002 + :css-dirs ["resources/public/css"] + :nrepl-middleware + [cider/wrap-cljs-repl cider.piggieback/wrap-cljs-repl]} + + + :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-dir "target/cljsbuild/public/js" + :output-to "target/cljsbuild/public/js/app.js" + :source-map "target/cljsbuild/public/js/app.js.map" + :optimizations :advanced + :pretty-print false + :infer-externs true + :closure-warnings + {:externs-validation :off :non-standard-jsdoc :off}}}}} + + + :aot :all + :uberjar-name "cat.jar" + :source-paths ["env/prod/clj"] + :resource-paths ["env/prod/resources"]} + + :dev [:project/dev :profiles/dev] + :test [:project/dev :project/test :profiles/test] + + :project/dev {:jvm-opts ["-Dconf=dev-config.edn"] + :dependencies [[binaryage/devtools "0.9.10"] + [cider/piggieback "0.3.10"] + [doo "0.1.11"] + [expound "0.7.2"] + [figwheel-sidecar "0.5.18"] + [pjstadig/humane-test-output "0.9.0"] + [prone "1.6.1"] + [ring/ring-devel "1.7.1"] + [ring/ring-mock "0.3.2"]] + :plugins [[com.jakemccrary/lein-test-refresh "0.23.0"] + [lein-doo "0.1.11"] + [lein-figwheel "0.5.18"]] + :cljsbuild + {:builds + {:app + {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] + :figwheel {:on-jsload "cat.core/mount-components"} + :compiler + {:main "cat.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"] + :resource-paths ["env/dev/resources"] + :repl-options {:init-ns user} + :injections [(require 'pjstadig.humane-test-output) + (pjstadig.humane-test-output/activate!)]} + :project/test {:jvm-opts ["-Dconf=test-config.edn"] + :resource-paths ["env/test/resources"] + :cljsbuild + {:builds + {:test + {:source-paths ["src/cljc" "src/cljs" "test/cljs"] + :compiler + {:output-to "target/test.js" + :main "cat.doo-runner" + :optimizations :whitespace + :pretty-print true}}}}} + + + :profiles/dev {} + :profiles/test {}} + :repl-options { + ;; If nREPL takes too long to load it may timeout, + ;; increase this to wait longer before timing out. + ;; Defaults to 30000 (30 seconds) + :timeout 120000}) + diff --git a/resources/docs/docs.md b/resources/docs/docs.md new file mode 100644 index 0000000..cef016f --- /dev/null +++ b/resources/docs/docs.md @@ -0,0 +1,97 @@ +

Congratulations, your Luminus site is ready!

+ +This page will help guide you through the first steps of building your site. + +#### Why are you seeing this page? + +The `home-routes` handler in the `cat.routes.home` namespace +defines the route that invokes the `home-page` function whenever an HTTP +request is made to the `/` URI using the `GET` method. + +``` +(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")))) +``` + +The `home-page` function will in turn call the `cat.layout/render` function +to render the HTML content: + +``` +(defn home-page [] + (layout/render "home.html")) +``` + +The page contains a link to the compiled ClojureScript found in the `target/cljsbuild/public` folder: + +``` +{% script "/js/app.js" %} +``` + +The rest of this page is rendered by ClojureScript found in the `src/cljs/cat/core.cljs` file. + + + +#### Organizing the routes + +The routes are aggregated and wrapped with middleware in the `cat.handler` namespace: + +``` +(defstate app + :start + (middleware/wrap-base + (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"})))))) +``` + +The `app` definition groups all the routes in the application into a single handler. +A default route group is added to handle the `404` case. + +learn more about routing » + +The `home-routes` are wrapped with two middleware functions. The first enables CSRF protection. +The second takes care of serializing and deserializing various encoding formats, such as JSON. + +#### Managing your middleware + +Request middleware functions are located under the `cat.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 `cat.dev-middleware` namespace found in +the `env/dev/clj/` source path. + +learn more about middleware » + +
+ +#### 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 `dev-config.edn` and `test-config.edn` files with your database name and login credentials. +* 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 `cat.db.core` in some other namespace. +* Restart the application. + +learn more about database access » + +
+ + + +#### Need some help? + +Visit the [official documentation](http://www.luminusweb.net/docs) for examples +on how to accomplish common tasks with Luminus. The `#luminus` channel on the [Clojurians Slack](http://clojurians.net/) and [Google Group](https://groups.google.com/forum/#!forum/luminusweb) are both great places to seek help and discuss projects with other users. diff --git a/resources/html/error.html b/resources/html/error.html new file mode 100644 index 0000000..31dd41d --- /dev/null +++ b/resources/html/error.html @@ -0,0 +1,55 @@ + + + + Something bad happened + + + {% style "/assets/bootstrap/css/bootstrap.min.css" %} + + + +
+
+
+
+
+

Error: {{status}}

+
+ {% if title %} +

{{title}}

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

{{message}}

+ {% endif %} +
+
+
+
+
+ + diff --git a/resources/html/home.html b/resources/html/home.html new file mode 100644 index 0000000..393c5d3 --- /dev/null +++ b/resources/html/home.html @@ -0,0 +1,123 @@ + + + + + + Welcome to cat + + + + +
+
+
+
+
+

Add person

+
+ {% csrf-field %} +
+
+
+ + +
+
+
+

Add relation (please enter correct id's of the person)

+
+ {% csrf-field %} +
+
+
+ +
+
+
+ +
+
+ +
+
+
+

Users

+
+
Name
+
Gender
+ {% for user in users %} +
+ {{user.name}} +
+
+ {{user.gender}} +
+ {% endfor %} +
+
+
+

Relations

+
+
Person 1
+
Person 2
+ {% for relation in relations %} +
+ {{relation.name}} +
+
+ {{relation.name_2}} +
+ {% endfor %} +
+
+
+
+
+
+
+
+

Welcome to cat

+

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/all.css" %} +{% style "/css/screen.css" %} + +{% script "/assets/jquery/jquery.min.js" %} +{% script "/assets/font-awesome/js/all.js" %} +{% script "/assets/tether/dist/js/tether.min.js" %} +{% script "/assets/bootstrap/js/bootstrap.min.js" %} + + +{% script "/js/app.js" %} + +{% script "/js/graphing.js" %} + + diff --git a/resources/migrations/20190109002211-add-users-table.down.sql_example b/resources/migrations/20190109002211-add-users-table.down.sql_example new file mode 100644 index 0000000..cc1f647 --- /dev/null +++ b/resources/migrations/20190109002211-add-users-table.down.sql_example @@ -0,0 +1 @@ +DROP TABLE users; diff --git a/resources/migrations/20190109002211-add-users-table.up.sql_example b/resources/migrations/20190109002211-add-users-table.up.sql_example new file mode 100644 index 0000000..b9c31f1 --- /dev/null +++ b/resources/migrations/20190109002211-add-users-table.up.sql_example @@ -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 TIMESTAMP, + is_active BOOLEAN, + pass VARCHAR(300)); diff --git a/resources/migrations/20190109004458-add-users-table.down.sql b/resources/migrations/20190109004458-add-users-table.down.sql new file mode 100644 index 0000000..441087a --- /dev/null +++ b/resources/migrations/20190109004458-add-users-table.down.sql @@ -0,0 +1 @@ +DROP TABLE users; \ No newline at end of file diff --git a/resources/migrations/20190109004458-add-users-table.up.sql b/resources/migrations/20190109004458-add-users-table.up.sql new file mode 100644 index 0000000..787b4ee --- /dev/null +++ b/resources/migrations/20190109004458-add-users-table.up.sql @@ -0,0 +1,4 @@ +CREATE TABLE users +(id SERIAL PRIMARY KEY, + name VARCHAR(255) NOT NULL, + gender VARCHAR(255)); \ No newline at end of file diff --git a/resources/migrations/20190109005337-add-relation-table.down.sql b/resources/migrations/20190109005337-add-relation-table.down.sql new file mode 100644 index 0000000..5a790e7 --- /dev/null +++ b/resources/migrations/20190109005337-add-relation-table.down.sql @@ -0,0 +1 @@ +DROP TABLE relations; diff --git a/resources/migrations/20190109005337-add-relation-table.up.sql b/resources/migrations/20190109005337-add-relation-table.up.sql new file mode 100644 index 0000000..aac53c1 --- /dev/null +++ b/resources/migrations/20190109005337-add-relation-table.up.sql @@ -0,0 +1,6 @@ +CREATE TABLE relations +(id SERIAL PRIMARY KEY, + from_id INTEGER NOT NULL, + to_id INTEGER NOT NULL, + FOREIGN KEY (from_id) REFERENCES users (id), + FOREIGN KEY (to_id) REFERENCES users (id)); \ No newline at end of file diff --git a/resources/public/css/screen.css b/resources/public/css/screen.css new file mode 100644 index 0000000..4184e2c --- /dev/null +++ b/resources/public/css/screen.css @@ -0,0 +1,46 @@ +html, +body { + font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; + height: 100%; +} +nav { + margin-bottom: 20px; +} + +.grid-container { + display: grid; + grid-template-columns: 1fr 1fr; +} + +.grid-item{ + margin-left: 20px; + margin-bottom: 20px; +} + +.item-container{ + /*https://medium.com/@js_tut/new-things-css-grid-brings-to-the-table-e465cb5d2841*/ + display: grid; + /*grid-template-rows: 100px 100px;*/ + grid-template-columns: 100px 100px; + grid-gap: 10px; + justify-items: unset; + padding: 0 0 20px 10px; +} +.item { + justify-content: start; + border: 1px solid #b1b1b1; + align-items: start; + padding: 10px; +} + +select { + margin-bottom: 10px; +} + +.input-container{ + display: grid; + grid-template-columns: 1fr 1fr; +} +.input-item { + +} \ No newline at end of file diff --git a/resources/public/favicon.ico b/resources/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0e50cb2fb96b2ae63a2cf81adf4e1b3869cfe152 GIT binary patch literal 1150 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 P-(WnP}f5EZ_VG%x##xBtZkUi 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 literal 0 HcmV?d00001 diff --git a/resources/public/js/graphing.js b/resources/public/js/graphing.js new file mode 100644 index 0000000..0395620 --- /dev/null +++ b/resources/public/js/graphing.js @@ -0,0 +1,13 @@ +var view; + +vega.loader() + .load('/js/spec.json') + .then(function(data) { render(JSON.parse(data)); }); + +function render(spec) { + view = new vega.View(vega.parse(spec)) + .renderer('canvas') // set renderer (canvas or svg) + .initialize('#view') // initialize view within parent DOM container + .hover() // enable hover encode set processing + .run(); +} \ No newline at end of file diff --git a/resources/public/js/spec.json b/resources/public/js/spec.json new file mode 100644 index 0000000..33864e0 --- /dev/null +++ b/resources/public/js/spec.json @@ -0,0 +1,325 @@ +{ + "$schema": "https://vega.github.io/schema/vega/v4.json", + "width": 400, + "height": 300, + "padding": { + "top": 25, + "left": 0, + "right": 0, + "bottom": 0 + }, + "autosize": "none", + "signals": [ + { + "name": "hover", + "value": null, + "on": [ + { + "events": "symbol:mouseover", + "update": "datum" + }, + { + "events": "symbol:mouseout", + "update": "null" + } + ] + }, + { + "name": "title", + "value": "", + "update": "hover ? hover.name : '' " + }, + { + "name": "cx", + "update": "width / 2" + }, + { + "name": "cy", + "update": "height / 2" + }, + { + "name": "nodeRadius", + "value": 8, + "bind": { + "input": "range", + "min": 1, + "max": 50, + "step": 1 + } + }, + { + "name": "nodeCharge", + "value": -30, + "bind": { + "input": "range", + "min": -100, + "max": 10, + "step": 1 + } + }, + { + "name": "linkDistance", + "value": 70, + "bind": { + "input": "range", + "min": 5, + "max": 100, + "step": 1 + } + }, + { + "name": "static", + "value": true, + "bind": { + "input": "checkbox" + } + }, + { + "description": "State variable for active node fix status.", + "name": "fix", + "value": false, + "on": [ + { + "events": "symbol:mouseout[!event.buttons], window:mouseup", + "update": "false" + }, + { + "events": "symbol:mouseover", + "update": "fix || true" + }, + { + "events": "[symbol:mousedown, window:mouseup] > window:mousemove!", + "update": "xy()", + "force": true + } + ] + }, + { + "description": "Graph node most recently interacted with.", + "name": "node", + "value": null, + "on": [ + { + "events": "symbol:mouseover", + "update": "fix === true ? item() : node" + } + ] + }, + { + "description": "Flag to restart Force simulation upon data changes.", + "name": "restart", + "value": false, + "on": [ + { + "events": { + "signal": "fix" + }, + "update": "fix && fix.length" + } + ] + } + ], + "data": [ + { + "name": "node-data", + "url": "/relations_zeroed", + "format": { + "type": "json", + "property": "nodes" + } + }, + { + "name": "link-data", + "url": "/relations_zeroed", + "format": { + "type": "json", + "property": "links" + } + } + ], + "scales": [ + { + "name": "color", + "type": "ordinal", + "domain": { + "data": "node-data", + "field": "group" + }, + "range": { + "scheme": "category20c" + } + } + ], + "marks": [ + { + "name": "nodes-group", + "type": "group", + "zindex": 1, + "from": { + "data": "node-data" + }, + "marks": [ + { + "name": "nodes", + "type": "symbol", + "encode": { + "enter": { + "fill": { + "scale": "color", + "field": {"parent": "group"} + }, + "stroke": { + "value": "white" + } + }, + "update": { + "size": { + "signal": "2 * nodeRadius * nodeRadius" + }, + "cursor": { + "value": "pointer" + } + } + } + }, + { + "type": "text", + "interactive": false, + "encode": { + "enter": { + "fill": { + "value": "black" + }, + "fontSize": { + "value": 12 + }, + "align": { + "value": "center" + }, + "text": { + "field": {"parent": "name"} + }, + "y": { + "value": -10 + } + } + } + } + ], + "on": [ + { + "trigger": "fix", + "modify": "node", + "values": "fix === true ? {fx: node.x, fy: node.y} : {fx: fix[0], fy: fix[1]}" + }, + { + "trigger": "!fix", + "modify": "node", + "values": "{fx: null, fy: null}" + } + ], + "transform": [ + { + "type": "force", + "iterations": 300, + "restart": { + "signal": "restart" + }, + "static": { + "signal": "static" + }, + "signal": "force", + "forces": [ + { + "force": "center", + "x": { + "signal": "cx" + }, + "y": { + "signal": "cy" + } + }, + { + "force": "collide", + "radius": { + "signal": "nodeRadius" + } + }, + { + "force": "nbody", + "strength": { + "signal": "nodeCharge" + } + }, + { + "force": "link", + "links": "link-data", + "distance": { + "signal": "linkDistance" + } + } + ] + } + ] + }, + { + "type": "path", + "from": { + "data": "link-data" + }, + "interactive": false, + "encode": { + "update": { + "stroke": { + "value": "#ccc" + }, + "strokeWidth": { + "value": 0.5 + } + } + }, + "transform": [ + { + "type": "linkpath", + "require": { + "signal": "force" + }, + "shape": "line", + "sourceX": "datum.source.x", + "sourceY": "datum.source.y", + "targetX": "datum.target.x", + "targetY": "datum.target.y" + } + ] + }, + { + "type": "text", + "interactive": false, + "encode": { + "enter": { + "x": { + "signal": "width", + "offset": -5 + }, + "y": { + "value": 0 + }, + "fill": { + "value": "black" + }, + "fontSize": { + "value": 20 + }, + "align": { + "value": "right" + } + }, + "update": { + "text": { + "signal": "title" + } + } + } + } + ] +} diff --git a/resources/public/js/vega_tuto_data.json b/resources/public/js/vega_tuto_data.json new file mode 100644 index 0000000..b267455 --- /dev/null +++ b/resources/public/js/vega_tuto_data.json @@ -0,0 +1,1661 @@ +{ + "nodes": [ + { + "name": "Myriel", + "group": 1, + "index": 0 + }, + { + "name": "Napoleon", + "group": 1, + "index": 1 + }, + { + "name": "Mlle.Baptistine", + "group": 1, + "index": 2 + }, + { + "name": "Mme.Magloire", + "group": 1, + "index": 3 + }, + { + "name": "CountessdeLo", + "group": 1, + "index": 4 + }, + { + "name": "Geborand", + "group": 1, + "index": 5 + }, + { + "name": "Champtercier", + "group": 1, + "index": 6 + }, + { + "name": "Cravatte", + "group": 1, + "index": 7 + }, + { + "name": "Count", + "group": 1, + "index": 8 + }, + { + "name": "OldMan", + "group": 1, + "index": 9 + }, + { + "name": "Labarre", + "group": 2, + "index": 10 + }, + { + "name": "Valjean", + "group": 2, + "index": 11 + }, + { + "name": "Marguerite", + "group": 3, + "index": 12 + }, + { + "name": "Mme.deR", + "group": 2, + "index": 13 + }, + { + "name": "Isabeau", + "group": 2, + "index": 14 + }, + { + "name": "Gervais", + "group": 2, + "index": 15 + }, + { + "name": "Tholomyes", + "group": 3, + "index": 16 + }, + { + "name": "Listolier", + "group": 3, + "index": 17 + }, + { + "name": "Fameuil", + "group": 3, + "index": 18 + }, + { + "name": "Blacheville", + "group": 3, + "index": 19 + }, + { + "name": "Favourite", + "group": 3, + "index": 20 + }, + { + "name": "Dahlia", + "group": 3, + "index": 21 + }, + { + "name": "Zephine", + "group": 3, + "index": 22 + }, + { + "name": "Fantine", + "group": 3, + "index": 23 + }, + { + "name": "Mme.Thenardier", + "group": 4, + "index": 24 + }, + { + "name": "Thenardier", + "group": 4, + "index": 25 + }, + { + "name": "Cosette", + "group": 5, + "index": 26 + }, + { + "name": "Javert", + "group": 4, + "index": 27 + }, + { + "name": "Fauchelevent", + "group": 0, + "index": 28 + }, + { + "name": "Bamatabois", + "group": 2, + "index": 29 + }, + { + "name": "Perpetue", + "group": 3, + "index": 30 + }, + { + "name": "Simplice", + "group": 2, + "index": 31 + }, + { + "name": "Scaufflaire", + "group": 2, + "index": 32 + }, + { + "name": "Woman1", + "group": 2, + "index": 33 + }, + { + "name": "Judge", + "group": 2, + "index": 34 + }, + { + "name": "Champmathieu", + "group": 2, + "index": 35 + }, + { + "name": "Brevet", + "group": 2, + "index": 36 + }, + { + "name": "Chenildieu", + "group": 2, + "index": 37 + }, + { + "name": "Cochepaille", + "group": 2, + "index": 38 + }, + { + "name": "Pontmercy", + "group": 4, + "index": 39 + }, + { + "name": "Boulatruelle", + "group": 6, + "index": 40 + }, + { + "name": "Eponine", + "group": 4, + "index": 41 + }, + { + "name": "Anzelma", + "group": 4, + "index": 42 + }, + { + "name": "Woman2", + "group": 5, + "index": 43 + }, + { + "name": "MotherInnocent", + "group": 0, + "index": 44 + }, + { + "name": "Gribier", + "group": 0, + "index": 45 + }, + { + "name": "Jondrette", + "group": 7, + "index": 46 + }, + { + "name": "Mme.Burgon", + "group": 7, + "index": 47 + }, + { + "name": "Gavroche", + "group": 8, + "index": 48 + }, + { + "name": "Gillenormand", + "group": 5, + "index": 49 + }, + { + "name": "Magnon", + "group": 5, + "index": 50 + }, + { + "name": "Mlle.Gillenormand", + "group": 5, + "index": 51 + }, + { + "name": "Mme.Pontmercy", + "group": 5, + "index": 52 + }, + { + "name": "Mlle.Vaubois", + "group": 5, + "index": 53 + }, + { + "name": "Lt.Gillenormand", + "group": 5, + "index": 54 + }, + { + "name": "Marius", + "group": 8, + "index": 55 + }, + { + "name": "BaronessT", + "group": 5, + "index": 56 + }, + { + "name": "Mabeuf", + "group": 8, + "index": 57 + }, + { + "name": "Enjolras", + "group": 8, + "index": 58 + }, + { + "name": "Combeferre", + "group": 8, + "index": 59 + }, + { + "name": "Prouvaire", + "group": 8, + "index": 60 + }, + { + "name": "Feuilly", + "group": 8, + "index": 61 + }, + { + "name": "Courfeyrac", + "group": 8, + "index": 62 + }, + { + "name": "Bahorel", + "group": 8, + "index": 63 + }, + { + "name": "Bossuet", + "group": 8, + "index": 64 + }, + { + "name": "Joly", + "group": 8, + "index": 65 + }, + { + "name": "Grantaire", + "group": 8, + "index": 66 + }, + { + "name": "MotherPlutarch", + "group": 9, + "index": 67 + }, + { + "name": "Gueulemer", + "group": 4, + "index": 68 + }, + { + "name": "Babet", + "group": 4, + "index": 69 + }, + { + "name": "Claquesous", + "group": 4, + "index": 70 + }, + { + "name": "Montparnasse", + "group": 4, + "index": 71 + }, + { + "name": "Toussaint", + "group": 5, + "index": 72 + }, + { + "name": "Child1", + "group": 10, + "index": 73 + }, + { + "name": "Child2", + "group": 10, + "index": 74 + }, + { + "name": "Brujon", + "group": 4, + "index": 75 + }, + { + "name": "Mme.Hucheloup", + "group": 8, + "index": 76 + } + ], + "links": [ + { + "source": 1, + "target": 0, + "value": 1 + }, + { + "source": 2, + "target": 0, + "value": 8 + }, + { + "source": 3, + "target": 0, + "value": 10 + }, + { + "source": 3, + "target": 2, + "value": 6 + }, + { + "source": 4, + "target": 0, + "value": 1 + }, + { + "source": 5, + "target": 0, + "value": 1 + }, + { + "source": 6, + "target": 0, + "value": 1 + }, + { + "source": 7, + "target": 0, + "value": 1 + }, + { + "source": 8, + "target": 0, + "value": 2 + }, + { + "source": 9, + "target": 0, + "value": 1 + }, + { + "source": 11, + "target": 10, + "value": 1 + }, + { + "source": 11, + "target": 3, + "value": 3 + }, + { + "source": 11, + "target": 2, + "value": 3 + }, + { + "source": 11, + "target": 0, + "value": 5 + }, + { + "source": 12, + "target": 11, + "value": 1 + }, + { + "source": 13, + "target": 11, + "value": 1 + }, + { + "source": 14, + "target": 11, + "value": 1 + }, + { + "source": 15, + "target": 11, + "value": 1 + }, + { + "source": 17, + "target": 16, + "value": 4 + }, + { + "source": 18, + "target": 16, + "value": 4 + }, + { + "source": 18, + "target": 17, + "value": 4 + }, + { + "source": 19, + "target": 16, + "value": 4 + }, + { + "source": 19, + "target": 17, + "value": 4 + }, + { + "source": 19, + "target": 18, + "value": 4 + }, + { + "source": 20, + "target": 16, + "value": 3 + }, + { + "source": 20, + "target": 17, + "value": 3 + }, + { + "source": 20, + "target": 18, + "value": 3 + }, + { + "source": 20, + "target": 19, + "value": 4 + }, + { + "source": 21, + "target": 16, + "value": 3 + }, + { + "source": 21, + "target": 17, + "value": 3 + }, + { + "source": 21, + "target": 18, + "value": 3 + }, + { + "source": 21, + "target": 19, + "value": 3 + }, + { + "source": 21, + "target": 20, + "value": 5 + }, + { + "source": 22, + "target": 16, + "value": 3 + }, + { + "source": 22, + "target": 17, + "value": 3 + }, + { + "source": 22, + "target": 18, + "value": 3 + }, + { + "source": 22, + "target": 19, + "value": 3 + }, + { + "source": 22, + "target": 20, + "value": 4 + }, + { + "source": 22, + "target": 21, + "value": 4 + }, + { + "source": 23, + "target": 16, + "value": 3 + }, + { + "source": 23, + "target": 17, + "value": 3 + }, + { + "source": 23, + "target": 18, + "value": 3 + }, + { + "source": 23, + "target": 19, + "value": 3 + }, + { + "source": 23, + "target": 20, + "value": 4 + }, + { + "source": 23, + "target": 21, + "value": 4 + }, + { + "source": 23, + "target": 22, + "value": 4 + }, + { + "source": 23, + "target": 12, + "value": 2 + }, + { + "source": 23, + "target": 11, + "value": 9 + }, + { + "source": 24, + "target": 23, + "value": 2 + }, + { + "source": 24, + "target": 11, + "value": 7 + }, + { + "source": 25, + "target": 24, + "value": 13 + }, + { + "source": 25, + "target": 23, + "value": 1 + }, + { + "source": 25, + "target": 11, + "value": 12 + }, + { + "source": 26, + "target": 24, + "value": 4 + }, + { + "source": 26, + "target": 11, + "value": 31 + }, + { + "source": 26, + "target": 16, + "value": 1 + }, + { + "source": 26, + "target": 25, + "value": 1 + }, + { + "source": 27, + "target": 11, + "value": 17 + }, + { + "source": 27, + "target": 23, + "value": 5 + }, + { + "source": 27, + "target": 25, + "value": 5 + }, + { + "source": 27, + "target": 24, + "value": 1 + }, + { + "source": 27, + "target": 26, + "value": 1 + }, + { + "source": 28, + "target": 11, + "value": 8 + }, + { + "source": 28, + "target": 27, + "value": 1 + }, + { + "source": 29, + "target": 23, + "value": 1 + }, + { + "source": 29, + "target": 27, + "value": 1 + }, + { + "source": 29, + "target": 11, + "value": 2 + }, + { + "source": 30, + "target": 23, + "value": 1 + }, + { + "source": 31, + "target": 30, + "value": 2 + }, + { + "source": 31, + "target": 11, + "value": 3 + }, + { + "source": 31, + "target": 23, + "value": 2 + }, + { + "source": 31, + "target": 27, + "value": 1 + }, + { + "source": 32, + "target": 11, + "value": 1 + }, + { + "source": 33, + "target": 11, + "value": 2 + }, + { + "source": 33, + "target": 27, + "value": 1 + }, + { + "source": 34, + "target": 11, + "value": 3 + }, + { + "source": 34, + "target": 29, + "value": 2 + }, + { + "source": 35, + "target": 11, + "value": 3 + }, + { + "source": 35, + "target": 34, + "value": 3 + }, + { + "source": 35, + "target": 29, + "value": 2 + }, + { + "source": 36, + "target": 34, + "value": 2 + }, + { + "source": 36, + "target": 35, + "value": 2 + }, + { + "source": 36, + "target": 11, + "value": 2 + }, + { + "source": 36, + "target": 29, + "value": 1 + }, + { + "source": 37, + "target": 34, + "value": 2 + }, + { + "source": 37, + "target": 35, + "value": 2 + }, + { + "source": 37, + "target": 36, + "value": 2 + }, + { + "source": 37, + "target": 11, + "value": 2 + }, + { + "source": 37, + "target": 29, + "value": 1 + }, + { + "source": 38, + "target": 34, + "value": 2 + }, + { + "source": 38, + "target": 35, + "value": 2 + }, + { + "source": 38, + "target": 36, + "value": 2 + }, + { + "source": 38, + "target": 37, + "value": 2 + }, + { + "source": 38, + "target": 11, + "value": 2 + }, + { + "source": 38, + "target": 29, + "value": 1 + }, + { + "source": 39, + "target": 25, + "value": 1 + }, + { + "source": 40, + "target": 25, + "value": 1 + }, + { + "source": 41, + "target": 24, + "value": 2 + }, + { + "source": 41, + "target": 25, + "value": 3 + }, + { + "source": 42, + "target": 41, + "value": 2 + }, + { + "source": 42, + "target": 25, + "value": 2 + }, + { + "source": 42, + "target": 24, + "value": 1 + }, + { + "source": 43, + "target": 11, + "value": 3 + }, + { + "source": 43, + "target": 26, + "value": 1 + }, + { + "source": 43, + "target": 27, + "value": 1 + }, + { + "source": 44, + "target": 28, + "value": 3 + }, + { + "source": 44, + "target": 11, + "value": 1 + }, + { + "source": 45, + "target": 28, + "value": 2 + }, + { + "source": 47, + "target": 46, + "value": 1 + }, + { + "source": 48, + "target": 47, + "value": 2 + }, + { + "source": 48, + "target": 25, + "value": 1 + }, + { + "source": 48, + "target": 27, + "value": 1 + }, + { + "source": 48, + "target": 11, + "value": 1 + }, + { + "source": 49, + "target": 26, + "value": 3 + }, + { + "source": 49, + "target": 11, + "value": 2 + }, + { + "source": 50, + "target": 49, + "value": 1 + }, + { + "source": 50, + "target": 24, + "value": 1 + }, + { + "source": 51, + "target": 49, + "value": 9 + }, + { + "source": 51, + "target": 26, + "value": 2 + }, + { + "source": 51, + "target": 11, + "value": 2 + }, + { + "source": 52, + "target": 51, + "value": 1 + }, + { + "source": 52, + "target": 39, + "value": 1 + }, + { + "source": 53, + "target": 51, + "value": 1 + }, + { + "source": 54, + "target": 51, + "value": 2 + }, + { + "source": 54, + "target": 49, + "value": 1 + }, + { + "source": 54, + "target": 26, + "value": 1 + }, + { + "source": 55, + "target": 51, + "value": 6 + }, + { + "source": 55, + "target": 49, + "value": 12 + }, + { + "source": 55, + "target": 39, + "value": 1 + }, + { + "source": 55, + "target": 54, + "value": 1 + }, + { + "source": 55, + "target": 26, + "value": 21 + }, + { + "source": 55, + "target": 11, + "value": 19 + }, + { + "source": 55, + "target": 16, + "value": 1 + }, + { + "source": 55, + "target": 25, + "value": 2 + }, + { + "source": 55, + "target": 41, + "value": 5 + }, + { + "source": 55, + "target": 48, + "value": 4 + }, + { + "source": 56, + "target": 49, + "value": 1 + }, + { + "source": 56, + "target": 55, + "value": 1 + }, + { + "source": 57, + "target": 55, + "value": 1 + }, + { + "source": 57, + "target": 41, + "value": 1 + }, + { + "source": 57, + "target": 48, + "value": 1 + }, + { + "source": 58, + "target": 55, + "value": 7 + }, + { + "source": 58, + "target": 48, + "value": 7 + }, + { + "source": 58, + "target": 27, + "value": 6 + }, + { + "source": 58, + "target": 57, + "value": 1 + }, + { + "source": 58, + "target": 11, + "value": 4 + }, + { + "source": 59, + "target": 58, + "value": 15 + }, + { + "source": 59, + "target": 55, + "value": 5 + }, + { + "source": 59, + "target": 48, + "value": 6 + }, + { + "source": 59, + "target": 57, + "value": 2 + }, + { + "source": 60, + "target": 48, + "value": 1 + }, + { + "source": 60, + "target": 58, + "value": 4 + }, + { + "source": 60, + "target": 59, + "value": 2 + }, + { + "source": 61, + "target": 48, + "value": 2 + }, + { + "source": 61, + "target": 58, + "value": 6 + }, + { + "source": 61, + "target": 60, + "value": 2 + }, + { + "source": 61, + "target": 59, + "value": 5 + }, + { + "source": 61, + "target": 57, + "value": 1 + }, + { + "source": 61, + "target": 55, + "value": 1 + }, + { + "source": 62, + "target": 55, + "value": 9 + }, + { + "source": 62, + "target": 58, + "value": 17 + }, + { + "source": 62, + "target": 59, + "value": 13 + }, + { + "source": 62, + "target": 48, + "value": 7 + }, + { + "source": 62, + "target": 57, + "value": 2 + }, + { + "source": 62, + "target": 41, + "value": 1 + }, + { + "source": 62, + "target": 61, + "value": 6 + }, + { + "source": 62, + "target": 60, + "value": 3 + }, + { + "source": 63, + "target": 59, + "value": 5 + }, + { + "source": 63, + "target": 48, + "value": 5 + }, + { + "source": 63, + "target": 62, + "value": 6 + }, + { + "source": 63, + "target": 57, + "value": 2 + }, + { + "source": 63, + "target": 58, + "value": 4 + }, + { + "source": 63, + "target": 61, + "value": 3 + }, + { + "source": 63, + "target": 60, + "value": 2 + }, + { + "source": 63, + "target": 55, + "value": 1 + }, + { + "source": 64, + "target": 55, + "value": 5 + }, + { + "source": 64, + "target": 62, + "value": 12 + }, + { + "source": 64, + "target": 48, + "value": 5 + }, + { + "source": 64, + "target": 63, + "value": 4 + }, + { + "source": 64, + "target": 58, + "value": 10 + }, + { + "source": 64, + "target": 61, + "value": 6 + }, + { + "source": 64, + "target": 60, + "value": 2 + }, + { + "source": 64, + "target": 59, + "value": 9 + }, + { + "source": 64, + "target": 57, + "value": 1 + }, + { + "source": 64, + "target": 11, + "value": 1 + }, + { + "source": 65, + "target": 63, + "value": 5 + }, + { + "source": 65, + "target": 64, + "value": 7 + }, + { + "source": 65, + "target": 48, + "value": 3 + }, + { + "source": 65, + "target": 62, + "value": 5 + }, + { + "source": 65, + "target": 58, + "value": 5 + }, + { + "source": 65, + "target": 61, + "value": 5 + }, + { + "source": 65, + "target": 60, + "value": 2 + }, + { + "source": 65, + "target": 59, + "value": 5 + }, + { + "source": 65, + "target": 57, + "value": 1 + }, + { + "source": 65, + "target": 55, + "value": 2 + }, + { + "source": 66, + "target": 64, + "value": 3 + }, + { + "source": 66, + "target": 58, + "value": 3 + }, + { + "source": 66, + "target": 59, + "value": 1 + }, + { + "source": 66, + "target": 62, + "value": 2 + }, + { + "source": 66, + "target": 65, + "value": 2 + }, + { + "source": 66, + "target": 48, + "value": 1 + }, + { + "source": 66, + "target": 63, + "value": 1 + }, + { + "source": 66, + "target": 61, + "value": 1 + }, + { + "source": 66, + "target": 60, + "value": 1 + }, + { + "source": 67, + "target": 57, + "value": 3 + }, + { + "source": 68, + "target": 25, + "value": 5 + }, + { + "source": 68, + "target": 11, + "value": 1 + }, + { + "source": 68, + "target": 24, + "value": 1 + }, + { + "source": 68, + "target": 27, + "value": 1 + }, + { + "source": 68, + "target": 48, + "value": 1 + }, + { + "source": 68, + "target": 41, + "value": 1 + }, + { + "source": 69, + "target": 25, + "value": 6 + }, + { + "source": 69, + "target": 68, + "value": 6 + }, + { + "source": 69, + "target": 11, + "value": 1 + }, + { + "source": 69, + "target": 24, + "value": 1 + }, + { + "source": 69, + "target": 27, + "value": 2 + }, + { + "source": 69, + "target": 48, + "value": 1 + }, + { + "source": 69, + "target": 41, + "value": 1 + }, + { + "source": 70, + "target": 25, + "value": 4 + }, + { + "source": 70, + "target": 69, + "value": 4 + }, + { + "source": 70, + "target": 68, + "value": 4 + }, + { + "source": 70, + "target": 11, + "value": 1 + }, + { + "source": 70, + "target": 24, + "value": 1 + }, + { + "source": 70, + "target": 27, + "value": 1 + }, + { + "source": 70, + "target": 41, + "value": 1 + }, + { + "source": 70, + "target": 58, + "value": 1 + }, + { + "source": 71, + "target": 27, + "value": 1 + }, + { + "source": 71, + "target": 69, + "value": 2 + }, + { + "source": 71, + "target": 68, + "value": 2 + }, + { + "source": 71, + "target": 70, + "value": 2 + }, + { + "source": 71, + "target": 11, + "value": 1 + }, + { + "source": 71, + "target": 48, + "value": 1 + }, + { + "source": 71, + "target": 41, + "value": 1 + }, + { + "source": 71, + "target": 25, + "value": 1 + }, + { + "source": 72, + "target": 26, + "value": 2 + }, + { + "source": 72, + "target": 27, + "value": 1 + }, + { + "source": 72, + "target": 11, + "value": 1 + }, + { + "source": 73, + "target": 48, + "value": 2 + }, + { + "source": 74, + "target": 48, + "value": 2 + }, + { + "source": 74, + "target": 73, + "value": 3 + }, + { + "source": 75, + "target": 69, + "value": 3 + }, + { + "source": 75, + "target": 68, + "value": 3 + }, + { + "source": 75, + "target": 25, + "value": 3 + }, + { + "source": 75, + "target": 48, + "value": 1 + }, + { + "source": 75, + "target": 41, + "value": 1 + }, + { + "source": 75, + "target": 70, + "value": 1 + }, + { + "source": 75, + "target": 71, + "value": 1 + }, + { + "source": 76, + "target": 64, + "value": 1 + }, + { + "source": 76, + "target": 65, + "value": 1 + }, + { + "source": 76, + "target": 66, + "value": 1 + }, + { + "source": 76, + "target": 63, + "value": 1 + }, + { + "source": 76, + "target": 62, + "value": 1 + }, + { + "source": 76, + "target": 48, + "value": 1 + }, + { + "source": 76, + "target": 58, + "value": 1 + } + ] +} \ No newline at end of file diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql new file mode 100644 index 0000000..257647a --- /dev/null +++ b/resources/sql/queries.sql @@ -0,0 +1,34 @@ +-- :name create-user! :! :n +-- :doc creates a new user record +INSERT INTO users +(name, gender) +VALUES (:name, :gender) + +-- :name update-user! :! :n +-- :doc updates an existing user record +--UPDATE users +--SET first_name = :first_name, last_name = :last_name, email = :email +--WHERE id = :id + +-- :name get-users :? :* +-- :doc retrieves a user record given the id +SELECT * FROM users +--WHERE id = :id + +-- :name delete-user! :! :n +-- :doc deletes a user record given the id +--DELETE FROM users +--WHERE id = :id + + +-- :name create-relation! :! :n +-- :doc creates a new relation record +INSERT INTO relations +(from_id, to_id) +VALUES (:from_id, :to_id) + +-- :name get-relations :? :* +-- :doc retrieves all relations +SELECT * FROM relations +JOIN users u_from on relations.from_id = u_from.id +JOIN users u_to on relations.to_id = u_to.id \ No newline at end of file diff --git a/src/clj/cat/config.clj b/src/clj/cat/config.clj new file mode 100644 index 0000000..572634b --- /dev/null +++ b/src/clj/cat/config.clj @@ -0,0 +1,12 @@ +(ns cat.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/cat/core.clj b/src/clj/cat/core.clj new file mode 100644 index 0000000..7b75d5f --- /dev/null +++ b/src/clj/cat/core.clj @@ -0,0 +1,66 @@ +(ns cat.core + (:require [cat.handler :as handler] + [cat.nrepl :as nrepl] + [luminus.http-server :as http] + [luminus-migrations.core :as migrations] + [cat.config :refer [env]] + [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 :io-threads #(or % (* 2 (.availableProcessors (Runtime/getRuntime))))) + (update :port #(or (-> env :options :port) %)))) + :stop + (http/stop http-server)) + +(mount/defstate ^{:on-reload :noop} repl-server + :start + (when (env :nrepl-port) + (nrepl/start {:bind (env :nrepl-bind) + :port (env :nrepl-port)})) + :stop + (when repl-server + (nrepl/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] + (mount/start #'cat.config/env) + (cond + (nil? (:database-url env)) + (do + (log/error "Database configuration not found, :database-url environment variable must be set before running") + (System/exit 1)) + (some #{"init"} args) + (do + (migrations/init (select-keys env [:database-url :init-script])) + (System/exit 0)) + (migrations/migration? args) + (do + (migrations/migrate args (select-keys env [:database-url])) + (System/exit 0)) + :else + (start-app args))) + diff --git a/src/clj/cat/db/core.clj b/src/clj/cat/db/core.clj new file mode 100644 index 0000000..404b9c3 --- /dev/null +++ b/src/clj/cat/db/core.clj @@ -0,0 +1,85 @@ +(ns cat.db.core + (:require + [cheshire.core :refer [generate-string parse-string]] + [clojure.java.jdbc :as jdbc] + [clojure.tools.logging :as log] + [conman.core :as conman] + [java-time :as jt] + [cat.config :refer [env]] + [mount.core :refer [defstate]]) + (:import org.postgresql.util.PGobject + java.sql.Array + clojure.lang.IPersistentMap + clojure.lang.IPersistentVector + [java.sql + BatchUpdateException + PreparedStatement])) +(defstate ^:dynamic *db* + :start (if-let [jdbc-url (env :database-url)] + (conman/connect! {:jdbc-url jdbc-url}) + (do + (log/warn "database connection URL was not found, please set :database-url in your config, e.g: dev-config.edn") + *db*)) + :stop (conman/disconnect! *db*)) + +(conman/bind-connection *db* "sql/queries.sql") + + +(extend-protocol jdbc/IResultSetReadColumn + java.sql.Timestamp + (result-set-read-column [v _2 _3] + (.toLocalDateTime v)) + java.sql.Date + (result-set-read-column [v _2 _3] + (.toLocalDate v)) + java.sql.Time + (result-set-read-column [v _2 _3] + (.toLocalTime 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)))) + +(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 + java.util.Date + (sql-value [v] + (java.sql.Timestamp. (.getTime v))) + java.time.LocalTime + (sql-value [v] + (jt/sql-time v)) + java.time.LocalDate + (sql-value [v] + (jt/sql-date v)) + java.time.LocalDateTime + (sql-value [v] + (jt/sql-timestamp v)) + java.time.ZonedDateTime + (sql-value [v] + (jt/sql-timestamp v)) + IPersistentMap + (sql-value [value] (to-pg-json value)) + IPersistentVector + (sql-value [value] (to-pg-json value))) + diff --git a/src/clj/cat/handler.clj b/src/clj/cat/handler.clj new file mode 100644 index 0000000..cc6d3c3 --- /dev/null +++ b/src/clj/cat/handler.clj @@ -0,0 +1,28 @@ +(ns cat.handler + (:require [cat.middleware :as middleware] + [cat.layout :refer [error-page]] + [cat.routes.home :refer [home-routes]] + [cat.routes.oauth :refer [oauth-routes]] + [compojure.core :refer [routes wrap-routes]] + [ring.util.http-response :as response] + [compojure.route :as route] + [cat.env :refer [defaults]] + [mount.core :as mount])) + +(mount/defstate init-app + :start ((or (:init defaults) identity)) + :stop ((or (:stop defaults) identity))) + +(mount/defstate app + :start + (middleware/wrap-base + (routes + (-> #'home-routes + (wrap-routes middleware/wrap-csrf) + (wrap-routes middleware/wrap-formats)) + #'oauth-routes + (route/not-found + (:body + (error-page {:status 404 + :title "page not found"})))))) + diff --git a/src/clj/cat/layout.clj b/src/clj/cat/layout.clj new file mode 100644 index 0000000..a8200f9 --- /dev/null +++ b/src/clj/cat/layout.clj @@ -0,0 +1,37 @@ +(ns cat.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*]])) + + +(parser/set-resource-path! (clojure.java.io/resource "html")) +(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/html" + [template & [params]] + (content-type + (ok + (parser/render-file + template + (assoc params + :page template + :csrf-token *anti-forgery-token*))) + "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/cat/middleware.clj b/src/clj/cat/middleware.clj new file mode 100644 index 0000000..942e2f1 --- /dev/null +++ b/src/clj/cat/middleware.clj @@ -0,0 +1,73 @@ +(ns cat.middleware + (:require [cat.env :refer [defaults]] + [cheshire.generate :as cheshire] + [cognitect.transit :as transit] + [clojure.tools.logging :as log] + [cat.layout :refer [error-page]] + [ring.middleware.anti-forgery :refer [wrap-anti-forgery]] + [ring.middleware.webjars :refer [wrap-webjars]] + [cat.middleware.formats :as formats] + [muuntaja.middleware :refer [wrap-format wrap-params]] + [cat.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]]) + (:import)) + + +(defn wrap-internal-error [handler] + (fn [req] + (try + (handler req) + (catch Throwable t + (log/error t (.getMessage 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 (-> handler wrap-params (wrap-format formats/instance))] + (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-auth [handler] + (let [backend (session-backend)] + (-> handler + (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-internal-error)) diff --git a/src/clj/cat/middleware/formats.clj b/src/clj/cat/middleware/formats.clj new file mode 100644 index 0000000..c8950e3 --- /dev/null +++ b/src/clj/cat/middleware/formats.clj @@ -0,0 +1,14 @@ +(ns cat.middleware.formats + (:require [cognitect.transit :as transit] + [luminus-transit.time :as time] + [muuntaja.core :as m])) + +(def instance + (m/create + (-> m/default-options + (update-in + [:formats "application/transit+json" :decoder-opts] + (partial merge time/time-deserialization-handlers)) + (update-in + [:formats "application/transit+json" :encoder-opts] + (partial merge time/time-serialization-handlers))))) diff --git a/src/clj/cat/nrepl.clj b/src/clj/cat/nrepl.clj new file mode 100644 index 0000000..82af366 --- /dev/null +++ b/src/clj/cat/nrepl.clj @@ -0,0 +1,26 @@ +(ns cat.nrepl + (:require [nrepl.server :as nrepl] + [clojure.tools.logging :as log])) + +(defn start + "Start a network repl for debugging on specified port followed by + an optional parameters map. The :bind, :transport-fn, :handler, + :ack-port and :greeting-fn will be forwarded to + clojure.tools.nrepl.server/start-server as they are." + [{:keys [port bind transport-fn handler ack-port greeting-fn]}] + (try + (log/info "starting nREPL server on port" port) + (nrepl/start-server :port port + :bind bind + :transport-fn transport-fn + :handler handler + :ack-port ack-port + :greeting-fn greeting-fn) + + (catch Throwable t + (log/error t "failed to start nREPL") + (throw t)))) + +(defn stop [server] + (nrepl/stop-server server) + (log/info "nREPL server stopped")) diff --git a/src/clj/cat/oauth.clj b/src/clj/cat/oauth.clj new file mode 100644 index 0000000..bfb67d3 --- /dev/null +++ b/src/clj/cat/oauth.clj @@ -0,0 +1,35 @@ +(ns cat.oauth + (:require [cat.config :refer [env]] + [oauth.client :as oauth] + [mount.core :refer [defstate]] + [clojure.tools.logging :as log])) + +(defstate consumer + :start (oauth/make-consumer + (env :oauth-consumer-key) + (env :oauth-consumer-secret) + (env :request-token-uri) + (env :access-token-uri) + (env :authorize-uri) + :hmac-sha1)) + +(defn oauth-callback-uri + "Generates the oauth request callback URI" + [{:keys [headers]}] + (str (headers "x-forwarded-proto") "://" (headers "host") "/oauth/oauth-callback")) + +(defn fetch-request-token + "Fetches a request token." + [request] + (let [callback-uri (oauth-callback-uri request)] + (log/info "Fetching request token using callback-uri" callback-uri) + (oauth/request-token consumer (oauth-callback-uri request)))) + +(defn fetch-access-token + [request_token] + (oauth/access-token consumer request_token (:oauth_verifier request_token))) + +(defn auth-redirect-uri + "Gets the URI the user should be redirected to when authenticating." + [request-token] + (str (oauth/user-approval-uri consumer request-token))) diff --git a/src/clj/cat/routes/home.clj b/src/clj/cat/routes/home.clj new file mode 100644 index 0000000..b0999bc --- /dev/null +++ b/src/clj/cat/routes/home.clj @@ -0,0 +1,88 @@ +(ns cat.routes.home + (:require [cat.layout :as layout] + [cat.db.core :refer [*db*] :as db] + [compojure.core :refer [defroutes GET POST]] + [ring.util.http-response :as response] + [clojure.java.io :as io] + [struct.core :as st] + [clojure.edn :as edn] + [clojure.tools.logging :as log] + [clojure.data.json :as json])) + +(def user-schema + [[:name st/required st/string] + [:gender st/string]]) + +(def relation-schema + [[:from_id st/required st/integer-str] + [:to_id st/required st/integer-str]]) + +(defn home-page [params] + (layout/render "home.html" params)) + +(defn get-relations [] + (map + (fn [relation] (select-keys relation [:name :name_2])) + (db/get-relations))) + +(defn get-users [] + (db/get-users)) + +(defroutes home-routes + (GET "/" [] + (let [users (get-users) + relations (get-relations)] + (home-page {:relations relations :users users}))) + ;(GET "/docs" [] + ; (-> (response/ok (-> "docs/docs.md" io/resource slurp)) + ; (response/header "Content-Type" "text/plain; charset=utf-8"))) + (GET "/relations" [] + (let [] + (response/ok {}))) + (GET "/relations_zeroed" [] + (let [users (db/get-users) + relations (db/get-relations) + used-node-ids (set (flatten (map (fn [ln] [(:from_id ln) (:to_id ln)]) relations))) + filtered-users (filter (fn [{id :id}] (contains? used-node-ids id)) users) + id-index-map (:map (reduce (fn [{map :map idx :index} usr] + {:map (assoc map (:id usr) idx) + :index (inc idx)}) + {:map {} :index 0} + filtered-users)) + rels-indexed (map (fn [{src :from_id target :to_id}] + {:source (get id-index-map src) + :target (get id-index-map target) + :value (+ 20 (rand-int 30))}) + relations) + nodes-indexed (->> filtered-users + (map (fn [usr] + (-> usr + (dissoc :gender :id) + (assoc :index (get id-index-map (:id usr))) + (assoc :group (rand-int 2))))))] + (response/ok {:nodes nodes-indexed + :links rels-indexed}))) + (POST "/relations" req + (let [data (:params req) [err result] (st/validate data relation-schema)] + (log/info "Post to " (:uri req)) + (if (nil? err) + (do + (db/create-relation! result) + (response/no-content)) + (do + (response/bad-request "Incorrect input"))))) + (POST "/users" req + (let [data (:params req)] + (log/info "Post to " (:uri req)) + (println data) + (if (st/valid? data user-schema) + (do + (db/create-user! data) + (response/no-content)) + (do + (response/bad-request "Incorrect input")))))) + + + + + diff --git a/src/clj/cat/routes/oauth.clj b/src/clj/cat/routes/oauth.clj new file mode 100644 index 0000000..7c98d0b --- /dev/null +++ b/src/clj/cat/routes/oauth.clj @@ -0,0 +1,34 @@ +(ns cat.routes.oauth + (:require [ring.util.http-response :refer [ok found]] + [compojure.core :refer [defroutes GET]] + [clojure.java.io :as io] + [cat.oauth :as oauth] + [clojure.tools.logging :as log])) + +(defn oauth-init + "Initiates the Twitter OAuth" + [request] + (-> (oauth/fetch-request-token request) + :oauth_token + oauth/auth-redirect-uri + found)) + +(defn oauth-callback + "Handles the callback from Twitter." + [{:keys [session params]}] + ; oauth request was denied by user + (if (:denied params) + (-> (found "/") + (assoc :flash {:denied true})) + ; fetch the request token and do anything else you wanna do if not denied. + (let [{:keys [user_id screen_name]} (oauth/fetch-access-token params)] + (log/info "successfully authenticated as" user_id screen_name) + (-> (found "/") + (assoc :session + (assoc session :user-id user_id :screen-name screen_name)))))) + + +(defroutes oauth-routes + (GET "/oauth/oauth-init" req (oauth-init req)) + (GET "/oauth/oauth-callback" [& req_token :as req] (oauth-callback req))) + diff --git a/src/cljc/cat/validation.cljc b/src/cljc/cat/validation.cljc new file mode 100644 index 0000000..1205d4b --- /dev/null +++ b/src/cljc/cat/validation.cljc @@ -0,0 +1,2 @@ +(ns cat.validation + (:require [struct.core :as st])) diff --git a/src/cljs/cat/core.cljs b/src/cljs/cat/core.cljs new file mode 100644 index 0000000..a260554 --- /dev/null +++ b/src/cljs/cat/core.cljs @@ -0,0 +1,159 @@ +(ns cat.core + (:require [vega-tools.core :refer [validate-and-parse]] + [promesa.core :as p])) + + +;(defn ^:export main [] +; (println "This is the main function.") +; (let [spec {:width 200 :height 200 +; :marks [{:type "symbol" +; :properties {:enter {:size {:value 1000} +; :x {:value 100} +; :y {:value 100} +; :shape {:value "circle"} +; :stroke {:value "red"}}}}]}] +; (-> (validate-and-parse spec) +; (p/catch #(js/alert (str "Unable to parse spec:\n\n" %))) +; (p/then #(-> (% {:el (js/document.getElementById "#chart")}) +; (.update)))))) + + +;(defn on-js-reload [] +; (println "This is the on-js-reload function.") +; (main)) + +(defn mount-components [] + (let [spec {:width 700 :height 500 + :signals [{:name "cx"}] + :marks [{:name "nodes" + :type "symbol" + :properties {:enter {:size {:value 1000} + :x {:value 100} + :y {:value 100} + :shape {:value "circle"} + :stroke {:value "red"}}}}]} + nodespec {;:$schema "https://vega.github.io/schema/vega/v4.json", + :width 700, + :height 500, + :padding 0, + :autosize "none", + :signals [{:name "cx", :update "width / 2"} + {:name "cy", :update "height / 2"} + {:name "nodeRadius", :value 8, + :bind {:input "range", + :min 1, + :max 50, + :step 1}} + {:name "nodeCharge", :value -30, + :bind {:input "range", + :min -100, + :max 10, + :step 1}} + {:name "linkDistance", :value 30, + :bind {:input "range", + :min 5, + :max 100, + :step 1}} + {:name "static", :value true, + :bind {:input "checkbox"}} + ;{:description + ; "State variable for active node fix status.", + ; :name "fix", :value false, + ; :on [{:events "symbol:mouseout[!event.buttons], window:mouseup", + ; :update "false"} + ; {:events "symbol:mouseover", + ; :update "fix || true"} + ; {:events "[symbol:mousedown, window:mouseup] > window:mousemove!", + ; :update "xy()", + ; :force true}]} + ;{:description "Graph node most recently interacted with.", + ; :name "node", :value nil, + ; :on [{:events "symbol:mouseover", + ; :update "fix === true ? item() : node"}]} + {:description "Flag to restart Force simulation upon data changes.", + :name "restart", + :value false, + :on [{:events {:signal "fix"}, + :update "fix && fix.length"}]}], + :data [{:name "node-data" + :url "/relations" + :format {:type "json", :property "nodes"} + } + {:name "link-data" + :url "/relations" + :format {:type "json", :property "links"} + :transform [{:type "lookup" + :fields ["name" "name_2"] + :as ["source" "target"]}] + }], + ;:scales + ; [{:name "color", + ; :type "ordinal", + ; :domain {:data "node-data", :field "name"}, + ; :range {:scheme "category20c"}}], + + :marks + [{:name "nodes", + :type "symbol", + :zindex 1, + :from {:data "node-data"}, + :on + [{:trigger "fix", + :modify "node", + :values + "fix === true ? {fx: node.x, fy: node.y} : {fx: fix[0], fy: fix[1]}"} + {:trigger "!fix", + :modify "node", + :values "{fx: null, fy: null}"}], + ;:encode + ; {:enter + ; {:fill {:scale "color", :field "group"}, + ; :stroke {:value "white"}}, + ; :update + ; {:size + ; {:signal "2 * nodeRadius * nodeRadius"}, + ; :cursor {:value "pointer"}}}, + :transform + [{:type "force", + :iterations 300, + :restart {:signal "restart"}, + :static {:signal "static"}, + :signal "force", + :forces [{:force "center", + :x {:signal "cx"}, + :y {:signal "cy"}} + {:force "collide", + :radius {:signal "nodeRadius"}} + {:force "nbody", + :strength {:signal "nodeCharge"}} + {:force "link", + :links "link-data", + :distance {:signal "linkDistance"}}]}]} + {:type "path", + :interactive false, + :from {:data "link-data"}, + :encode {:update + {:stroke {:value "#ccc"}, + :strokeWidth {:value 0.5}}}, + :transform + [{:type "linkpath", + :require {:signal "force"}, + :shape "line", + :sourceX "datum.source.x", :sourceY "datum.source.y", + :targetX "datum.target.x", :targetY "datum.target.y"}]}]}] + + ;(-> (validate-and-parse nodespec) + ; (p/catch #(js/alert (str "Unable to parse spec:\n\n" %))) + ; (p/then #(-> (% {:el (js/document.getElementById "chart")}) + ; (.update)))) + + (let [content (js/document.getElementById "app")] + (while (.hasChildNodes content) + (.removeChild content (.-lastChild content))) + (.appendChild content (js/document.createTextNode "Welcome to cat"))))) + +(defn init! [] + (mount-components)) +;(main)) + + diff --git a/test/clj/cat/test/db/core.clj b/test/clj/cat/test/db/core.clj new file mode 100644 index 0000000..b8dbc0a --- /dev/null +++ b/test/clj/cat/test/db/core.clj @@ -0,0 +1,36 @@ +(ns cat.test.db.core + (:require [cat.db.core :refer [*db*] :as db] + [luminus-migrations.core :as migrations] + [clojure.test :refer :all] + [clojure.java.jdbc :as jdbc] + [cat.config :refer [env]] + [mount.core :as mount])) + +(use-fixtures + :once + (fn [f] + (mount/start + #'cat.config/env + #'cat.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/cat/test/handler.clj b/test/clj/cat/test/handler.clj new file mode 100644 index 0000000..b78e6fd --- /dev/null +++ b/test/clj/cat/test/handler.clj @@ -0,0 +1,26 @@ +(ns cat.test.handler + (:require [clojure.test :refer :all] + [ring.mock.request :refer :all] + [cat.handler :refer :all] + [cat.middleware.formats :as formats] + [muuntaja.core :as m] + [mount.core :as mount])) + +(defn parse-json [body] + (m/decode formats/instance "application/json" body)) + +(use-fixtures + :once + (fn [f] + (mount/start #'cat.config/env + #'cat.handler/app) + (f))) + +(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/cat/core_test.cljs b/test/cljs/cat/core_test.cljs new file mode 100644 index 0000000..bc467eb --- /dev/null +++ b/test/cljs/cat/core_test.cljs @@ -0,0 +1,8 @@ +(ns cat.core-test + (:require [cljs.test :refer-macros [is are deftest testing use-fixtures]] + [pjstadig.humane-test-output] + [cat.core :as rc])) + +(deftest test-home + (is (= true true))) + diff --git a/test/cljs/cat/doo_runner.cljs b/test/cljs/cat/doo_runner.cljs new file mode 100644 index 0000000..7089890 --- /dev/null +++ b/test/cljs/cat/doo_runner.cljs @@ -0,0 +1,6 @@ +(ns cat.doo-runner + (:require [doo.runner :refer-macros [doo-tests]] + [cat.core-test])) + +(doo-tests 'cat.core-test) +