From acae3992f5a85b97d2aaa3701af5f806ba32cf3c Mon Sep 17 00:00:00 2001
From: cpsdqs <cpsdqs@gmail.com>
Date: Mon, 11 Sep 2017 17:20:53 +0200
Subject: [PATCH] Restructuring

---
 .eslintignore                  |  7 +++---
 .gitignore                     |  2 --
 README.md                      |  4 +--
 _dev_router.php                | 13 ++++++++++
 build.sh                       | 45 +++++++++++++++++++++-------------
 css/.gitkeep                   |  0
 dump_js_lang.php               |  2 +-
 js/.gitkeep                    |  0
 {jssrc => js}/appcommon.js     |  0
 {jssrc => js}/debug_screen.js  |  0
 {jssrc => js}/lang.js          |  0
 {jssrc => js}/lib/chibi.js     |  0
 {jssrc => js}/lib/keymaster.js |  0
 {jssrc => js}/lib/polyfills.js |  0
 {jssrc => js}/modal.js         |  0
 {jssrc => js}/notif.js         |  0
 {jssrc => js}/soft_keyboard.js |  0
 {jssrc => js}/td/WebAudio.d.ts |  0
 {jssrc => js}/term.js          |  0
 {jssrc => js}/term_conn.js     |  0
 {jssrc => js}/term_input.js    |  0
 {jssrc => js}/term_screen.js   |  0
 {jssrc => js}/term_upload.js   |  0
 {jssrc => js}/utils.js         |  0
 {jssrc => js}/wifi.js          |  0
 server.sh                      |  2 +-
 26 files changed, 48 insertions(+), 27 deletions(-)
 create mode 100644 _dev_router.php
 delete mode 100644 css/.gitkeep
 delete mode 100644 js/.gitkeep
 rename {jssrc => js}/appcommon.js (100%)
 rename {jssrc => js}/debug_screen.js (100%)
 rename {jssrc => js}/lang.js (100%)
 rename {jssrc => js}/lib/chibi.js (100%)
 rename {jssrc => js}/lib/keymaster.js (100%)
 rename {jssrc => js}/lib/polyfills.js (100%)
 rename {jssrc => js}/modal.js (100%)
 rename {jssrc => js}/notif.js (100%)
 rename {jssrc => js}/soft_keyboard.js (100%)
 rename {jssrc => js}/td/WebAudio.d.ts (100%)
 rename {jssrc => js}/term.js (100%)
 rename {jssrc => js}/term_conn.js (100%)
 rename {jssrc => js}/term_input.js (100%)
 rename {jssrc => js}/term_screen.js (100%)
 rename {jssrc => js}/term_upload.js (100%)
 rename {jssrc => js}/utils.js (100%)
 rename {jssrc => js}/wifi.js (100%)

diff --git a/.eslintignore b/.eslintignore
index 5db3e80..76fd6af 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,9 +1,8 @@
 # possibly minified output
-js
-out
+out/**/*
 
 # libraries
