# HG changeset patch
# User drewp@bigasterisk.com
# Date 1525070239 0
# Node ID e30493d458f969c49d4f3367e7a9d4cb4a11b3c6
# Parent 115a268f1d74f60b080a7d6866d6d468b478f02a
more npm setup. n3 upgraded but code is not, yet
Ignore-this: f2c1fdfef218cedc322e03d3784d1123
diff -r 115a268f1d74 -r e30493d458f9 bin/homepage
--- a/bin/homepage Sun Apr 29 21:56:51 2018 +0000
+++ b/bin/homepage Mon Apr 30 06:37:19 2018 +0000
@@ -21,6 +21,7 @@
server {
access_log off;
+ autoindex on;
include "/tmp/light9_nginx_routes.conf";
@@ -28,6 +29,10 @@
root $ROOT/light9/web;
}
+ location /node_modules {
+ root $ROOT/;
+ }
+
}
}
EOF
diff -r 115a268f1d74 -r e30493d458f9 light9/web/edit-choice-demo.html
--- a/light9/web/edit-choice-demo.html Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/edit-choice-demo.html Mon Apr 30 06:37:19 2018 +0000
@@ -6,7 +6,7 @@
-
+
diff -r 115a268f1d74 -r e30493d458f9 light9/web/effects/index.html
--- a/light9/web/effects/index.html Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/effects/index.html Mon Apr 30 06:37:19 2018 +0000
@@ -7,7 +7,7 @@
-
+
diff -r 115a268f1d74 -r e30493d458f9 light9/web/graph.coffee
--- a/light9/web/graph.coffee Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/graph.coffee Mon Apr 30 06:37:19 2018 +0000
@@ -6,8 +6,8 @@
# for mocha
if require?
`window = {}`
- `N3 = require('./lib/N3.js-pull61/N3.js')`
- `d3 = require('./lib/d3/build/d3.min.js')`
+ `N3 = require('../../node_modules/n3/n3-browser.js')`
+ `d3 = require('../../node_modules/d3/dist/d3.min.js')`
`RdfDbClient = require('./rdfdbclient.js').RdfDbClient`
module.exports = window
diff -r 115a268f1d74 -r e30493d458f9 light9/web/index.html
--- a/light9/web/index.html Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/index.html Mon Apr 30 06:37:19 2018 +0000
@@ -3,14 +3,17 @@
light9 home
-
+
-
+
diff -r 115a268f1d74 -r e30493d458f9 light9/web/paint/paint-elements.html
--- a/light9/web/paint/paint-elements.html Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/paint/paint-elements.html Mon Apr 30 06:37:19 2018 +0000
@@ -89,7 +89,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
diff -r 115a268f1d74 -r e30493d458f9 light9/web/rdfdbclient.coffee
--- a/light9/web/rdfdbclient.coffee Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/rdfdbclient.coffee Mon Apr 30 06:37:19 2018 +0000
@@ -3,7 +3,7 @@
# for mocha
if require?
`window = {}`
- `N3 = require('./lib/N3.js-pull61/N3.js')`
+ `N3 = require('../../node_modules/n3/n3-browser.js')`
module.exports = window
diff -r 115a268f1d74 -r e30493d458f9 light9/web/timeline/index.html
--- a/light9/web/timeline/index.html Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/timeline/index.html Mon Apr 30 06:37:19 2018 +0000
@@ -3,7 +3,7 @@
timeline
-
+
diff -r 115a268f1d74 -r e30493d458f9 light9/web/timeline/timeline-elements.html
--- a/light9/web/timeline/timeline-elements.html Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/timeline/timeline-elements.html Mon Apr 30 06:37:19 2018 +0000
@@ -76,7 +76,7 @@
-
+
@@ -273,19 +273,15 @@
-
-
-
-
-
-
-
-
+
-
+
-
+
+
+
+
diff -r 115a268f1d74 -r e30493d458f9 makefile
--- a/makefile Sun Apr 29 21:56:51 2018 +0000
+++ b/makefile Mon Apr 30 06:37:19 2018 +0000
@@ -51,12 +51,10 @@
bower: node_modules/bower/bin/bower bin/node
cd light9/web/lib; nodejs ../../../node_modules/bower/bin/bower install
- # pixi is fetched with npm
- ln -s ../../../node_modules/pixi.js light9/web/lib/
- cd light9/web/lib/N3.js; npm install; PATH=../../../../bin:$(PATH) npm run browser
-
- cd light9/web/lib/d3; PATH=../../../../bin:$(PATH) npm install
+npm:
+ npm install
+ cd node_modules/n3; nodejs ../browserify/bin/cmd.js --standalone N3 --require n3 -o n3-browser.js
bin/ascoltami2: gst_packages link_to_sys_packages
diff -r 115a268f1d74 -r e30493d458f9 package.json
--- a/package.json Sun Apr 29 21:56:51 2018 +0000
+++ b/package.json Mon Apr 30 06:37:19 2018 +0000
@@ -1,15 +1,22 @@
{
"name": "light9",
"version": "1.0.0",
+ "repository": "...",
+ "license": "MIT",
"description": "Mini instructions:",
"main": "index.js",
"directories": {
"test": "test"
},
"dependencies": {
+ "@webcomponents/shadycss": "^1.1.3",
+ "@webcomponents/webcomponentsjs": "^1.2.0",
"bower": "^1.8.0",
+ "browserify": "^16.2.0",
"chai": "^3.5.0",
+ "d3": "^5.1.0",
"mocha": "^2.5.3",
+ "n3": "^1.0.0-alpha",
"pixi.js": "^4.7.3"
},
"devDependencies": {