From 9b1e6fef980fd903c2cbb10d654bb97107985a0d Mon Sep 17 00:00:00 2001 From: BingBlog Date: Mon, 4 Dec 2017 21:12:17 +0800 Subject: [PATCH 1/5] scalars frontend basically done --- .../visualdl/frontend => frontend}/.babelrc | 0 .../frontend => frontend}/.fecsignore | 0 .../visualdl/frontend => frontend}/.fecsrc | 0 .../visualdl/frontend => frontend}/.gitignore | 0 frontend/mock/API.md | 27 +++ frontend/mock/data/plugin/scalars/scalars.js | 38 ++++ frontend/mock/data/plugin/scalars/tags.js | 177 +++++++++++++++ frontend/mock/data/runs.js | 22 ++ .../frontend => frontend}/package.json | 4 +- frontend/src/App.san | 42 ++++ .../src/common/fun/downLoadFile.js | 20 +- frontend/src/common/ui/AppMenu.san | 67 ++++++ frontend/src/common/ui/Charts/chart.san | 206 ++++++++++++++++++ frontend/src/common/ui/CheckBoxGroup.san | 114 ++++++++++ frontend/src/common/ui/DropDownMenu.san | 43 ++++ frontend/src/common/ui/ExpandPanel.san | 55 +++++ .../common/ui/Notification/Notification.js | 99 +++++++++ .../common/ui/Notification/Notification.md | 179 +++++++++++++++ .../common/ui/Notification/Notification.styl | 51 +++++ .../ui/Notification/NotificationItem.js | 106 +++++++++ frontend/src/common/ui/Notification/index.js | 7 + frontend/src/common/ui/RadioGroup.san | 43 ++++ frontend/src/common/ui/Slider.san | 64 ++++++ frontend/src/common/ui/ui-common.styl | 87 ++++++++ frontend/src/common/util/http.js | 49 +++++ frontend/src/common/util/routeTo.js | 8 + .../frontend => frontend}/src/home/Home.san | 8 +- .../frontend => frontend}/src/home/index.js | 3 +- .../frontend => frontend}/src/index.js | 7 +- frontend/src/scalars/Scalars.san | 155 +++++++++++++ frontend/src/scalars/index.js | 9 + frontend/src/scalars/ui/chartPage.san | 71 ++++++ frontend/src/scalars/ui/config.san | 126 +++++++++++ frontend/src/service.js | 7 + .../src/style/variables.styl | 0 .../frontend => frontend}/template/index.html | 2 +- .../tool/HtmlReplacePlugin.js | 0 .../frontend => frontend}/tool/build.js | 0 .../frontend => frontend}/tool/dev-client.js | 0 .../frontend => frontend}/tool/dev-server.js | 44 +--- .../frontend => frontend}/tool/entry.js | 0 .../tool/webpack.config.js | 0 .../tool/webpack.dev.config.js | 0 .../tool/webpack.prod.config.js | 0 server/visualdl/frontend/mock/example/mock.js | 26 --- server/visualdl/frontend/src/App.san | 57 ----- 46 files changed, 1898 insertions(+), 125 deletions(-) rename {server/visualdl/frontend => frontend}/.babelrc (100%) rename {server/visualdl/frontend => frontend}/.fecsignore (100%) rename {server/visualdl/frontend => frontend}/.fecsrc (100%) rename {server/visualdl/frontend => frontend}/.gitignore (100%) create mode 100644 frontend/mock/API.md create mode 100644 frontend/mock/data/plugin/scalars/scalars.js create mode 100644 frontend/mock/data/plugin/scalars/tags.js create mode 100644 frontend/mock/data/runs.js rename {server/visualdl/frontend => frontend}/package.json (97%) create mode 100644 frontend/src/App.san rename server/visualdl/frontend/src/common/fun/downLoadCSV.js => frontend/src/common/fun/downLoadFile.js (76%) create mode 100644 frontend/src/common/ui/AppMenu.san create mode 100644 frontend/src/common/ui/Charts/chart.san create mode 100644 frontend/src/common/ui/CheckBoxGroup.san create mode 100644 frontend/src/common/ui/DropDownMenu.san create mode 100644 frontend/src/common/ui/ExpandPanel.san create mode 100644 frontend/src/common/ui/Notification/Notification.js create mode 100644 frontend/src/common/ui/Notification/Notification.md create mode 100644 frontend/src/common/ui/Notification/Notification.styl create mode 100644 frontend/src/common/ui/Notification/NotificationItem.js create mode 100644 frontend/src/common/ui/Notification/index.js create mode 100644 frontend/src/common/ui/RadioGroup.san create mode 100644 frontend/src/common/ui/Slider.san create mode 100644 frontend/src/common/ui/ui-common.styl create mode 100644 frontend/src/common/util/http.js create mode 100644 frontend/src/common/util/routeTo.js rename {server/visualdl/frontend => frontend}/src/home/Home.san (50%) rename {server/visualdl/frontend => frontend}/src/home/index.js (86%) rename {server/visualdl/frontend => frontend}/src/index.js (59%) create mode 100644 frontend/src/scalars/Scalars.san create mode 100644 frontend/src/scalars/index.js create mode 100644 frontend/src/scalars/ui/chartPage.san create mode 100644 frontend/src/scalars/ui/config.san create mode 100644 frontend/src/service.js rename {server/visualdl/frontend => frontend}/src/style/variables.styl (100%) rename {server/visualdl/frontend => frontend}/template/index.html (94%) rename {server/visualdl/frontend => frontend}/tool/HtmlReplacePlugin.js (100%) rename {server/visualdl/frontend => frontend}/tool/build.js (100%) rename {server/visualdl/frontend => frontend}/tool/dev-client.js (100%) rename {server/visualdl/frontend => frontend}/tool/dev-server.js (70%) rename {server/visualdl/frontend => frontend}/tool/entry.js (100%) rename {server/visualdl/frontend => frontend}/tool/webpack.config.js (100%) rename {server/visualdl/frontend => frontend}/tool/webpack.dev.config.js (100%) rename {server/visualdl/frontend => frontend}/tool/webpack.prod.config.js (100%) delete mode 100644 server/visualdl/frontend/mock/example/mock.js delete mode 100644 server/visualdl/frontend/src/App.san diff --git a/server/visualdl/frontend/.babelrc b/frontend/.babelrc similarity index 100% rename from server/visualdl/frontend/.babelrc rename to frontend/.babelrc diff --git a/server/visualdl/frontend/.fecsignore b/frontend/.fecsignore similarity index 100% rename from server/visualdl/frontend/.fecsignore rename to frontend/.fecsignore diff --git a/server/visualdl/frontend/.fecsrc b/frontend/.fecsrc similarity index 100% rename from server/visualdl/frontend/.fecsrc rename to frontend/.fecsrc diff --git a/server/visualdl/frontend/.gitignore b/frontend/.gitignore similarity index 100% rename from server/visualdl/frontend/.gitignore rename to frontend/.gitignore diff --git a/frontend/mock/API.md b/frontend/mock/API.md new file mode 100644 index 000000000..5574e0145 --- /dev/null +++ b/frontend/mock/API.md @@ -0,0 +1,27 @@ +# API + +## runs +current runs + +url: /data/runs + +response: +``` +["train", "test"] + +``` + +## logdir + +url: /data/logdir + +response: +``` +{ + "logdir": "./tmp/tensorflow/mnist/logs/mnist_with_summaries/" +} +``` + +## data/plugins_listing + +url: data/plugins_listing \ No newline at end of file diff --git a/frontend/mock/data/plugin/scalars/scalars.js b/frontend/mock/data/plugin/scalars/scalars.js new file mode 100644 index 000000000..90a78da90 --- /dev/null +++ b/frontend/mock/data/plugin/scalars/scalars.js @@ -0,0 +1,38 @@ +/** + * get mock data + * + * @param {string} path request path + * @param {Object} queryParam query params + * @param {Object} postParam post params + * @return {Object} + */ +module.exports = function (path, queryParam, postParam) { + if (queryParam.run === 'train') { + return { + // moock delay + _timeout: 0, + // mock http status + _status: 200, + // mock response data + _data: { + status: 0, + msg: 'SUCCESS', + data: [[1511842145.705075, 1, 0.05000000074505806], [1511842145.7388, 2, 0.12999999523162842], [1511842145.774563, 3, 0.27000001072883606], [1511842145.806828, 4, 0.4399999976158142], [1511842145.838082, 5, 0.47999998927116394], [1511842145.868955, 6, 0.5899999737739563], [1511842145.899323, 7, 0.6100000143051147], [1511842145.930518, 8, 0.699999988079071], [1511842145.96089, 9, 0.6700000166893005], [1511842146.460557, 11, 0.6499999761581421], [1511842146.4952, 12, 0.7300000190734863], [1511842146.525936, 13, 0.6899999976158142], [1511842146.556059, 14, 0.75], [1511842146.648703, 15, 0.7099999785423279], [1511842146.683295, 16, 0.7900000214576721], [1511842146.719782, 17, 0.8299999833106995], [1511842146.752392, 18, 0.7900000214576721], [1511842146.786562, 19, 0.8299999833106995], [1511842147.296362, 21, 0.8199999928474426], [1511842147.329616, 22, 0.75], [1511842147.36413, 23, 0.800000011920929], [1511842147.394166, 24, 0.8700000047683716], [1511842147.426248, 25, 0.8500000238418579], [1511842147.455792, 26, 0.8799999952316284], [1511842147.486918, 27, 0.8600000143051147], [1511842147.516537, 28, 0.8399999737739563], [1511842147.545978, 29, 0.8999999761581421], [1511842148.059008, 31, 0.8299999833106995], [1511842148.093655, 32, 0.8500000238418579], [1511842148.126041, 33, 0.8799999952316284], [1511842148.156253, 34, 0.9100000262260437], [1511842148.189653, 35, 0.8700000047683716], [1511842148.221602, 36, 0.800000011920929], [1511842148.251149, 37, 0.7900000214576721], [1511842148.281332, 38, 0.8700000047683716], [1511842148.312354, 39, 0.8500000238418579], [1511842148.828949, 41, 0.8700000047683716], [1511842148.865255, 42, 0.8600000143051147], [1511842148.898558, 43, 0.8999999761581421], [1511842148.93859, 44, 0.8799999952316284], [1511842148.97468, 45, 0.8799999952316284], [1511842149.013585, 46, 0.8299999833106995], [1511842149.044709, 47, 0.8500000238418579], [1511842149.077821, 48, 0.8700000047683716], [1511842149.107665, 49, 0.8899999856948853], [1511842149.647978, 51, 0.8600000143051147], [1511842149.686268, 52, 0.8999999761581421], [1511842149.722652, 53, 0.8700000047683716], [1511842149.758858, 54, 0.8700000047683716], [1511842149.795508, 55, 0.8999999761581421], [1511842149.830682, 56, 0.8700000047683716], [1511842149.874498, 57, 0.8600000143051147], [1511842149.916357, 58, 0.8399999737739563], [1511842149.951223, 59, 0.8600000143051147], [1511842150.470112, 61, 0.8500000238418579], [1511842150.505811, 62, 0.9399999976158142], [1511842150.542528, 63, 0.8399999737739563], [1511842150.579082, 64, 0.8999999761581421], [1511842150.611267, 65, 0.8799999952316284], [1511842150.642279, 66, 0.8500000238418579], [1511842150.679586, 67, 0.9399999976158142], [1511842150.709423, 68, 0.8999999761581421], [1511842150.742542, 69, 0.9200000166893005], [1511842151.287115, 71, 0.8700000047683716], [1511842151.320888, 72, 0.9200000166893005], [1511842151.352388, 73, 0.8600000143051147], [1511842151.385154, 74, 0.8600000143051147], [1511842151.421342, 75, 0.8399999737739563], [1511842151.458697, 76, 0.8999999761581421], [1511842151.492929, 77, 0.8399999737739563], [1511842151.524682, 78, 0.9200000166893005], [1511842151.55707, 79, 0.8799999952316284], [1511842152.071344, 81, 0.8500000238418579], [1511842152.101479, 82, 0.949999988079071], [1511842152.132134, 83, 0.8999999761581421], [1511842152.165848, 84, 0.8799999952316284], [1511842152.195162, 85, 0.8899999856948853], [1511842152.224646, 86, 0.9399999976158142], [1511842152.255385, 87, 0.9300000071525574], [1511842152.28573, 88, 0.9100000262260437], [1511842152.315899, 89, 0.8999999761581421], [1511842152.834572, 91, 0.8899999856948853], [1511842152.872045, 92, 0.949999988079071], [1511842152.904879, 93, 0.9800000190734863], [1511842152.940016, 94, 0.8700000047683716], [1511842152.976859, 95, 0.8500000238418579], [1511842153.012571, 96, 0.8999999761581421], [1511842153.043776, 97, 0.8199999928474426], [1511842153.081662, 98, 0.8799999952316284], [1511842153.190446, 99, 0.8700000047683716], [1511842153.698591, 101, 0.9200000166893005], [1511842153.732005, 102, 0.9300000071525574], [1511842153.765796, 103, 0.8500000238418579], [1511842153.797352, 104, 0.9700000286102295], [1511842153.831314, 105, 0.9599999785423279], [1511842153.866427, 106, 0.9300000071525574], [1511842153.896475, 107, 0.8999999761581421], [1511842153.929657, 108, 0.9200000166893005], [1511842153.965421, 109, 0.949999988079071], [1511842154.485552, 111, 0.949999988079071], [1511842154.516489, 112, 0.9100000262260437], [1511842154.548223, 113, 0.8799999952316284], [1511842154.580801, 114, 0.9200000166893005], [1511842154.611307, 115, 0.9200000166893005], [1511842154.642873, 116, 0.9200000166893005], [1511842154.6751, 117, 0.9300000071525574], [1511842154.707684, 118, 0.8999999761581421], [1511842154.744283, 119, 0.9300000071525574], [1511842155.255668, 121, 0.9200000166893005], [1511842155.288454, 122, 0.8899999856948853], [1511842155.320779, 123, 0.9599999785423279], [1511842155.353925, 124, 0.9200000166893005], [1511842155.389438, 125, 0.8899999856948853], [1511842155.424823, 126, 0.9399999976158142], [1511842155.454526, 127, 0.9300000071525574], [1511842155.489204, 128, 0.9399999976158142], [1511842155.521019, 129, 0.9399999976158142], [1511842156.033606, 131, 0.8999999761581421], [1511842156.071066, 132, 0.9100000262260437], [1511842156.100447, 133, 0.8899999856948853], [1511842156.132395, 134, 0.9200000166893005], [1511842156.165163, 135, 0.8700000047683716], [1511842156.203128, 136, 0.8999999761581421], [1511842156.239275, 137, 0.8399999737739563], [1511842156.270908, 138, 0.9200000166893005], [1511842156.303224, 139, 0.9200000166893005], [1511842156.823475, 141, 0.9300000071525574], [1511842156.860178, 142, 0.8999999761581421], [1511842156.89245, 143, 0.8500000238418579], [1511842156.932155, 144, 0.9300000071525574], [1511842156.966936, 145, 0.8999999761581421], [1511842157.002507, 146, 0.9100000262260437], [1511842157.04046, 147, 0.949999988079071], [1511842157.075624, 148, 0.8799999952316284], [1511842157.113062, 149, 0.9100000262260437], [1511842157.610962, 151, 0.9200000166893005], [1511842157.644282, 152, 0.8899999856948853], [1511842157.674532, 153, 0.9399999976158142], [1511842157.704223, 154, 0.9700000286102295], [1511842157.734917, 155, 0.9100000262260437], [1511842157.766545, 156, 0.949999988079071], [1511842157.803228, 157, 0.9300000071525574], [1511842157.833582, 158, 0.9399999976158142], [1511842157.863983, 159, 0.9599999785423279], [1511842158.365138, 161, 0.9399999976158142], [1511842158.402051, 162, 0.8999999761581421], [1511842158.432824, 163, 0.9100000262260437], [1511842158.468544, 164, 0.9399999976158142], [1511842158.501693, 165, 0.9200000166893005], [1511842158.536712, 166, 0.9200000166893005], [1511842158.576052, 167, 0.9100000262260437], [1511842158.608077, 168, 0.9300000071525574], [1511842158.639638, 169, 0.9399999976158142], [1511842159.144704, 171, 0.949999988079071], [1511842159.175508, 172, 0.9200000166893005], [1511842159.206246, 173, 0.9399999976158142], [1511842159.236448, 174, 0.949999988079071], [1511842159.268592, 175, 0.8999999761581421], [1511842159.298385, 176, 0.8999999761581421], [1511842159.330691, 177, 0.9200000166893005], [1511842159.362888, 178, 0.949999988079071], [1511842159.394601, 179, 0.8899999856948853], [1511842159.917987, 181, 0.8500000238418579], [1511842159.949645, 182, 0.9800000190734863], [1511842159.980383, 183, 0.9399999976158142], [1511842160.011846, 184, 0.8999999761581421], [1511842160.043909, 185, 0.8999999761581421], [1511842160.082747, 186, 0.8999999761581421], [1511842160.116125, 187, 0.949999988079071], [1511842160.147119, 188, 0.9100000262260437], [1511842160.182338, 189, 0.9599999785423279], [1511842160.69661, 191, 0.9300000071525574], [1511842160.72888, 192, 0.8899999856948853], [1511842160.762084, 193, 0.9300000071525574], [1511842160.792814, 194, 0.9599999785423279], [1511842160.823444, 195, 0.9100000262260437], [1511842160.852744, 196, 0.9399999976158142], [1511842160.885255, 197, 0.9599999785423279], [1511842160.917985, 198, 0.8999999761581421], [1511842161.028077, 199, 0.949999988079071], [1511842161.548108, 201, 0.9300000071525574], [1511842161.580669, 202, 0.9100000262260437], [1511842161.613862, 203, 0.949999988079071], [1511842161.653309, 204, 0.8899999856948853], [1511842161.691085, 205, 0.9599999785423279], [1511842161.72533, 206, 0.9200000166893005], [1511842161.754774, 207, 0.9300000071525574], [1511842161.786702, 208, 0.9300000071525574], [1511842161.820508, 209, 0.8999999761581421], [1511842162.336378, 211, 0.949999988079071], [1511842162.373533, 212, 0.949999988079071], [1511842162.411207, 213, 0.8899999856948853], [1511842162.4438, 214, 0.9300000071525574], [1511842162.477444, 215, 0.949999988079071], [1511842162.509545, 216, 0.9399999976158142], [1511842162.543586, 217, 0.949999988079071], [1511842162.574829, 218, 0.9300000071525574], [1511842162.612825, 219, 0.9399999976158142], [1511842163.134331, 221, 0.9700000286102295], [1511842163.169464, 222, 0.9200000166893005], [1511842163.203311, 223, 0.9700000286102295], [1511842163.240668, 224, 0.9300000071525574], [1511842163.278642, 225, 0.9100000262260437], [1511842163.318872, 226, 0.9300000071525574], [1511842163.361079, 227, 0.9300000071525574], [1511842163.397876, 228, 0.9800000190734863], [1511842163.430826, 229, 0.9599999785423279], [1511842163.953991, 231, 0.9300000071525574], [1511842163.988582, 232, 0.9399999976158142], [1511842164.021841, 233, 0.949999988079071], [1511842164.052817, 234, 0.9300000071525574], [1511842164.090031, 235, 0.9399999976158142], [1511842164.121797, 236, 0.9100000262260437], [1511842164.158074, 237, 0.949999988079071], [1511842164.189932, 238, 0.9300000071525574], [1511842164.225797, 239, 0.9200000166893005], [1511842164.742692, 241, 0.949999988079071], [1511842164.773757, 242, 0.9800000190734863], [1511842164.810333, 243, 0.9300000071525574], [1511842164.840904, 244, 0.949999988079071], [1511842164.875269, 245, 0.949999988079071], [1511842164.907458, 246, 0.9700000286102295], [1511842164.940818, 247, 0.9200000166893005], [1511842165.032471, 248, 0.9399999976158142], [1511842165.06494, 249, 0.9399999976158142], [1511842165.711591, 251, 0.9200000166893005], [1511842165.742034, 252, 0.9399999976158142], [1511842165.776186, 253, 0.9100000262260437], [1511842165.80631, 254, 0.9300000071525574], [1511842165.841813, 255, 0.9700000286102295], [1511842165.88272, 256, 0.9100000262260437], [1511842165.914834, 257, 0.9399999976158142], [1511842165.944832, 258, 0.8999999761581421], [1511842165.977476, 259, 0.8999999761581421], [1511842166.49414, 261, 0.9300000071525574], [1511842166.530139, 262, 0.9300000071525574], [1511842166.582532, 263, 0.9200000166893005], [1511842166.624934, 264, 0.9399999976158142], [1511842166.65914, 265, 0.9200000166893005], [1511842166.708159, 266, 0.949999988079071], [1511842166.738785, 267, 0.8899999856948853], [1511842166.789074, 268, 0.9599999785423279], [1511842166.821725, 269, 0.949999988079071], [1511842167.351619, 271, 0.8899999856948853], [1511842167.383981, 272, 0.949999988079071], [1511842167.415674, 273, 0.9300000071525574], [1511842167.453889, 274, 0.9300000071525574], [1511842167.487546, 275, 0.9800000190734863], [1511842167.520855, 276, 0.8999999761581421], [1511842167.553859, 277, 0.949999988079071], [1511842167.591104, 278, 0.9800000190734863], [1511842167.627239, 279, 0.9100000262260437], [1511842168.151087, 281, 0.9599999785423279], [1511842168.185722, 282, 0.9300000071525574], [1511842168.225793, 283, 0.9399999976158142], [1511842168.265352, 284, 0.9200000166893005], [1511842168.297638, 285, 0.9599999785423279], [1511842168.331366, 286, 0.8899999856948853], [1511842168.367654, 287, 0.949999988079071], [1511842168.404366, 288, 0.9200000166893005], [1511842168.437306, 289, 0.9599999785423279], [1511842168.977181, 291, 0.9700000286102295], [1511842169.008927, 292, 0.8999999761581421], [1511842169.043079, 293, 0.8999999761581421], [1511842169.079313, 294, 0.9599999785423279], [1511842169.111267, 295, 0.8899999856948853], [1511842169.141979, 296, 0.9700000286102295], [1511842169.173568, 297, 0.9399999976158142], [1511842169.206784, 298, 0.9399999976158142], [1511842169.318883, 299, 0.9100000262260437], [1511842169.836233, 301, 0.949999988079071], [1511842169.869173, 302, 0.9300000071525574], [1511842169.899444, 303, 0.9599999785423279], [1511842169.93236, 304, 0.9399999976158142], [1511842169.964287, 305, 0.9200000166893005], [1511842169.999156, 306, 0.9399999976158142], [1511842170.04658, 307, 0.949999988079071], [1511842170.079765, 308, 0.9399999976158142], [1511842170.116286, 309, 0.9100000262260437], [1511842170.626257, 311, 0.9599999785423279], [1511842170.660356, 312, 0.9399999976158142], [1511842170.69418, 313, 0.9200000166893005], [1511842170.72758, 314, 0.8999999761581421], [1511842170.761281, 315, 0.9399999976158142], [1511842170.795563, 316, 0.9399999976158142], [1511842170.831212, 317, 0.949999988079071], [1511842170.865901, 318, 0.9200000166893005], [1511842170.900623, 319, 0.9100000262260437], [1511842171.442059, 321, 0.9200000166893005], [1511842171.474961, 322, 0.8999999761581421], [1511842171.506307, 323, 0.9399999976158142], [1511842171.539442, 324, 0.949999988079071], [1511842171.570183, 325, 0.9700000286102295], [1511842171.600969, 326, 0.9300000071525574], [1511842171.6316, 327, 0.949999988079071], [1511842171.665024, 328, 0.9399999976158142], [1511842171.697585, 329, 0.9399999976158142], [1511842172.226505, 331, 0.9300000071525574], [1511842172.261344, 332, 0.949999988079071], [1511842172.296245, 333, 0.9300000071525574], [1511842172.326279, 334, 0.9700000286102295], [1511842172.358168, 335, 0.9100000262260437], [1511842172.392341, 336, 0.9399999976158142], [1511842172.422466, 337, 0.9399999976158142], [1511842172.459868, 338, 0.9599999785423279], [1511842172.493555, 339, 0.949999988079071], [1511842173.033582, 341, 0.949999988079071], [1511842173.073034, 342, 0.9300000071525574], [1511842173.104858, 343, 0.9599999785423279], [1511842173.140056, 344, 0.8899999856948853], [1511842173.178958, 345, 0.9399999976158142], [1511842173.21675, 346, 0.9300000071525574], [1511842173.246909, 347, 0.9700000286102295], [1511842173.282099, 348, 0.9100000262260437], [1511842173.317242, 349, 0.9599999785423279], [1511842173.847353, 351, 0.9599999785423279], [1511842173.885366, 352, 0.9599999785423279], [1511842173.921206, 353, 0.8999999761581421], [1511842173.953769, 354, 0.9399999976158142], [1511842173.991128, 355, 0.9599999785423279], [1511842174.02312, 356, 0.8700000047683716], [1511842174.056031, 357, 0.9399999976158142], [1511842174.08923, 358, 0.9599999785423279], [1511842174.127158, 359, 0.9800000190734863], [1511842174.652944, 361, 0.9200000166893005], [1511842174.687431, 362, 0.9900000095367432], [1511842174.71948, 363, 0.9399999976158142], [1511842174.753943, 364, 0.9599999785423279], [1511842174.78847, 365, 0.9700000286102295], [1511842174.823361, 366, 0.8799999952316284], [1511842174.856826, 367, 0.9300000071525574], [1511842174.891638, 368, 0.8999999761581421], [1511842174.925622, 369, 0.9599999785423279], [1511842175.439573, 371, 0.9700000286102295], [1511842175.474021, 372, 0.9300000071525574], [1511842175.504075, 373, 0.9599999785423279], [1511842175.540268, 374, 0.9599999785423279], [1511842175.574921, 375, 0.9800000190734863], [1511842175.608212, 376, 0.949999988079071], [1511842175.64061, 377, 0.949999988079071], [1511842175.671253, 378, 0.9399999976158142], [1511842175.702623, 379, 0.949999988079071], [1511842176.214339, 381, 0.949999988079071], [1511842176.248076, 382, 0.8999999761581421], [1511842176.286246, 383, 0.949999988079071], [1511842176.319941, 384, 0.9300000071525574], [1511842176.357204, 385, 0.9100000262260437], [1511842176.388956, 386, 0.949999988079071], [1511842176.419332, 387, 0.9300000071525574], [1511842176.451727, 388, 0.9599999785423279], [1511842176.484456, 389, 0.9399999976158142], [1511842177.034638, 391, 0.9800000190734863], [1511842177.067667, 392, 0.9200000166893005], [1511842177.101138, 393, 0.9200000166893005], [1511842177.135038, 394, 0.9700000286102295], [1511842177.170068, 395, 0.9399999976158142], [1511842177.200651, 396, 0.949999988079071], [1511842177.23465, 397, 0.9599999785423279], [1511842177.269173, 398, 0.9700000286102295], [1511842177.379705, 399, 0.9300000071525574], [1511842177.930872, 401, 0.9700000286102295], [1511842177.964943, 402, 0.9200000166893005], [1511842177.999324, 403, 0.949999988079071], [1511842178.033477, 404, 0.9900000095367432], [1511842178.071781, 405, 0.949999988079071], [1511842178.105857, 406, 0.949999988079071], [1511842178.135511, 407, 0.9300000071525574], [1511842178.167634, 408, 0.9300000071525574], [1511842178.199537, 409, 0.9200000166893005], [1511842178.717725, 411, 0.9399999976158142], [1511842178.74796, 412, 0.9399999976158142], [1511842178.780912, 413, 0.949999988079071], [1511842178.811067, 414, 0.949999988079071], [1511842178.84161, 415, 0.9399999976158142], [1511842178.878333, 416, 0.949999988079071], [1511842178.914753, 417, 0.9100000262260437], [1511842178.947455, 418, 0.9800000190734863], [1511842178.979425, 419, 0.9700000286102295], [1511842179.503057, 421, 0.9200000166893005], [1511842179.540604, 422, 0.9300000071525574], [1511842179.573449, 423, 0.9300000071525574], [1511842179.608729, 424, 0.949999988079071], [1511842179.645117, 425, 0.949999988079071], [1511842179.678533, 426, 0.9599999785423279], [1511842179.725027, 427, 0.9100000262260437], [1511842179.758991, 428, 0.9700000286102295], [1511842179.78958, 429, 0.9300000071525574], [1511842180.311945, 431, 0.9700000286102295], [1511842180.342856, 432, 0.9800000190734863], [1511842180.372838, 433, 0.949999988079071], [1511842180.402146, 434, 0.9100000262260437], [1511842180.43488, 435, 0.9200000166893005], [1511842180.467817, 436, 0.8999999761581421], [1511842180.497947, 437, 0.9599999785423279], [1511842180.529357, 438, 0.9399999976158142], [1511842180.561293, 439, 0.949999988079071], [1511842181.077772, 441, 0.9399999976158142], [1511842181.108623, 442, 0.949999988079071], [1511842181.140136, 443, 0.9900000095367432], [1511842181.174364, 444, 0.9700000286102295], [1511842181.20535, 445, 0.9300000071525574], [1511842181.23487, 446, 0.9700000286102295], [1511842181.267768, 447, 0.9200000166893005], [1511842181.296881, 448, 0.9599999785423279], [1511842181.331577, 449, 0.9599999785423279], [1511842181.84731, 451, 0.9700000286102295], [1511842181.877643, 452, 0.949999988079071], [1511842181.90728, 453, 0.9200000166893005], [1511842181.937846, 454, 0.9599999785423279], [1511842181.971116, 455, 0.949999988079071], [1511842182.000763, 456, 0.949999988079071], [1511842182.037276, 457, 0.9399999976158142], [1511842182.06702, 458, 0.9399999976158142], [1511842182.096206, 459, 0.9300000071525574], [1511842182.611312, 461, 0.949999988079071], [1511842182.64513, 462, 0.9599999785423279], [1511842182.674909, 463, 0.9300000071525574], [1511842182.705437, 464, 0.9300000071525574], [1511842182.735784, 465, 1.0], [1511842182.767558, 466, 0.949999988079071], [1511842182.796914, 467, 0.949999988079071], [1511842182.826817, 468, 0.8999999761581421], [1511842182.857851, 469, 0.9800000190734863], [1511842183.352468, 471, 0.9800000190734863], [1511842183.384449, 472, 0.8799999952316284], [1511842183.420997, 473, 0.9300000071525574], [1511842183.452375, 474, 0.9399999976158142], [1511842183.483695, 475, 0.949999988079071], [1511842183.514538, 476, 0.949999988079071], [1511842183.547066, 477, 0.9599999785423279], [1511842183.577378, 478, 0.9399999976158142], [1511842183.613494, 479, 0.949999988079071], [1511842184.166345, 481, 0.9599999785423279], [1511842184.198856, 482, 0.9300000071525574], [1511842184.231571, 483, 0.9399999976158142], [1511842184.261741, 484, 0.949999988079071], [1511842184.291412, 485, 0.9599999785423279], [1511842184.321249, 486, 0.9900000095367432], [1511842184.351878, 487, 0.9300000071525574], [1511842184.381002, 488, 0.9399999976158142], [1511842184.410772, 489, 0.9700000286102295], [1511842184.908431, 491, 0.949999988079071], [1511842184.941166, 492, 0.949999988079071], [1511842184.978217, 493, 0.9700000286102295], [1511842185.008197, 494, 0.9399999976158142], [1511842185.039879, 495, 0.9800000190734863], [1511842185.070592, 496, 0.9599999785423279], [1511842185.10259, 497, 0.9599999785423279], [1511842185.133795, 498, 0.9900000095367432], [1511842185.243204, 499, 0.9599999785423279], [1511842185.856761, 501, 0.949999988079071], [1511842185.896018, 502, 0.9700000286102295], [1511842185.943021, 503, 0.949999988079071], [1511842185.981642, 504, 0.949999988079071], [1511842186.023147, 505, 0.9800000190734863], [1511842186.058391, 506, 0.949999988079071], [1511842186.092093, 507, 0.9599999785423279], [1511842186.134389, 508, 0.9200000166893005], [1511842186.168454, 509, 0.9300000071525574], [1511842186.73473, 511, 0.9399999976158142], [1511842186.765813, 512, 0.9399999976158142], [1511842186.798392, 513, 0.9599999785423279], [1511842186.832886, 514, 0.9700000286102295], [1511842186.869, 515, 0.9399999976158142], [1511842186.899931, 516, 0.9399999976158142], [1511842186.92933, 517, 0.9700000286102295], [1511842186.961637, 518, 0.949999988079071], [1511842186.993339, 519, 0.949999988079071], [1511842187.51295, 521, 0.949999988079071], [1511842187.542084, 522, 0.9300000071525574], [1511842187.571555, 523, 0.9800000190734863], [1511842187.600865, 524, 0.949999988079071], [1511842187.630905, 525, 0.9700000286102295], [1511842187.66434, 526, 0.9599999785423279], [1511842187.695883, 527, 0.9399999976158142], [1511842187.734118, 528, 0.949999988079071], [1511842187.768383, 529, 0.9399999976158142], [1511842188.2609, 531, 0.9599999785423279], [1511842188.291538, 532, 0.949999988079071], [1511842188.324743, 533, 0.949999988079071], [1511842188.359286, 534, 0.9399999976158142], [1511842188.392047, 535, 0.9300000071525574], [1511842188.421359, 536, 0.9399999976158142], [1511842188.454753, 537, 0.949999988079071], [1511842188.48794, 538, 0.9900000095367432], [1511842188.524741, 539, 0.9599999785423279], [1511842189.0112, 541, 0.949999988079071], [1511842189.043185, 542, 0.9300000071525574], [1511842189.074307, 543, 0.9700000286102295], [1511842189.106053, 544, 0.9399999976158142], [1511842189.135565, 545, 0.9700000286102295], [1511842189.168538, 546, 0.9599999785423279], [1511842189.201185, 547, 0.9399999976158142], [1511842189.235236, 548, 0.9900000095367432], [1511842189.26819, 549, 0.949999988079071], [1511842189.760432, 551, 0.9300000071525574], [1511842189.789696, 552, 0.9599999785423279], [1511842189.818744, 553, 0.9200000166893005], [1511842189.848042, 554, 0.949999988079071], [1511842189.877089, 555, 0.9399999976158142], [1511842189.907031, 556, 0.949999988079071], [1511842189.936881, 557, 0.9800000190734863], [1511842189.966071, 558, 0.9399999976158142], [1511842189.995653, 559, 0.9900000095367432], [1511842190.508212, 561, 0.9200000166893005], [1511842190.540299, 562, 0.9800000190734863], [1511842190.578574, 563, 0.9300000071525574], [1511842190.610377, 564, 0.949999988079071], [1511842190.643136, 565, 0.9399999976158142], [1511842190.672663, 566, 1.0], [1511842190.707029, 567, 0.9900000095367432], [1511842190.739414, 568, 0.949999988079071], [1511842190.77237, 569, 0.9599999785423279], [1511842191.31564, 571, 0.9300000071525574], [1511842191.348465, 572, 0.9900000095367432], [1511842191.382138, 573, 0.949999988079071], [1511842191.412707, 574, 0.9399999976158142], [1511842191.443585, 575, 0.9599999785423279], [1511842191.477383, 576, 0.9700000286102295], [1511842191.510109, 577, 0.9399999976158142], [1511842191.540084, 578, 0.9399999976158142], [1511842191.569611, 579, 0.9599999785423279], [1511842192.080061, 581, 0.949999988079071], [1511842192.114685, 582, 0.949999988079071], [1511842192.146026, 583, 0.9599999785423279], [1511842192.179577, 584, 0.9300000071525574], [1511842192.213491, 585, 0.949999988079071], [1511842192.247531, 586, 0.949999988079071], [1511842192.279046, 587, 0.9700000286102295], [1511842192.3092, 588, 0.9300000071525574], [1511842192.343594, 589, 0.9700000286102295], [1511842192.842748, 591, 0.9599999785423279], [1511842192.872712, 592, 0.9700000286102295], [1511842192.903806, 593, 0.9700000286102295], [1511842192.935047, 594, 0.949999988079071], [1511842192.966689, 595, 0.9300000071525574], [1511842192.996178, 596, 1.0], [1511842193.025323, 597, 0.9300000071525574], [1511842193.059378, 598, 0.949999988079071], [1511842193.161189, 599, 0.9599999785423279], [1511842193.658418, 601, 0.9900000095367432], [1511842193.688131, 602, 0.9399999976158142], [1511842193.720422, 603, 0.9800000190734863], [1511842193.752308, 604, 0.9599999785423279], [1511842193.782545, 605, 0.949999988079071], [1511842193.814567, 606, 0.9599999785423279], [1511842193.848188, 607, 0.9399999976158142], [1511842193.879656, 608, 0.9700000286102295], [1511842193.910992, 609, 0.9900000095367432], [1511842194.408775, 611, 0.949999988079071], [1511842194.557519, 612, 0.9900000095367432], [1511842194.59024, 613, 0.9700000286102295], [1511842194.62302, 614, 0.9399999976158142], [1511842194.656742, 615, 0.9599999785423279], [1511842194.68816, 616, 0.9900000095367432], [1511842194.720722, 617, 0.9300000071525574], [1511842194.752064, 618, 0.9800000190734863], [1511842194.784808, 619, 0.9100000262260437], [1511842195.290169, 621, 0.949999988079071], [1511842195.323044, 622, 0.9700000286102295], [1511842195.353092, 623, 0.9900000095367432], [1511842195.386405, 624, 0.949999988079071], [1511842195.417719, 625, 0.9700000286102295], [1511842195.471398, 626, 0.9800000190734863], [1511842195.508423, 627, 0.9599999785423279], [1511842195.543529, 628, 0.9700000286102295], [1511842195.582063, 629, 0.9700000286102295], [1511842196.143761, 631, 0.9700000286102295], [1511842196.182851, 632, 0.9700000286102295], [1511842196.214629, 633, 0.9700000286102295], [1511842196.253051, 634, 0.9700000286102295], [1511842196.287821, 635, 0.949999988079071], [1511842196.319766, 636, 0.9399999976158142], [1511842196.354184, 637, 0.9399999976158142], [1511842196.38808, 638, 0.9599999785423279], [1511842196.421604, 639, 0.949999988079071], [1511842196.947931, 641, 1.0], [1511842196.977982, 642, 0.949999988079071], [1511842197.013177, 643, 0.9599999785423279], [1511842197.053432, 644, 0.9599999785423279], [1511842197.089024, 645, 0.9700000286102295], [1511842197.120129, 646, 0.9599999785423279], [1511842197.150194, 647, 0.9300000071525574], [1511842197.18433, 648, 0.9700000286102295], [1511842197.214245, 649, 0.9599999785423279], [1511842197.734399, 651, 0.9599999785423279], [1511842197.765878, 652, 0.949999988079071], [1511842197.795536, 653, 0.9300000071525574], [1511842197.828955, 654, 0.949999988079071], [1511842197.858018, 655, 0.949999988079071], [1511842197.88918, 656, 0.9300000071525574], [1511842197.921247, 657, 0.9599999785423279], [1511842197.961132, 658, 0.9599999785423279], [1511842197.990723, 659, 0.949999988079071], [1511842198.489996, 661, 0.9700000286102295], [1511842198.520217, 662, 0.9900000095367432], [1511842198.550925, 663, 1.0], [1511842198.582604, 664, 0.9700000286102295], [1511842198.612304, 665, 0.9700000286102295], [1511842198.648211, 666, 0.9300000071525574], [1511842198.686078, 667, 0.9599999785423279], [1511842198.717921, 668, 0.949999988079071], [1511842198.750968, 669, 0.9599999785423279], [1511842199.258821, 671, 0.9399999976158142], [1511842199.291037, 672, 0.9800000190734863], [1511842199.320875, 673, 0.9700000286102295], [1511842199.352976, 674, 0.949999988079071], [1511842199.382681, 675, 0.9800000190734863], [1511842199.411833, 676, 0.949999988079071], [1511842199.443132, 677, 0.9700000286102295], [1511842199.475117, 678, 0.9700000286102295], [1511842199.505664, 679, 0.949999988079071], [1511842200.00445, 681, 0.949999988079071], [1511842200.037647, 682, 0.9900000095367432], [1511842200.073666, 683, 0.9200000166893005], [1511842200.104847, 684, 0.9200000166893005], [1511842200.137768, 685, 0.9300000071525574], [1511842200.170784, 686, 0.9800000190734863], [1511842200.204724, 687, 0.9800000190734863], [1511842200.240477, 688, 0.9800000190734863], [1511842200.275783, 689, 0.9900000095367432], [1511842200.81989, 691, 0.9700000286102295], [1511842200.858525, 692, 0.9300000071525574], [1511842200.890363, 693, 0.949999988079071], [1511842200.932829, 694, 0.9599999785423279], [1511842200.962743, 695, 0.9800000190734863], [1511842200.994843, 696, 0.9200000166893005], [1511842201.03947, 697, 0.9800000190734863], [1511842201.070836, 698, 0.9399999976158142], [1511842201.246026, 699, 0.9100000262260437], [1511842201.786404, 701, 0.9300000071525574], [1511842201.819202, 702, 0.9800000190734863], [1511842201.856957, 703, 0.9200000166893005], [1511842201.888767, 704, 1.0], [1511842201.92143, 705, 0.9399999976158142], [1511842201.961242, 706, 0.9700000286102295], [1511842201.996298, 707, 0.9200000166893005], [1511842202.032258, 708, 0.9800000190734863], [1511842202.069833, 709, 0.9300000071525574], [1511842202.5957, 711, 0.9800000190734863], [1511842202.632072, 712, 0.9800000190734863], [1511842202.664469, 713, 0.9700000286102295], [1511842202.696135, 714, 0.9300000071525574], [1511842202.72853, 715, 0.9700000286102295], [1511842202.759628, 716, 0.9800000190734863], [1511842202.794048, 717, 0.9800000190734863], [1511842202.827036, 718, 0.949999988079071], [1511842202.858473, 719, 0.9700000286102295], [1511842203.391985, 721, 0.9599999785423279], [1511842203.4215, 722, 0.9399999976158142], [1511842203.453421, 723, 0.9800000190734863], [1511842203.484233, 724, 0.9700000286102295], [1511842203.516743, 725, 0.9900000095367432], [1511842203.550632, 726, 0.9800000190734863], [1511842203.584461, 727, 0.9800000190734863], [1511842203.617915, 728, 0.9599999785423279], [1511842203.652398, 729, 0.9700000286102295], [1511842204.185468, 731, 0.9800000190734863], [1511842204.217265, 732, 0.9800000190734863], [1511842204.249281, 733, 1.0], [1511842204.282808, 734, 0.9700000286102295], [1511842204.314277, 735, 0.9700000286102295], [1511842204.345353, 736, 0.949999988079071], [1511842204.375898, 737, 0.9599999785423279], [1511842204.411013, 738, 0.9100000262260437], [1511842204.441207, 739, 0.9700000286102295], [1511842204.967109, 741, 0.9399999976158142], [1511842204.999614, 742, 0.9900000095367432], [1511842205.037706, 743, 0.9599999785423279], [1511842205.071398, 744, 0.9700000286102295], [1511842205.109827, 745, 0.9800000190734863], [1511842205.150377, 746, 0.9700000286102295], [1511842205.196859, 747, 0.9399999976158142], [1511842205.238587, 748, 0.9900000095367432], [1511842205.284592, 749, 0.9700000286102295], [1511842205.913203, 751, 0.9599999785423279], [1511842205.977628, 752, 0.9800000190734863], [1511842206.049908, 753, 0.9399999976158142], [1511842206.088929, 754, 0.9599999785423279], [1511842206.12656, 755, 0.9700000286102295], [1511842206.171609, 756, 0.9700000286102295], [1511842206.207161, 757, 0.9599999785423279], [1511842206.259537, 758, 0.9900000095367432], [1511842206.299124, 759, 0.9800000190734863], [1511842206.839902, 761, 0.9399999976158142], [1511842206.869605, 762, 0.9800000190734863], [1511842206.901015, 763, 0.9599999785423279], [1511842206.931029, 764, 0.9700000286102295], [1511842206.961387, 765, 0.9300000071525574], [1511842206.992158, 766, 0.9599999785423279], [1511842207.02291, 767, 0.9700000286102295], [1511842207.055302, 768, 0.9599999785423279], [1511842207.089098, 769, 0.9399999976158142], [1511842207.593272, 771, 0.9800000190734863], [1511842207.624582, 772, 0.949999988079071], [1511842207.654845, 773, 0.9599999785423279], [1511842207.688258, 774, 0.9800000190734863], [1511842207.718489, 775, 0.9700000286102295], [1511842207.747767, 776, 0.949999988079071], [1511842207.778593, 777, 0.9700000286102295], [1511842207.808232, 778, 0.9599999785423279], [1511842207.838551, 779, 0.9599999785423279], [1511842208.397092, 781, 0.9700000286102295], [1511842208.427281, 782, 0.949999988079071], [1511842208.458664, 783, 0.9800000190734863], [1511842208.488235, 784, 0.9599999785423279], [1511842208.519785, 785, 0.9599999785423279], [1511842208.554034, 786, 0.9800000190734863], [1511842208.586204, 787, 0.9800000190734863], [1511842208.619628, 788, 0.9700000286102295], [1511842208.654394, 789, 0.9800000190734863], [1511842209.194778, 791, 0.9800000190734863], [1511842209.226194, 792, 0.9599999785423279], [1511842209.266281, 793, 0.9599999785423279], [1511842209.295469, 794, 0.9800000190734863], [1511842209.327287, 795, 0.9800000190734863], [1511842209.364207, 796, 0.9599999785423279], [1511842209.395033, 797, 0.9599999785423279], [1511842209.429895, 798, 0.949999988079071], [1511842209.556844, 799, 0.949999988079071], [1511842210.130269, 801, 0.9700000286102295], [1511842210.160287, 802, 0.9700000286102295], [1511842210.193199, 803, 0.9700000286102295], [1511842210.22632, 804, 0.9399999976158142], [1511842210.26311, 805, 0.9800000190734863], [1511842210.309019, 806, 0.9599999785423279], [1511842210.347609, 807, 0.9800000190734863], [1511842210.390996, 808, 0.9900000095367432], [1511842210.439887, 809, 0.9200000166893005], [1511842211.003122, 811, 0.9599999785423279], [1511842211.037074, 812, 0.9599999785423279], [1511842211.067644, 813, 0.9399999976158142], [1511842211.101507, 814, 0.9599999785423279], [1511842211.140325, 815, 0.9599999785423279], [1511842211.174903, 816, 0.949999988079071], [1511842211.224003, 817, 0.9700000286102295], [1511842211.286801, 818, 0.9900000095367432], [1511842211.327776, 819, 0.9800000190734863], [1511842211.985095, 821, 0.9200000166893005], [1511842212.030882, 822, 0.9700000286102295], [1511842212.070569, 823, 0.9399999976158142], [1511842212.118181, 824, 0.9800000190734863], [1511842212.157094, 825, 0.9599999785423279], [1511842212.226286, 826, 0.9599999785423279], [1511842212.277023, 827, 0.9900000095367432], [1511842212.311592, 828, 1.0], [1511842212.348642, 829, 0.9599999785423279], [1511842212.91796, 831, 0.9900000095367432], [1511842212.950586, 832, 0.9800000190734863], [1511842212.996488, 833, 0.9599999785423279], [1511842213.027555, 834, 0.9800000190734863], [1511842213.058825, 835, 0.9800000190734863], [1511842213.091046, 836, 0.9599999785423279], [1511842213.125024, 837, 0.9599999785423279], [1511842213.160207, 838, 0.9399999976158142], [1511842213.191536, 839, 0.9700000286102295], [1511842213.728065, 841, 0.9700000286102295], [1511842213.762401, 842, 0.9700000286102295], [1511842213.799732, 843, 0.9700000286102295], [1511842213.833657, 844, 0.9800000190734863], [1511842213.866312, 845, 0.9800000190734863], [1511842213.902647, 846, 0.9599999785423279], [1511842213.942028, 847, 0.9700000286102295], [1511842213.983694, 848, 0.9599999785423279], [1511842214.017235, 849, 0.949999988079071], [1511842214.539192, 851, 0.9800000190734863], [1511842214.570802, 852, 0.9599999785423279], [1511842214.602371, 853, 0.9800000190734863], [1511842214.63469, 854, 0.9599999785423279], [1511842214.666527, 855, 0.9700000286102295], [1511842214.7013, 856, 0.949999988079071], [1511842214.736796, 857, 0.9700000286102295], [1511842214.773076, 858, 0.9900000095367432], [1511842214.804659, 859, 0.9900000095367432], [1511842215.333667, 861, 0.9700000286102295], [1511842215.36866, 862, 0.9800000190734863], [1511842215.408818, 863, 0.9800000190734863], [1511842215.446431, 864, 0.9900000095367432], [1511842215.484602, 865, 0.9399999976158142], [1511842215.520258, 866, 0.9800000190734863], [1511842215.555225, 867, 0.9800000190734863], [1511842215.592115, 868, 0.9599999785423279], [1511842215.630665, 869, 0.9700000286102295], [1511842216.128021, 871, 1.0], [1511842216.159525, 872, 0.9200000166893005], [1511842216.191044, 873, 0.9800000190734863], [1511842216.22625, 874, 0.949999988079071], [1511842216.264204, 875, 1.0], [1511842216.301708, 876, 0.9300000071525574], [1511842216.346822, 877, 0.949999988079071], [1511842216.387908, 878, 0.9900000095367432], [1511842216.431012, 879, 0.9399999976158142], [1511842216.948288, 881, 0.9800000190734863], [1511842216.980613, 882, 0.9599999785423279], [1511842217.01133, 883, 0.9700000286102295], [1511842217.042047, 884, 0.9900000095367432], [1511842217.073482, 885, 0.9300000071525574], [1511842217.108726, 886, 0.9599999785423279], [1511842217.14001, 887, 0.9800000190734863], [1511842217.171317, 888, 0.9599999785423279], [1511842217.203606, 889, 0.9800000190734863], [1511842217.753845, 891, 0.9399999976158142], [1511842217.789057, 892, 0.9599999785423279], [1511842217.830139, 893, 0.9800000190734863], [1511842217.864796, 894, 0.949999988079071], [1511842217.897203, 895, 0.9800000190734863], [1511842217.929849, 896, 0.949999988079071], [1511842217.963099, 897, 0.9800000190734863], [1511842217.996219, 898, 0.9599999785423279], [1511842218.111479, 899, 0.9599999785423279], [1511842218.683541, 901, 0.9700000286102295], [1511842218.714867, 902, 0.9900000095367432], [1511842218.745403, 903, 0.949999988079071], [1511842218.775027, 904, 0.9599999785423279], [1511842218.804858, 905, 0.9700000286102295], [1511842218.834642, 906, 0.9599999785423279], [1511842218.865326, 907, 0.9900000095367432], [1511842218.896291, 908, 0.9700000286102295], [1511842218.926799, 909, 0.9800000190734863], [1511842219.457638, 911, 0.949999988079071], [1511842219.489308, 912, 0.9700000286102295], [1511842219.524922, 913, 0.9100000262260437], [1511842219.55795, 914, 0.9900000095367432], [1511842219.595283, 915, 0.9900000095367432], [1511842219.687366, 916, 0.9900000095367432], [1511842219.727115, 917, 0.9800000190734863], [1511842219.768945, 918, 0.9599999785423279], [1511842219.801816, 919, 0.9800000190734863], [1511842220.390596, 921, 0.9900000095367432], [1511842220.43033, 922, 0.9700000286102295], [1511842220.469885, 923, 0.9700000286102295], [1511842220.501432, 924, 0.949999988079071], [1511842220.534336, 925, 0.949999988079071], [1511842220.577459, 926, 0.9800000190734863], [1511842220.634076, 927, 0.9700000286102295], [1511842220.668908, 928, 0.9599999785423279], [1511842220.7005, 929, 0.9900000095367432], [1511842221.287896, 931, 0.9800000190734863], [1511842221.319684, 932, 0.9599999785423279], [1511842221.355376, 933, 0.949999988079071], [1511842221.390386, 934, 0.9700000286102295], [1511842221.424849, 935, 0.9599999785423279], [1511842221.455576, 936, 0.9800000190734863], [1511842221.488522, 937, 0.9700000286102295], [1511842221.523331, 938, 0.949999988079071], [1511842221.562103, 939, 0.9800000190734863], [1511842222.11082, 941, 0.9399999976158142], [1511842222.144042, 942, 1.0], [1511842222.180893, 943, 0.9599999785423279], [1511842222.214718, 944, 0.9599999785423279], [1511842222.250779, 945, 0.9399999976158142], [1511842222.283768, 946, 0.9599999785423279], [1511842222.318964, 947, 0.949999988079071], [1511842222.351751, 948, 0.9599999785423279], [1511842222.382504, 949, 0.9800000190734863], [1511842222.889534, 951, 0.9800000190734863], [1511842222.921617, 952, 0.949999988079071], [1511842222.953747, 953, 0.9399999976158142], [1511842222.989928, 954, 0.9399999976158142], [1511842223.023551, 955, 0.9700000286102295], [1511842223.060438, 956, 0.9800000190734863], [1511842223.097254, 957, 0.9599999785423279], [1511842223.138771, 958, 0.9800000190734863], [1511842223.174054, 959, 0.9399999976158142], [1511842223.693137, 961, 0.949999988079071], [1511842223.723562, 962, 0.9800000190734863], [1511842223.755989, 963, 0.9700000286102295], [1511842223.790843, 964, 0.9900000095367432], [1511842223.822565, 965, 0.9800000190734863], [1511842223.853841, 966, 0.9900000095367432], [1511842223.892184, 967, 0.9399999976158142], [1511842223.928116, 968, 0.9800000190734863], [1511842223.961467, 969, 0.9700000286102295], [1511842224.536617, 971, 0.9900000095367432], [1511842224.577399, 972, 0.9599999785423279], [1511842224.617609, 973, 0.9700000286102295], [1511842224.655355, 974, 0.9599999785423279], [1511842224.689069, 975, 0.949999988079071], [1511842224.72824, 976, 0.9700000286102295], [1511842224.759455, 977, 0.949999988079071], [1511842224.793144, 978, 0.9599999785423279], [1511842224.824675, 979, 0.9700000286102295], [1511842225.342267, 981, 0.9599999785423279], [1511842225.374886, 982, 0.9700000286102295], [1511842225.407038, 983, 0.9800000190734863], [1511842225.438013, 984, 1.0], [1511842225.468219, 985, 0.9800000190734863], [1511842225.499246, 986, 0.9800000190734863], [1511842225.528987, 987, 0.949999988079071], [1511842225.56184, 988, 0.9599999785423279], [1511842225.596399, 989, 0.949999988079071], [1511842226.096082, 991, 0.9399999976158142], [1511842226.125964, 992, 0.9800000190734863], [1511842226.156644, 993, 0.9599999785423279], [1511842226.187556, 994, 0.9599999785423279], [1511842226.218394, 995, 0.9900000095367432], [1511842226.250693, 996, 0.9599999785423279], [1511842226.284415, 997, 0.9800000190734863], [1511842226.316085, 998, 0.9700000286102295], [1511842226.42392, 999, 0.9599999785423279]] + } + } + } + else { + return { + // moock delay + _timeout: 0, + // mock http status + _status: 200, + // mock response data + _data: { + status: 0, + msg: 'SUCCESS', + data: [[1511842145.514333, 0, 0.094200000166893], [1511842146.427384, 10, 0.7394000291824341], [1511842147.260405, 20, 0.8302000164985657], [1511842148.019018, 30, 0.8662999868392944], [1511842148.793569, 40, 0.8877999782562256], [1511842149.610228, 50, 0.8952000141143799], [1511842150.437095, 60, 0.9031000137329102], [1511842151.254679, 70, 0.9004999995231628], [1511842152.039353, 80, 0.9110000133514404], [1511842152.800043, 90, 0.9143000245094299], [1511842153.668115, 100, 0.9175000190734863], [1511842154.453025, 110, 0.9190000295639038], [1511842155.224028, 120, 0.9214000105857849], [1511842156.001674, 130, 0.9204999804496765], [1511842156.788682, 140, 0.9297999739646912], [1511842157.580495, 150, 0.9289000034332275], [1511842158.331122, 160, 0.9283999800682068], [1511842159.112936, 170, 0.9298999905586243], [1511842159.881351, 180, 0.9301000237464905], [1511842160.659058, 190, 0.9330999851226807], [1511842161.515267, 200, 0.9345999956130981], [1511842162.301136, 210, 0.9351000189781189], [1511842163.092769, 220, 0.9343000054359436], [1511842163.920516, 230, 0.9372000098228455], [1511842164.705352, 240, 0.9351999759674072], [1511842165.674882, 250, 0.9369999766349792], [1511842166.462909, 260, 0.9444000124931335], [1511842167.319383, 270, 0.9437000155448914], [1511842168.114944, 280, 0.9441999793052673], [1511842168.942822, 290, 0.9441999793052673], [1511842169.801691, 300, 0.9453999996185303], [1511842170.594651, 310, 0.9419000148773193], [1511842171.406169, 320, 0.9437000155448914], [1511842172.190729, 330, 0.9488999843597412], [1511842172.997593, 340, 0.9483000040054321], [1511842173.815758, 350, 0.9453999996185303], [1511842174.613314, 360, 0.9480000138282776], [1511842175.402401, 370, 0.9513999819755554], [1511842176.180888, 380, 0.9480999708175659], [1511842176.999133, 390, 0.9520000219345093], [1511842177.900425, 400, 0.954200029373169], [1511842178.682129, 410, 0.9490000009536743], [1511842179.471428, 420, 0.9534000158309937], [1511842180.272808, 430, 0.9549999833106995], [1511842181.044304, 440, 0.9545999765396118], [1511842181.814283, 450, 0.951200008392334], [1511842182.576814, 460, 0.9560999870300293], [1511842183.319649, 470, 0.9588000178337097], [1511842184.080669, 480, 0.9555000066757202], [1511842184.877782, 490, 0.955299973487854], [1511842185.816123, 500, 0.9545000195503235], [1511842186.704832, 510, 0.9559999704360962], [1511842187.475836, 520, 0.9563999772071838], [1511842188.231245, 530, 0.9596999883651733], [1511842188.981693, 540, 0.9562000036239624], [1511842189.72966, 550, 0.9553999900817871], [1511842190.468321, 560, 0.9580000042915344], [1511842191.281197, 570, 0.9575999975204468], [1511842192.046349, 580, 0.9589999914169312], [1511842192.808289, 590, 0.9599999785423279], [1511842193.623127, 600, 0.9603999853134155], [1511842194.371868, 610, 0.9605000019073486], [1511842195.257612, 620, 0.9606000185012817], [1511842196.113539, 630, 0.9559999704360962], [1511842196.914175, 640, 0.9610000252723694], [1511842197.701817, 650, 0.9621999859809875], [1511842198.457409, 660, 0.9599000215530396], [1511842199.228452, 670, 0.9620000123977661], [1511842199.973789, 680, 0.9628000259399414], [1511842200.786072, 690, 0.963699996471405], [1511842201.752806, 700, 0.963100016117096], [1511842202.55644, 710, 0.9632999897003174], [1511842203.355084, 720, 0.964900016784668], [1511842204.150081, 730, 0.9638000130653381], [1511842204.931775, 740, 0.9660000205039978], [1511842205.878417, 750, 0.9628000259399414], [1511842206.808438, 760, 0.9613000154495239], [1511842207.560386, 770, 0.9656000137329102], [1511842208.364481, 780, 0.9664000272750854], [1511842209.154627, 790, 0.9628000259399414], [1511842210.098208, 800, 0.9627000093460083], [1511842210.969653, 810, 0.9656999707221985], [1511842211.929992, 820, 0.9657999873161316], [1511842212.882522, 830, 0.9656000137329102], [1511842213.690861, 840, 0.9682000279426575], [1511842214.508996, 850, 0.9678999781608582], [1511842215.295672, 860, 0.968999981880188], [1511842216.096151, 870, 0.9682999849319458], [1511842216.910752, 880, 0.9661999940872192], [1511842217.718586, 890, 0.9648000001907349], [1511842218.653347, 900, 0.9678000211715698], [1511842219.421863, 910, 0.96670001745224], [1511842220.34967, 920, 0.9674000144004822], [1511842221.234565, 930, 0.9684000015258789], [1511842222.075741, 940, 0.9682000279426575], [1511842222.854794, 950, 0.9663000106811523], [1511842223.658847, 960, 0.9681000113487244], [1511842224.500655, 970, 0.9692999720573425], [1511842225.308939, 980, 0.9692000150680542], [1511842226.065685, 990, 0.9692000150680542]] + } + } + } +}; diff --git a/frontend/mock/data/plugin/scalars/tags.js b/frontend/mock/data/plugin/scalars/tags.js new file mode 100644 index 000000000..5ae1acd61 --- /dev/null +++ b/frontend/mock/data/plugin/scalars/tags.js @@ -0,0 +1,177 @@ +/** + * get mock data + * + * @param {string} path request path + * @param {Object} queryParam query params + * @param {Object} postParam post params + * @return {Object} + */ +module.exports = function (path, queryParam, postParam) { + return { + // moock delay + _timeout: 0, + // mock http status + _status: 200, + // mock response data + _data: { + status: 0, + msg: 'SUCCESS', + data: { + "test": { + "layer2/biases/summaries/mean": { + "displayName": "layer2/biases/summaries/mean", + "description": "" + }, + "layer1/weights/summaries/min": { + "displayName": "layer1/weights/summaries/min", + "description": "" + }, + "layer2/biases/summaries/stddev_1": { + "displayName": "layer2/biases/summaries/stddev_1", + "description": "" + }, + "layer1/biases/summaries/mean": { + "displayName": "layer1/biases/summaries/mean", + "description": "" + }, + "layer1/weights/summaries/mean": { + "displayName": "layer1/weights/summaries/mean", + "description": "" + }, + "dropout/dropout_keep_probability": { + "displayName": "dropout/dropout_keep_probability", + "description": "" + }, + "layer1/weights/summaries/max": { + "displayName": "layer1/weights/summaries/max", + "description": "" + }, "layer2/weights/summaries/mean": { + "displayName": "layer2/weights/summaries/mean", + "description": "" + }, "layer2/weights/summaries/stddev_1": { + "displayName": "layer2/weights/summaries/stddev_1", + "description": "" + }, + "layer2/weights/summaries/min": { + "displayName": "layer2/weights/summaries/min", + "description": "" + }, + "layer1/biases/summaries/max": { + "displayName": "layer1/biases/summaries/max", + "description": "" + }, + "layer2/weights/summaries/max": { + "displayName": "layer2/weights/summaries/max", + "description": "" + }, + "accuracy_1": { + "displayName": "accuracy_1", + "description": "" + }, + "layer2/biases/summaries/min": { + "displayName": "layer2/biases/summaries/min", + "description": "" + }, + "cross_entropy_1": { + "displayName": "cross_entropy_1", + "description": "" + }, + "layer2/biases/summaries/max": { + "displayName": "layer2/biases/summaries/max", + "description": "" + }, + "layer1/weights/summaries/stddev_1": { + "displayName": "layer1/weights/summaries/stddev_1", + "description": "" + }, + "layer1/biases/summaries/stddev_1": { + "displayName": "layer1/biases/summaries/stddev_1", + "description": "" + }, + "layer1/biases/summaries/min": { + "displayName": "layer1/biases/summaries/min", + "description": "" + } + }, + "train": { + "layer2/biases/summaries/mean": { + "displayName": "layer2/biases/summaries/mean", + "description": "" + }, + "layer1/weights/summaries/min": { + "displayName": "layer1/weights/summaries/min", + "description": "" + }, + "layer2/biases/summaries/stddev_1": { + "displayName": "layer2/biases/summaries/stddev_1", + "description": "" + }, + "layer1/biases/summaries/mean": { + "displayName": "layer1/biases/summaries/mean", + "description": "" + }, + "layer1/weights/summaries/mean": { + "displayName": "layer1/weights/summaries/mean", + "description": "" + }, + "dropout/dropout_keep_probability": { + "displayName": "dropout/dropout_keep_probability", + "description": "" + }, + "layer1/weights/summaries/max": { + "displayName": "layer1/weights/summaries/max", + "description": "" + }, + "layer2/weights/summaries/mean": { + "displayName": "layer2/weights/summaries/mean", + "description": "" + }, + "layer2/weights/summaries/stddev_1": { + "displayName": "layer2/weights/summaries/stddev_1", + "description": "" + }, + "layer2/weights/summaries/min": { + "displayName": "layer2/weights/summaries/min", + "description": "" + }, + "layer1/biases/summaries/max": { + "displayName": "layer1/biases/summaries/max", + "description": "" + }, + "layer2/weights/summaries/max": { + "displayName": "layer2/weights/summaries/max", + "description": "" + }, + "accuracy_1": { + "displayName": "accuracy_1", + "description": "" + }, + "layer2/biases/summaries/min": { + "displayName": "layer2/biases/summaries/min", + "description": "" + }, + "cross_entropy_1": { + "displayName": "cross_entropy_1", + "description": "" + }, + "layer2/biases/summaries/max": { + "displayName": "layer2/biases/summaries/max", + "description": "" + }, + "layer1/weights/summaries/stddev_1": { + "displayName": "layer1/weights/summaries/stddev_1", + "description": "" + }, + "layer1/biases/summaries/stddev_1": { + "displayName": "layer1/biases/summaries/stddev_1", + "description": "" + }, + "layer1/biases/summaries/min": { + "displayName": "layer1/biases/summaries/min", + "description": "" + } + } + } + } + }; +}; diff --git a/frontend/mock/data/runs.js b/frontend/mock/data/runs.js new file mode 100644 index 000000000..4e9854de6 --- /dev/null +++ b/frontend/mock/data/runs.js @@ -0,0 +1,22 @@ +/** + * get mock data + * + * @param {string} path request path + * @param {Object} queryParam query params + * @param {Object} postParam post params + * @return {Object} + */ +module.exports = function (path, queryParam, postParam) { + return { + // moock delay + _timeout: 0, + // mock http status + _status: 200, + // mock response data + _data: { + status: 0, + msg: 'SUCCESS', + data: ["train", "test", "model"] + } + }; +}; diff --git a/server/visualdl/frontend/package.json b/frontend/package.json similarity index 97% rename from server/visualdl/frontend/package.json rename to frontend/package.json index e922fa020..57dc9b6da 100644 --- a/server/visualdl/frontend/package.json +++ b/frontend/package.json @@ -17,9 +17,11 @@ }, "dependencies": { "axios": "^0.16.1", + "echarts": "^3.8.5", "file-saver": "^1.3.3", "lodash": "^4.17.4", "normalize.css": "^6.0.0", + "qs": "^6.5.1", "san": "3.2.3", "san-mui": "^1.0.4", "san-router": "^1.1.1", @@ -45,7 +47,7 @@ "css-loader": "^0.28.0", "express": "^4.16.2", "extract-text-webpack-plugin": "^2.1.0", - "fecs": "^1.5.2", + "fecs": "^1.5.3", "file-loader": "^0.11.1", "friendly-errors-webpack-plugin": "^1.6.1", "glob": "^7.1.1", diff --git a/frontend/src/App.san b/frontend/src/App.san new file mode 100644 index 000000000..d161a7070 --- /dev/null +++ b/frontend/src/App.san @@ -0,0 +1,42 @@ + + + + + diff --git a/server/visualdl/frontend/src/common/fun/downLoadCSV.js b/frontend/src/common/fun/downLoadFile.js similarity index 76% rename from server/visualdl/frontend/src/common/fun/downLoadCSV.js rename to frontend/src/common/fun/downLoadFile.js index cfb887be4..0a2fbbaa1 100644 --- a/server/visualdl/frontend/src/common/fun/downLoadCSV.js +++ b/frontend/src/common/fun/downLoadFile.js @@ -1,6 +1,5 @@ import XLSX from 'xlsx'; import FileSaver from 'file-saver'; -// const JSON_TO_SHEET = XLSX.utils.json_to_sheet; const aoaToSheet = XLSX.utils.aoa_to_sheet; const saveAs = FileSaver.saveAs; function s2ab(s) { @@ -50,3 +49,22 @@ export const generateXLSXandAutoDownload = function (data, name) { name + '.xlsx' || 'sheetjs.xlsx' ); }; + +/** + * download json + * + * @desc download json + * @param {Array} data the data for the xlsx + * @param {string} name filename + */ +export const generateJsonAndDownload = function (data, name) { + saveAs( + new Blob( + [s2ab(JSON.stringify(data, null, ' '))], + { + type: 'application/octet-stream' + } + ), + name + '.json' || 'json.json' + ); +}; diff --git a/frontend/src/common/ui/AppMenu.san b/frontend/src/common/ui/AppMenu.san new file mode 100644 index 000000000..df9352032 --- /dev/null +++ b/frontend/src/common/ui/AppMenu.san @@ -0,0 +1,67 @@ + + + + + diff --git a/frontend/src/common/ui/Charts/chart.san b/frontend/src/common/ui/Charts/chart.san new file mode 100644 index 000000000..95d608b9b --- /dev/null +++ b/frontend/src/common/ui/Charts/chart.san @@ -0,0 +1,206 @@ + + + + diff --git a/frontend/src/common/ui/CheckBoxGroup.san b/frontend/src/common/ui/CheckBoxGroup.san new file mode 100644 index 000000000..b098b2bf4 --- /dev/null +++ b/frontend/src/common/ui/CheckBoxGroup.san @@ -0,0 +1,114 @@ + + diff --git a/frontend/src/common/ui/DropDownMenu.san b/frontend/src/common/ui/DropDownMenu.san new file mode 100644 index 000000000..56db8cc5a --- /dev/null +++ b/frontend/src/common/ui/DropDownMenu.san @@ -0,0 +1,43 @@ + + diff --git a/frontend/src/common/ui/ExpandPanel.san b/frontend/src/common/ui/ExpandPanel.san new file mode 100644 index 000000000..243e43296 --- /dev/null +++ b/frontend/src/common/ui/ExpandPanel.san @@ -0,0 +1,55 @@ + + + + + diff --git a/frontend/src/common/ui/Notification/Notification.js b/frontend/src/common/ui/Notification/Notification.js new file mode 100644 index 000000000..929f9a36f --- /dev/null +++ b/frontend/src/common/ui/Notification/Notification.js @@ -0,0 +1,99 @@ +import NotificationItem from './NotificationItem'; + +let seed = 1; +// instances +const instances = []; + +/** + * caculate top dist + * + * @param {number} topDist top dist + * @return {number} final top dist + */ +function calcTopDist(topDist = 16) { + for (let i = 0, len = instances.length; i < len; i++) { + topDist += (instances[i].vm.el.offsetHeight + 16); + } + return topDist; +} + +/** + * Notification main func + * + * @param {Object} options options + * @return {NotificationItem} instance + */ +const notification = function (options = {}) { + options.top = calcTopDist(options.offset); + const {onClose, onClick} = options; + delete options.onClick; + delete options.onClose; + delete options.offset; + const instance = { + vm: new NotificationItem({ + data: options + }), + id: `notification_${seed++}` + }; + + if (typeof onClick === 'function') { + instance.vm.on('itemClick', onClick); + } + instance.vm.on('close', () => { + notification.close(instance.id, onClose); + }); + instance.vm.attach(document.body); + + instances.push(instance); + return instance.vm; +}; + +/** + * close + * + * @param {string} id instance id + * @param {Function} onClose cusmtom func + */ +notification.close = function (id, onClose) { + let index; + let removedHeight; + let len = instances.length; + for (let i = 0; i < len; i++) { + if (id === instances[i].id) { + if (typeof onClose === 'function') { + onClose(instances[i]); + } + index = i; + removedHeight = instances[i].vm.el.offsetHeight; + // distroy instance + instances[i].vm.dispose(); + instances[i] = null; + // reomve instance fron instances + instances.splice(i, 1); + break; + } + } + // change the left notification's height + if (len > 1) { + for (let i = index; i < len - 1; i++) { + instances[i].vm.el.style.top = `${parseInt(instances[i].vm.el.style.top, 10) - removedHeight - 16}px`; + } + } + +}; + +// fout type func +['success', 'warning', 'info', 'error'].forEach(type => { + notification[type] = options => { + if (typeof options === 'string') { + options = { + message: options + }; + } + options = options || {}; + options.type = type; + return notification(options); + }; +}); + +export default notification; diff --git a/frontend/src/common/ui/Notification/Notification.md b/frontend/src/common/ui/Notification/Notification.md new file mode 100644 index 000000000..7dedf7cbb --- /dev/null +++ b/frontend/src/common/ui/Notification/Notification.md @@ -0,0 +1,179 @@ + +## Notification + +### base usage + +```san Notification + + + +``` + +### with icon + +```san Notification + + + +``` +### width offset + +```san Notification + + + +``` + + +## API + +### Props + +| name | type | fefault | desc | +| --- | --- | --- | --- | +| title | String | | title | +| message | String | | content | +| customClass |String| | custom class | +| offset | Number | | offset to the top | +| onClick | Function | | on-click callback | +| onClose | Function | | on-close callback | +| duration | Number | 3000 | duration | +| type | String | | include success,error,warning,info, others not use | + + + diff --git a/frontend/src/common/ui/Notification/Notification.styl b/frontend/src/common/ui/Notification/Notification.styl new file mode 100644 index 000000000..c2ca52090 --- /dev/null +++ b/frontend/src/common/ui/Notification/Notification.styl @@ -0,0 +1,51 @@ +.sm-notification + position: fixed + display: flex + z-index: 9999 + right: 16px + top 16px + width: 330px + padding: 20px + box-sizing border-box + border-radius 2px + background-color #fff + box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04); + transition: all .4s; + overflow: hidden + + &.state-hidden + transform translateX(346px) + + &.state-open + transform translateX(0) + + &-group + color: #000 + + &-type + margin auto 0 + margin-right 20px + &.type-success + color: #13ce66 + &.type-info + color: #50bfff + &.type-warning + color: #f7ba2a + &.type-error + color: #ff4949 + &-title + color: #1f2d3d + font-size 16px + &-content + color: #8d9baf + padding: 5px 0 + &-close + position: absolute + cursor: pointer + right 20px + top: 20px + &-btn + transition all .3s + color #bfcbd9 + &:hover + color: #777F8C diff --git a/frontend/src/common/ui/Notification/NotificationItem.js b/frontend/src/common/ui/Notification/NotificationItem.js new file mode 100644 index 000000000..74ba52888 --- /dev/null +++ b/frontend/src/common/ui/Notification/NotificationItem.js @@ -0,0 +1,106 @@ +import {Component} from 'san'; +import Icon from 'san-mui/Icon'; + +const typeMap = { + success: 'check_circle', + info: 'info', + warning: 'error', + error: 'cancel' +}; + +export default class NotificationItem extends Component { + static template = ` +
+ {{iconType}} +
+

{{title}}

+
{{message}}
+
+ close +
+
+
+ `; + + initData() { + return { + title: '', + message: '', + duration: 3000, + closed: true + }; + } + + static components = { + 'san-icon': Icon + }; + + static computed = { + iconType() { + return typeMap[this.data.get('type')]; + } + }; + + handleClick() { + this.fire('itemClick'); + } + + /** + * close + * + * @param {Object} e event Object + */ + close(e) { + if (e) { + e.stopPropagation(); + } + this.data.set('closed', true); + this.el.addEventListener('transitionend', () => { + this.fire('close'); + }); + } + + /** + * clear timer + */ + clearTimer() { + clearTimeout(this.timer); + } + + /** + * start timet + */ + startTimer() { + const duration = this.data.get('duration'); + if (duration > 0) { + this.timer = setTimeout(() => { + if (!this.closed) { + this.close(); + } + }, duration); + } + } + + attached() { + if (this.el.parentNode !== document.body) { + document.body.appendChild(this.el); + } + requestAnimationFrame(() => { + this.data.set('closed', false); + }); + + this.startTimer(); + } + + detached() { + this.clearTimer(); + } +} diff --git a/frontend/src/common/ui/Notification/index.js b/frontend/src/common/ui/Notification/index.js new file mode 100644 index 000000000..460b76af9 --- /dev/null +++ b/frontend/src/common/ui/Notification/index.js @@ -0,0 +1,7 @@ +import Notification from './Notification'; +import NotificationItem from './NotificationItem'; + +export { + NotificationItem, + Notification as default +}; diff --git a/frontend/src/common/ui/RadioGroup.san b/frontend/src/common/ui/RadioGroup.san new file mode 100644 index 000000000..43e093055 --- /dev/null +++ b/frontend/src/common/ui/RadioGroup.san @@ -0,0 +1,43 @@ + + \ No newline at end of file diff --git a/frontend/src/common/ui/Slider.san b/frontend/src/common/ui/Slider.san new file mode 100644 index 000000000..b4e2fa4a6 --- /dev/null +++ b/frontend/src/common/ui/Slider.san @@ -0,0 +1,64 @@ + + + + + + diff --git a/frontend/src/common/ui/ui-common.styl b/frontend/src/common/ui/ui-common.styl new file mode 100644 index 000000000..9384719dd --- /dev/null +++ b/frontend/src/common/ui/ui-common.styl @@ -0,0 +1,87 @@ +// initual style +body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, dl, dt, dd, ul, ol, li, pre, form, fieldset, legend, button, input, textarea, th, td { margin:0; padding:0; } body, button, input, select, textarea { font:12px/1.5tahoma, arial, \5b8b\4f53; } h1, h2, h3, h4, h5, h6{ font-size:100%; } address, cite, dfn, em, var { font-style:normal; } code, kbd, pre, samp { font-family:couriernew, courier, monospace; } small{ font-size:12px; } ul, ol { list-style:none; } a { text-decoration:none; } a:hover { text-decoration:underline; } sup { vertical-align:text-top; } sub{ vertical-align:text-bottom; } legend { color:#000; } fieldset, img { border:0; } button, input, select, textarea { font-size:100%; } table { border-collapse:collapse; border-spacing:0; } + +@import './Notification/Notification.styl' + +// modify some styles of san-mui +.sm-icon + width 100% + height 100% + overflow hidden + +.sm-radio, +.sm-checkbox + margin-top 2px + margin-bottom 4px + margin-right 10px + float left + width 100% + + .sm-radio-wrapper, + .sm-checkbox-wrapper + justify-content start + + .sm-radio-label, + .sm-checkbox-label + font-size 12px + + .sm-radio-icon + .sm-checkbox-icon + width 20px + height 20px + margin-right 10px + + .sm-radio-ripple-wrapper + .sm-checkbox-ripple-wrapper + width 20px + height 20px + top 0px + left 0px + + .sm-checkbox-svg-icon, + .sm-radio-svg-icon + width 20px + height 20px + + .sm-checkbox-icon-uncheck + .sm-radio-icon-uncheck + color #58666e + + .sm-radio-label, + .sm-checkbox-label + color #58666e + +.sm-dropdown-menu + .sm-dropdown-menu-icon + .sm-icon + color #58666e + +.sm-popover-content + .sm-menu-item + line-height 30px + font-size 14px + color #58666e + + .sm-menu-item.state-selected + color #ff4081 + +.sm-text-field-input + color #58666e + +.sm-form-item + margin-top 10px + + .label + color rgba(0,0,0,0.54) + font-size 12px + line-height 20px + + .group-box + overflow hidden + +.collapse-transition + transition: 0.3s height ease-in-out, 0.3s padding-top ease-in-out, 0.3s padding-bottom ease-in-out; + +.sm-pagination + margin 30px 0 + font-size 12px \ No newline at end of file diff --git a/frontend/src/common/util/http.js b/frontend/src/common/util/http.js new file mode 100644 index 000000000..9f77fdedd --- /dev/null +++ b/frontend/src/common/util/http.js @@ -0,0 +1,49 @@ +import axios from 'axios'; +import qs from 'qs'; +import Notification from '../ui/Notification'; + +const STATUS = 'status'; +const STATUSINFO = 'msg'; + +const instance = axios.create({ + baseURL: '/', + timeout: 30000 +}); + +const responseErrorStatus = response => { + const data = response.data; + if (data[STATUS] !== 0) { + Notification.error(data[STATUSINFO]); + return Promise.reject(data); + } + return data; +}; + +const responseNetError = error => { + Notification.error('net error'); + return Promise.reject(error); +}; + +// post from +const formInstance = axios.create({ + baseURL: '/', + timeout: 3000, + transformRequest: [data => qs.stringify(data)], + headers: { + 'Content-Type': 'application/x-www-form-urlencoded', + 'Accept': 'application/json,application/vnd.ms-excel' + } +}); + +formInstance.interceptors.response.use(responseErrorStatus, responseNetError); + +instance.interceptors.response.use(responseErrorStatus, responseNetError); + +export const makeService = (url, opt = {method: 'get'}) => (params = {}) => { + if (opt.method === 'delete' || opt.method === 'get') { + params = {params}; + } + return instance[opt.method](url, params); +}; + +export const makeFormService = (url, method = 'post') => (params = {}) => formInstance[method](url, params); diff --git a/frontend/src/common/util/routeTo.js b/frontend/src/common/util/routeTo.js new file mode 100644 index 000000000..f9520cddc --- /dev/null +++ b/frontend/src/common/util/routeTo.js @@ -0,0 +1,8 @@ +import {router} from 'san-router'; + +export function routeTo(url, params = {}) { + let paramsArr = Object.keys(params).map(key => `${key}=${params[key]}`); + let urlParams = (url.indexOf('?') > -1 ? '&' : '?') + paramsArr.join('&'); + + router.locator.redirect(urlParams.length > 1 ? `${url}${urlParams}` : url); +} diff --git a/server/visualdl/frontend/src/home/Home.san b/frontend/src/home/Home.san similarity index 50% rename from server/visualdl/frontend/src/home/Home.san rename to frontend/src/home/Home.san index dec8ff6b0..dbb358a44 100644 --- a/server/visualdl/frontend/src/home/Home.san +++ b/frontend/src/home/Home.san @@ -2,7 +2,7 @@

- welcome + {{text}}

@@ -12,7 +12,11 @@ diff --git a/server/visualdl/frontend/src/home/index.js b/frontend/src/home/index.js similarity index 86% rename from server/visualdl/frontend/src/home/index.js rename to frontend/src/home/index.js index 0ec3406a4..cb5823206 100644 --- a/server/visualdl/frontend/src/home/index.js +++ b/frontend/src/home/index.js @@ -1,10 +1,9 @@ import {router} from 'san-router'; - import HomePage from './Home'; router.add({ target: '#content', - rule: '/home', + rule: '/', Component: HomePage }); diff --git a/server/visualdl/frontend/src/index.js b/frontend/src/index.js similarity index 59% rename from server/visualdl/frontend/src/index.js rename to frontend/src/index.js index 3c31ecf63..5519c6861 100644 --- a/server/visualdl/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,6 +1,11 @@ import 'normalize.css/normalize.css'; import 'san-mui/index.css'; -let App = require('./App'); +import './common/ui/ui-common.styl'; + +import './home/index'; +import './scalars/index'; + +import App from './App'; new App({ data: { titleName: 'VisualDL' diff --git a/frontend/src/scalars/Scalars.san b/frontend/src/scalars/Scalars.san new file mode 100644 index 000000000..7c907ce9b --- /dev/null +++ b/frontend/src/scalars/Scalars.san @@ -0,0 +1,155 @@ + + + + + diff --git a/frontend/src/scalars/index.js b/frontend/src/scalars/index.js new file mode 100644 index 000000000..2b08bf22f --- /dev/null +++ b/frontend/src/scalars/index.js @@ -0,0 +1,9 @@ +import {router} from 'san-router'; + +import Scalar from './Scalars'; + +router.add({ + target: '#content', + rule: '/scalars', + Component: Scalar +}); diff --git a/frontend/src/scalars/ui/chartPage.san b/frontend/src/scalars/ui/chartPage.san new file mode 100644 index 000000000..aa1eb5db2 --- /dev/null +++ b/frontend/src/scalars/ui/chartPage.san @@ -0,0 +1,71 @@ + + + + + diff --git a/frontend/src/scalars/ui/config.san b/frontend/src/scalars/ui/config.san new file mode 100644 index 000000000..98e2f3150 --- /dev/null +++ b/frontend/src/scalars/ui/config.san @@ -0,0 +1,126 @@ + + + + + diff --git a/frontend/src/service.js b/frontend/src/service.js new file mode 100644 index 000000000..e30dfbf33 --- /dev/null +++ b/frontend/src/service.js @@ -0,0 +1,7 @@ +import {makeService} from './common/util/http'; + +export const getPluginScalarsTags = makeService('/data/plugin/scalars/tags'); + +export const getRuns = makeService('/data/runs'); + +export const getPluginScalarsScalars = makeService('/data/plugin/scalars/scalars'); diff --git a/server/visualdl/frontend/src/style/variables.styl b/frontend/src/style/variables.styl similarity index 100% rename from server/visualdl/frontend/src/style/variables.styl rename to frontend/src/style/variables.styl diff --git a/server/visualdl/frontend/template/index.html b/frontend/template/index.html similarity index 94% rename from server/visualdl/frontend/template/index.html rename to frontend/template/index.html index 0840dad12..f93f6d72c 100755 --- a/server/visualdl/frontend/template/index.html +++ b/frontend/template/index.html @@ -1,5 +1,5 @@ - + VisualDL diff --git a/server/visualdl/frontend/tool/HtmlReplacePlugin.js b/frontend/tool/HtmlReplacePlugin.js similarity index 100% rename from server/visualdl/frontend/tool/HtmlReplacePlugin.js rename to frontend/tool/HtmlReplacePlugin.js diff --git a/server/visualdl/frontend/tool/build.js b/frontend/tool/build.js similarity index 100% rename from server/visualdl/frontend/tool/build.js rename to frontend/tool/build.js diff --git a/server/visualdl/frontend/tool/dev-client.js b/frontend/tool/dev-client.js similarity index 100% rename from server/visualdl/frontend/tool/dev-client.js rename to frontend/tool/dev-client.js diff --git a/server/visualdl/frontend/tool/dev-server.js b/frontend/tool/dev-server.js similarity index 70% rename from server/visualdl/frontend/tool/dev-server.js rename to frontend/tool/dev-server.js index f86feb1f5..98299e0c2 100644 --- a/server/visualdl/frontend/tool/dev-server.js +++ b/frontend/tool/dev-server.js @@ -38,47 +38,23 @@ compiler.plugin('compilation', function (compilation) { }); }); -var context = [ - '/example', -]; -var proxypath = ''; - -var options = { - target: proxypath, - changeOrigin: true, -}; -if (context.length) { - // app.use(proxyMiddleware(context, options)); - app.use('/example', proxyMiddleware({ - target: 'www.baidu.com', - changeOrigin: true, - })); +// autoresponse +let AutoresponseMatchs = ['data']; +let matchsReg = new RegExp(AutoresponseMatchs.join('\|')); +let excludeReg = /\.(html|js|map)$/; +let isAutoresponseRequest = (path) => { + return !excludeReg.test(path) && matchsReg.test(path); } + app.use(autoresponse({ logLevel: 'debug', root: path.dirname(__dirname), rules: [ { - match: '/example/:id', - method: ['get'] - } - ], - post: { - match: function (reqPathName) { - return !/\.(html|js|map)$/.test(reqPathName) && /^\/(api)(.*)/.test(reqPathName); - } - }, - delete: { - match: function () { - return true; - } - }, - get: { - match: function (reqPathName) { - return !/\.(html|js|map)$/.test(reqPathName) && /^\/(api)(.*)/.test(reqPathName); + match: isAutoresponseRequest, + method: ['get', 'post', , 'delete'] } - } - + ] })); // serve webpack bundle output diff --git a/server/visualdl/frontend/tool/entry.js b/frontend/tool/entry.js similarity index 100% rename from server/visualdl/frontend/tool/entry.js rename to frontend/tool/entry.js diff --git a/server/visualdl/frontend/tool/webpack.config.js b/frontend/tool/webpack.config.js similarity index 100% rename from server/visualdl/frontend/tool/webpack.config.js rename to frontend/tool/webpack.config.js diff --git a/server/visualdl/frontend/tool/webpack.dev.config.js b/frontend/tool/webpack.dev.config.js similarity index 100% rename from server/visualdl/frontend/tool/webpack.dev.config.js rename to frontend/tool/webpack.dev.config.js diff --git a/server/visualdl/frontend/tool/webpack.prod.config.js b/frontend/tool/webpack.prod.config.js similarity index 100% rename from server/visualdl/frontend/tool/webpack.prod.config.js rename to frontend/tool/webpack.prod.config.js diff --git a/server/visualdl/frontend/mock/example/mock.js b/server/visualdl/frontend/mock/example/mock.js deleted file mode 100644 index 5544c73a6..000000000 --- a/server/visualdl/frontend/mock/example/mock.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * frontend mock data - * - * @param {string} path request path - * @param {Object} queryParam params - * @param {Object} postParam post post params - * @return {Object} - */ -module.exports = function (path, queryParam, postParam) { - return { - // delay - _timeout: 0, - - // http code status - _status: 200, - - // response data - _data: { - // 0 for sucsuss, others for error - status: 0, - // error msg - msg: '', - data: '' - } - }; -}; diff --git a/server/visualdl/frontend/src/App.san b/server/visualdl/frontend/src/App.san deleted file mode 100644 index 3e8f7d7fb..000000000 --- a/server/visualdl/frontend/src/App.san +++ /dev/null @@ -1,57 +0,0 @@ - - - - - From 5e66cde789c7bf3a5897454c93d0f22ef19f9bd6 Mon Sep 17 00:00:00 2001 From: BingBlog Date: Tue, 5 Dec 2017 15:12:44 +0800 Subject: [PATCH 2/5] frontend rename common/fun to util --- frontend/src/common/ui/Charts/chart.san | 2 +- frontend/src/common/{fun => util}/downLoadFile.js | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename frontend/src/common/{fun => util}/downLoadFile.js (100%) diff --git a/frontend/src/common/ui/Charts/chart.san b/frontend/src/common/ui/Charts/chart.san index 95d608b9b..e9121a348 100644 --- a/frontend/src/common/ui/Charts/chart.san +++ b/frontend/src/common/ui/Charts/chart.san @@ -18,7 +18,7 @@ import Button from 'san-mui/Button'; import Icon from 'san-mui/Icon'; import DropDownMenu from '../../../common/ui/DropDownMenu'; -import {generateJsonAndDownload} from '../../../common/fun/downLoadFile'; +import {generateJsonAndDownload} from '../../../common/util/downLoadFile'; import echarts from 'echarts'; import axios from 'axios'; import {getPluginScalarsScalars} from '../../../service'; diff --git a/frontend/src/common/fun/downLoadFile.js b/frontend/src/common/util/downLoadFile.js similarity index 100% rename from frontend/src/common/fun/downLoadFile.js rename to frontend/src/common/util/downLoadFile.js From 7d693fb209c3171102c3ae9b22f799abcb850c26 Mon Sep 17 00:00:00 2001 From: BingBlog Date: Mon, 25 Dec 2017 11:33:27 +0800 Subject: [PATCH 3/5] add images, scalar config --- frontend/mock/data/plugin/images/images.js | 42 ++ .../data/plugin/images/individualImage.js | 29 ++ frontend/mock/data/plugin/images/tags.js | 25 ++ frontend/mock/data/runs.js | 2 +- frontend/package.json | 5 +- frontend/src/common/ui/AppMenu.san | 2 +- frontend/src/common/ui/Charts/chart.san | 396 +++++++++++++++--- frontend/src/common/ui/Charts/image.san | 101 +++++ frontend/src/common/ui/ExpandPanel.san | 8 +- frontend/src/common/ui/Slider.san | 19 +- frontend/src/common/ui/ui-common.styl | 19 +- frontend/src/common/util/index.js | 5 + frontend/src/common/util/number.js | 3 + frontend/src/common/util/quantile.js | 21 + frontend/src/images/Images.san | 155 +++++++ frontend/src/images/index.js | 9 + frontend/src/images/ui/chartPage.san | 71 ++++ frontend/src/images/ui/config.san | 63 +++ frontend/src/index.js | 1 + frontend/src/scalars/Scalars.san | 32 +- frontend/src/scalars/ui/chartPage.san | 23 +- frontend/src/scalars/ui/config.san | 51 ++- frontend/src/service.js | 4 + frontend/tool/HtmlReplacePlugin.js | 1 + frontend/tool/build.js | 1 + frontend/tool/dev-client.js | 1 + frontend/tool/dev-server.js | 1 + frontend/tool/entry.js | 1 + frontend/tool/webpack.config.js | 1 + frontend/tool/webpack.dev.config.js | 1 + frontend/tool/webpack.prod.config.js | 1 + 31 files changed, 987 insertions(+), 107 deletions(-) create mode 100644 frontend/mock/data/plugin/images/images.js create mode 100644 frontend/mock/data/plugin/images/individualImage.js create mode 100644 frontend/mock/data/plugin/images/tags.js create mode 100644 frontend/src/common/ui/Charts/image.san create mode 100644 frontend/src/common/util/index.js create mode 100644 frontend/src/common/util/number.js create mode 100644 frontend/src/common/util/quantile.js create mode 100644 frontend/src/images/Images.san create mode 100644 frontend/src/images/index.js create mode 100644 frontend/src/images/ui/chartPage.san create mode 100644 frontend/src/images/ui/config.san diff --git a/frontend/mock/data/plugin/images/images.js b/frontend/mock/data/plugin/images/images.js new file mode 100644 index 000000000..98ee5bc95 --- /dev/null +++ b/frontend/mock/data/plugin/images/images.js @@ -0,0 +1,42 @@ +/** + * get mock data + * + * @param {string} path request path + * @param {Object} queryParam query params + * @param {Object} postParam post params + * @return {Object} + */ +module.exports = function (path, queryParam, postParam) { + return { + // moock delay + _timeout: 0, + // mock http status + _status: 200, + // mock response data + _data: { + status: 0, + msg: 'SUCCESS', + data: [ + { + "wall_time": 1512549785.061623, + "step": 60, + "query": + "sample=0&index=0&tag=input_reshape%2Finput%2Fimage%2F0&run=test", + "width": 28, + "height": 28 + }, + {"wall_time": 1512886109.672786, "step": 60, "query": "sample=0&index=1&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886124.266915, "step": 210, "query": "sample=0&index=2&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886138.898628, "step": 330, "query": "sample=0&index=3&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886139.883663, "step": 340, "query": "sample=0&index=4&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886147.195567, "step": 410, "query": "sample=0&index=5&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886156.47856, "step": 500, "query": "sample=0&index=6&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886187.82793, "step": 810, "query": "sample=0&index=7&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886200.386198, "step": 950, "query": "sample=0&index=8&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28}, + {"wall_time": 1512886204.224405, "step": 990, "query": "sample=0&index=9&tag=input_reshape%2Finput%2Fimage%2F0&run=test", "width": 28, "height": 28} + ] + } + }; +}; + + diff --git a/frontend/mock/data/plugin/images/individualImage.js b/frontend/mock/data/plugin/images/individualImage.js new file mode 100644 index 000000000..c4dafc4ec --- /dev/null +++ b/frontend/mock/data/plugin/images/individualImage.js @@ -0,0 +1,29 @@ +/** + * @file mock data + * @author autoresponse + */ + +/* eslint-disable fecs-camelcase */ + +/** + * 获取 mock 响应数据 + * + * @param {string} path 请求路径名 + * @param {Object} queryParam 查询参数信息 + * @param {Object} postParam post 的查询参数信息 + * @return {Object} + */ +module.exports = function (path, queryParam, postParam) { + return { + // 可以通过该属性来设置响应的延时，也可以设为值为'0,100'，表示随机 0-100ms 的延时，默认 0 + _timeout: 0, + + // 通过该状态来设置响应的 http 的状态码，默认 200 + _status: 200, + + // 对于要响应的 json 数据可以统一放在该字段里，也可以不使用该字段，直接跟 _xx 属性平级放 + _data: [] + }; +}; + +/* eslint-enable fecs-camelcase */ diff --git a/frontend/mock/data/plugin/images/tags.js b/frontend/mock/data/plugin/images/tags.js new file mode 100644 index 000000000..bf0b3acf5 --- /dev/null +++ b/frontend/mock/data/plugin/images/tags.js @@ -0,0 +1,25 @@ +/** + * get mock data + * + * @param {string} path request path + * @param {Object} queryParam query params + * @param {Object} postParam post params + * @return {Object} + */ + module.exports = function (path, queryParam, postParam) { + return { + // moock delay + _timeout: 0, + // mock http status + _status: 200, + // mock response data + _data: { + status: 0, + msg: 'SUCCESS', + data: { + "test": { + "input_reshape/input/image/6": { + "displayName": "input_reshape/input/image/6", "description": "", "samples": 1}, "input_reshape/input/image/7": {"displayName": "input_reshape/input/image/7", "description": "", "samples": 1}, "input_reshape/input/image/4": {"displayName": "input_reshape/input/image/4", "description": "", "samples": 1}, "input_reshape/input/image/5": {"displayName": "input_reshape/input/image/5", "description": "", "samples": 1}, "input_reshape/input/image/2": {"displayName": "input_reshape/input/image/2", "description": "", "samples": 1}, "input_reshape/input/image/3": {"displayName": "input_reshape/input/image/3", "description": "", "samples": 1}, "input_reshape/input/image/0": {"displayName": "input_reshape/input/image/0", "description": "", "samples": 1}, "input_reshape/input/image/1": {"displayName": "input_reshape/input/image/1", "description": "", "samples": 1}, "input_reshape/input/image/8": {"displayName": "input_reshape/input/image/8", "description": "", "samples": 1}, "input_reshape/input/image/9": {"displayName": "input_reshape/input/image/9", "description": "", "samples": 1}}, "train": {"input_reshape/input/image/6": {"displayName": "input_reshape/input/image/6", "description": "", "samples": 1}, "input_reshape/input/image/7": {"displayName": "input_reshape/input/image/7", "description": "", "samples": 1}, "input_reshape/input/image/4": {"displayName": "input_reshape/input/image/4", "description": "", "samples": 1}, "input_reshape/input/image/5": {"displayName": "input_reshape/input/image/5", "description": "", "samples": 1}, "input_reshape/input/image/2": {"displayName": "input_reshape/input/image/2", "description": "", "samples": 1}, "input_reshape/input/image/3": {"displayName": "input_reshape/input/image/3", "description": "", "samples": 1}, "input_reshape/input/image/0": {"displayName": "input_reshape/input/image/0", "description": "", "samples": 1}, "input_reshape/input/image/1": {"displayName": "input_reshape/input/image/1", "description": "", "samples": 1}, "input_reshape/input/image/8": {"displayName": "input_reshape/input/image/8", "description": "", "samples": 1}, "input_reshape/input/image/9": {"displayName": "input_reshape/input/image/9", "description": "", "samples": 1}}} + } + }; +}; diff --git a/frontend/mock/data/runs.js b/frontend/mock/data/runs.js index 4e9854de6..1a7897bc5 100644 --- a/frontend/mock/data/runs.js +++ b/frontend/mock/data/runs.js @@ -16,7 +16,7 @@ module.exports = function (path, queryParam, postParam) { _data: { status: 0, msg: 'SUCCESS', - data: ["train", "test", "model"] + data: ["train", "test"] } }; }; diff --git a/frontend/package.json b/frontend/package.json index 57dc9b6da..5cd4c1f81 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,9 +8,7 @@ "release": "cross-env NODE_ENV=production node ./tool/build.js", "build": "cross-env NODE_ENV=dev node ./tool/build.js", "dev": "cross-env NODE_ENV=dev node tool/dev-server.js", - "lint": "./node_modules/fecs/bin/fecs --rule", - "precommit": "npm run lint", - "prepush": "npm run lint" + "lint": "./node_modules/fecs/bin/fecs --rule" }, "engines": { "node": ">= 6.4.0" @@ -54,7 +52,6 @@ "html-loader": "^0.4.4", "html-webpack-plugin": "^2.28.0", "http-proxy-middleware": "^0.17.4", - "husky": "^0.14.3", "json-loader": "^0.5.4", "opn": "^5.1.0", "optimize-css-assets-webpack-plugin": "^1.3.2", diff --git a/frontend/src/common/ui/AppMenu.san b/frontend/src/common/ui/AppMenu.san index df9352032..a89279c97 100644 --- a/frontend/src/common/ui/AppMenu.san +++ b/frontend/src/common/ui/AppMenu.san @@ -32,7 +32,7 @@ export default { }, { value: '2', - url: '/image', + url: '/images', title: 'IMAGES' } ] diff --git a/frontend/src/common/ui/Charts/chart.san b/frontend/src/common/ui/Charts/chart.san index e9121a348..ac314fd9b 100644 --- a/frontend/src/common/ui/Charts/chart.san +++ b/frontend/src/common/ui/Charts/chart.san @@ -3,31 +3,57 @@
+ + settings_overscan + - - file_download + + file_download
diff --git a/frontend/src/common/ui/Charts/image.san b/frontend/src/common/ui/Charts/image.san new file mode 100644 index 000000000..03288b0c8 --- /dev/null +++ b/frontend/src/common/ui/Charts/image.san @@ -0,0 +1,101 @@ + + + + diff --git a/frontend/src/common/ui/ExpandPanel.san b/frontend/src/common/ui/ExpandPanel.san index 243e43296..cc3fec1d2 100644 --- a/frontend/src/common/ui/ExpandPanel.san +++ b/frontend/src/common/ui/ExpandPanel.san @@ -7,7 +7,7 @@ {{title}}
@@ -16,12 +16,6 @@ @@ -53,7 +64,7 @@ export default { margin-right 20px margin-top 4px float left - width 100px + width 160px .sm-slider-thumb transform translate(0, -50%) .sm-inputNumber diff --git a/frontend/src/common/ui/ui-common.styl b/frontend/src/common/ui/ui-common.styl index 9384719dd..d4982106e 100644 --- a/frontend/src/common/ui/ui-common.styl +++ b/frontend/src/common/ui/ui-common.styl @@ -52,7 +52,22 @@ body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, dl, dt, dd, ul, ol, li, pre, fo color #58666e .sm-dropdown-menu + .sm-text-field + margin-bottom 0px + min-height 30px + border-bottom solid 1px #e4e4e4 + + .sm-text-field-content + padding 0 + padding-left 4px + + input + cursor pointer + .sm-dropdown-menu-icon + top 6px + right 0 + bottom 0 .sm-icon color #58666e @@ -64,12 +79,14 @@ body, h1, h2, h3, h4, h5, h6, hr, p, blockquote, dl, dt, dd, ul, ol, li, pre, fo .sm-menu-item.state-selected color #ff4081 - +.sm-text-field + width 100% .sm-text-field-input color #58666e .sm-form-item margin-top 10px + overflow hidden .label color rgba(0,0,0,0.54) diff --git a/frontend/src/common/util/index.js b/frontend/src/common/util/index.js new file mode 100644 index 000000000..4f0efd2c2 --- /dev/null +++ b/frontend/src/common/util/index.js @@ -0,0 +1,5 @@ +import quantile from './quantile'; + +export { + quantile +}; diff --git a/frontend/src/common/util/number.js b/frontend/src/common/util/number.js new file mode 100644 index 000000000..0adc69d8b --- /dev/null +++ b/frontend/src/common/util/number.js @@ -0,0 +1,3 @@ +export default function (x) { + return x === null ? NaN : +x; +} diff --git a/frontend/src/common/util/quantile.js b/frontend/src/common/util/quantile.js new file mode 100644 index 000000000..11db42b7d --- /dev/null +++ b/frontend/src/common/util/quantile.js @@ -0,0 +1,21 @@ +import number from './number'; +export default function (values, p, valueof) { + if (valueof == null) { + return valueof = number; + } + let n = values.length; + if (!(n)) { + return; + } + if ((p = +p) <= 0 || n < 2) { + return +valueof(values[0], 0, values); + } + if (p >= 1) { + return +valueof(values[n - 1], n - 1, values); + } + let i = (n - 1) * p; + let i0 = Math.floor(i); + let value0 = +valueof(values[i0], i0, values); + let value1 = +valueof(values[i0 + 1], i0 + 1, values); + return value0 + (value1 - value0) * (i - i0); +} diff --git a/frontend/src/images/Images.san b/frontend/src/images/Images.san new file mode 100644 index 000000000..fab509cf1 --- /dev/null +++ b/frontend/src/images/Images.san @@ -0,0 +1,155 @@ + + + + + diff --git a/frontend/src/images/index.js b/frontend/src/images/index.js new file mode 100644 index 000000000..01d1fd72d --- /dev/null +++ b/frontend/src/images/index.js @@ -0,0 +1,9 @@ +import {router} from 'san-router'; + +import Images from './Images'; + +router.add({ + target: '#content', + rule: '/images', + Component: Images +}); diff --git a/frontend/src/images/ui/chartPage.san b/frontend/src/images/ui/chartPage.san new file mode 100644 index 000000000..38e53de0e --- /dev/null +++ b/frontend/src/images/ui/chartPage.san @@ -0,0 +1,71 @@ + + + + + diff --git a/frontend/src/images/ui/config.san b/frontend/src/images/ui/config.san new file mode 100644 index 000000000..750d22031 --- /dev/null +++ b/frontend/src/images/ui/config.san @@ -0,0 +1,63 @@ + + + diff --git a/frontend/src/index.js b/frontend/src/index.js index 5519c6861..03486227b 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -4,6 +4,7 @@ import './common/ui/ui-common.styl'; import './home/index'; import './scalars/index'; +import './images/index'; import App from './App'; new App({ diff --git a/frontend/src/scalars/Scalars.san b/frontend/src/scalars/Scalars.san index 7c907ce9b..d15e61cef 100644 --- a/frontend/src/scalars/Scalars.san +++ b/frontend/src/scalars/Scalars.san @@ -10,14 +10,14 @@
{ + let val = config[key]; + if (tansformArr.indexOf(key) > -1) { + filteredConfig[key] = isArray(val) && val[0] === 'yes'; + } + else { + filteredConfig[key] = val; + } + }); + return filteredConfig; } }, initData() { @@ -99,11 +114,13 @@ export default { tags: [], config: { groupNameReg: '.*', - smoothing: '0.5', - horizontal: '1', + smoothing: 0.6, + horizontal: 'step', sortingMethod: '2', - link: [], - chart: [] + downloadLink: [], + outlier: [], + runs: [], + running: true } }; }, @@ -117,6 +134,7 @@ export default { }); getRuns().then(({errno, data}) => { this.data.set('runsArray', data); + this.data.set('config.runs', data); }); // need debounce， can't use computed diff --git a/frontend/src/scalars/ui/chartPage.san b/frontend/src/scalars/ui/chartPage.san index aa1eb5db2..20ea7db0e 100644 --- a/frontend/src/scalars/ui/chartPage.san +++ b/frontend/src/scalars/ui/chartPage.san @@ -1,11 +1,18 @@ diff --git a/frontend/src/service.js b/frontend/src/service.js index e30dfbf33..d759f32b4 100644 --- a/frontend/src/service.js +++ b/frontend/src/service.js @@ -5,3 +5,7 @@ export const getPluginScalarsTags = makeService('/data/plugin/scalars/tags'); export const getRuns = makeService('/data/runs'); export const getPluginScalarsScalars = makeService('/data/plugin/scalars/scalars'); + +export const getPluginImagesTags = makeService('/data/plugin/images/tags'); + +export const getPluginImagesImages = makeService('/data/plugin/images/images'); diff --git a/frontend/tool/HtmlReplacePlugin.js b/frontend/tool/HtmlReplacePlugin.js index ce67a520d..31acce6c1 100644 --- a/frontend/tool/HtmlReplacePlugin.js +++ b/frontend/tool/HtmlReplacePlugin.js @@ -1,3 +1,4 @@ +'use strict'; function noopReplace (val) { return val; } function HtmlReplacePlugin(options) { diff --git a/frontend/tool/build.js b/frontend/tool/build.js index d8a67b1f1..3cfaf7cc1 100644 --- a/frontend/tool/build.js +++ b/frontend/tool/build.js @@ -1,3 +1,4 @@ +'use strict'; const webpack = require('webpack'); const rm = require('rimraf'); const ora = require('ora'); diff --git a/frontend/tool/dev-client.js b/frontend/tool/dev-client.js index d882b7bf8..61627601e 100644 --- a/frontend/tool/dev-client.js +++ b/frontend/tool/dev-client.js @@ -1,3 +1,4 @@ +'use strict'; var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true') hotClient.subscribe(function (event) { diff --git a/frontend/tool/dev-server.js b/frontend/tool/dev-server.js index 98299e0c2..feed66fb5 100644 --- a/frontend/tool/dev-server.js +++ b/frontend/tool/dev-server.js @@ -1,3 +1,4 @@ +'use strict'; process.env.NODE_ENV = 'dev'; let devPort = 8999; let opn = require('opn'); diff --git a/frontend/tool/entry.js b/frontend/tool/entry.js index 78754c6a5..f19b4630a 100644 --- a/frontend/tool/entry.js +++ b/frontend/tool/entry.js @@ -1,3 +1,4 @@ +'use strict'; const path = require('path'); const projectPath = path.resolve(__dirname, '..'); const HtmlWebpackPlugin = require('html-webpack-plugin'); diff --git a/frontend/tool/webpack.config.js b/frontend/tool/webpack.config.js index 24764208c..ae2862a0a 100644 --- a/frontend/tool/webpack.config.js +++ b/frontend/tool/webpack.config.js @@ -1,3 +1,4 @@ +'use strict'; const webpack = require('webpack'); const path = require('path'); const projectPath = path.resolve(__dirname, '..'); diff --git a/frontend/tool/webpack.dev.config.js b/frontend/tool/webpack.dev.config.js index 5b16958fa..334304e4e 100644 --- a/frontend/tool/webpack.dev.config.js +++ b/frontend/tool/webpack.dev.config.js @@ -1,3 +1,4 @@ +'use strict'; const webpack = require('webpack'); const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin'); let merge = require('webpack-merge'); diff --git a/frontend/tool/webpack.prod.config.js b/frontend/tool/webpack.prod.config.js index fa73c7837..7c76cff71 100644 --- a/frontend/tool/webpack.prod.config.js +++ b/frontend/tool/webpack.prod.config.js @@ -1,3 +1,4 @@ +'use strict'; const webpack = require('webpack'); const ExtractTextPlugin = require('extract-text-webpack-plugin'); const path = require('path'); From 98244c1942946e22d1e15a50da3438025ff19021 Mon Sep 17 00:00:00 2001 From: BingBlog Date: Mon, 25 Dec 2017 19:26:28 +0800 Subject: [PATCH 4/5] add expandpael arrow --- .../data/plugin/images/individualImage.js | 29 ------------------- frontend/src/common/ui/Charts/chart.san | 8 +++-- frontend/src/common/ui/ExpandPanel.san | 24 +++++++++++++++ frontend/src/common/ui/ui-common.styl | 4 +-- frontend/src/scalars/ui/chartPage.san | 2 +- 5 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 frontend/mock/data/plugin/images/individualImage.js diff --git a/frontend/mock/data/plugin/images/individualImage.js b/frontend/mock/data/plugin/images/individualImage.js deleted file mode 100644 index c4dafc4ec..000000000 --- a/frontend/mock/data/plugin/images/individualImage.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @file mock data - * @author autoresponse - */ - -/* eslint-disable fecs-camelcase */ - -/** - * 获取 mock 响应数据 - * - * @param {string} path 请求路径名 - * @param {Object} queryParam 查询参数信息 - * @param {Object} postParam post 的查询参数信息 - * @return {Object} - */ -module.exports = function (path, queryParam, postParam) { - return { - // 可以通过该属性来设置响应的延时，也可以设为值为'0,100'，表示随机 0-100ms 的延时，默认 0 - _timeout: 0, - - // 通过该状态来设置响应的 http 的状态码，默认 200 - _status: 200, - - // 对于要响应的 json 数据可以统一放在该字段里，也可以不使用该字段，直接跟 _xx 属性平级放 - _data: [] - }; -}; - -/* eslint-enable fecs-camelcase */ diff --git a/frontend/src/common/ui/Charts/chart.san b/frontend/src/common/ui/Charts/chart.san index 1c10fb2b4..c80dac65e 100644 --- a/frontend/src/common/ui/Charts/chart.san +++ b/frontend/src/common/ui/Charts/chart.san @@ -83,6 +83,7 @@ export default { this.watch('orginData', orginData => { this.setChartData(); this.setChartsOutlier(); + this.setChartHorizon(); }); this.watch('smoothing', smoothing => { @@ -95,7 +96,7 @@ export default { }); this.watch('horizontal', horizontal => { - this.setChartHorizon(horizontal); + this.setChartHorizon(); }); this.watch('runs', runs => { @@ -318,7 +319,7 @@ export default { startValue = millisecond; } // relative time, millisecond to hours - d[4] = Math.floor(millisecond - startValue) / (60 * 60 * 1000); + d[4] = Math.floor(millisecond - startValue); if (!isFinite(nextVal)) { d[3] = nextVal; } else { @@ -391,7 +392,8 @@ export default { }, // chart horizontal options methods and functions ---- start - setChartHorizon(horizontal) { + setChartHorizon() { + let horizontal = this.data.get('horizontal'); let seriesOption = this.myChart.getOption().series; let encodeSeries = val => { return { diff --git a/frontend/src/common/ui/ExpandPanel.san b/frontend/src/common/ui/ExpandPanel.san index cc3fec1d2..0ddf3f648 100644 --- a/frontend/src/common/ui/ExpandPanel.san +++ b/frontend/src/common/ui/ExpandPanel.san @@ -5,6 +5,10 @@ on-click="handleHeadClick()" > {{title}} + + {{iconName}} + ({{info}}) +