Skip to content

L
luna
Commit 2b68de5c authored by liuzheng712's avatar liuzheng712
Browse files
Options

update

parent 1a97e0a4
Show whitespace changes
Inline Side-by-side
Showing with 361 additions and 273 deletions
package-lock.json
View file @ 2b68de5c
...@@ -290,8 +290,7 @@ ...@@ -290,8 +290,7 @@
"after": { "after": {
"version": "0.8.2", "version": "0.8.2",
"resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
"integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
"dev": true
}, },
"agent-base": { "agent-base": {
"version": "2.1.1", "version": "2.1.1",
...@@ -520,8 +519,7 @@ ...@@ -520,8 +519,7 @@
"arraybuffer.slice": { "arraybuffer.slice": {
"version": "0.0.6", "version": "0.0.6",
"resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz",
"integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco=", "integrity": "sha1-8zshWfBTKj8xB6JywMz70a0peco="
"dev": true
}, },
"arrify": { "arrify": {
"version": "1.0.1", "version": "1.0.1",
...@@ -748,8 +746,7 @@ ...@@ -748,8 +746,7 @@
"backo2": { "backo2": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
"integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc="
"dev": true
}, },
"balanced-match": { "balanced-match": {
"version": "0.4.2", "version": "0.4.2",
...@@ -760,8 +757,7 @@ ...@@ -760,8 +757,7 @@
"base64-arraybuffer": { "base64-arraybuffer": {
"version": "0.1.5", "version": "0.1.5",
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
"dev": true
}, },
"base64-js": { "base64-js": {
"version": "1.2.1", "version": "1.2.1",
...@@ -772,8 +768,7 @@ ...@@ -772,8 +768,7 @@
"base64id": { "base64id": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
"integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY="
"dev": true
}, },
"batch": { "batch": {
"version": "0.6.1", "version": "0.6.1",
...@@ -795,7 +790,6 @@ ...@@ -795,7 +790,6 @@
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
"integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
"dev": true,
"requires": { "requires": {
"callsite": "1.0.0" "callsite": "1.0.0"
} }
...@@ -815,8 +809,7 @@ ...@@ -815,8 +809,7 @@
"blob": { "blob": {
"version": "0.0.4", "version": "0.0.4",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz", "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
"integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=", "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE="
"dev": true
}, },
"block-stream": { "block-stream": {
"version": "0.0.9", "version": "0.0.9",
...@@ -1093,8 +1086,7 @@ ...@@ -1093,8 +1086,7 @@
"callsite": { "callsite": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
"integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
"dev": true
}, },
"camel-case": { "camel-case": {
"version": "3.0.0", "version": "3.0.0",
...@@ -1472,20 +1464,17 @@ ...@@ -1472,20 +1464,17 @@
"component-bind": { "component-bind": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
"integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E="
"dev": true
}, },
"component-emitter": { "component-emitter": {
"version": "1.1.2", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=", "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
"dev": true
}, },
"component-inherit": { "component-inherit": {
"version": "0.0.3", "version": "0.0.3",
"resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
"integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
"dev": true
}, },
"compressible": { "compressible": {
"version": "2.0.11", "version": "2.0.11",
...@@ -1577,8 +1566,7 @@ ...@@ -1577,8 +1566,7 @@
"cookie": { "cookie": {
"version": "0.3.1", "version": "0.3.1",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
"integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
"dev": true
}, },
"cookie-signature": { "cookie-signature": {
"version": "1.0.6", "version": "1.0.6",
...@@ -1882,7 +1870,6 @@ ...@@ -1882,7 +1870,6 @@
"version": "2.6.8", "version": "2.6.8",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
"dev": true,
"requires": { "requires": {
"ms": "2.0.0" "ms": "2.0.0"
} }
...@@ -2221,101 +2208,99 @@ ...@@ -2221,101 +2208,99 @@
"dev": true "dev": true
}, },
"engine.io": { "engine.io": {
"version": "1.8.3", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.0.tgz",
"integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=", "integrity": "sha1-XKQ4486f28kVxKIcjdnhJmcG5X4=",
"dev": true,
"requires": { "requires": {
"accepts": "1.3.3", "accepts": "1.3.3",
"base64id": "1.0.0", "base64id": "1.0.0",
"cookie": "0.3.1", "cookie": "0.3.1",
"debug": "2.3.3", "debug": "2.6.8",
"engine.io-parser": "1.3.2", "engine.io-parser": "2.1.1",
"ws": "1.1.2" "uws": "0.14.5",
"ws": "2.3.1"
}, },
"dependencies": { "dependencies": {
"accepts": { "accepts": {
"version": "1.3.3", "version": "1.3.3",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
"integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
"dev": true,
"requires": { "requires": {
"mime-types": "2.1.16", "mime-types": "2.1.16",
"negotiator": "0.6.1" "negotiator": "0.6.1"
} }
}, },
"debug": { "safe-buffer": {
"version": "2.3.3", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
"integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
"dev": true, },
"ultron": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz",
"integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ="
},
"ws": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz",
"integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=",
"requires": { "requires": {
"ms": "0.7.2" "safe-buffer": "5.0.1",
"ultron": "1.1.0"
} }
},
"ms": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
"dev": true
} }
} }
}, },
"engine.io-client": { "engine.io-client": {
"version": "1.8.3", "version": "3.1.1",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz", "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.1.tgz",
"integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=", "integrity": "sha1-QVqYUrrbFPoAj6PvHjFgjbZ2EyU=",
"dev": true,
"requires": { "requires": {
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
"component-inherit": "0.0.3", "component-inherit": "0.0.3",
"debug": "2.3.3", "debug": "2.6.8",
"engine.io-parser": "1.3.2", "engine.io-parser": "2.1.1",
"has-cors": "1.1.0", "has-cors": "1.1.0",
"indexof": "0.0.1", "indexof": "0.0.1",
"parsejson": "0.0.3", "parsejson": "0.0.3",
"parseqs": "0.0.5", "parseqs": "0.0.5",
"parseuri": "0.0.5", "parseuri": "0.0.5",
"ws": "1.1.2", "ws": "2.3.1",
"xmlhttprequest-ssl": "1.5.3", "xmlhttprequest-ssl": "1.5.3",
"yeast": "0.1.2" "yeast": "0.1.2"
}, },
"dependencies": { "dependencies": {
"component-emitter": { "safe-buffer": {
"version": "1.2.1", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c="
"dev": true
}, },
"debug": { "ultron": {
"version": "2.3.3", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz",
"integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=", "integrity": "sha1-sHoualQagV/Go0zNRTO67DB8qGQ="
"dev": true, },
"ws": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/ws/-/ws-2.3.1.tgz",
"integrity": "sha1-a5Sz5EfLajY/eF6vlK9jWejoHIA=",
"requires": { "requires": {
"ms": "0.7.2" "safe-buffer": "5.0.1",
"ultron": "1.1.0"
} }
},
"ms": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
"dev": true
} }
} }
}, },
"engine.io-parser": { "engine.io-parser": {
"version": "1.3.2", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.1.tgz",
"integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=", "integrity": "sha1-4Ps/DgRi9/WLt3waUun1p+JuRmg=",
"dev": true,
"requires": { "requires": {
"after": "0.8.2", "after": "0.8.2",
"arraybuffer.slice": "0.0.6", "arraybuffer.slice": "0.0.6",
"base64-arraybuffer": "0.1.5", "base64-arraybuffer": "0.1.5",
"blob": "0.0.4", "blob": "0.0.4",
"has-binary": "0.1.7", "has-binary2": "1.0.2"
"wtf-8": "1.0.0"
} }
}, },
"enhanced-resolve": { "enhanced-resolve": {
...@@ -4101,11 +4086,25 @@ ...@@ -4101,11 +4086,25 @@
"isarray": "0.0.1" "isarray": "0.0.1"
} }
}, },
"has-binary2": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz",
"integrity": "sha1-6D26SfC5vk0CbSc2U1DZ8D9Uvpg=",
"requires": {
"isarray": "2.0.1"
},
"dependencies": {
"isarray": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
}
}
},
"has-cors": { "has-cors": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz", "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
"integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=", "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk="
"dev": true
}, },
"has-flag": { "has-flag": {
"version": "1.0.0", "version": "1.0.0",
...@@ -4510,8 +4509,7 @@ ...@@ -4510,8 +4509,7 @@
"indexof": { "indexof": {
"version": "0.0.1", "version": "0.0.1",
"resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
"integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10="
"dev": true
}, },
"inflection": { "inflection": {
"version": "1.12.0", "version": "1.12.0",
...@@ -5250,12 +5248,105 @@ ...@@ -5250,12 +5248,105 @@
"useragent": "2.2.1" "useragent": "2.2.1"
}, },
"dependencies": { "dependencies": {
"accepts": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz",
"integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=",
"dev": true,
"requires": {
"mime-types": "2.1.16",
"negotiator": "0.6.1"
}
},
"component-emitter": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz",
"integrity": "sha1-KWWU8nU9qmOZbSrwjRWpURbJrsM=",
"dev": true
},
"debug": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
"integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
"dev": true,
"requires": {
"ms": "0.7.2"
}
},
"engine.io": {
"version": "1.8.3",
"resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz",
"integrity": "sha1-jef5eJXSDTm4X4ju7nd7K9QrE9Q=",
"dev": true,
"requires": {
"accepts": "1.3.3",
"base64id": "1.0.0",
"cookie": "0.3.1",
"debug": "2.3.3",
"engine.io-parser": "1.3.2",
"ws": "1.1.2"
}
},
"engine.io-client": {
"version": "1.8.3",
"resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz",
"integrity": "sha1-F5jtk0USRkU9TG9jXXogH+lA1as=",
"dev": true,
"requires": {
"component-emitter": "1.2.1",
"component-inherit": "0.0.3",
"debug": "2.3.3",
"engine.io-parser": "1.3.2",
"has-cors": "1.1.0",
"indexof": "0.0.1",
"parsejson": "0.0.3",
"parseqs": "0.0.5",
"parseuri": "0.0.5",
"ws": "1.1.2",
"xmlhttprequest-ssl": "1.5.3",
"yeast": "0.1.2"
},
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
"dev": true
}
}
},
"engine.io-parser": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.2.tgz",
"integrity": "sha1-k3sHnwAH0Ik+xW1GyyILjLQ1Igo=",
"dev": true,
"requires": {
"after": "0.8.2",
"arraybuffer.slice": "0.0.6",
"base64-arraybuffer": "0.1.5",
"blob": "0.0.4",
"has-binary": "0.1.7",
"wtf-8": "1.0.0"
}
},
"lodash": { "lodash": {
"version": "3.10.1", "version": "3.10.1",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
"integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=",
"dev": true "dev": true
}, },
"ms": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
"dev": true
},
"object-assign": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
"integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
"dev": true
},
"optimist": { "optimist": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
...@@ -5265,6 +5356,87 @@ ...@@ -5265,6 +5356,87 @@
"minimist": "0.0.8", "minimist": "0.0.8",
"wordwrap": "0.0.3" "wordwrap": "0.0.3"
} }
},
"socket.io": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz",
"integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=",
"dev": true,
"requires": {
"debug": "2.3.3",
"engine.io": "1.8.3",
"has-binary": "0.1.7",
"object-assign": "4.1.0",
"socket.io-adapter": "0.5.0",
"socket.io-client": "1.7.3",
"socket.io-parser": "2.3.1"
}
},
"socket.io-adapter": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz",
"integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=",
"dev": true,
"requires": {
"debug": "2.3.3",
"socket.io-parser": "2.3.1"
}
},
"socket.io-client": {
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz",
"integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=",
"dev": true,
"requires": {
"backo2": "1.0.2",
"component-bind": "1.0.0",
"component-emitter": "1.2.1",
"debug": "2.3.3",
"engine.io-client": "1.8.3",
"has-binary": "0.1.7",
"indexof": "0.0.1",
"object-component": "0.0.3",
"parseuri": "0.0.5",
"socket.io-parser": "2.3.1",
"to-array": "0.1.4"
},
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
"dev": true
}
}
},
"socket.io-parser": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz",
"integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=",
"dev": true,
"requires": {
"component-emitter": "1.1.2",
"debug": "2.2.0",
"isarray": "0.0.1",
"json3": "3.3.2"
},
"dependencies": {
"debug": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
"dev": true,
"requires": {
"ms": "0.7.1"
}
},
"ms": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
"dev": true
}
}
} }
} }
}, },
...@@ -5745,14 +5917,12 @@ ...@@ -5745,14 +5917,12 @@
"mime-db": { "mime-db": {
"version": "1.29.0", "version": "1.29.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz",
"integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=", "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg="
"dev": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.16", "version": "2.1.16",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz",
"integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=", "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=",
"dev": true,
"requires": { "requires": {
"mime-db": "1.29.0" "mime-db": "1.29.0"
} }
...@@ -5820,8 +5990,7 @@ ...@@ -5820,8 +5990,7 @@
"ms": { "ms": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
"dev": true
}, },
"multicast-dns": { "multicast-dns": {
"version": "6.1.1", "version": "6.1.1",
...@@ -5864,8 +6033,7 @@ ...@@ -5864,8 +6033,7 @@
"negotiator": { "negotiator": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
"integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
"dev": true
}, },
"ng2-cookies": { "ng2-cookies": {
"version": "1.0.12", "version": "1.0.12",
...@@ -6155,14 +6323,12 @@ ...@@ -6155,14 +6323,12 @@
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
"dev": true
}, },
"object-component": { "object-component": {
"version": "0.0.3", "version": "0.0.3",
"resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz", "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
"integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=", "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE="
"dev": true
}, },
"object.omit": { "object.omit": {
"version": "2.0.1", "version": "2.0.1",
...@@ -6386,7 +6552,6 @@ ...@@ -6386,7 +6552,6 @@
"version": "0.0.3", "version": "0.0.3",
"resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz",
"integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=", "integrity": "sha1-q343WfIJ7OmUN5c/fQ8fZK4OZKs=",
"dev": true,
"requires": { "requires": {
"better-assert": "1.0.2" "better-assert": "1.0.2"
} }
...@@ -6395,7 +6560,6 @@ ...@@ -6395,7 +6560,6 @@
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
"integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
"dev": true,
"requires": { "requires": {
"better-assert": "1.0.2" "better-assert": "1.0.2"
} }
...@@ -6404,7 +6568,6 @@ ...@@ -6404,7 +6568,6 @@
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
"integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
"dev": true,
"requires": { "requires": {
"better-assert": "1.0.2" "better-assert": "1.0.2"
} }
...@@ -8074,138 +8237,58 @@ ...@@ -8074,138 +8237,58 @@
} }
}, },
"socket.io": { "socket.io": {
"version": "1.7.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz", "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.0.3.tgz",
"integrity": "sha1-uK+cq6AJSeVo42nxMn6pvp6iRhs=", "integrity": "sha1-Q1nwaiSTOua9CHeYr3jGgOrjReM=",
"dev": true,
"requires": {
"debug": "2.3.3",
"engine.io": "1.8.3",
"has-binary": "0.1.7",
"object-assign": "4.1.0",
"socket.io-adapter": "0.5.0",
"socket.io-client": "1.7.3",
"socket.io-parser": "2.3.1"
},
"dependencies": {
"debug": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
"integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
"dev": true,
"requires": { "requires": {
"ms": "0.7.2" "debug": "2.6.8",
} "engine.io": "3.1.0",
}, "object-assign": "4.1.1",
"ms": { "socket.io-adapter": "1.1.1",
"version": "0.7.2", "socket.io-client": "2.0.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", "socket.io-parser": "3.1.2"
"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
"dev": true
},
"object-assign": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz",
"integrity": "sha1-ejs9DpgGPUP0wD8uiubNUahog6A=",
"dev": true
}
} }
}, },
"socket.io-adapter": { "socket.io-adapter": {
"version": "0.5.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz", "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
"integrity": "sha1-y21LuL7IHhB4uZZ3+c7QBGBmu4s=", "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs="
"dev": true,
"requires": {
"debug": "2.3.3",
"socket.io-parser": "2.3.1"
},
"dependencies": {
"debug": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
"integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
"dev": true,
"requires": {
"ms": "0.7.2"
}
},
"ms": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
"dev": true
}
}
}, },
"socket.io-client": { "socket.io-client": {
"version": "1.7.3", "version": "2.0.3",
"resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz", "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.3.tgz",
"integrity": "sha1-sw6GqhDV7zVGYBwJzeR2Xjgdo3c=", "integrity": "sha1-bK9K/5+FsZ/ZG2zhPWmttWT4hzs=",
"dev": true,
"requires": { "requires": {
"backo2": "1.0.2", "backo2": "1.0.2",
"base64-arraybuffer": "0.1.5",
"component-bind": "1.0.0", "component-bind": "1.0.0",
"component-emitter": "1.2.1", "component-emitter": "1.2.1",
"debug": "2.3.3", "debug": "2.6.8",
"engine.io-client": "1.8.3", "engine.io-client": "3.1.1",
"has-binary": "0.1.7", "has-cors": "1.1.0",
"indexof": "0.0.1", "indexof": "0.0.1",
"object-component": "0.0.3", "object-component": "0.0.3",
"parseqs": "0.0.5",
"parseuri": "0.0.5", "parseuri": "0.0.5",
"socket.io-parser": "2.3.1", "socket.io-parser": "3.1.2",
"to-array": "0.1.4" "to-array": "0.1.4"
},
"dependencies": {
"component-emitter": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
"dev": true
},
"debug": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz",
"integrity": "sha1-QMRT5n5uE8kB3ewxeviYbNqe/4w=",
"dev": true,
"requires": {
"ms": "0.7.2"
}
},
"ms": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz",
"integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=",
"dev": true
}
} }
}, },
"socket.io-parser": { "socket.io-parser": {
"version": "2.3.1", "version": "3.1.2",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.3.1.tgz", "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.2.tgz",
"integrity": "sha1-3VMgJRA85Clpcya+/WQAX8/ltKA=", "integrity": "sha1-28IoIVH8T6675Aru3Ady66YZ9/I=",
"dev": true,
"requires": { "requires": {
"component-emitter": "1.1.2", "component-emitter": "1.2.1",
"debug": "2.2.0", "debug": "2.6.8",
"isarray": "0.0.1", "has-binary2": "1.0.2",
"json3": "3.3.2" "isarray": "2.0.1"
}, },
"dependencies": { "dependencies": {
"debug": { "isarray": {
"version": "2.2.0", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
"integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
"dev": true,
"requires": {
"ms": "0.7.1"
}
},
"ms": {
"version": "0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
"integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
"dev": true
} }
} }
}, },
...@@ -8830,8 +8913,7 @@ ...@@ -8830,8 +8913,7 @@
"to-array": { "to-array": {
"version": "0.1.4", "version": "0.1.4",
"resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
"integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA="
"dev": true
}, },
"to-arraybuffer": { "to-arraybuffer": {
"version": "1.0.1", "version": "1.0.1",
...@@ -9257,6 +9339,12 @@ ...@@ -9257,6 +9339,12 @@
"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
"dev": true "dev": true
}, },
"uws": {
"version": "0.14.5",
"resolved": "https://registry.npmjs.org/uws/-/uws-0.14.5.tgz",
"integrity": "sha1-Z6rzPEaypYel9mZtAPdpEyjxSdw=",
"optional": true
},
"v8flags": { "v8flags": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.0.tgz", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.0.0.tgz",
...@@ -9867,8 +9955,7 @@ ...@@ -9867,8 +9955,7 @@
"xmlhttprequest-ssl": { "xmlhttprequest-ssl": {
"version": "1.5.3", "version": "1.5.3",
"resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
"integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0=", "integrity": "sha1-GFqIjATspGw+QHDZn3tJ3jUomS0="
"dev": true
}, },
"xtend": { "xtend": {
"version": "4.0.1", "version": "4.0.1",
...@@ -9963,8 +10050,7 @@ ...@@ -9963,8 +10050,7 @@
"yeast": { "yeast": {
"version": "0.1.2", "version": "0.1.2",
"resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
"integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=", "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk="
"dev": true
}, },
"yn": { "yn": {
"version": "2.0.0", "version": "2.0.0",
......
package.json
View file @ 2b68de5c
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
"ng2-cookies": "^1.0.12", "ng2-cookies": "^1.0.12",
"pty.js": "^0.3.1", "pty.js": "^0.3.1",
"rxjs": "^5.4.2", "rxjs": "^5.4.2",
"socket.io": "^2.0.3",
"zone.js": "^0.8.14" "zone.js": "^0.8.14"
}, },
"devDependencies": { "devDependencies": {
......
src/app/app.service.ts
View file @ 2b68de5c
...@@ -10,10 +10,11 @@ import 'rxjs/add/operator/map'; ...@@ -10,10 +10,11 @@ import 'rxjs/add/operator/map';
// import {DynamicRouteConfigurator} from './dynamicRouteConfigurator' // import {DynamicRouteConfigurator} from './dynamicRouteConfigurator'
// import 'rxjs/add/operator/share'; // import 'rxjs/add/operator/share';
// import 'rxjs/Rx'; // import 'rxjs/Rx';
// declare var jQuery: any; declare let jQuery: any;
// declare var Terminal: any; // declare var Terminal: any;
// declare var Clipboard: any; // declare var Clipboard: any;
// declare var io: any; import * as io from 'socket.io-client';
// declare let io: any;
// declare var layer: any; // declare var layer: any;
// @Injectable() // @Injectable()
// export class Logger { // export class Logger {
...@@ -25,7 +26,7 @@ import 'rxjs/add/operator/map'; ...@@ -25,7 +26,7 @@ import 'rxjs/add/operator/map';
// } // }
export interface User { export class User {
id: number; id: number;
name: string; name: string;
username: string; username: string;
...@@ -33,20 +34,20 @@ export interface User { ...@@ -33,20 +34,20 @@ export interface User {
phone: string; phone: string;
avatar: string; avatar: string;
role: string; role: string;
email: string ; email: string;
is_active: boolean; is_active: boolean;
date_joined: string; date_joined: string;
last_login: string; last_login: string;
groups: Array<string>; groups: Array<string>;
} }
export interface Group { export class Group {
id: number; id: number;
name: string; name: string;
membercount: number; membercount: number;
comment: string; comment: string;
} }
export interface DataStore { export let DataStore: {
socket: any; socket: any;
user: User; user: User;
Nav: Array<{}>; Nav: Array<{}>;
...@@ -65,28 +66,26 @@ export interface DataStore { ...@@ -65,28 +66,26 @@ export interface DataStore {
leftbarhide: boolean; leftbarhide: boolean;
termlist: Array<string>; termlist: Array<string>;
windowsize: Array<number>; windowsize: Array<number>;
} } = {
// = { socket: io.connect(),
// socket: io.connect(), user: new User,
// user: new User, Nav: [{}],
// Nav: [{}], logined: false,
// logined: false, lastNavigationAttempt: '',
// lastNavigationAttempt: '', route: [{}],
// route: [{}], activenav: {},
// activenav: {}, Path: {},
// Path: {}, error: {},
// error: {}, msg: {},
// msg: {}, leftbar: '/api/leftbar',
// leftbar: '/api/leftbar', leftbarrightclick: '/api/leftbarrightclick',
// leftbarrightclick: '/api/leftbarrightclick', loglevel: 0,
// loglevel: 0, term: [],
// term: [], termActive: 0,
// termActive: 0, leftbarhide: false,
// leftbarhide: false, termlist: [],
// termlist: [], windowsize: [],
// windowsize: [], };
// };
@Injectable() @Injectable()
...@@ -104,7 +103,7 @@ export class AppService { ...@@ -104,7 +103,7 @@ export class AppService {
// 3.- Level.INFO // 3.- Level.INFO
// 4.- Level.DEBUG // 4.- Level.DEBUG
// 5.- Level.LOG // 5.- Level.LOG
this._logger.level = parseInt(Cookie.get('loglevel')); this._logger.level = parseInt(Cookie.get('loglevel'), 10);
// this._logger.debug('Your debug stuff'); // this._logger.debug('Your debug stuff');
// this._logger.info('An info'); // this._logger.info('An info');
// this._logger.warn('Take care '); // this._logger.warn('Take care ');
...@@ -115,24 +114,26 @@ export class AppService { ...@@ -115,24 +114,26 @@ export class AppService {
// this._logger.level = parseInt(Cookie.getCookie('loglevel')); // this._logger.level = parseInt(Cookie.getCookie('loglevel'));
this._logger.level = 0; this._logger.level = 0;
} }
// let vm = this; const vm = this;
// DataStore.socket.on('connect', function () { DataStore.socket.on('connect', function () {
// console.log('DatsStore socket connected'); console.log('DatsStore socket connected');
// DataStore.socket.on('nav', function (data) { DataStore.socket.on('nav', function (data) {
// DataStore.Nav = JSON.parse(data); DataStore.Nav = JSON.parse(data);
// }); });
// DataStore.socket.on('leftbar', function (data) { DataStore.socket.on('leftbar', function (data) {
// if (data == 'changed') if (data === 'changed') {
// vm.ReloadLeftbar(); vm.ReloadLeftbar();
// }); }
// // DataStore.socket.on('popup', function (data) { });
// // layer.msg(data); // DataStore.socket.on('popup', function (data) {
// // }); // layer.msg(data);
//
// // DataStore.socket.emit('api', 'all');
// }); // });
// // this.checklogin();
// } // DataStore.socket.emit('api', 'all');
});
// this.checklogin();
}
// //
// checklogin() { // checklogin() {
// this._logger.log('service.ts:AppService,checklogin'); // this._logger.log('service.ts:AppService,checklogin');
...@@ -248,20 +249,20 @@ export class AppService { ...@@ -248,20 +249,20 @@ export class AppService {
// //
// } // }
// //
// ReloadLeftbar() { ReloadLeftbar() {
// jQuery('#left-bar').fancytree('getTree').reload(); jQuery('#left-bar').fancytree('getTree').reload();
}
// setMyinfo(user:User) {
// // Update data store
// this._dataStore.user = user;
// this._logger.log("service.ts:AppService,setMyinfo");
// this._logger.debug(user);
// // Push the new list of todos into the Observable stream
// // this._dataObserver.next(user);
// // this.myinfo$ = new Observable(observer => this._dataObserver = observer).share()
// } // }
// //
// // setMyinfo(user:User) {
// // // Update data store
// // this._dataStore.user = user;
// // this._logger.log("service.ts:AppService,setMyinfo");
// // this._logger.debug(user);
// // // Push the new list of todos into the Observable stream
// // // this._dataObserver.next(user);
// // // this.myinfo$ = new Observable(observer => this._dataObserver = observer).share()
// // }
//
// getMyinfo() { // getMyinfo() {
// this._logger.log('service.ts:AppService,getMyinfo'); // this._logger.log('service.ts:AppService,getMyinfo');
// return this.http.get('/api/userprofile') // return this.http.get('/api/userprofile')
...@@ -476,8 +477,8 @@ export class AppService { ...@@ -476,8 +477,8 @@ export class AppService {
// ); // );
// this._logger.log(q); // this._logger.log(q);
// } // }
}
} }
// }
// //
// @Pipe({ // @Pipe({
// name: 'join' // name: 'join'
......
src/app/nav.component.ts
View file @ 2b68de5c
...@@ -25,7 +25,7 @@ import {AppService, DataStore} from './app.service'; ...@@ -25,7 +25,7 @@ import {AppService, DataStore} from './app.service';
export class NavComponent { export class NavComponent {
// DataStore = DataStore; DataStore = DataStore;
constructor(private _appService: AppService, constructor(private _appService: AppService,
private _logger: Logger) { private _logger: Logger) {
......
src/app/nav.html
View file @ 2b68de5c
<div class="nav" > <div class="nav" >
nav nav{{DataStore.leftbar}}
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment