Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@arttuka
arttuka committed Jul 2, 2018
2 parents 5ce1ea9 + 9a8c392 commit 48849f2
Show file tree
Hide file tree
Showing 29 changed files with 1,522 additions and 7,768 deletions.
1 change: 1 addition & 0 deletions mtg-pairings-server/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pom.xml.asc
*.iml
/.lein-*
/.nrepl-port
.rebel_readline_history
/bin
.classpath
.DS_Store
Expand Down
101 changes: 46 additions & 55 deletions mtg-pairings-server/project.clj
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
(defproject mtg-pairings-server "2.0.0"
(defproject mtg-pairings-server "2.0.1"
:license {:name "MIT License"
:url "http://www.opensource.org/licenses/mit-license.php"}
:dependencies [[org.clojure/clojure "1.8.0"]
[org.clojure/core.async "0.3.443"]
[reagent "0.7.0" :exclusions [cljsjs/react]]
[reagent-utils "0.2.1"]
[ring "1.6.2"]
[ring/ring-defaults "0.3.1"]
[compojure "1.6.0"]
:dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/core.async "0.4.474"]
[reagent "0.8.1" :exclusions [cljsjs/react]]
[reagent-utils "0.3.1"]
[ring "1.6.3"]
[ring/ring-defaults "0.3.2"]
[compojure "1.6.1"]
[hiccup "1.0.5"]
[yogthos/config "0.9"]
[org.clojure/clojurescript "1.9.908"
:scope "provided"]
[yogthos/config "1.1.1"]
[org.clojure/clojurescript "1.10.339"]
[secretary "1.2.3"]
[venantius/accountant "0.2.0"
[venantius/accountant "0.2.4"
:exclusions [org.clojure/tools.reader]]
[org.clojure/core.cache "0.6.5"]
[http-kit "2.2.0"]
[org.clojure/tools.reader "1.0.5"]
[clj-time "0.14.0"]
[com.andrewmcveigh/cljs-time "0.5.0"]
[org.clojure/core.cache "0.7.1"]
[http-kit "2.3.0"]
[org.clojure/tools.reader "1.2.2"]
[clj-time "0.14.4"]
[com.andrewmcveigh/cljs-time "0.5.2"]
[korma "0.4.3"]
[mount "0.1.11"]
[org.postgresql/postgresql "42.1.4"]
[org.clojure/tools.logging "0.4.0"]
[metosin/compojure-api "1.1.11"]
[org.postgresql/postgresql "42.2.2"]
[metosin/compojure-api "1.1.12"]
[ring.middleware.jsonp "0.1.6"]
[com.taoensso/sente "1.11.0" :exclusions [com.taoensso/encore]]
[com.taoensso/sente "1.12.0" :exclusions [com.taoensso/encore]]
[com.taoensso/timbre "4.10.0"]
[com.cognitect/transit-clj "0.8.300"]
[com.cognitect/transit-cljs "0.8.239"]
[re-frame "0.10.1" :exclusions [cljsjs/react]]
[cljsjs/react-with-addons "15.6.1-0"]]
[com.cognitect/transit-clj "0.8.309"]
[com.cognitect/transit-cljs "0.8.256"]
[re-frame "0.10.5" :exclusions [cljsjs/react]]
[cljsjs/react "16.4.0-0"]
[cljsjs/react-transition-group "2.3.1-0"]]
:plugins [[lein-environ "1.1.0" :exclusions [org.clojure/clojure]]
[lein-cljsbuild "1.1.7"]
[lein-asset-minifier "0.3.2"]]
Expand All @@ -46,9 +45,7 @@
:resource-paths ["resources" "target/cljsbuild"]

:minify-assets {:assets {"resources/public/css/main.min.css"
["resources/public/css/main.css"
"resources/public/css/bootstrap.css"
"resources/public/css/bootstrap-theme.css"]}}
"resources/public/css/main.css"}}

:cljsbuild
{:builds {:min
Expand All @@ -63,22 +60,16 @@
{:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"]
:figwheel {:on-jsload "mtg-pairings-server.core/mount-root"}
:compiler
{:main "mtg-pairings-server.dev"
: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}}
#_#_
:test
{:source-paths ["src/cljs" "src/cljc" "test/cljs"]
:compiler {:main mtg-pairings-server.doo-runner
:asset-path "/js/out"
:output-to "target/test.js"
:output-dir "target/cljstest/public/js/out"
:optimizations :whitespace
:pretty-print true}}}}
{:main "mtg-pairings-server.dev"
: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
:closure-defines {"re_frame.trace.trace_enabled_QMARK_" true}
:preloads [devtools.preload
day8.re-frame-10x.preload]}}}}

:figwheel {:http-server-root "public"
:server-port 3449
Expand All @@ -91,22 +82,22 @@
:profiles {:dev {:repl-options {:init-ns mtg-pairings-server.repl
:nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}
:source-paths ["dev" "env/dev/clj"]
:plugins [[lein-figwheel "0.5.13"]
[lein-doo "0.1.6"]]
:plugins [[lein-figwheel "0.5.16"]]

:injections [(require 'pjstadig.humane-test-output)
(pjstadig.humane-test-output/activate!)]
:injections [(require 'pjstadig.humane-test-output)
(pjstadig.humane-test-output/activate!)]

:env {:dev true}
:env {:dev true}
:dependencies [[org.clojure/tools.namespace "0.2.11"]
[binaryage/devtools "0.9.4"]
[ring/ring-mock "0.3.1"]
[ring/ring-devel "1.6.2"]
[prone "1.1.4"]
[figwheel-sidecar "0.5.13"]
[binaryage/devtools "0.9.10"]
[ring/ring-mock "0.3.2"]
[ring/ring-devel "1.6.3"]
[prone "1.6.0"]
[figwheel-sidecar "0.5.16"]
[org.clojure/tools.nrepl "0.2.13"]
[com.cemerick/piggieback "0.2.2"]
[pjstadig/humane-test-output "0.8.2"]]}
[pjstadig/humane-test-output "0.8.3"]
[day8.re-frame/re-frame-10x "0.3.3-react16"]]}
:uberjar {:main mtg-pairings-server.main
:aot :all
:hooks [minify-assets.plugin/hooks]
Expand Down
5 changes: 3 additions & 2 deletions mtg-pairings-server/resources/private/db.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ create table seating (

create table pod_round (
id serial primary key,
tournament int not null references tournament(id)
tournament int not null references tournament(id),
round int references round(id)
);

create table pod (
Expand All @@ -90,4 +91,4 @@ create table pod_seat (
seat int not null
);

commit;
commit;
Loading

0 comments on commit 48849f2

Please sign in to comment.