ryuslash/scrumli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small refactor

Browse source
This commit is contained in:
Tom Willemse 2013-07-05 23:22:25 +02:00
parent 88404fc72d
commit eb32c34e1f
1 changed files with 68 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
scrumli.lisp
View file

@ -3,27 +3,27 @@
(defvar *scrumli-host* "http://localhost:8080" (defvar *scrumli-host* "http://localhost:8080"
"The host currently running Scrumli. Used by Mozilla Persona.") "The host currently running Scrumli. Used by Mozilla Persona.")
(defvar *scrumelo-bootstrap-css-location* (defvar *scrumli-bootstrap-css-location*
"http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css" "http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.no-icons.min.css"
"The location of the twitter bootstrap CSS file.") "The location of the twitter bootstrap CSS file.")
(defvar *scrumelo-bootstrap-js-location* (defvar *scrumli-bootstrap-js-location*
"http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js" "http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"
"The location of the twitter bootstrap JS file.") "The location of the twitter bootstrap JS file.")
(defvar *scrumelo-font-awesome-css-location* (defvar *scrumli-font-awesome-css-location*
"http://netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.min.css" "http://netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.min.css"
"The location of the font awesome CSS file.") "The location of the font awesome CSS file.")
(defvar *scrumelo-jquery-js-location* (defvar *scrumli-jquery-js-location*
"http://code.jquery.com/jquery-2.0.0.min.js" "http://code.jquery.com/jquery-2.0.0.min.js"
"The location of the jQuery JS file.") "The location of the jQuery JS file.")
(defvar *scrumelo-react-js-location* (defvar *scrumli-react-js-location*
"http://cdnjs.cloudflare.com/ajax/libs/react/0.3.2/react.min.js" "http://cdnjs.cloudflare.com/ajax/libs/react/0.3.2/react.min.js"
"The location of the React JS file.") "The location of the React JS file.")
(defvar *scrumelo-jsxtransformer-js-location* (defvar *scrumli-jsxtransformer-js-location*
"http://cdnjs.cloudflare.com/ajax/libs/react/0.3.2/JSXTransformer.js" "http://cdnjs.cloudflare.com/ajax/libs/react/0.3.2/JSXTransformer.js"
"The location of the JSX Transformer JS file.") "The location of the JSX Transformer JS file.")
@ -33,48 +33,56 @@
(defun page-title (title) (defun page-title (title)
(<:title (concatenate 'string title " | scrumli"))) (<:title (concatenate 'string title " | scrumli")))
(defun css (&rest sheets)
(apply 'concatenate 'string
(mapcar (lambda (s)
(<:link :href s :rel "stylesheet" :type "text/css"))
sheets)))
(defun js (&rest scripts)
(apply 'concatenate 'string
(mapcar (lambda (s)
(<:script :type "text/javascript" :src s))
scripts)))
(defmacro navbar (&body body)
`(<:div :class "navbar navbar-static-top navbar-inverse"
(<:div :class "navbar-inner"
(<:div :class "container"
(<:a :class "brand" "scrumli")
,@body))))
(define-route main ("") (define-route main ("")
(if (logged-in-p) (if (logged-in-p)
(<:html (<:html
(<:head (page-title "Backlog") (<:head (page-title "Backlog")
(<:link :href *scrumelo-bootstrap-css-location* (css *scrumli-bootstrap-css-location*
:rel "stylesheet" :type "text/css") *scrumli-font-awesome-css-location*)
(<:link :href *scrumelo-font-awesome-css-location* (js *scrumli-bootstrap-js-location*
:rel "stylesheet" :type "text/css") *scrumli-jquery-js-location*
(<:script :type "text/javascript" *scrumli-react-js-location*
:src *scrumelo-bootstrap-js-location*) *scrumli-jsxtransformer-js-location*))
(<:script :type "text/javascript"
:src *scrumelo-jquery-js-location*)
(<:script :type "text/javascript"
:src *scrumelo-react-js-location*)
(<:script :type "text/javascript"
:src *scrumelo-jsxtransformer-js-location*))
(<:body (<:body
(<:div :class "navbar navbar-static-top navbar-inverse" (navbar (<:div :class "pull-right"
(<:div :class "navbar-inner" (<:span :class "navbar-text"
(<:div :class "container" (hunchentoot:session-value :username))
(<:a :class "brand" "scrumli") (<:ul :class "nav pull-right"
(<:div :class "pull-right" (<:li :class "divider-vertical")
(<:span :class "navbar-text" (<:li (<:a :href (genurl 'logout-page)
(hunchentoot:session-value "Logout"))
:username)) (<:li :class "divider-vertical"))))
(<:ul :class "nav pull-right"
(<:li :class "divider-vertical")
(<:li (<:a :href "/logout"
"Logout")))))))
(<:div :class "container" (<:div :class "container"
(<:h1 "Backlog") (<:h1 "Backlog")
(<:div :id "content") (<:div :id "content")
(<:script :type "text/jsx" :src "js/main.js")))) (<:script :type "text/jsx" :src (genurl 'main-js)))))
(redirect 'login-page))) (redirect 'login-page)))
(define-route react-ui ("js/main.js" (defmacro serve-static (name relpath)
:content-type "application/ecmascript") `(define-route ,name (,relpath :content-type "application/ecmascript")
(merge-pathnames "js/main.js" *static-directory*)) (merge-pathnames ,relpath *static-directory*)))
(define-route login-js ("js/login.js" (serve-static main-js "js/main.js")
:content-type "application/ecmascript") (serve-static login-js "js/login.js")
(merge-pathnames "js/login.js" *static-directory*))
(define-route stories-json ("stories" :content-type "text/json") (define-route stories-json ("stories" :content-type "text/json")
(if (logged-in-p) (if (logged-in-p)
@ -82,22 +90,26 @@
(encode-json (get-all-stories) out)) (encode-json (get-all-stories) out))
403)) 403))
(defmacro with-post-parameters (parameters &body body)
`(let ,(mapcar (lambda (p)
(list (intern (string-upcase p))
`(hunchentoot:post-parameter ,p)))
parameters)
,@body))
(define-route stories-new ("stories/new" :method :post) (define-route stories-new ("stories/new" :method :post)
(if (logged-in-p) (if (logged-in-p)
(let ((role (hunchentoot:post-parameter "role")) (with-post-parameters ("role" "necessity" "headline" "content")
(necessity (hunchentoot:post-parameter "necessity")) (post-story role necessity headline content
(title (hunchentoot:post-parameter "headline"))
(content (hunchentoot:post-parameter "content")))
(post-story role necessity title content
(hunchentoot:session-value :username)) (hunchentoot:session-value :username))
200) 200)
403)) 403))
(define-route tasks-new ("stories/tasks/new" :method :post) (define-route tasks-new ("stories/tasks/new" :method :post)
(if (logged-in-p) (if (logged-in-p)
(let ((id (hunchentoot:post-parameter "storyId")) (with-post-parameters ("storyId" "description")
(description (hunchentoot:post-parameter "description"))) (post-task storyid description
(post-task id description (hunchentoot:session-value :username)) (hunchentoot:session-value :username))
200) 200)
403)) 403))
@ -142,20 +154,16 @@
(<:html :lang "en" (<:html :lang "en"
(<:head (<:meta :charset "utf-8") (<:head (<:meta :charset "utf-8")
(page-title "Login") (page-title "Login")
(<:link :href *scrumelo-bootstrap-css-location* (css *scrumli-bootstrap-css-location*)
:rel "stylesheet" :type "text/css") (js *scrumli-bootstrap-js-location*
(<:script :type "text/javascript" "https://login.persona.org/include.js"
:src *scrumelo-bootstrap-js-location*) (genurl 'login-js)))
(<:script :src "https://login.persona.org/include.js")
(<:script :src "/js/login.js"))
(<:body (<:body
(<:div :class "navbar navbar-static-top navbar-inverse" (navbar (<:ul :class "nav pull-right"
(<:div :class "navbar-inner" (<:li :class "divider-vertical")
(<:div :class "container" (<:li (<:a :href "javascript:login()"
(<:a :class "brand" "scrumli") "Login"))
(<:ul :class "nav pull-right" (<:li :class "divider-vertical")))
(<:li (<:a :href "javascript:login()"
"Login"))))))
(<:div :class "container" (<:div :class "container"
(<:br) (<:br)
(<:div :class "hero-unit" (<:div :class "hero-unit"
@ -173,8 +181,7 @@
(define-route logout-page ("logout") (define-route logout-page ("logout")
(if (logged-in-p) (if (logged-in-p)
(progn (setf (hunchentoot:session-value :username) nil))
(setf (hunchentoot:session-value :username) nil)))
(redirect 'login-page)) (redirect 'login-page))
(defun json-to-string (obj) (defun json-to-string (obj)
@ -203,7 +210,7 @@
(redirect 'main)) (redirect 'main))
403))) 403)))
(define-route scrumelo-story ("stories/:id") (define-route scrumli-story ("stories/:id")
(if (logged-in-p) (if (logged-in-p)
(with-output-to-string (out) (with-output-to-string (out)
(encode-json (get-story id) out)) (encode-json (get-story id) out))