Mercurial > code > home > repos > light9

changeset 1706:e30493d458f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more npm setup. n3 upgraded but code is not, yet Ignore-this: f2c1fdfef218cedc322e03d3784d1123
author drewp@bigasterisk.com
date Mon, 30 Apr 2018 06:37:19 +0000
parents 115a268f1d74
children e19018a039f7
files bin/homepage light9/web/edit-choice-demo.html light9/web/effects/index.html light9/web/graph.coffee light9/web/index.html light9/web/lib/bower.json light9/web/live/index.html light9/web/paint/paint-elements.html light9/web/rdfdbclient.coffee light9/web/timeline/index.html light9/web/timeline/timeline-elements.html makefile package.json
diffstat 13 files changed, 58 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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 @@
     <script src="/lib/webcomponentsjs/webcomponents-hi-sd-ce.js"></script>
     <link rel="import" href="rdfdb-synced-graph.html">
     <link rel="import" href="edit-choice.html">
-    <script src="/lib/N3.js-pull61/browser/n3-browser.js"></script>
+    <script src="/node_modules/n3/n3-browser.js"></script>
       <script src="/lib/knockout/dist/knockout.js"></script>
       <script src="/lib/shortcut/index.js"></script>
       <script src="/lib/async/dist/async.js"></script>
--- 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 @@
     <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
     <link rel="import" href="/lib/polymer/polymer.html">
     <link rel="import" href="/lib/iron-ajax/iron-ajax.html">
-    <script src="/lib/N3.js-pull61/browser/n3-browser.js"></script>
+    <script src="/node_modules/n3/n3-browser.js"></script>
     <script src="/lib/async/dist/async.js"></script>
     <script src="/lib/underscore/underscore-min.js"></script>
     <link rel="import" href="/rdfdb-synced-graph.html">
--- 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
 
--- 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 @@
   <head>
     <title>light9 home</title>
     <meta charset="utf-8" />
-    <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
+    <script src="/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
     <link rel="stylesheet" href="/style.css">
-    <link rel="import" href="/lib/polymer/polymer.html">
+    <link rel="import" href="/node_modules/@polymer/polymer/polymer.html">
   </head>
   <body>
     <dom-module id="service-button-row">
       <template>
         <style>
+         a {
+             color: #7d7dec;
+         }
          div {
              display: flex;
              justify-content: space-between;
--- a/light9/web/lib/bower.json	Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/lib/bower.json	Mon Apr 30 06:37:19 2018 +0000
@@ -1,44 +1,30 @@
 {
-  "name": "3rd-party libs",
+  "name": "3rd-party-libs",
   "dependencies": {
-    "polymer": "2.6.0",
-    "paper-slider": "PolymerElements/paper-slider#~2.0.6",
-    "iron-ajax": "PolymerElements/iron-ajax#~2.1.3",
-    "jquery": "^3.3.1",
-    "underscore": "~1.8.3",
-    "jquery-ui": "~1.11.4",
+    "N3.js": "https://github.com/RubenVerborgh/N3.js.git#04f4e21f4ccb351587dc00a3f26340b28d4bb10f",
     "QueryString": "http://unixpapa.com/js/QueryString.js",
+    "async": "https://github.com/caolan/async.git#^1.5.2",
+    "color": "https://github.com/One-com/one-color.git#^3.0.4",
+    "iron-ajax": "PolymerElements/iron-ajax#~2.1.3",
+    "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^2.1.0",
+    "isotope": "^3.0.4",
+    "isotope-fit-columns": "^1.1.3",
+    "jquery": "^3.3.1",
+    "jquery-ui": "~1.11.4",
+    "jquery.columnizer": "https://github.com/adamwulf/Columnizer-jQuery-Plugin.git#^1.6.2",
     "knockout": "knockoutjs#^3.4.2",
-    "sylvester": "~0.1.3",
-    "d3": "https://github.com/d3/d3.git#e7194db33090a0afc06c77a959594361ffb949df",
-    "rdflib.js": "https://github.com/linkeddata/rdflib.js.git#920e59fe37",
-    "rdfstore": "https://github.com/antoniogarrote/rdfstore-js.git#b3f7c0c9c1da9b26261af0d4858722fa982411bb",
-    "N3.js": "https://github.com/RubenVerborgh/N3.js.git#04f4e21f4ccb351587dc00a3f26340b28d4bb10f",
-    "shortcut": "http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js",
-    "async": "https://github.com/caolan/async.git#^1.5.2",
-    "iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^2.1.0",
-    "paper-radio-button": "PolymerElements/paper-radio-button#^2.1.0",
     "paper-button": "PolymerElements/paper-button#^2.1.0",
     "paper-dialog": "PolymerElements/paper-dialog#^2.1.0",
+    "paper-item": "PolymerElements/paper-item#2.1.0",
+    "paper-listbox": "PolymerElements/paper-listbox#2.1.0",
+    "paper-radio-button": "PolymerElements/paper-radio-button#^2.1.0",
     "paper-radio-group": "PolymerElements/paper-radio-group#^2.1.0",
-    "color": "https://github.com/One-com/one-color.git#^3.0.4",
-    "paper-listbox": "PolymerElements/paper-listbox#2.1.0",
-    "paper-item": "PolymerElements/paper-item#2.1.0",
+    "paper-slider": "PolymerElements/paper-slider#~2.0.6",
     "paper-styles": "PolymerElements/paper-styles#^2.1.0",
-    "isotope": "^3.0.4",
-    "isotope-fit-columns": "^1.1.3",
-    "jquery.columnizer": "https://github.com/adamwulf/Columnizer-jQuery-Plugin.git#^1.6.2"
-  },
-  "resolutions": {
-    "rdflib.js": "920e59fe37",
-    "d3": "e7194db33090a0afc06c77a959594361ffb949df",
-    "jquery": "^3.2.1",
-    "webcomponentsjs": "^v1.1.0",
-    "paper-radio-button": "^2.1.0",
-    "iron-resizable-behavior": "^2.1.0",
-    "polymer": "2.6.0",
-    "paper-slider": "~2.0.6",
-    "iron-ajax": "~2.1.3",
-    "paper-styles": "^2.1.0"
+    "rdflib.js": "https://github.com/linkeddata/rdflib.js.git#920e59fe37",
+    "rdfstore": "https://github.com/antoniogarrote/rdfstore-js.git#b3f7c0c9c1da9b26261af0d4858722fa982411bb",
+    "shortcut": "http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js",
+    "sylvester": "~0.1.3",
+    "underscore": "~1.8.3"
   }
 }
--- a/light9/web/live/index.html	Sun Apr 29 21:56:51 2018 +0000
+++ b/light9/web/live/index.html	Mon Apr 30 06:37:19 2018 +0000
@@ -13,7 +13,7 @@
     <link rel="import" href="../light9-collector-client.html">
 
     <script src="/lib/d3/build/d3.min.js"></script>
-    <script src="/lib/N3.js-pull61/browser/n3-browser.js"></script>
+    <script src="/node_modules/n3/n3-browser.js"></script>
     <script src="/lib/async/dist/async.js"></script>
     <script src="/lib/underscore/underscore-min.js"></script>
     <!-- see live.coffee
@@ -163,7 +163,7 @@
         </template>
 
       </template>
-     
+      
     </dom-module>
 
     <dom-module id="light9-live-device-control">
@@ -243,7 +243,7 @@
          }
          light9-live-device-control {
 
-             }
+         }
         </style>
         <rdfdb-synced-graph graph="{{graph}}"></rdfdb-synced-graph>
 
