OK, Figwheel requires webroot under resources. Bother.

Bother.
2020-10-20 14:34:26 +01:00 · 2020-10-20 14:34:26 +01:00 · ec9a0803f4
commit ec9a0803f4
parent 26a60fb1fe
11 changed files with 29 additions and 690 deletions
--- a/docs/js/compiled/app.js
+++ b/docs/js/compiled/app.js
--- a/index.html
+++ b/index.html
@ -0,0 +1,24 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset='utf-8'>
+    <meta http-equiv="refresh" content="0; URL='resources/public/index.html'" />
+    <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css">
+    <link rel="stylesheet" href="resources/public/css/re-com.css">
+    <link rel="stylesheet" href="resources/public/css/swinging-needle-meter.css">
+    <link href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic" rel="stylesheet" type="text/css">
+    <link href="http://fonts.googleapis.com/css?family=Roboto+Condensed:400,300" rel="stylesheet" type="text/css">
+
+    <title>Example swinging needle meter following re-com conventions.</title>
+  </head>
+  <body>
+    <div id="app">
+      <h1>
+        This isn't actually where you want to be.
+      </h1>
+      <p>
+        If you're seeing this, you probably want to <a href="resources/public/index.html">go here.</a>
+      </p>
+    </div>
+ </body>
+</html>
--- a/project.clj
+++ b/project.clj
@ -14,9 +14,9 @@

  :source-paths ["src/clj"]

-  :clean-targets ^{:protect false} ["docs/js/compiled" "target"]
+  :clean-targets ^{:protect false} ["resources/public/js/compiled" "target"]

-  :figwheel {:css-dirs ["docs/css"]}
+  :figwheel {:css-dirs ["resources/public/css"]}

  :profiles
  {:dev
@ -29,8 +29,8 @@
     :source-paths ["src/cljs"]
     :figwheel     {:on-jsload "swinging-needle-meter.core/mount-root"}
     :compiler     {:main                 swinging-needle-meter.core
-                    :output-to            "docs/js/compiled/app.js"
-                    :output-dir           "docs/js/compiled/out"
+                    :output-to            "resources/public/js/compiled/app.js"
+                    :output-dir           "resources/public/js/compiled/out"
                    :asset-path           "js/compiled/out"
                    :source-map-timestamp true
                    :preloads             [devtools.preload]
@ -40,7 +40,7 @@
    {:id           "min"
     :source-paths ["src/cljs"]
     :compiler     {:main            swinging-needle-meter.core
-                    :output-to       "docs/js/compiled/app.js"
+                    :output-to       "resources/public/js/compiled/app.js"
                    :optimizations   :advanced
                    :closure-defines {goog.DEBUG false}
                    :pretty-print    false}}]})
--- a/resources/public/content
+++ b/resources/public/content
@ -1 +0,0 @@
-../../docs
--- a/resources/public/css/chosen-sprite.png
+++ b/resources/public/css/chosen-sprite.png
--- a/resources/public/css/re-com.css
+++ b/resources/public/css/re-com.css
--- a/resources/public/css/swinging-needle-meter.css
+++ b/resources/public/css/swinging-needle-meter.css
--- a/resources/public/favicon.ico
+++ b/resources/public/favicon.ico
--- a/resources/public/images/example.png
+++ b/resources/public/images/example.png
--- a/resources/public/images/example.xcf
+++ b/resources/public/images/example.xcf
--- a/resources/public/index.html
+++ b/resources/public/index.html