Skip to content

Commit

Permalink
rest style route uri
Browse files Browse the repository at this point in the history
  • Loading branch information
helly(양완수) committed Jul 7, 2015
1 parent cd23514 commit 1017759
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ pom.xml
profiles.clj
/.env
*.log
*.db
.nrepl-port

/.idea
*.iml
7 changes: 3 additions & 4 deletions resources/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
<time>{{item.timestamp|date:"yyyy-MM-dd HH:mm"}}</time>
<p>{{item.message}}</p>
<p> - {{item.name}}</p>

<form method="POST" action="/delete">
<form id="delete-form-{{item.id}}" method="post" action="/delete/{{item.id}}">
{% csrf-field %}
<input type="hidden" name="id" value={{item.id}}>
<input style="display:inline" type="submit" class="btn btn-primary" value="delete" />
</form>
<input type="submit" form="delete-form-{{item.id}}" class="btn btn-primary" value="delete" />

<a href="/update?id={{item.id}}" class="btn btn-primary"> update </a>
</li>
{% endfor %}
Expand Down
17 changes: 9 additions & 8 deletions src/guestbook/routes/home.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
[guestbook.db.core :as db]
[bouncer.core :as b]
[bouncer.validators :as v]
[ring.util.response :refer [redirect]]))
[ring.util.response :refer [redirect]])
(:import (java.util Date)))

(defn validate-message [params]
(first
Expand All @@ -19,20 +20,20 @@
(-> (redirect "/")
(assoc :flash (assoc params :errors errors)))
(do
(db/save-message! (assoc params :timestamp (java.util.Date.)))
(db/save-message! (assoc params :timestamp (Date.)))
(redirect "/"))))

(defn delete-message! [{:keys [params]}]
(defn delete-message! [id]
(do
(db/delete-message! params)
(db/delete-message! {:id id})
(redirect "/")))

(defn update-message [{:keys [params flash]}]
(defn update-message [id]
(if (empty? params)
(redirect "/")
(layout/render
"update.html"
(merge (first (db/get-message params))
(merge (first (db/get-message {:id id}))
(select-keys flash [:name :message :errors])))))

(defn update-message! [{:keys [params]}]
Expand All @@ -51,7 +52,7 @@
(defroutes home-routes
(GET "/" request (home-page request))
(POST "/" request (save-message! request))
(POST "/delete" request (delete-message! request))
(GET "/update" request (update-message request))
(POST "/delete/:id" [id] (delete-message! id))
(GET "/update/:id" [id] (update-message id))
(POST "/update" request (update-message! request))
(GET "/about" [] (about-page)))

0 comments on commit 1017759

Please sign in to comment.