--- 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 @@
       </svg>
     </div>
   </template>
- 
+  
 </dom-module>
 
 <dom-module id="light9-paint">
@@ -108,7 +108,7 @@
   </template>
 </dom-module>
 
-<script src="/lib/N3.js-pull61/browser/n3-browser.js"></script>
+<script src="/node_modules/n3/n3-browser.js"></script>
 <script src="/lib/shortcut/index.js"></script>
 <script src="/lib/underscore/underscore-min.js"></script>
 <script src="/lib/async/dist/async.js"></script>
--- 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
 
 
--- 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 @@
   <head>
     <title>timeline</title>
     <meta charset="utf-8" />
-    <script src="/lib/webcomponentsjs/webcomponents-lite.min.js"></script>
+    <script src="/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
     <link rel="import" href="timeline-elements.html">
   </head>
   <body>
--- 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 @@
       <light9-cursor-canvas id="cursorCanvas"></light9-cursor-canvas>
     </div>
   </template>
- 
+  
 </dom-module>
 
 <!-- the whole section that pans/zooms in time (most of the editor) -->
@@ -273,19 +273,15 @@
   </template>
 </dom-module>
 
-<script src="/lib/sylvester/sylvester.js"></script>
-<script src="/lib/d3/build/d3.min.js"></script>
-
-<!-- version with https://github.com/RubenVerborgh/N3.js/pull/61 -->
-<script src="/lib/N3.js-pull61/browser/n3-browser.js"></script>
-<!-- master version -->
-<xxscript src="/lib/N3.js/browser/n3-browser.js"></script>
-  
+<script src="/lib/async/dist/async.js"></script>
 <script src="/lib/knockout/dist/knockout.js"></script>
 <script src="/lib/shortcut/index.js"></script>
-<script src="/lib/async/dist/async.js"></script>
+<script src="/lib/sylvester/sylvester.js"></script>
 <script src="/lib/underscore/underscore-min.js"></script>
-<script src="/lib/pixi.js/dist/pixi.min.js"></script>
+<script src="/node_modules/d3/dist/d3.min.js"></script>
+<script src="/node_modules/n3/n3-browser.js"></script> 
+<script src="/node_modules/pixi.js/dist/pixi.min.js"></script>
+
 <script src="adjustable.js"></script>
 <script src="drawing.js"></script>
 <script src="timeline.js"></script>
--- 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
 
--- 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": {