From 46c0cffac2c313501b2ae892a9a6106a06684a1e Mon Sep 17 00:00:00 2001
From: Laurent Mazet <mazet@softndesign.org>
Date: Fri, 1 May 2020 22:16:29 +0200
Subject: [PATCH] rename server-data to public

---
 .gitignore                               |   2 +-
 l10n/makejs.js                           |   2 +-
 {server-data => public}/alert.css        |   0
 {server-data => public}/alert.js         |   0
 {server-data => public}/bag.svg          |   0
 {server-data => public}/baton.svg        |   0
 {server-data => public}/config.js.sample |   0
 {server-data => public}/index.html       |   0
 {server-data => public}/l10n.js          |   0
 {server-data => public}/l10n/js/br.js    |   0
 {server-data => public}/l10n/js/en.js    |   0
 {server-data => public}/l10n/js/fr.js    |   0
 {server-data => public}/notification.mp3 | Bin
 {server-data => public}/notification.ogg | Bin
 {server-data => public}/receive.mp3      | Bin
 {server-data => public}/receive.ogg      | Bin
 {server-data => public}/touch2click.js   |   0
 {server-data => public}/trivabble.css    |   0
 {server-data => public}/trivabble.js     |   0
 trivabble-server.js                      |   4 ++--
 20 files changed, 4 insertions(+), 4 deletions(-)
 rename {server-data => public}/alert.css (100%)
 rename {server-data => public}/alert.js (100%)
 rename {server-data => public}/bag.svg (100%)
 rename {server-data => public}/baton.svg (100%)
 rename {server-data => public}/config.js.sample (100%)
 rename {server-data => public}/index.html (100%)
 rename {server-data => public}/l10n.js (100%)
 rename {server-data => public}/l10n/js/br.js (100%)
 rename {server-data => public}/l10n/js/en.js (100%)
 rename {server-data => public}/l10n/js/fr.js (100%)
 rename {server-data => public}/notification.mp3 (100%)
 rename {server-data => public}/notification.ogg (100%)
 rename {server-data => public}/receive.mp3 (100%)
 rename {server-data => public}/receive.ogg (100%)
 rename {server-data => public}/touch2click.js (100%)
 rename {server-data => public}/trivabble.css (100%)
 rename {server-data => public}/trivabble.js (100%)

diff --git a/.gitignore b/.gitignore
index 4cb193f..3f44abf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /games.backup.json
-/server-data/config.js
+/public/config.js
diff --git a/l10n/makejs.js b/l10n/makejs.js
index 215e7ae..bef4edd 100755
--- a/l10n/makejs.js
+++ b/l10n/makejs.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-var ROOT = "../server-data/l10n/";
+var ROOT = "../public/l10n/";
 
 /* Builds translation files.*/
 
diff --git a/server-data/alert.css b/public/alert.css
similarity index 100%
rename from server-data/alert.css
rename to public/alert.css
diff --git a/server-data/alert.js b/public/alert.js
similarity index 100%
rename from server-data/alert.js
rename to public/alert.js
diff --git a/server-data/bag.svg b/public/bag.svg
similarity index 100%
rename from server-data/bag.svg
rename to public/bag.svg
diff --git a/server-data/baton.svg b/public/baton.svg
similarity index 100%
rename from server-data/baton.svg
rename to public/baton.svg
diff --git a/server-data/config.js.sample b/public/config.js.sample
similarity index 100%
rename from server-data/config.js.sample
rename to public/config.js.sample
diff --git a/server-data/index.html b/public/index.html
similarity index 100%
rename from server-data/index.html
rename to public/index.html
diff --git a/server-data/l10n.js b/public/l10n.js
similarity index 100%
rename from server-data/l10n.js
rename to public/l10n.js
diff --git a/server-data/l10n/js/br.js b/public/l10n/js/br.js
similarity index 100%
rename from server-data/l10n/js/br.js
rename to public/l10n/js/br.js
diff --git a/server-data/l10n/js/en.js b/public/l10n/js/en.js
similarity index 100%
rename from server-data/l10n/js/en.js
rename to public/l10n/js/en.js
diff --git a/server-data/l10n/js/fr.js b/public/l10n/js/fr.js
similarity index 100%
rename from server-data/l10n/js/fr.js
rename to public/l10n/js/fr.js
diff --git a/server-data/notification.mp3 b/public/notification.mp3
similarity index 100%
rename from server-data/notification.mp3
rename to public/notification.mp3
diff --git a/server-data/notification.ogg b/public/notification.ogg
similarity index 100%
rename from server-data/notification.ogg
rename to public/notification.ogg
diff --git a/server-data/receive.mp3 b/public/receive.mp3
similarity index 100%
rename from server-data/receive.mp3
rename to public/receive.mp3
diff --git a/server-data/receive.ogg b/public/receive.ogg
similarity index 100%
rename from server-data/receive.ogg
rename to public/receive.ogg
diff --git a/server-data/touch2click.js b/public/touch2click.js
similarity index 100%
rename from server-data/touch2click.js
rename to public/touch2click.js
diff --git a/server-data/trivabble.css b/public/trivabble.css
similarity index 100%
rename from server-data/trivabble.css
rename to public/trivabble.css
diff --git a/server-data/trivabble.js b/public/trivabble.js
similarity index 100%
rename from server-data/trivabble.js
rename to public/trivabble.js
diff --git a/trivabble-server.js b/trivabble-server.js
index ae14ff0..51dacba 100644
--- a/trivabble-server.js
+++ b/trivabble-server.js
@@ -972,9 +972,9 @@ function handleRequest(request, response) {
 
             debuglog("Serving " + request.url);
 
-            fs.exists("server-data/" + request.url, function (exists) {
+            fs.exists("public/" + request.url, function (exists) {
                 if (exists) {
-                    fs.readFile("server-data/" + request.url, function(err, contents) {
+                    fs.readFile("public/" + request.url, function(err, contents) {
                         if (err) {
                             response.statusCode = 500;
                             response.setHeader("Content-Type", "text/plain; charset=utf-8");
-- 
2.30.2