• R/O
  • HTTP
  • SSH
  • HTTPS

zephyr: Commit

This repository is for zephyr, which is implemented for a GUI of Eos.


Commit MetaInfo

Revisiona582bc3c8d2fb484f7038b800b8646f2486ce57e (tree)
Time2016-02-18 18:40:03
Authorhimetani_cafe <fumifumi@yasu...>
Commiterhimetani_cafe

Log Message

[TMP] Before developing command exectuion UI view.

Change Summary

Incremental Difference

--- a/front-end/app/scripts/directives/Command.ts
+++ b/front-end/app/scripts/directives/Command.ts
@@ -89,9 +89,14 @@ namespace app.directives {
8989 controller.isOpen = false;
9090 });
9191
92- this.WebSocket.on('test', function(data) {
93- console.log("HOGEHOGEHOGEHOHGOEHGOH");
92+ this.WebSocket.on('connect', function(msg) {
93+ console.log(msg);
9494 });
95+
96+ this.WebSocket.on('test', function(msg) {
97+ console.log(msg);
98+ });
99+
95100 }
96101
97102 public submit() {
--- a/front-end/dist/bundle.js
+++ b/front-end/dist/bundle.js
@@ -41200,8 +41200,11 @@
4120041200 this.$scope.$on('close', function () {
4120141201 controller.isOpen = false;
4120241202 });
41203- this.WebSocket.on('test', function (data) {
41204- console.log("HOGEHOGEHOGEHOHGOEHGOH");
41203+ this.WebSocket.on('connect', function (msg) {
41204+ console.log(msg);
41205+ });
41206+ this.WebSocket.on('test', function (msg) {
41207+ console.log(msg);
4120541208 });
4120641209 }
4120741210 CommandController.prototype.submit = function () {
@@ -41800,8 +41803,11 @@
4180041803 this.$scope.$on('close', function () {
4180141804 controller.isOpen = false;
4180241805 });
41803- this.WebSocket.on('test', function (data) {
41804- console.log("HOGEHOGEHOGEHOHGOEHGOH");
41806+ this.WebSocket.on('connect', function (msg) {
41807+ console.log(msg);
41808+ });
41809+ this.WebSocket.on('test', function (msg) {
41810+ console.log(msg);
4180541811 });
4180641812 }
4180741813 CommandController.prototype.submit = function () {
@@ -42400,8 +42406,11 @@
4240042406 this.$scope.$on('close', function () {
4240142407 controller.isOpen = false;
4240242408 });
42403- this.WebSocket.on('test', function (data) {
42404- console.log("HOGEHOGEHOGEHOHGOEHGOH");
42409+ this.WebSocket.on('connect', function (msg) {
42410+ console.log(msg);
42411+ });
42412+ this.WebSocket.on('test', function (msg) {
42413+ console.log(msg);
4240542414 });
4240642415 }
4240742416 CommandController.prototype.submit = function () {
@@ -43000,8 +43009,11 @@
4300043009 this.$scope.$on('close', function () {
4300143010 controller.isOpen = false;
4300243011 });
43003- this.WebSocket.on('test', function (data) {
43004- console.log("HOGEHOGEHOGEHOHGOEHGOH");
43012+ this.WebSocket.on('connect', function (msg) {
43013+ console.log(msg);
43014+ });
43015+ this.WebSocket.on('test', function (msg) {
43016+ console.log(msg);
4300543017 });
4300643018 }
4300743019 CommandController.prototype.submit = function () {
@@ -43600,8 +43612,11 @@
4360043612 this.$scope.$on('close', function () {
4360143613 controller.isOpen = false;
4360243614 });
43603- this.WebSocket.on('test', function (data) {
43604- console.log("HOGEHOGEHOGEHOHGOEHGOH");
43615+ this.WebSocket.on('connect', function (msg) {
43616+ console.log(msg);
43617+ });
43618+ this.WebSocket.on('test', function (msg) {
43619+ console.log(msg);
4360543620 });
4360643621 }
4360743622 CommandController.prototype.submit = function () {
@@ -44200,8 +44215,11 @@
4420044215 this.$scope.$on('close', function () {
4420144216 controller.isOpen = false;
4420244217 });
44203- this.WebSocket.on('test', function (data) {
44204- console.log("HOGEHOGEHOGEHOHGOEHGOH");
44218+ this.WebSocket.on('connect', function (msg) {
44219+ console.log(msg);
44220+ });
44221+ this.WebSocket.on('test', function (msg) {
44222+ console.log(msg);
4420544223 });
4420644224 }
4420744225 CommandController.prototype.submit = function () {
@@ -44800,8 +44818,11 @@
4480044818 this.$scope.$on('close', function () {
4480144819 controller.isOpen = false;
4480244820 });
44803- this.WebSocket.on('test', function (data) {
44804- console.log("HOGEHOGEHOGEHOHGOEHGOH");
44821+ this.WebSocket.on('connect', function (msg) {
44822+ console.log(msg);
44823+ });
44824+ this.WebSocket.on('test', function (msg) {
44825+ console.log(msg);
4480544826 });
4480644827 }
4480744828 CommandController.prototype.submit = function () {
@@ -45400,8 +45421,11 @@
4540045421 this.$scope.$on('close', function () {
4540145422 controller.isOpen = false;
4540245423 });
45403- this.WebSocket.on('test', function (data) {
45404- console.log("HOGEHOGEHOGEHOHGOEHGOH");
45424+ this.WebSocket.on('connect', function (msg) {
45425+ console.log(msg);
45426+ });
45427+ this.WebSocket.on('test', function (msg) {
45428+ console.log(msg);
4540545429 });
4540645430 }
4540745431 CommandController.prototype.submit = function () {
@@ -46000,8 +46024,11 @@
4600046024 this.$scope.$on('close', function () {
4600146025 controller.isOpen = false;
4600246026 });
46003- this.WebSocket.on('test', function (data) {
46004- console.log("HOGEHOGEHOGEHOHGOEHGOH");
46027+ this.WebSocket.on('connect', function (msg) {
46028+ console.log(msg);
46029+ });
46030+ this.WebSocket.on('test', function (msg) {
46031+ console.log(msg);
4600546032 });
4600646033 }
4600746034 CommandController.prototype.submit = function () {
@@ -46600,8 +46627,11 @@
4660046627 this.$scope.$on('close', function () {
4660146628 controller.isOpen = false;
4660246629 });
46603- this.WebSocket.on('test', function (data) {
46604- console.log("HOGEHOGEHOGEHOHGOEHGOH");
46630+ this.WebSocket.on('connect', function (msg) {
46631+ console.log(msg);
46632+ });
46633+ this.WebSocket.on('test', function (msg) {
46634+ console.log(msg);
4660546635 });
4660646636 }
4660746637 CommandController.prototype.submit = function () {
@@ -47200,8 +47230,11 @@
4720047230 this.$scope.$on('close', function () {
4720147231 controller.isOpen = false;
4720247232 });
47203- this.WebSocket.on('test', function (data) {
47204- console.log("HOGEHOGEHOGEHOHGOEHGOH");
47233+ this.WebSocket.on('connect', function (msg) {
47234+ console.log(msg);
47235+ });
47236+ this.WebSocket.on('test', function (msg) {
47237+ console.log(msg);
4720547238 });
4720647239 }
4720747240 CommandController.prototype.submit = function () {
@@ -47800,8 +47833,11 @@
4780047833 this.$scope.$on('close', function () {
4780147834 controller.isOpen = false;
4780247835 });
47803- this.WebSocket.on('test', function (data) {
47804- console.log("HOGEHOGEHOGEHOHGOEHGOH");
47836+ this.WebSocket.on('connect', function (msg) {
47837+ console.log(msg);
47838+ });
47839+ this.WebSocket.on('test', function (msg) {
47840+ console.log(msg);
4780547841 });
4780647842 }
4780747843 CommandController.prototype.submit = function () {
@@ -48400,8 +48436,11 @@
4840048436 this.$scope.$on('close', function () {
4840148437 controller.isOpen = false;
4840248438 });
48403- this.WebSocket.on('test', function (data) {
48404- console.log("HOGEHOGEHOGEHOHGOEHGOH");
48439+ this.WebSocket.on('connect', function (msg) {
48440+ console.log(msg);
48441+ });
48442+ this.WebSocket.on('test', function (msg) {
48443+ console.log(msg);
4840548444 });
4840648445 }
4840748446 CommandController.prototype.submit = function () {
@@ -49000,8 +49039,11 @@
4900049039 this.$scope.$on('close', function () {
4900149040 controller.isOpen = false;
4900249041 });
49003- this.WebSocket.on('test', function (data) {
49004- console.log("HOGEHOGEHOGEHOHGOEHGOH");
49042+ this.WebSocket.on('connect', function (msg) {
49043+ console.log(msg);
49044+ });
49045+ this.WebSocket.on('test', function (msg) {
49046+ console.log(msg);
4900549047 });
4900649048 }
4900749049 CommandController.prototype.submit = function () {
--- a/n_thesis.log
+++ /dev/null
@@ -1,56 +0,0 @@
1-This is e-pTeX, Version 3.14159265-p3.5-130605-2.6 (utf8.euc) (TeX Live 2014) (preloaded format=platex 2015.3.17) 3 FEB 2016 13:38
2-entering extended mode
3- restricted \write18 enabled.
4- %&-line parsing enabled.
5-**/Users/Takafumi/m_thesis/n_thesis.tex
6-(/Users/Takafumi/m_thesis/n_thesis.tex
7-pLaTeX2e <2006/11/10> (based on LaTeX2e <2014/05/01> patch level 0)
8-Babel <3.9k> and hyphenation patterns for 78 languages loaded.
9-(/usr/local/texlive/2014/texmf-dist/tex/platex/base/jarticle.cls
10-Document Class: jarticle 2006/06/27 v1.6 Standard pLaTeX class
11-\c@@paper=\count81
12-(/usr/local/texlive/2014/texmf-dist/tex/platex/base/jsize12.clo
13-File: jsize12.clo 2006/06/27 v1.6 Standard pLaTeX file (size option)
14-)
15-\c@part=\count82
16-\c@section=\count83
17-\c@subsection=\count84
18-\c@subsubsection=\count85
19-\c@paragraph=\count86
20-\c@subparagraph=\count87
21-\c@figure=\count88
22-\c@table=\count89
23-\abovecaptionskip=\skip41
24-\belowcaptionskip=\skip42
25-\symmincho=\mathgroup4
26-LaTeX Font Info: Overwriting symbol font `mincho' in version `bold'
27-(Font) JY1/mc/m/n --> JY1/gt/m/n on input line 601.
28-\toclineskip=\dimen118
29-\@lnumwidth=\dimen119
30-\bibindent=\dimen120
31-\heisei=\count90
32-)
33-
34-! LaTeX Error: File `AIthesis.sty' not found.
35-
36-Type X to quit or <RETURN> to proceed,
37-or enter new name. (Default extension: sty)
38-
39-Enter file name:
40-! Emergency stop.
41-<read *>
42-
43-l.5 \usepackage
44- {ascmac}^^M
45-End of file on the terminal!
46-
47-
48-Here is how much of TeX's memory you used:
49- 251 strings out of 493807
50- 2615 string characters out of 6151951
51- 56782 words of memory out of 5000000
52- 3804 multiletter control sequences out of 15000+600000
53- 7817 words of font info for 32 fonts, out of 8000000 for 9000
54- 929 hyphenation exceptions out of 8191
55- 22i,0n,19p,159b,36s stack positions out of 5000i,500n,10000p,200000b,80000s
56-No pages of output.
--- a/server/api/v1/execution/index.js
+++ b/server/api/v1/execution/index.js
@@ -6,8 +6,12 @@ var path = require('path')
66 var formidable = require('formidable')
77 var db = require(__dirname + '/../../../../server/class/DB').instance;
88 var eos = require(__dirname + '/../../../../server/class/Eos').instance;
9+var ws = require(__dirname + '/../../../../server/ws').instance;
910
1011 router.post('/', function(req, res) {
12+
13+ ws.emit();
14+
1115 var form = new formidable.IncomingForm();
1216 var root;
1317 var result;
--- a/server/app.js
+++ b/server/app.js
@@ -8,6 +8,8 @@ var app = express();
88 var EventEmitter = require('events').EventEmitter;
99 var emitter = new EventEmitter;
1010 var server = require('http').Server(app)
11+var ioServer = require('socket.io');
12+var ws = require('./ws').instance;
1113
1214 require('./express')(app);
1315 require('./routes')(app);
@@ -29,8 +31,8 @@ DB.init()
2931 console.log('NODE_ENV = ' + app.get('env'))
3032 });
3133
32- var io = require('socket.io').listen(server);
33- require('./ws')(io);
34+ var io = ioServer.listen(server);
35+ ws.connect(io);
3436 });
3537
36-//exports = module.exports = app;
38+exports = module.exports = app;
--- a/server/ws/index.js
+++ b/server/ws/index.js
@@ -3,10 +3,17 @@
33 var fs = require('fs')
44 var socket;
55
6-module.exports = function(io) {
7- io.on('connection', function(socket) {
8- console.log("websocket was connected")
9- socket.emit('test', 'testtesttest');
6+var instance = {
7+ connect: function(io) {
8+ io.on('connection', function(s) {
9+ socket = s;
10+ console.log('connected');
11+ socket.emit('connect', 'connected');
12+ });
13+ },
14+ emit: function() {
15+ socket.emit('test','outer test');
16+ }
1017 /*
1118 array include obj
1219 {
@@ -22,5 +29,6 @@ module.exports = function(io) {
2229 socket.emit('done', 'success')
2330 })
2431 */
25- })
26-}
32+};
33+
34+module.exports = { instance: instance };
Show on old repository browser