-jssrc/lib
+js/lib/*
 
 # php generated file
-jssrc/lang.js
+js/lang.js
diff --git a/.gitignore b/.gitignore
index 744d0a9..0de9aaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
 _env.php
-js/*
-css/*
 out/*
 !.gitkeep
 node_modules/
diff --git a/README.md b/README.md
index 83861f9..a0e5ebf 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ PHP is used to build the HTML files and apply substitutions.
 
 ## Development
 
-JavaScript source files can be found in the `jssrc/` folder, SASS
+JavaScript source files can be found in the `js/` folder, SASS
 files in the `sass/` folder.
 
 Fontello (icon font) is maintained in the `fontello/` folder. To update Fontello, replace
@@ -20,7 +20,7 @@ the `fontello.zip` file and run `unpack.sh` in the same folder. This will extrac
 from the zip file and put them into the `sass/` folder to be included with the other styles.
 
 To test you changes (after building JS and CSS), run a PHP local server in the project
-directory using the `server.sh` script or by a command like `php -S 0.0.0.0:2000`.
+directory using the `server.sh` script or by a command like `php -S 0.0.0.0:2000 _dev_router.php`.
 Template substitutions (that are normally done by the ESPTerm's webserver) applied to the 
 files fior testing can be defined in `_debug_replacements.php`.
 
diff --git a/_dev_router.php b/_dev_router.php
new file mode 100644
index 0000000..641c482
--- /dev/null
+++ b/_dev_router.php
@@ -0,0 +1,13 @@
+<?php
+
+if (preg_match('/\\/(?:js|css)/', $_SERVER["REQUEST_URI"])) {
+  $path = pathinfo($_SERVER["REQUEST_URI"]);
+  if ($path["extension"] == "js") {
+    header("Content-Type: application/javascript");
+  } else if ($path["extension"] == "css") {
+    header("Content-Type: text/css");
+  }
+  readfile("out" . $_SERVER["REQUEST_URI"]);
+} else {
+  return false;
+}
diff --git a/build.sh b/build.sh
index ebfd632..127f8f6 100755
--- a/build.sh
+++ b/build.sh
@@ -1,29 +1,40 @@
 #!/bin/bash
 
+cd $(dirname $0)
+
+rm -r out/*
+mkdir out/js
+mkdir out/css
+
+echo 'Generating lang.js...'
+php ./dump_js_lang.php
+
 echo 'Packing JS...'
-npm run babel -- -o js/app.js --source-maps jssrc/lib \
-    jssrc/lib/chibi.js \
-    jssrc/lib/keymaster.js \
-    jssrc/lib/polyfills.js \
-    jssrc/utils.js \
-    jssrc/modal.js \
-    jssrc/notif.js \
-    jssrc/appcommon.js \
-    jssrc/lang.js \
-    jssrc/wifi.js \
-    jssrc/term_* \
-    jssrc/debug_screen.js \
-    jssrc/soft_keyboard.js \
-    jssrc/term.js
+npm run babel -- -o out/js/app.js --source-maps js/lib \
+    js/lib/chibi.js \
+    js/lib/keymaster.js \
+    js/lib/polyfills.js \
+    js/utils.js \
+    js/modal.js \
+    js/notif.js \
+    js/appcommon.js \
+    js/lang.js \
+    js/wifi.js \
+    js/term_* \
+    js/debug_screen.js \
+    js/soft_keyboard.js \
+    js/term.js
 
 echo 'Building CSS...'
 
-npm run sass -- --output-style compressed sass/app.scss css/app.css
+npm run sass -- --output-style compressed sass/app.scss out/css/app.css
 
 echo 'Building HTML...'
 
-rm out/*
-php ./dump_js_lang.php
 php ./compile_html.php
 
+echo 'Copying resources...'
+
+cp -r img out/img
+
 echo 'ESPTerm front-end ready'
diff --git a/css/.gitkeep b/css/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/dump_js_lang.php b/dump_js_lang.php
index 47eee0a..2639eea 100755
--- a/dump_js_lang.php
+++ b/dump_js_lang.php
@@ -15,7 +15,7 @@ foreach ($selected as $key) {
 	$out[$key] = $_messages[$key];
 }
 
-file_put_contents(__DIR__. '/jssrc/lang.js',
+file_put_contents(__DIR__. '/js/lang.js',
 	"// Generated from PHP locale file\n" .
 	'let _tr = ' . json_encode($out, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE) . ";\n\n" .
 	"function tr (key) { return _tr[key] || '?' + key + '?' }\n"
diff --git a/js/.gitkeep b/js/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/jssrc/appcommon.js b/js/appcommon.js
similarity index 100%
rename from jssrc/appcommon.js
rename to js/appcommon.js
diff --git a/jssrc/debug_screen.js b/js/debug_screen.js
similarity index 100%
rename from jssrc/debug_screen.js
rename to js/debug_screen.js
diff --git a/jssrc/lang.js b/js/lang.js
similarity index 100%
rename from jssrc/lang.js
rename to js/lang.js
diff --git a/jssrc/lib/chibi.js b/js/lib/chibi.js
similarity index 100%
rename from jssrc/lib/chibi.js
rename to js/lib/chibi.js
diff --git a/jssrc/lib/keymaster.js b/js/lib/keymaster.js
similarity index 100%
rename from jssrc/lib/keymaster.js
rename to js/lib/keymaster.js
diff --git a/jssrc/lib/polyfills.js b/js/lib/polyfills.js
similarity index 100%
rename from jssrc/lib/polyfills.js
rename to js/lib/polyfills.js
diff --git a/jssrc/modal.js b/js/modal.js
similarity index 100%
rename from jssrc/modal.js
rename to js/modal.js
diff --git a/jssrc/notif.js b/js/notif.js
similarity index 100%
rename from jssrc/notif.js
rename to js/notif.js
diff --git a/jssrc/soft_keyboard.js b/js/soft_keyboard.js
similarity index 100%
rename from jssrc/soft_keyboard.js
rename to js/soft_keyboard.js
diff --git a/jssrc/td/WebAudio.d.ts b/js/td/WebAudio.d.ts
similarity index 100%
rename from jssrc/td/WebAudio.d.ts
rename to js/td/WebAudio.d.ts
diff --git a/jssrc/term.js b/js/term.js
similarity index 100%
rename from jssrc/term.js
rename to js/term.js
diff --git a/jssrc/term_conn.js b/js/term_conn.js
similarity index 100%
rename from jssrc/term_conn.js
rename to js/term_conn.js
diff --git a/jssrc/term_input.js b/js/term_input.js
similarity index 100%
rename from jssrc/term_input.js
rename to js/term_input.js
diff --git a/jssrc/term_screen.js b/js/term_screen.js
similarity index 100%
rename from jssrc/term_screen.js
rename to js/term_screen.js
diff --git a/jssrc/term_upload.js b/js/term_upload.js
similarity index 100%
rename from jssrc/term_upload.js
rename to js/term_upload.js
diff --git a/jssrc/utils.js b/js/utils.js
similarity index 100%
rename from jssrc/utils.js
rename to js/utils.js
diff --git a/jssrc/wifi.js b/js/wifi.js
similarity index 100%
rename from jssrc/wifi.js
rename to js/wifi.js
diff --git a/server.sh b/server.sh
index 467ae0b..f058929 100755
--- a/server.sh
+++ b/server.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-xterm -e "php -S 0.0.0.0:2000"
+xterm -e "php -S 0.0.0.0:2000" _dev_router.php