Skip to content

Commit

Permalink
Introduced a Noir web process. Went back to Clojure 1.2.1 due to inco…
Browse files Browse the repository at this point in the history
…mpatibilities.
  • Loading branch information
cfox committed Mar 27, 2012
1 parent a2c8954 commit 1b0bc4f
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 6 deletions.
9 changes: 5 additions & 4 deletions .gitignore
@@ -1,5 +1,6 @@
project.clj~
lib/
magicluster-0.0.1.jar
**/*~
*~
.lein-deps-sum
pom.xml
*jar
/lib/
/classes/
1 change: 1 addition & 0 deletions Procfile
@@ -0,0 +1 @@
web: lein run -m mc.server
6 changes: 4 additions & 2 deletions project.clj
@@ -1,6 +1,8 @@
(defproject magicluster "0.0.1"
:dependencies [[org.clojure/clojure "1.3.0"]
:dependencies [[org.clojure/clojure "1.2.1"]
[org.clojure/data.json "0.1.2"]
[congomongo "0.1.8"]
[noir "1.1.0-SNAPSHOT"]
[ring/ring-jetty-adapter "1.0.1"]]
:run-aliases {:extractor mc.extractor})
:run-aliases {:extractor mc.extractor
:server mc.server})
57 changes: 57 additions & 0 deletions resources/public/css/reset.css
@@ -0,0 +1,57 @@
html {
margin:0;
padding:0;
border:0;
}

body, div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, code,
del, dfn, em, img, q, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, dialog, figure, footer, header,
hgroup, nav, section {
margin: 0;
padding: 0;
border: 0;
font-weight: inherit;
font-style: inherit;
font-size: 100%;
font-family: inherit;
vertical-align: baseline;
}

article, aside, dialog, figure, footer, header,
hgroup, nav, section {
display:block;
}

body {
line-height: 1.5;
background: white;
}

table {
border-collapse: separate;
border-spacing: 0;
}

caption, th, td {
text-align: left;
font-weight: normal;
float:none !important;
}
table, th, td {
vertical-align: middle;
}

blockquote:before, blockquote:after, q:before, q:after { content: ''; }
blockquote, q { quotes: "" ""; }

a img { border: none; }

/*:focus { outline: 0; }*/



10 changes: 10 additions & 0 deletions src/mc/server.clj
@@ -0,0 +1,10 @@
(ns mc.server
(:require [noir.server :as server]))

(server/load-views "src/mc/views/")

(defn -main [& m]
(let [mode (keyword (or (first m) :dev))
port (Integer. (get (System/getenv) "PORT" "8080"))]
(server/start port {:mode mode
:ns 'mc})))
13 changes: 13 additions & 0 deletions src/mc/views/common.clj
@@ -0,0 +1,13 @@
(ns mc.views.common
(:use noir.core
hiccup.core
hiccup.page-helpers))

(defpartial layout [& content]
(html5
[:head
[:title "magicluster"]
(include-css "/css/reset.css")]
[:body
[:div#wrapper
content]]))
10 changes: 10 additions & 0 deletions src/mc/views/welcome.clj
@@ -0,0 +1,10 @@
(ns mc.views.welcome
(:require [mc.views.common :as common]
[noir.content.pages :as pages])
(:use noir.core
hiccup.core
hiccup.page-helpers))

(defpage "/welcome" []
(common/layout
[:p "Welcome to magicluster"]))

0 comments on commit 1b0bc4f

Please sign in to comment.