reorganise

diff --git a/Cargo.toml b/Cargo.toml
index 9460ba086abeda8c8d5e765f0c614c7bec450fe1..9131c9c64acb5546d8bb17954c5162470e3d53e3 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
 name = "game"
 version = "0.0.1"
+edition = "2018"
 
 [dependencies]
 #lazy_static = "1.0.0"

diff --git a/src/bin/ssetest.rs b/src/bin/server.rs
similarity index 90%
rename from src/bin/ssetest.rs
rename to src/bin/server.rs
index 6caaca9ec6a8b9c7cc91fc9b735704c9a1d68dbe..c592d5c2c43bb6f64789319060f51d9ba47448c5 100644 (file)
--- a/src/bin/ssetest.rs
+++ b/src/bin/server.rs
@@ -1,16 +1,10 @@
 
 #![feature(proc_macro_hygiene, decl_macro)]
 
-#[macro_use] extern crate rocket;
+use rocket::{get,routes};
+//use rocket::{post};
 
-extern crate rocket_contrib; // why do we need this ?
-extern crate serde;
-extern crate thiserror;
-extern crate anyhow;
-
-#[path="../imports.rs"]
-mod imports;
-use imports::*;
+use game::imports::*;
 
 type RE = E;
 

diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644 (file)
index 0000000..4202e99
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,2 @@
+
+pub mod imports;

diff --git a/templates/script.js b/templates/script.js
index 09721052632297fcf136bec0ac354fbf8ab5f886..030a59a58341642c7a83828171601847942d4af7 100644 (file)
--- a/templates/script.js
+++ b/templates/script.js
@@ -16,7 +16,7 @@ function drag_mousedown(e) {
   drag_cancel();
   console.log('mousedown', e);
   delt = e.target;
-  if (!delt.dataset.p) { return; }
+  if (!qdelt.dataset.p) { return; }
   dcx = e.clientX;
   dcy = e.clientY;
   dox = parseFloat(delt.getAttributeNS(null,"x"));