simon/youyesyet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature/60: revert to trusting Selmer to resolve the servlet context...

Browse source 
Even though it doesn't. This works in Jetty, which is OK for development. It doesn't work in Tomcat, which I would like it to, but that possibly doesn't matter and at least isn't an issue for now.
This commit is contained in:
Simon Brooke 2021-05-21 10:17:12 +01:00
parent e0a310a7e5
commit 03c274486e
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
project.clj
View file

@ -6,6 +6,7 @@
:url "https://github.com/simon-brooke/youyesyet" :url "https://github.com/simon-brooke/youyesyet"
:dependencies [[adl-support "0.1.6"] :dependencies [[adl-support "0.1.6"]
[binaryage/devtools "1.0.3"]
[bouncer "1.0.1"] [bouncer "1.0.1"]
[ch.qos.logback/logback-classic "1.2.3"] [ch.qos.logback/logback-classic "1.2.3"]
[clj-oauth "1.5.5"] [clj-oauth "1.5.5"]

8
resources/templates/base.html
View file

@ -6,11 +6,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/> <meta name="viewport" content="width=device-width, initial-scale=1"/>
<meta name="referrer" content="same-origin"> <meta name="referrer" content="same-origin">
<link rel="stylesheet" type="text/css" href="{{servlet-context}}/css/yyy-common.css" /> {% style "/css/yyy-common.css" %}
<link rel="stylesheet" type="text/css" href="{{servlet-context}}/css/yyy-site.css" /> {% style "/css/yyy-site.css" %}
<link rel="stylesheet" type="text/css" href="{{servlet-context}}/css/spinner.css" /> {% style "/css/spinner.css" %}
<link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/> <link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
<script src="{{servlet-context}}/js/lib/node_modules/jquery/dist/jquery.min.js"></script> {% script "/js/lib/node_modules/jquery/dist/jquery.min.js" %}
<title>{{site-title}}: {{title}}</title> <title>{{site-title}}: {{title}}</title>
{% endblock %} {% endblock %}
{% block extra-head %} {% block extra-head %}

6
src/clj/youyesyet/middleware.clj
View file

@ -30,7 +30,11 @@
(do (do
(log/debug "Taking '" (:app-context env) "' as *app-context* from env") (log/debug "Taking '" (:app-context env) "' as *app-context* from env")
(:app-context env)))] (:app-context env)))]
(handler (assoc request :servlet-context *app-context*))))) (handler (assoc
request
;; bind both possible keys just to save grief
:selmer/context *app-context*
:servlet-context *app-context*)))))
(defn wrap-internal-error [handler] (defn wrap-internal-error [handler]

6
src/cljs/youyesyet/canvasser_app/core.cljs
View file

@ -3,6 +3,7 @@
youyesyet.canvasser-app.core youyesyet.canvasser-app.core
(:require [ajax.core :refer [GET POST]] (:require [ajax.core :refer [GET POST]]
[cljsjs.leaflet] [cljsjs.leaflet]
[devtools.core :as devtools]
[goog.events :as events] [goog.events :as events]
[goog.history.EventType :as HistoryEventType] [goog.history.EventType :as HistoryEventType]
[markdown.core :refer [md->html]] [markdown.core :refer [md->html]]
@ -50,6 +51,11 @@
;;;; ;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; install tools to aid debugging in Chrome/Chromium.
(devtools/install!)
;;; So that we can do debug logging! ;;; So that we can do debug logging!
(enable-console-print!) (enable-console-print!)