Ensure custom code is loaded after generic code

on-prem · Nov 27, 2017 · 5bb55a3 · 5bb55a3
1 parent 8cfd8d9
commit 5bb55a3
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.19.0 (2017-11-27)
+
+  ### Minor fixes
+
+  * [html] Append API version to static files
+  * [api] Ensure custom code is loaded after generic code
+
 ## 1.18.3 (2017-11-16)
 
   ### Minor fixes

diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ TEST_REPO = $(REPO_PREFIX)/picolisp-unit.git
 TEST_DIR = $(PIL_MODULE_DIR)/picolisp-unit/HEAD
 
 # Generic
-.PHONY: all clean
+.PHONY: all clean html
 
 all: $(JSON_DIR) $(SEMVER_DIR)
 

diff --git a/app.l b/app.l
@@ -25,10 +25,14 @@
 
 # Load core
 (chdir (pack *API_PATH "/core")
-  (load "api.l" "auth.l" "helpers.l" (when (sys "JIDO_API_CUSTOM") (pack "../../../" @ "/" *API_PATH "/core/custom.l"))) )
+  (load "api.l" "auth.l" "helpers.l") )
 
 (load (pack *API_PATH "/core/allowed.l"))
 
+# Load custom code
+(when (sys "JIDO_API_CUSTOM")
+      (load (pack @ "/" *API_PATH "/core/custom.l")) )
+
 (api-start)
 
 (wait)
diff --git a/docs/API.md b/docs/API.md
@@ -1652,4 +1652,4 @@ Content-Type: application/json
 
 ----
 
-Powered by Jidoteki.com - v1.18.3 - [Copyright notices](/docs/NOTICE.TXT)
+Powered by Jidoteki.com - v1.19.0 - [Copyright notices](/docs/NOTICE.TXT)
diff --git a/index.html b/index.html
@@ -8,11 +8,11 @@
     <meta name="author" content="">
     <title>Admin Dashboard</title>
     <!-- Bootstrap Core CSS-->
-    <link href="docs/themes/bootstrap.min.css" rel="stylesheet">
+    <link href="/docs/themes/bootstrap.min.css?v=1.19.0" rel="stylesheet">
     <!-- Fontello / Font Awesome CSS-->
-    <link href="docs/font-awesome/css/fontello.min.css" rel="stylesheet" type="text/css">
+    <link href="/docs/font-awesome/css/fontello.min.css?v=1.19.0" rel="stylesheet" type="text/css">
     <!-- UI CSS-->
-    <link href="docs/ui.css" rel="stylesheet">
+    <link href="/docs/ui.css?v=1.19.0" rel="stylesheet">
   </head>
   <body>
     <div id="jido-page-navbar" style="display:none">
@@ -749,23 +749,23 @@ <h1><i style="font-size:2em;" class="fa icon-attention text-warning"></i>
         </div>
       </div>
     </div>
-    <script src="docs/jquery/jquery.min.js"></script>
-    <script src="docs/forge/forge.min.js"></script>
-    <script src="docs/validator/validator.min.js"></script>
-    <script src="docs/themes/bootstrap.min.js"></script>
-    <script src="docs/jsrrdgraph/binaryxhr.js"></script>
-    <script src="docs/jsrrdgraph/rrdcmdline.js"></script>
-    <script src="docs/jsrrdgraph/rrddatafile.js"></script>
-    <script src="docs/jsrrdgraph/rrdfile.js"></script>
-    <script src="docs/jsrrdgraph/rrdgfxcanvas.js"></script>
-    <script src="docs/jsrrdgraph/rrdgraph.min.js"></script>
-    <script src="docs/jsrrdgraph/rrdrpn.js"></script>
-    <script src="docs/jsrrdgraph/rrdtime.js"></script>
-    <script src="docs/jsrrdgraph/sprintf.js"></script>
-    <script src="docs/jsrrdgraph/strftime.js"></script>
-    <script src="docs/jsrrdgraph/draw.js"></script>
-    <script src="docs/ui.min.js"></script>
-    <div style="margin-bottom:0;margin-top:3em;position:relative;bottom:0px;width:100%;" class="well text-right text-muted jido-smalltext">Powered by Jidoteki.com - v1.18.3 - <a href="/docs/NOTICE.TXT">Copyright notices</a></div>
+    <script src="/docs/jquery/jquery.min.js?v=1.19.0"></script>
+    <script src="/docs/forge/forge.min.js?v=1.19.0"></script>
+    <script src="/docs/validator/validator.min.js?v=1.19.0"></script>
+    <script src="/docs/themes/bootstrap.min.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/binaryxhr.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/rrdcmdline.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/rrddatafile.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/rrdfile.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/rrdgfxcanvas.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/rrdgraph.min.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/rrdrpn.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/rrdtime.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/sprintf.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/strftime.js?v=1.19.0"></script>
+    <script src="/docs/jsrrdgraph/draw.js?v=1.19.0"></script>
+    <script src="/docs/ui.min.js?v=1.19.0"></script>
+    <div style="margin-bottom:0;margin-top:3em;position:relative;bottom:0px;width:100%;" class="well text-right text-muted jido-smalltext">Powered by Jidoteki.com - v1.19.0 - <a href="/docs/NOTICE.TXT">Copyright notices</a></div>
     <!-- This Source Code Form is subject to the terms of the Mozilla Public-->
     <!-- License, v. 2.0. If a copy of the MPL was not distributed with this-->
     <!-- file, You can obtain one at http://mozilla.org/MPL/2.0/.-->

