Make /_config/*.jst use ES6 superclass calls, fix failure to await the superclass...

diff --git a/.gitignore b/.gitignore
index 9ad57a9..0c8ed8e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@
 .*.svg
 /_analytics
 /node_modules
-/pnpm-lock.yaml
+/package-lock.json

diff --git a/_config/server.jst b/_config/server.jst
index e6ebffc..f0cd853 100644 (file)
--- a/_config/server.jst
+++ b/_config/server.jst
@@ -1,4 +1,6 @@
-return async (resources, prev_server) => new _jst_server.Server(
+let jst_server = (await import('@ndcode/jst_server')).default
+
+return async (resources, prev_server) => new jst_server.Server(
   resources,
   {
     hosts: {

diff --git a/_config/site.jst b/_config/site.jst
index c849156..6d56a2f 100644 (file)
--- a/_config/site.jst
+++ b/_config/site.jst
@@ -1,56 +1,57 @@
+let assert = require('assert')
+let jst_server = (await import('@ndcode/jst_server')).default
 //let EmailJSCache = require('@ndcode/emailjs_cache')
 //let ZettairCache = require('@ndcode/zettair_cache')
-let assert = require('assert')
 
 return async (resources, root, prev_site) => {
-  class CustomSite extends _jst_server.Site {
+  class CustomSite extends jst_server.Site {
     //constructor(resources, root, options, prev_site) {
     //  super(resources, root, options, prev_site)
     //
-    //  //this.emailjs_cache = undefined
-    //  //this.zettair_cache = undefined
+    //  this.emailjs_cache = undefined
+    //  this.zettair_cache = undefined
     //}
-
-    async start() {
-      await _jst_server.Site.prototype.start.call(this)
-
-      //assert(this.emailjs_cache === undefined)
-      //this.emailjs_cache = await this.resources.ref(
-      //  'emailjs_cache',
-      //  async () => new EmailJSCache(true)
-      //)
-
-      //assert(this.zettair_cache === undefined)
-      //this.zettair_cache = await this.resources.ref(
-      //  'zettair_cache',
-      //  async () => new ZettairCache(true)
-      //)
-    }
-
-    async stop() {
-      await _jst_server.Site.prototype.stop.call(this)
-
-      //assert(this.emailjs_cache !== undefined)
-      //await this.resources.unref('emailjs_cache')
-
-      //assert(this.zettair_cache !== undefined)
-      //await this.resources.unref('zettair_cache')
-    }
-
-    async kick() {
-      await _jst_server.Site.prototype.kick.call(this)
-
-      //assert(this.emailjs_cache !== undefined)
-      //this.emailjs_cache.kick()
-
-      //assert(this.zettair_cache !== undefined)
-      //this.zettair_cache.kick()
-    }
-
+    //
+    //async start() {
+    //  await super.start()
+    //
+    //  assert(this.emailjs_cache === undefined)
+    //  this.emailjs_cache = await this.resources.ref(
+    //    'emailjs_cache',
+    //    async () => new EmailJSCache(true)
+    //  )
+    //
+    //  assert(this.zettair_cache === undefined)
+    //  this.zettair_cache = await this.resources.ref(
+    //    'zettair_cache',
+    //    async () => new ZettairCache(true)
+    //  )
+    //}
+    //
+    //async stop() {
+    //  await super.stop()
+    //
+    //  assert(this.emailjs_cache !== undefined)
+    //  await this.resources.unref('emailjs_cache')
+    //
+    //  assert(this.zettair_cache !== undefined)
+    //  await this.resources.unref('zettair_cache')
+    //}
+    //
+    //async kick() {
+    //  await super.kick()
+    //
+    //  assert(this.emailjs_cache !== undefined)
+    //  this.emailjs_cache.kick()
+    //
+    //  assert(this.zettair_cache !== undefined)
+    //  this.zettair_cache.kick()
+    //}
+    //
     //get_emailjs(pathname) {
     //  return /*await*/ this.emailjs_cache.get(this.root + pathname)
     //}
-
+    //
     //get_zettair(pathname) {
     //  return /*await*/ this.zettair_cache.get(this.root + pathname)
     //}
@@ -61,17 +62,15 @@ return async (resources, root, prev_site) => {
         env.parsed_url.pathname.slice(0, 14) === '/node_modules/' ||
         env.parsed_url.pathname === '/package.json'
       ) {
-        this.die(env, `banned file ${env.parsed_url.pathname}`)
-        return
+        throw new jst_server.Problem(
+          'Not found',
+          `Banned file \"${env.parsed_url.pathname}\"`,
+          404
+        )
       }
