diff --git a/src/mtgcoll/core.clj b/src/mtgcoll/core.clj index d84152d..65777f1 100644 --- a/src/mtgcoll/core.clj +++ b/src/mtgcoll/core.clj @@ -10,6 +10,7 @@ [ring.middleware.defaults :refer [wrap-defaults site-defaults]] [ring.middleware.format :refer [wrap-restful-format]] [ring.middleware.reload :refer [wrap-reload]] + [ring.middleware.webjars :refer [wrap-webjars]] [ring-ttl-session.core :refer [ttl-memory-store]] [taoensso.sente.server-adapters.immutant :refer [sente-web-server-adapter]] [mtgcoll.cli :as cli] @@ -36,7 +37,8 @@ (route/not-found "not found")) (wrap-restful-format :formats [:json-kw]) (sente/wrap-sente "/chsk") - (wrap-defaults (assoc-in site-defaults [:session :store] (ttl-memory-store (* 60 30)))))) + (wrap-defaults (assoc-in site-defaults [:session :store] (ttl-memory-store (* 60 30)))) + (wrap-webjars))) (defstate ^{:on-reload :noop} http-server :start (let [options (merge diff --git a/src/mtgcoll/routes/main_page.clj b/src/mtgcoll/routes/main_page.clj index 16a842e..e6a96c2 100644 --- a/src/mtgcoll/routes/main_page.clj +++ b/src/mtgcoll/routes/main_page.clj @@ -6,28 +6,21 @@ [hiccup.page :refer [include-css include-js]] [hiccup.element :refer [javascript-tag]] [webtools.page :refer [html5 js-env-settings]] - [webtools.reagent.page :refer [include-bootstrap-metatags]] [mtgcoll.config :as config]) (:use mtgcoll.utils)) -(defn- include-bootstrap-css - [& [use-bootstrap-theme?]] - (->> ["https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" - (if use-bootstrap-theme? "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css") - "https://npmcdn.com/react-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" - "https://npmcdn.com/react-select/dist/react-select.min.css"] - (remove nil?) - (apply include-css))) - (defn main-page [request] (html5 [:head - [:title "MTG Web Collection"] + [:meta {:charset "utf-8"}] + [:meta {:http-equiv "X-UA-Compatible" :content "IE=edge"}] + [:meta {:name "viewport" :content "width=device-width, initial-scale=1"}] (anti-forgery-field) - (include-bootstrap-metatags) - (include-bootstrap-css true) + [:title "MTG Web Collection"] + (include-css "/assets/bootstrap/css/bootstrap.min.css") + (include-css "/assets/bootstrap/css/bootstrap-theme.min.css") (include-css "css/app.css")] [:body [:div#wrap