notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

merged.

Browse Source
This commit is contained in:
Bryce Covert
2019-04-05 08:11:51 -07:00
parent 4e3e6d3bea c28be9919a
commit 039b513ed1
6 changed files with 40 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev.cljs.edn Normal file
View File

@@ -0,0 +1,2 @@
{:main auto-ap.core
:output-to "resources/public/js/compiled/app.js"}

5
figwheel-main.edn Normal file
View File

@@ -0,0 +1,5 @@
{:watch-dirs ["src/cljs"]
:css-dirs ["resources/public/css"]
:ring-server-options {:port 3449}
:ring-handler auto-ap.handler/app
:open-url false}

6
min.cljs.edn Normal file
View File

@@ -0,0 +1,6 @@
{:main auto-ap.core
:output-to "resources/public/js/compiled/app.js"
:optimizations :advanced
:closure-defines {goog.DEBUG false}
:pretty-print false}

70
project.clj
View File

@@ -6,14 +6,14 @@
:username "datomic@brycecovertoperations.com" :username "datomic@brycecovertoperations.com"
:password "0ba303bb-01be-471c-bc91-1dfd3172a96a"}} :password "0ba303bb-01be-471c-bc91-1dfd3172a96a"}}
:dependencies [[org.clojure/clojure "1.9.0"] :dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/clojurescript "1.10.238"] [org.clojure/clojurescript "1.10.339"]
[postgresql/postgresql "9.3-1102.jdbc41"] [postgresql/postgresql "9.3-1102.jdbc41"]
[com.datomic/datomic-pro "0.9.5703" :exclusions [com.google.guava/guava]] [com.datomic/datomic-pro "0.9.5703" :exclusions [com.google.guava/guava]]
[compojure "1.6.0"] [compojure "1.6.1" :exclusions [ring]]
[kibu/pushy "0.3.8"] [kibu/pushy "0.3.8"]
[bidi "2.1.2"] [bidi "2.1.2"]
[ring/ring-defaults "0.2.1"] [ring/ring-defaults "0.2.1"]
[ring "1.4.0"] [ring "1.6.3" :exclusions [clj-time]]
[yogthos/config "0.8"] [yogthos/config "0.8"]
[dk.ative/docjure "1.12.0"] [dk.ative/docjure "1.12.0"]
[org.clojure/java.jdbc "0.7.3"] [org.clojure/java.jdbc "0.7.3"]
@@ -34,12 +34,12 @@
[fogus/ring-edn "0.3.0"] [fogus/ring-edn "0.3.0"]
[buddy/buddy-auth "2.1.0"] [buddy/buddy-auth "2.1.0"]
[buddy/buddy-sign "2.1.0"] [buddy/buddy-sign "2.1.0"]
[org.clojure/tools.nrepl "0.2.13"] [nrepl "0.6.0" :exclusions [org.clojure/tools.logging]]
[clj-time "0.14.2"] [clj-time "0.14.3"]
[io.forward/clojure-mail "1.0.7"] [io.forward/clojure-mail "1.0.7"]
[ring/ring-json "0.4.0" [ring/ring-json "0.4.0" :exclusions [cheshire]]
:exclusions [cheshire]]
[com.cemerick/url "0.1.1"] [com.cemerick/url "0.1.1"]
[cider/cider-nrepl "0.21.1"]
[amazonica "0.3.121" [amazonica "0.3.121"
:exclusions [com.amazonaws/aws-java-sdk :exclusions [com.amazonaws/aws-java-sdk
com.amazonaws/amazon-kinesis-client]] com.amazonaws/amazon-kinesis-client]]
@@ -49,41 +49,33 @@
[com.amazonaws/aws-java-sdk-s3 "1.11.282"] [com.amazonaws/aws-java-sdk-s3 "1.11.282"]
[org.clojure/data.json "0.2.6"] [org.clojure/data.json "0.2.6"]
[org.clojure/data.csv "0.1.4"] [org.clojure/data.csv "0.1.4"]
[cider/cider-nrepl "0.16.0"]
[io.rkn/conformity "0.5.1"] [io.rkn/conformity "0.5.1"]
[cider/piggieback "0.4.0"]
[hiccup "1.0.5"]] [hiccup "1.0.5"]]
:plugins [[lein-ring "0.9.7"] :plugins [[lein-ring "0.9.7"]
[lein-cljsbuild "1.1.5"]] [lein-cljsbuild "1.1.5"]]
:clean-targets ^{:protect false} ["resources/public/js/compiled" "target"] :clean-targets ^{:protect false} ["resources/public/js/compiled" "target"]
:ring {:handler auto-ap.handler/app} :ring {:handler auto-ap.handler/app}
:source-paths ["src/clj" "src/cljc"] :source-paths ["src/clj" "src/cljc" "src/cljs"]
:resource-paths ["resources"] :resource-paths ["resources"]
:aliases {"build" ["do" "clean" ["uberjar"]]
:figwheel {:css-dirs ["resources/public/css"] "fig:min" ["run" "-m" "figwheel.main" "-bo" "min"]}
:ring-handler auto-ap.handler/app
:nrepl-middleware ["cider.nrepl/cider-middleware"]
:nrepl-port 7888}
:aliases {"dev" ["do" "clean"
["pdo" ["figwheel" "dev"]]]
"build" ["do" "clean"
["uberjar"]]}
:profiles :profiles
{:dev {:dev
{:dependencies [[binaryage/devtools "0.9.4"]
[javax.servlet/servlet-api "2.5"]
[figwheel-sidecar "0.5.13"]
[com.cemerick/piggieback "0.2.2"]
]
:plugins [[lein-figwheel "0.5.13"] {:resource-paths ["resources" "target"]
[lein-pdo "0.1.1"] :dependencies [[binaryage/devtools "0.9.4"]
[cider/cider-nrepl "0.16.0"]] [com.bhauman/figwheel-main "0.1.9" :exclusions [org.clojure/clojurescript]]
[com.bhauman/rebel-readline-cljs "0.1.4"]
[javax.servlet/servlet-api "2.5"]]
:plugins [
[lein-pdo "0.1.1"]]
:jvm-opts ["-Dconfig=config/dev.edn" "--add-modules" "java.xml.bind"]} :jvm-opts ["-Dconfig=config/dev.edn" "--add-modules" "java.xml.bind"]}
:uberjar {:prep-tasks [["cljsbuild" "once" "min"] "compile"]} :uberjar {:prep-tasks ["fig:min" ]
:provided {:dependencies [[org.clojure/clojurescript "1.10.238"] :dependencies [[com.bhauman/figwheel-main "0.1.9" :exclusions [org.clojure/clojurescript]]]}
:provided {:dependencies [[org.clojure/clojurescript "1.10.339"]
[reagent "0.7.0" ] [reagent "0.7.0" ]
[cljsjs/react-datepicker "2.1.0-0"] [cljsjs/react-datepicker "2.1.0-0"]
[cljsjs/react-transition-group "2.4.0-0"] [cljsjs/react-transition-group "2.4.0-0"]
@@ -94,31 +86,13 @@
{:builds {:builds
[{:id "dev" [{:id "dev"
:source-paths ["src/cljs" "src/cljc"] :source-paths ["src/cljs" "src/cljc"]
:figwheel {:on-jsload "auto-ap.core/mount-root"}
:compiler {:main auto-ap.core :compiler {:main auto-ap.core
:output-to "resources/public/js/compiled/app.js" :output-to "resources/public/js/compiled/app.js"
:output-dir "resources/public/js/compiled/out" :output-dir "resources/public/js/compiled/out"
:asset-path "/js/compiled/out" :asset-path "/js/compiled/out"
:source-map-timestamp true :source-map-timestamp true
:preloads [devtools.preload] :preloads [devtools.preload]
:external-config {:devtools/config {:features-to-install :all}} :external-config {:devtools/config {:features-to-install :all}}}}]}
:install-deps true
:infer-externs true
}}
{:id "min"
:source-paths ["src/cljs" "src/cljc"]
:jar true
:compiler {:main auto-ap.core
:output-to "resources/public/js/compiled/app.js"
:optimizations :advanced
:closure-defines {goog.DEBUG false}
:pretty-print false}}
]}
:main auto-ap.server :main auto-ap.server

6
src/clj/auto_ap/server.clj
View File

@@ -2,17 +2,17 @@
(:require #_[auto-ap.background.mail :refer [always-process-sqs]] (:require #_[auto-ap.background.mail :refer [always-process-sqs]]
[auto-ap.handler :refer [app]] [auto-ap.handler :refer [app]]
[auto-ap.ledger :refer [process-all]] [auto-ap.ledger :refer [process-all]]
[clojure.tools.nrepl.server :refer [start-server stop-server]] [nrepl.server :refer [start-server stop-server]]
[config.core :refer [env]] [config.core :refer [env]]
[ring.adapter.jetty :refer [run-jetty]]) [ring.adapter.jetty :refer [run-jetty]])
(:gen-class)) (:gen-class))
(defn cider-nrepl-handler [] #_(defn cider-nrepl-handler []
(require 'cider.nrepl) (require 'cider.nrepl)
(ns-resolve 'cider.nrepl 'cider-nrepl-handler)) (ns-resolve 'cider.nrepl 'cider-nrepl-handler))
(defn -main [& args] (defn -main [& args]
(start-server :port 9000 :bind "0.0.0.0" :handler (cider-nrepl-handler)) (start-server :port 9000 :bind "0.0.0.0" #_#_:handler (cider-nrepl-handler))
(let [port (Integer/parseInt (or (env :port) "3000"))] (let [port (Integer/parseInt (or (env :port) "3000"))]
(future (process-all)) (future (process-all))
#_(future (always-process-sqs)) #_(future (always-process-sqs))

3
src/cljs/auto_ap/views/components/layouts.cljs
View File

@@ -87,7 +87,7 @@
[:a {:class "navbar-item" [:a {:class "navbar-item"
:on-click (fn [] :on-click (fn []
(re-frame/dispatch [::events/swap-client nil])) (re-frame/dispatch [::events/swap-client nil]))
} "All"] } "Allo" ]
[:hr {:class "navbar-divider"}] [:hr {:class "navbar-divider"}]
(for [{:keys [name id] :as client} @clients] (for [{:keys [name id] :as client} @clients]
^{:key id } ^{:key id }
@@ -97,6 +97,7 @@
} name])]])]] } name])]])]]
[login-dropdown]]])) [login-dropdown]]]))
(defn footer [] (defn footer []
[:footer {:style {:padding "1em"}} [:footer {:style {:padding "1em"}}
[:div {:class "content has-text-centered"} [:div {:class "content has-text-centered"}