-      return /*await*/ _jst_server.Site.prototype.respond.call(this, env)
+      return /*await*/ super.respond(env)
     }
   }
 
-  return new CustomSite(
-    resources,
-    root,
-    {},
-    prev_site
-  )
+  return new CustomSite(resources, root, {}, prev_site)
 }

diff --git a/assembly_instructions/a_axis_assembly.html.jst b/assembly_instructions/a_axis_assembly.html.jst
deleted file mode 100644 (file)
index 590e68e..0000000
--- a/assembly_instructions/a_axis_assembly.html.jst
+++ /dev/null
@@ -1,27 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page11 = await env.site.get_min_svg('/_svg/page11.svg')
-  let page12 = await env.site.get_min_svg('/_svg/page12.svg')
-  let page13 = await env.site.get_min_svg('/_svg/page13.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'A-Axis Assembly'}
-
-      h3 {'Components Required'}
-      _out.push(page12)
-
-      h3 {'Before'}
-      _out.push(page13)
-
-      h3 {'After'}
-      _out.push(page11)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/b_axis_assembly.html.jst b/assembly_instructions/b_axis_assembly.html.jst
deleted file mode 100644 (file)
index 888ca46..0000000
--- a/assembly_instructions/b_axis_assembly.html.jst
+++ /dev/null
@@ -1,26 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page14 = await env.site.get_min_svg('/_svg/page14.svg')
-  let page15 = await env.site.get_min_svg('/_svg/page15.svg')
-  let page16 = await env.site.get_min_svg('/_svg/page16.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'B-Axis Assembly'}
-
-      h3 {'Components Required'}
-      _out.push(page15)
-
-      h3 {'Before'}
-      _out.push(page16)
-      h3 {'After'}
-      _out.push(page14)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/base_assembly.html.jst b/assembly_instructions/base_assembly.html.jst
deleted file mode 100644 (file)
index d8235ee..0000000
--- a/assembly_instructions/base_assembly.html.jst
+++ /dev/null
@@ -1,27 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page8 = await env.site.get_min_svg('/_svg/page8.svg')
-  let page9 = await env.site.get_min_svg('/_svg/page9.svg')
-  let page10 = await env.site.get_min_svg('/_svg/page10.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'Base Assembly'}
-
-      h3 {'Components Required'}
-      _out.push(page9)
-
-      h3 {'Before'}
-      _out.push(page10)
-
-      h3 {'After'}
-      _out.push(page8)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/c_axis_assembly.html.jst b/assembly_instructions/c_axis_assembly.html.jst
deleted file mode 100644 (file)
index 1a453e2..0000000
--- a/assembly_instructions/c_axis_assembly.html.jst
+++ /dev/null
@@ -1,27 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page17 = await env.site.get_min_svg('/_svg/page17.svg')
-  let page18 = await env.site.get_min_svg('/_svg/page18.svg')
-  let page19 = await env.site.get_min_svg('/_svg/page19.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'C-Axis Assembly'}
-
-      h3 {'Components Required'}
-      _out.push(page18)
-
-      h3 {'Before'}
-      _out.push(page19)
-
-      h3 {'After'}
-      _out.push(page17)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/components_list.html.jst b/assembly_instructions/components_list.html.jst
deleted file mode 100644 (file)
index 1b6a829..0000000
--- a/assembly_instructions/components_list.html.jst
+++ /dev/null
@@ -1,17 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page7 = await env.site.get_min_svg('/_svg/page7.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'Components List'}
-      _out.push(page7)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/d_e_axis_assembly.html.jst b/assembly_instructions/d_e_axis_assembly.html.jst
deleted file mode 100644 (file)
index 38cc5f1..0000000
--- a/assembly_instructions/d_e_axis_assembly.html.jst
+++ /dev/null
@@ -1,27 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page20 = await env.site.get_min_svg('/_svg/page20.svg')
-  let page21 = await env.site.get_min_svg('/_svg/page21.svg')
-  let page22 = await env.site.get_min_svg('/_svg/page22.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'D & E-Axis Assembly'}
-
-      h3 {'Components Required'}
-      _out.push(page21)
-
-      h3 {'Before'}
-      _out.push(page22)
-
-      h3 {'After'}
-      _out.push(page20)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/gripper_assembly.html.jst b/assembly_instructions/gripper_assembly.html.jst
deleted file mode 100644 (file)
index 232797a..0000000
--- a/assembly_instructions/gripper_assembly.html.jst
+++ /dev/null
@@ -1,17 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page23 = await env.site.get_min_svg('/_svg/page23.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'Gripper Assembly'}
-      _out.push(page23)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/overview.html.jst b/assembly_instructions/overview.html.jst
deleted file mode 100644 (file)
index e2e57ef..0000000
--- a/assembly_instructions/overview.html.jst
+++ /dev/null
@@ -1,17 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page4 = await env.site.get_min_svg('/_svg/page4.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'Overview'}
-      _out.push(page4)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/parts_list.html.jst b/assembly_instructions/parts_list.html.jst
deleted file mode 100644 (file)
index 078366e..0000000
--- a/assembly_instructions/parts_list.html.jst
+++ /dev/null
@@ -1,28 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page2 = await env.site.get_min_svg('/_svg/page2.svg')
-  let page3 = await env.site.get_min_svg('/_svg/page3.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'Parts List'}
-
-      h3 {'Lasercut Parts'}
-      _out.push(page2)
-
-      h3 {'3D Printed'}
-      p {
-        'Before you begin, you will need to 3D print these parts, please download STL files from '
-        a(href="http://www.techedu.com.au/software") {'http://www.techedu.com.au/software'}
-        '.'
-      }
-      _out.push(page3)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/assembly_instructions/tapping_threads.html.jst b/assembly_instructions/tapping_threads.html.jst
deleted file mode 100644 (file)
index b74cb32..0000000
--- a/assembly_instructions/tapping_threads.html.jst
+++ /dev/null
@@ -1,34 +0,0 @@
-return async env => {
-  let navbar = await _require('/navbar.jst')
-  let page5 = await env.site.get_min_svg('/_svg/page5.svg')
-  let page6 = await env.site.get_min_svg('/_svg/page6.svg')
-
-  await navbar(
-    env,
-    // head
-    async _out => {},
-    // body
-    async _out => {
-      h1 {'Tapping Threads'}
-      p {'You will need to produce threads in some of the Laser Cut parts.'}
-      p {'For example, a M3 x 0.5mm tap has a 3mm outside diameter with a distance between threads (pitch) of 0.5mm. We suggest using Gun Taps.'}
-
-      h4 {'Required Taps'}
-      'M3 X 0.5mm'
-      br {}
-      'M4 X 0.7mm'
-
-      h4 {'Tap Wrench / Holder'}
-      p {'In order to use a Tap, you will need something to hold it. You can buy Tap Wrenches from Engineering Suppliers or sometimes even hardware stores. If you don\'t want to buy a Tap Wrench we have provided a set of 3D printable files of very simple plastic Tap Holders, which are not as versatile as a commercial unit but will still do the job.'}
-
-      h4 {'Using a Tap'}
-      p {'To use a tap, choose one that is appropriate for the size of the bolt or the hole you want to thread. Place the tap into the Tap wrench or Holder and tighten it if required. Place the point of the Tap into the hole, making sure the Tap is square to the work. Whilst turning the Tap apply GENTLE pressure until the Tap begins to cut the thread and winds itself into the hole without pressure.'}
-      _out.push(page5)
-
-     h3 {'C1, C2, A1, A2'}
-     _out.push(page6)
-    },
-    // scripts
-    async _out => {}
-  )
-}

diff --git a/link.sh b/link.sh
new file mode 100755 (executable)
index 0000000..76c2ff9
--- /dev/null
+++ b/link.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+rm -rf node_modules package-lock.json
+npm link @ndcode/jst_server
+npm install
+npm link

diff --git a/package.json b/package.json
index 3b1688f..70d446a 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,9 +1,10 @@
 {
-  "name": "@ndcode/mirobot_site",
+  "name": "@ndcode/challenger_site",
   "version": "0.1.0",
-  "description": "Test website for MiRobot",
+  "description": "Olly's school assignment website for Challenger disaster",
   "directories": {},
   "dependencies": {
+    "@ndcode/jst_server": "^0.1.0",
     "cookie": "^0.3.1",
     "querystring": "^0.2.0",
     "stream-buffers": "^3.0.2",
@@ -12,5 +13,5 @@
   "devDependencies": {},
   "scripts": {},
   "author": "Nick Downing",
-  "license": "Proprietary"
+  "license": "GPL-2.0"
 }