diff --git a/bin/homepage b/bin/homepage --- a/bin/homepage +++ b/bin/homepage @@ -21,6 +21,7 @@ http { server { access_log off; + autoindex on; include "/tmp/light9_nginx_routes.conf"; @@ -28,6 +29,10 @@ http { root $ROOT/light9/web; } + location /node_modules { + root $ROOT/; + } + } } EOF diff --git a/light9/web/edit-choice-demo.html b/light9/web/edit-choice-demo.html --- a/light9/web/edit-choice-demo.html +++ b/light9/web/edit-choice-demo.html @@ -6,7 +6,7 @@ - + diff --git a/light9/web/effects/index.html b/light9/web/effects/index.html --- a/light9/web/effects/index.html +++ b/light9/web/effects/index.html @@ -7,7 +7,7 @@ - + diff --git a/light9/web/graph.coffee b/light9/web/graph.coffee --- a/light9/web/graph.coffee +++ b/light9/web/graph.coffee @@ -6,8 +6,8 @@ log = console.log # 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 --git a/light9/web/index.html b/light9/web/index.html --- a/light9/web/index.html +++ b/light9/web/index.html @@ -3,14 +3,17 @@ light9 home - + - + - + @@ -108,7 +108,7 @@ - + diff --git a/light9/web/rdfdbclient.coffee b/light9/web/rdfdbclient.coffee --- a/light9/web/rdfdbclient.coffee +++ b/light9/web/rdfdbclient.coffee @@ -3,7 +3,7 @@ log = console.log # 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 --git a/light9/web/timeline/index.html b/light9/web/timeline/index.html --- a/light9/web/timeline/index.html +++ b/light9/web/timeline/index.html @@ -3,7 +3,7 @@ timeline - + diff --git a/light9/web/timeline/timeline-elements.html b/light9/web/timeline/timeline-elements.html --- a/light9/web/timeline/timeline-elements.html +++ b/light9/web/timeline/timeline-elements.html @@ -76,7 +76,7 @@ - + @@ -273,19 +273,15 @@ - - - - - - - - + - + - + + + + diff --git a/makefile b/makefile --- a/makefile +++ b/makefile @@ -51,12 +51,10 @@ bin/node: 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 --git a/package.json b/package.json --- a/package.json +++ b/package.json @@ -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": {