dependencies| org.clojure/clojure |
| 1.6.0 | | mw-engine |
| 0.1.0-SNAPSHOT | | mw-parser |
| 0.1.0-SNAPSHOT | | lib-noir |
| 0.8.4 | | ring-server |
| 0.3.1 | | selmer |
| 0.6.8 | | com.taoensso/timbre |
| 3.2.1 | | com.taoensso/tower |
| 2.0.2 | | markdown-clj |
| 0.9.44 | | environ |
| 0.5.0 | | noir-exception |
| 0.2.2 |
|
(this space intentionally left almost blank) |
| |
| |
+dependencies| org.clojure/clojure |
| 1.6.0 | | mw-engine |
| 0.1.0-SNAPSHOT | | mw-parser |
| 0.1.0-SNAPSHOT | | lib-noir |
| 0.8.4 | | ring-server |
| 0.3.1 | | selmer |
| 0.6.8 | | com.taoensso/timbre |
| 3.2.1 | | com.taoensso/tower |
| 2.0.2 | | markdown-clj |
| 0.9.44 | | environ |
| 0.5.0 | | noir-exception |
| 0.2.2 |
|
(this space intentionally left almost blank) |
| |
| |
|
| (ns mw-ui.handler
(:require [compojure.core :refer [defroutes]]
[mw-ui.routes.home :refer [home-routes]]
@@ -3151,7 +3151,7 @@ net.brehaut.ClojureTools = (function (SH) {
(let [world (or (session/get :world)
(engine/transform-world
(heightmap/apply-heightmap
- "resources/public/img/20x20/hill.png"
+ "resources/public/img/heightmaps/small_hill.png"
;; "resources/public/img/heightmaps/great_britain_and_ireland_small.png")
rules/init-rules))
rules (or (session/get :rules)
@@ -3212,23 +3212,36 @@ net.brehaut.ClojureTools = (function (SH) {
(.stop @server)
(reset! server nil)) |
| | |
| |
|
| (ns mw-ui.routes.home
- (:use compojure.core
- [mw-ui.routes.rules :as rules])
+ (:use clojure.walk
+ compojure.core
+ [mw-ui.routes.rules :as rules]
+ [mw-ui.routes.params :as params])
(:require [hiccup.core :refer [html]]
[mw-ui.layout :as layout]
[mw-ui.util :as util]
[mw-ui.render-world :as world]
[noir.session :as session])) |
|
| (defn home-page []
- (layout/render "home.html" {:title "Welcome to MicroWorld"
+ (layout/render "trusted-content.html" {:title "Welcome to MicroWorld"
:content (util/md->html "/md/mw-ui.md")})) |
|
| (defn world-page []
- (layout/render "world.html" {:title "Watch your world grow"
- :content (html (world/render-world-table))
- :seconds (or (session/get :seconds) 5)
- :maybe-refresh "refresh"})) |
|
+ (layout/render "trusted-content.html"
+ {:title "Watch your world grow"
+ :world-selected "active"
+ :content (html (world/render-world-table))
+ :pause (or (session/get :pause) 5)
+ :maybe-refresh "refresh"})) |
|
| (defn about-page []
- (layout/render "about.html" {:title "About MicroWorld" :content (util/md->html "/md/about.md")})) |
|
+ (layout/render "trusted-content.html"
+ {:title "About MicroWorld"
+ :about-selected "active"
+ :content (util/md->html "/md/about.md")})) |
|
+ | (defn md-page [request]
+ (let [params (keywordize-keys (:params request))
+ content (or (:content params) "missing.md")]
+ (layout/render "trusted-content.html"
+ {:title "Welcome to MicroWorld"
+ :content (util/md->html (str "/md/" content))}))) |
|
| (defn list-states []
(sort
(filter #(not (nil? %))
@@ -3236,16 +3249,72 @@ net.brehaut.ClojureTools = (function (SH) {
(file-seq (clojure.java.io/file "resources/public/img/tiles")))))) |
|
| (defn docs-page []
(layout/render "docs.html" {:title "Documentation"
- :parser (util/md->html "/md/mw-parser.md")
- :states (list-states)
+ :parser (util/md->html "/md/mw-parser.md" )
+ :states (util/list-resources "resources/public/img/tiles" #"([0-9a-z-_]+).png")
+ :lessons (util/list-resources "resources/public/md/lesson-plans" #"([0-9a-z-_]+).md")
:components ["mw-engine" "mw-parser" "mw-ui"]})) |
|
| (defroutes home-routes
(GET "/" [] (home-page))
(GET "/about" [] (about-page))
(GET "/docs" [] (docs-page))
(GET "/world" [] (world-page))
+ (GET "/params" [] (params/params-page))
+ (GET "/md" request (md-page request))
+ (POST "/params" request (params/params-page request))
(GET "/rules" request (rules/rules-page request))
- (POST "/rules" request (rules/rules-page request))) |
| | |
| |
|
+ (POST "/rules" request (rules/rules-page request))) |
| | |
| |
|
+ | (ns mw-ui.routes.params
+ (:use clojure.walk
+ compojure.core)
+ (:require [hiccup.core :refer [html]]
+ [mw-engine.heightmap :as heightmap]
+ [mw-parser.bulk :as compiler]
+ [mw-ui.layout :as layout]
+ [mw-ui.util :as util]
+ [mw-ui.render-world :as world]
+ [noir.session :as session])) |
|
+ | (defn- send-params []
+ {:title "Choose your world"
+ :heightmaps (util/list-resources "resources/public/img/heightmaps" #"([0-9a-z-_]+).png")
+ :pause (or (session/get :pause) 5)
+ :rulesets (util/list-resources "resources/rulesets" #"([0-9a-z-_]+).txt")
+ }) |
Handler for params request. If no request passed, show empty params form.
+ If request is passed, put parameters from request into session and show
+ the world page.
+ | (defn params-page
+ ([]
+ (layout/render "params.html" (send-params)))
+ ([request]
+ (try
+ (let [params (keywordize-keys (:form-params request))
+ map (:heightmap params)
+ pause (:pause params)
+ rulefile (:ruleset params)
+ rulepath (str "resources/rulesets/" rulefile ".txt")]
+ (if (not (= map ""))
+ (session/put! :world
+ (heightmap/apply-heightmap
+ (str "resources/public/img/heightmaps/" map ".png"))))
+ (if (not (= rulefile ""))
+ (do
+ (session/put! :rule-text (slurp rulepath))
+ (session/put! :rules (compiler/compile-file rulepath))))
+ (if (not (= pause ""))
+ (session/put! :pause pause))
+ (layout/render "params.html"
+ (merge (send-params)
+ {:r rulefile
+ :h map
+ :message "Your parameters are saved, now look at your world"})))
+ (catch Exception e
+ (let [params (keywordize-keys (:form-params request))]
+ (layout/render "params.html"
+ (merge (send-params)
+ {:title "Choose your world"
+ :r (:ruleset params)
+ :h (:heightmap params)
+ :message "Your paramters are not saved"
+ :error (str (.getName (.getClass e)) ": " (.getMessage e) "; " params)}))))))) |
| | |
| |
|
| (ns mw-ui.routes.rules
(:use clojure.walk
compojure.core)
@@ -3298,5 +3367,11 @@ net.brehaut.ClojureTools = (function (SH) {
[filename]
(->>
(io/slurp-resource filename)
- (md/md-to-html-string))) |
| | |