#36: Still not working, but good enough for now

The compiled clojurescript is still not correctly deployed in the war; however, it is now compiled correctly and does work, and can be moved into place manually after deployment.

externs.js

@@ -1,12 +1,14 @@
+/* I'm not certain that this file is still needed at all; however, it doesn't seem to be doing any harm. */
 /* Things which should not get renamed when compiling ClojureScript */
 
 /* this block relates to the use of Leaflet */
 var L = {
-    "map": {
-    "setView": function(){}
-    },
-    "tileLayer": {
+  "map": {
+    "setView": function(){},
+    "eg": function(){}
+  },
+  "tileLayer": {
     "addTo": function(){}
-    }
+  }
 };
 

project.clj

@@ -8,6 +8,7 @@
                  [ring/ring-servlet "1.5.1"]
                  [lib-noir "0.9.9" :exclusions [org.clojure/tools.reader]]
                  [clj-oauth "1.5.5"]
+                 [cljsjs/react-leaflet "0.12.3-4"]
                  [ch.qos.logback/logback-classic "1.2.2"]
                  [re-frame "0.9.2"]
                  [cljs-ajax "0.5.8"]
@@ -76,23 +77,14 @@
                        {:min
                         {:source-paths ["src/cljc" "src/cljs" "env/prod/cljs"]
                          :compiler
-                         {:asset-path "/youyesyet/js/out"
-                          :externs "externs.js"
-                          :main "youyesyet.core"
+                         {:main "youyesyet.core"
                           :optimizations :advanced
-                          :output-dir "resources/public/js"
-                          :output-to "resources/public/js/app.js"
                           :pretty-print false
                           :verbose true}}}}
                       :aot :all
                       :uberjar-name "youyesyet.jar"
                       :source-paths ["env/prod/clj"]
                       :resource-paths ["env/prod/resources"]}}
-;;   {:prep-tasks ["compile" "bower" ["cljsbuild" "once" "min"]]
-;;    :handler youyesyet.handler/app
-;;    :init youyesyet.handler/init
-;;    :destroy youyesyet.handler/destroy
-;;    :name "youyesyet.war"}
 
   :clean-targets ^{:protect false}
   [:target-path [:cljsbuild :builds :app :compiler :output-dir] [:cljsbuild :builds :app :compiler :output-to]]

resources/templates/base-unauthenticated.html

@@ -37,16 +37,16 @@
     <footer>
       <div id="credits">
         <div>
-          <img src="img/ric-logo.png" width="24" height="24"/>
+          <img src="img/credits/ric-logo.png" width="24" height="24"/>
           A project of the
           <a href="https://radical.scot/">Radical Independence Campaign</a> ||
           Version {{version}}
         </div>
         <div>
-          <img height="16" width="16" alt="Clojure" src="img/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
-          <img height="16" width="16" alt="Clojure" src="img/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
-          <img height="16" width="16" alt="GitHub" src="img/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
-          <img height="16" width="16" alt="Free Software Foundation" src="img/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
+          <img height="16" width="16" alt="Clojure" src="img/credits/luminus-logo.png"/>Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||
+          <img height="16" width="16" alt="Clojure" src="img/credits/clojure-icon.gif"/> Powered by <a href="http://clojure.org">Clojure</a> ||
+          <img height="16" width="16" alt="GitHub" src="img/credits/github-logo-transparent.png"/>Find me/fork me on <a href="https://github.com/simon-brooke/smeagol">Github</a> ||
+          <img height="16" width="16" alt="Free Software Foundation" src="img/credits/gnu.small.png"/>Licensed under the <a href="http://www.gnu.org/licenses/gpl-2.0.html">GNU General Public License version 2.0</a>
         </div>
       </div>
     </footer>

src/cljs/youyesyet/core.cljs

@@ -1,11 +1,12 @@
 (ns youyesyet.core
-  (:require [reagent.core :as r]
-            [re-frame.core :as rf]
-            [secretary.core :as secretary]
+  (:require cljsjs.react-leaflet
+            [ajax.core :refer [GET POST]]
             [goog.events :as events]
             [goog.history.EventType :as HistoryEventType]
             [markdown.core :refer [md->html]]
-            [ajax.core :refer [GET POST]]
+            [reagent.core :as r]
+            [re-frame.core :as rf]
+            [secretary.core :as secretary]
             [youyesyet.ajax :refer [load-interceptors!]]
             [youyesyet.handlers]
             [youyesyet.subscriptions]

src/cljs/youyesyet/views/about.cljs

@@ -41,23 +41,23 @@
     [:p.motd {:dangerouslySetInnerHTML
               {:__html (md->html motd)}}]
     [:p
-     [:img {:src "img/ric-logo.png" :width "24" :height "24"}]
+     [:img {:src "img/credits/ric-logo.png" :width "24" :height "24"}]
      " A project of the "
      [:a {:href "https://radical.scot/"} "Radical Independence Campaign"]]
     [:p
-     [:img {:src "img/luminus-logo.png" :alt "Luminus" :height "24" :width "24"}]
+     [:img {:src "img/credits/luminus-logo.png" :alt "Luminus" :height "24" :width "24"}]
      " Built with "
      [:a {:href "http://www.luminusweb.net/"} "Luminus Web"]]
     [:p
-     [:img {:src "img/clojure-icon.gif" :alt "Clojure" :height "24" :width "24"}]
+     [:img {:src "img/credits/clojure-icon.gif" :alt "Clojure" :height "24" :width "24"}]
      " Powered by "
      [:a {:href "http://clojure.org"} "Clojure"]]
     [:p
-     [:img {:src "img/github-logo-transparent.png" :alt "GitHub" :height "24" :width "24"}]
+     [:img {:src "img/credits/github-logo-transparent.png" :alt "GitHub" :height "24" :width "24"}]
      " Find me/fork me on "
      [:a {:href "https://github.com/simon-brooke/youyesyet"} "GitHub"]]
     [:p
-     [:img {:src "img/gnu.small.png" :alt "Free Software Foundation" :height "24" :width "24"}]
+     [:img {:src "img/credits/gnu.small.png" :alt "Free Software Foundation" :height "24" :width "24"}]
      " Licensed under the "
      [:a {:href "http://www.gnu.org/licenses/gpl-2.0.html"}
       "GNU General Public License v2.0"]]