Skip to content

Commit

Permalink
Finished nested-hexagons, styling quiz list
Browse files Browse the repository at this point in the history
  • Loading branch information
KingMob committed Mar 16, 2015
1 parent f22772a commit 8c0993e
Show file tree
Hide file tree
Showing 41 changed files with 780 additions and 668 deletions.
8 changes: 3 additions & 5 deletions project.clj
Expand Up @@ -6,20 +6,18 @@
[org.clojure/clojurescript "0.0-3053"]
[cljsjs/react-with-addons "0.12.2-8"]
[reagent "0.5.0" :exclusions [cljsjs/react]]
;; [reagent "0.4.3"]
[reagent-forms "0.4.4"]
[reagent-forms "0.4.5"]
[reagent-utils "0.1.3"]
;; [secretary "2.0.0.1-5a007a"]
[com.cemerick/piggieback "0.1.5"]
[weasel "0.6.0"]
[ring "1.3.2"]
[ring/ring-defaults "0.1.4"]
[prone "0.8.1"]
[compojure "1.3.2"]
[selmer "0.8.1"]
; [selmer "0.8.1"]
[environ "1.0.0"]
[leiningen "2.5.1"]
[figwheel "0.2.5-SNAPSHOT"]
[figwheel "0.2.5"]
[org.clojure/core.async "0.1.346.0-17112a-alpha"]]

:hooks [leiningen.cljsbuild]
Expand Down
16 changes: 16 additions & 0 deletions resources/public/css/sailing-study-guide.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion resources/public/css/sailing-study-guide.css.map

Large diffs are not rendered by default.

449 changes: 225 additions & 224 deletions resources/public/js/main.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/public/js/out/sailing_study_guide/core.cljs
Expand Up @@ -29,9 +29,9 @@
:question :quizzes))
))

