Start dev branch

CounterpartyXCP · Aug 21, 2014 · b6c7c61 · b6c7c61
1 parent 8af06b9
commit b6c7c61
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 17 deletions.
diff --git a/src/assets/overrides.css b/src/assets/overrides.css
@@ -0,0 +1,8 @@
+body {
+  padding-top: 60px;
+}
+@media (max-width: 979px) {
+  body {
+    padding-top: 0px;
+  }
+}
diff --git a/src/index.html b/src/index.html
@@ -5,6 +5,7 @@
   <script data-main="index.js" type="text/javascript" src="vendors/requirejs/require.js"></script>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href="/assets/flatly.css" rel="stylesheet">
+  <link href="/assets/overrides.css" rel="stylesheet">
 </head>
 <body>
 
@@ -23,6 +24,7 @@
       <ul class="nav navbar-nav">
         <li><a data-bind="page-href: '/start'">Home</a></li>
         <li><a data-bind="page-href: '/status'">Status</a></li>
+        <li><a data-bind="page-href: '/test'">Test</a> </li>
       </ul>
     </div><!--/.nav-collapse -->
   </div>
@@ -35,6 +37,7 @@
 </div>
 
 <div data-bind="page: {id: 'status', sourceOnShow: 'pages/status.html', withOnShow: requireVM('status')}"></div>
+<div data-bind="page: {id: 'test', sourceOnShow: 'pages/test.html', withOnShow: requireVM('test')}"></div>
 
 </div>
 

diff --git a/src/index.js b/src/index.js
@@ -5,6 +5,7 @@ requirejs.config({
     util: 'js/util',
     conf: 'js/conf',
     status: 'vm/status',
+    test: 'vm/test',
     jquery: 'vendors/jquery/dist/jquery',
     knockout: 'vendors/knockoutjs/dist/knockout',
     pager: 'vendors/pagerjs/pager',
@@ -13,9 +14,11 @@ requirejs.config({
   urlArgs: "bust=" + (new Date()).getTime() //Cache bust!
 });
 
-requirejs(['jquery', 'knockout', 'pager','bootstrap'], function ($, ko, pager) {
+requirejs(['jquery', 'knockout', 'pager'], function ($, ko, pager) {
 
-  var viewModel = {id: "test"};
+  var viewModel = {
+
+  };
 
   window.requireVM = function (moduleName) {
     return function (callback) {
@@ -25,20 +28,20 @@ requirejs(['jquery', 'knockout', 'pager','bootstrap'], function ($, ko, pager) {
     };
   };
 
-  window.requireJson = function(url) {
+  window.requireJson = function (url) {
 
   };
 
+  // withOnShow: requireVM('product')
 
   $(function () {
-    pager.onBindingError.add(function(event) {
-      console.log(event);
-    });
     pager.Href.hash = '#!/';
 
     pager.extendWithPage(viewModel);
 
     ko.applyBindings(viewModel);
     pager.start();
+
   });
-});
+});
+
diff --git a/src/js/util.js b/src/js/util.js
@@ -2,11 +2,15 @@ define(['conf'], function (conf) {
       console.log(conf);
       console.log('loading util');
       return {
-        rpc: function (method, params, result) {
+        rpc: function (method, params, result, callback) {
           params = typeof params !== 'undefined' ? params : [];
+          var real_params = {
+            method: method,
+            params: params
+          };
           var request = {};
-          request.method = method;
-          request.params = params;
+          request.method = "proxy_to_counterpartyd";;
+          request.params = real_params;
           request.id = 1;
           request.jsonrpc = "2.0";
 
@@ -15,8 +19,10 @@ define(['conf'], function (conf) {
             url: conf.API_SERVER + "/_api",
             data: JSON.stringify(request),
             success: function (data, status, jqx) {
-              console.log(data);
-              result = data;
+              result = data.result;
+              if (typeof callback !== 'undefined'){
+                callback(result);
+              }
             },
             dataType: "json"
 

diff --git a/src/pages/status.html b/src/pages/status.html
@@ -1,3 +1,6 @@
-<dl>
-
-</dl>
+<table class="table table-striped" data-bind="for-each: stat_arr">
+  <tr>
+    <td data-bind="text: key"></td>
+    <td data-bind="text: value"></td>
+  </tr>
+</table>
diff --git a/src/pages/test.html b/src/pages/test.html
@@ -0,0 +1,3 @@
+<p data-bind="text: foo"></p>
+
+<p>Some static test</p>
diff --git a/src/vm/status.js b/src/vm/status.js
@@ -1,8 +1,18 @@
 define('status',['jquery','knockout','util'], function($,ko, util){
     console.log('loading status');
     var status = ko.observableArray([]);
-    util.rpc("get_running_info",{}, status);
+    var stat_arr = ko.observableArray([]);
+    util.rpc("get_running_info",{}, status, function(data){
+      stat_arr.removeAll();
+      console.log(data);
+      for (var key in data){
+        stat_arr.push({'key':key,'value':data[key]});
+        console.log({'key':key,'value':data[key]});
+      }
+      console.log(stat_arr);
+    });
     return {
-      status: status
+      status: status,
+      stat_arr: stat_arr
     };
 });
diff --git a/src/vm/test.js b/src/vm/test.js
@@ -0,0 +1,6 @@
+define('test',['jquery','knockout','util'], function($,ko, util){
+  console.log("in test vm");
+  return {
+    foo: ko.observable('bar')
+  }
+});