diff --git a/module.l b/module.l
@@ -1,6 +1,6 @@
 [de MODULE_INFO
   ("name"       "jidoteki-admin-api")
-  ("version"    "1.18.3")
+  ("version"    "1.19.0")
   ("summary"    "Jidoteki Admin API")
   ("source"     "https://jidoteki.com")
   ("author"     "Alexander Williams")

diff --git a/ui/footer.jade b/ui/footer.jade
@@ -4,27 +4,27 @@
 //- 
 //- Copyright (c) 2015-2017 Alexander Williams, Unscramble <license@unscramble.jp>
 
-script(src='docs/jquery/jquery.min.js')
-script(src='docs/forge/forge.min.js')
-script(src='docs/validator/validator.min.js')
-script(src='docs/themes/bootstrap.min.js')
+script(src="/docs/jquery/jquery.min.js?v=#{appVersion}")
+script(src="/docs/forge/forge.min.js?v=#{appVersion}")
+script(src="/docs/validator/validator.min.js?v=#{appVersion}")
+script(src="/docs/themes/bootstrap.min.js?v=#{appVersion}")
 
 //- Load jsrrdgraph files
-script(src='docs/jsrrdgraph/binaryxhr.js')
-script(src='docs/jsrrdgraph/rrdcmdline.js')
-script(src='docs/jsrrdgraph/rrddatafile.js')
-script(src='docs/jsrrdgraph/rrdfile.js')
-script(src='docs/jsrrdgraph/rrdgfxcanvas.js')
-script(src='docs/jsrrdgraph/rrdgraph.min.js')
-script(src='docs/jsrrdgraph/rrdrpn.js')
-script(src='docs/jsrrdgraph/rrdtime.js')
-script(src='docs/jsrrdgraph/sprintf.js')
-script(src='docs/jsrrdgraph/strftime.js')
-script(src='docs/jsrrdgraph/draw.js')
+script(src="/docs/jsrrdgraph/binaryxhr.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/rrdcmdline.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/rrddatafile.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/rrdfile.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/rrdgfxcanvas.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/rrdgraph.min.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/rrdrpn.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/rrdtime.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/sprintf.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/strftime.js?v=#{appVersion}")
+script(src="/docs/jsrrdgraph/draw.js?v=#{appVersion}")
 
 //- Always load the UI last
-script(src='docs/ui.min.js')
+script(src="/docs/ui.min.js?v=#{appVersion}")
 
 .well.text-right.text-muted.jido-smalltext(style='margin-bottom:0;margin-top:3em;position:relative;bottom:0px;width:100%;')
-  | Powered by Jidoteki.com - v1.18.3 - 
+  | Powered by Jidoteki.com - v#{appVersion} - 
   a(href='/docs/NOTICE.TXT') Copyright notices
diff --git a/ui/header.jade b/ui/header.jade
@@ -2,7 +2,9 @@
 //- License, v. 2.0. If a copy of the MPL was not distributed with this
 //- file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //- 
-//- Copyright (c) 2015-2016 Alexander Williams, Unscramble <license@unscramble.jp>
+//- Copyright (c) 2015-2017 Alexander Williams, Unscramble <license@unscramble.jp>
+
+- appVersion = '1.19.0'
 
 head
   meta(charset='utf-8')
@@ -14,10 +16,10 @@ head
   title Admin Dashboard
 
   // Bootstrap Core CSS
-  link(href='docs/themes/bootstrap.min.css', rel='stylesheet')
+  link(href="/docs/themes/bootstrap.min.css?v=#{appVersion}", rel='stylesheet')
 
   // Fontello / Font Awesome CSS
-  link(href='docs/font-awesome/css/fontello.min.css', rel='stylesheet', type='text/css')
+  link(href="/docs/font-awesome/css/fontello.min.css?v=#{appVersion}", rel='stylesheet', type='text/css')
 
   // UI CSS
-  link(href='docs/ui.css', rel='stylesheet')
+  link(href="/docs/ui.css?v=#{appVersion}", rel='stylesheet')