(defn test-container [page]
(defn page-container [page]
[:div [(pages @page)]])


(defn init! []
(reagent/render-component [test-container model/current-page] (.-body js/document)))
(reagent/render-component [page-container model/current-page] (.-body js/document)))
@@ -1,2 +1,2 @@
;; Analyzed by ClojureScript 0.0-3053
{:use-macros {go cljs.core.async.macros, go-loop cljs.core.async.macros}, :excludes #{}, :name sailing-study-guide.core, :imports nil, :requires {reagent reagent.core, model sailing-study-guide.model, sailing-study-guide.view.splash sailing-study-guide.view.splash, reagent.core reagent.core, splash sailing-study-guide.view.splash, cljsjs.react cljsjs.react, sailing-study-guide.model sailing-study-guide.model, sailing-study-guide.view.question sailing-study-guide.view.question, question sailing-study-guide.view.question, dispatcher sailing-study-guide.dispatch, sailing-study-guide.view.quizzes sailing-study-guide.view.quizzes, sailing-study-guide.dispatch sailing-study-guide.dispatch, quizzes sailing-study-guide.view.quizzes}, :uses nil, :defs {init! {:protocol-inline nil, :meta {:arglists (quote ([])), :end-column 12, :end-line 37, :column 7, :line 37, :file "/Users/matthew/Documents/Code/sailing-study-guide/src/cljs/sailing_study_guide/core.cljs"}, :name sailing-study-guide.core/init!, :variadic false, :file "src/cljs/sailing_study_guide/core.cljs", :end-column 12, :method-params ([]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :methods ({:tag any, :variadic false, :max-fixed-arity 0}), :line 37, :end-line 37, :max-fixed-arity 0, :fn-var true, :arglists (quote ([])), :test true}, test-container {:protocol-inline nil, :meta {:arglists (quote ([page])), :end-column 21, :end-line 33, :column 7, :line 33, :file "/Users/matthew/Documents/Code/sailing-study-guide/src/cljs/sailing_study_guide/core.cljs"}, :name sailing-study-guide.core/test-container, :variadic false, :file "src/cljs/sailing_study_guide/core.cljs", :end-column 21, :method-params ([page]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :methods ({:tag cljs.core/IVector, :variadic false, :max-fixed-arity 1}), :line 33, :end-line 33, :max-fixed-arity 1, :fn-var true, :arglists (quote ([page])), :test true}, pages {:meta {:end-column 15, :end-line 17, :column 10, :line 17, :file "/Users/matthew/Documents/Code/sailing-study-guide/src/cljs/sailing_study_guide/core.cljs"}, :file "src/cljs/sailing_study_guide/core.cljs", :line 17, :column 1, :end-line 17, :end-column 15, :test true, :name sailing-study-guide.core/pages}}, :require-macros {cljs.core.async.macros cljs.core.async.macros}, :cljs.analyzer/constants {:order [:splash :quizzes :question :page-finished :div], :seen #{:splash :question :div :quizzes :page-finished}}, :doc nil}
{:use-macros {go cljs.core.async.macros, go-loop cljs.core.async.macros}, :excludes #{}, :name sailing-study-guide.core, :imports nil, :requires {reagent reagent.core, model sailing-study-guide.model, sailing-study-guide.view.splash sailing-study-guide.view.splash, reagent.core reagent.core, splash sailing-study-guide.view.splash, cljsjs.react cljsjs.react, sailing-study-guide.model sailing-study-guide.model, sailing-study-guide.view.question sailing-study-guide.view.question, question sailing-study-guide.view.question, dispatcher sailing-study-guide.dispatch, sailing-study-guide.view.quizzes sailing-study-guide.view.quizzes, sailing-study-guide.dispatch sailing-study-guide.dispatch, quizzes sailing-study-guide.view.quizzes}, :uses nil, :defs {init! {:protocol-inline nil, :meta {:arglists (quote ([])), :end-column 12, :end-line 37, :column 7, :line 37, :file "/Users/matthew/Documents/Code/sailing-study-guide/src/cljs/sailing_study_guide/core.cljs"}, :name sailing-study-guide.core/init!, :variadic false, :file "src/cljs/sailing_study_guide/core.cljs", :end-column 12, :method-params ([]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :methods ({:tag any, :variadic false, :max-fixed-arity 0}), :line 37, :end-line 37, :max-fixed-arity 0, :fn-var true, :arglists (quote ([])), :test true}, page-container {:protocol-inline nil, :meta {:arglists (quote ([page])), :end-column 21, :end-line 33, :column 7, :line 33, :file "/Users/matthew/Documents/Code/sailing-study-guide/src/cljs/sailing_study_guide/core.cljs"}, :name sailing-study-guide.core/page-container, :variadic false, :file "src/cljs/sailing_study_guide/core.cljs", :end-column 21, :method-params ([page]), :protocol-impl nil, :arglists-meta (nil nil), :column 1, :methods ({:tag cljs.core/IVector, :variadic false, :max-fixed-arity 1}), :line 33, :end-line 33, :max-fixed-arity 1, :fn-var true, :arglists (quote ([page])), :test true}, pages {:meta {:end-column 15, :end-line 17, :column 10, :line 17, :file "/Users/matthew/Documents/Code/sailing-study-guide/src/cljs/sailing_study_guide/core.cljs"}, :file "src/cljs/sailing_study_guide/core.cljs", :line 17, :column 1, :end-line 17, :end-column 15, :test true, :name sailing-study-guide.core/pages}}, :require-macros {cljs.core.async.macros cljs.core.async.macros}, :cljs.analyzer/constants {:order [:splash :quizzes :question :page-finished :div], :seen #{:splash :question :div :quizzes :page-finished}}, :doc nil}
8 changes: 4 additions & 4 deletions resources/public/js/out/sailing_study_guide/core.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion resources/public/js/out/sailing_study_guide/core.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions resources/public/js/out/sailing_study_guide/dispatch.cljs
Expand Up @@ -2,12 +2,12 @@
(:require-macros [cljs.core.async.macros :refer [go go-loop]])
(:require [cljs.core.async :refer [chan mult tap put! <! >! pub sub unsub close!]]))


(defonce default-buffer-size 5)
(defonce *dispatcher-logging-enabled* true)

(defonce ^:private dispatch-chan (chan 1))
(defonce ^:private dispatch-chan (chan default-buffer-size))
(defonce ^:private dispatch-mult (mult dispatch-chan))
(defonce ^:private dispatch-pub-chan (chan 1))
(defonce ^:private dispatch-pub-chan (chan default-buffer-size))
(defonce ^:private dispatch-pub (pub dispatch-pub-chan #(:tag %)))
(tap dispatch-mult dispatch-pub-chan)

Expand All @@ -27,14 +27,14 @@
(defn whenever [tag cb]
(let [c (register tag)]
(go-loop [payload (<! c)]
(if payload
(do
;; (println "Processing mesg in " payload)
(cb (retrieve-message payload))
(recur (<! c)))
(do
(println "Leaving loop for " c)
(close! c))))
(if payload
(do
;; (println "Processing mesg in " payload)
(cb (retrieve-message payload))
(recur (<! c)))
(do
(println "Leaving loop for " c)
(close! c))))
c))

(defn dispatch! [tagortags message]
Expand Down

0 comments on commit 8c0993e

Please sign in to comment.