Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/clj/catalog/routes/home.clj
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
[ ""
{:middleware [middleware/wrap-csrf
middleware/wrap-formats]}
["/" {:get {:handler (fn [_] (views/home))}}]
["/" {:get {:handler views/home}}]
["/:year/:issue"
{:coercion spec-coercion/coercion
:middleware [coercion/coerce-request-middleware
multipart/multipart-middleware]}

["" {:get {:parameters {:path {:year ::year :issue ::issue}}
:handler (fn [{{{:keys [year issue]} :path} :parameters}]
(views/home year issue))}}]
["" {:name :issue
:get {:parameters {:path {:year ::year :issue ::issue}}
:handler (fn [{{{:keys [year issue]} :path} :parameters :as request}]
(views/home request year issue))}}]

;; Neu im Sortiment
["/neu-im-sortiment.pdf"
Expand Down
6 changes: 6 additions & 0 deletions src/clj/catalog/web/layout.clj
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
(:require [catalog.issue :as issue]
[hiccup.page :refer [html5 include-css include-js]]
[ring.util.http-response :as response]
[reitit.core :as reitit]
[trptcolin.versioneer.core :as version]))

(defn glyphicon
Expand Down Expand Up @@ -34,6 +35,11 @@
(for [[link label] items]
(menu-item link label))]])

(defn path-for [{::reitit/keys[router]} name args]
(-> router
(reitit/match-by-name name args)
(reitit/match->path)))

(defn navbar
"Display the navbar"
[year issue]
Expand Down
7 changes: 4 additions & 3 deletions src/clj/catalog/web/views.clj
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@
(download-button (download-url year issue file-name))])

(defn home
([]
([request]
(let [date (time/local-date)
[year issue] (issue/issue-for date)]
(response/redirect (format "/%s/%s" year issue))))
([year issue]
(response/redirect
(layout/path-for request :issue {:year year :issue issue}))))
([request year issue]
(layout/common
year issue
[:div.row
Expand Down