UI fixups; Added terminal tab

calibrae-project · Apr 3, 2017 · c668303 · c668303
1 parent a81ce05
commit c668303
Show file tree

Hide file tree

Showing 14 changed files with 576 additions and 198 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ Eleos-*
 zcash*
 zend*
 zclassicd
+eleos.htpasswd
 
 # Logs
 logs

diff --git a/config.json b/config.json
@@ -9,6 +9,5 @@
     "binaryPathLinux": "",
     "confPathWin": "",
     "confPathMacOS": "",
-    "confPathLinux": "",
-    "keysLoaded": false
+    "confPathLinux": ""
 }
diff --git a/console.html b/console.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html>
+    <head>
+        <title>eleos console</title>
+        <link rel="stylesheet" href="resources/xtermjs.css" />
+        <link rel="stylesheet" href="xterm/addons/fullscreen/fullscreen.css" />
+        <link rel="stylesheet" href="xterm/xterm.css" />
+      	<script src="resources/fetch.min.js"></script>
+        <script src="xterm/xterm.js" ></script>
+        <script src="xterm/addons/attach/attach.js" ></script>
+        <script src="xterm/addons/fit/fit.js" ></script>
+        <script src="xterm/addons/fullscreen/fullscreen.js" ></script>
+    </head>
+    <body>
+        <div id="terminal-container"></div>
+
+        <script src="resources/xtermjs.js" defer ></script>
+    </body>
+</html>
diff --git a/index.html b/index.html
@@ -17,7 +17,7 @@
                     <li><a class="navLink" id="sendPTab" href="javascript:void(0)" onclick="setActiveNav(this); openPage('sendPrivatePage')">Send Private</a></li>
                     <li><a class="navLink" id="receiveTab" href="javascript:void(0)" onclick="setActiveNav(this); openPage('receivePage')">Receive</a></li>
                     <li><a class="navLink" id="addressesTab" href="javascript:void(0)" onclick="setActiveNav(this); openPage('addressesPage')">Addresses</a></li>
-                    <!--<li><a class="navLink" id="consoleTab" href="javascript:void(0)" onclick="setActiveNav(this); openPage('consolePage')">Console</a></li>-->
+                    <li><a class="navLink" id="consoleTab" href="javascript:void(0)" onclick="setActiveNav(this); openPage('consolePage')">Console</a></li>
                 </ul>
             </div>
             <div class="bodyDiv" id="bodyDiv">
@@ -76,7 +76,9 @@
                     <span id="addressTransparentSpan"></span>
                     <span id="addressPrivateSpan"></span>
                 </div>
-                <div class="page" id="consolePage"></div>
+                <div class="page" id="consolePage" style="height: 100%; width: 100%;">
+                    <object type="text/html" data="http://127.0.0.1:3000/console.html" style="height: 100%; width: 100%;"></object>
+                </div>
             </div>
             <div class="statusBar">
                 <span class="w3-small" id="statusBar">Current Balance: <span class="w3-small" id="currentBalanceValue"></span> <span class="w3-small" id="coin"></span>

diff --git a/init.sh b/init.sh
@@ -14,6 +14,8 @@ SPROUT_VKEY_NAME='sprout-verifying.key'
 SPROUT_PKEY_URL="https://z.cash/downloads/$SPROUT_PKEY_NAME"
 SPROUT_VKEY_URL="https://z.cash/downloads/$SPROUT_VKEY_NAME"
 
+mkdir -p "$PARAMS_DIR"
+
 if [[ "$OSTYPE" == "darwin"* ]]; then
     SHA256CMD="$(command -v shasum -a 256 || echo shasum -a 256)"
     SHA256ARGS="$(command -v shasum -a 256 >/dev/null || echo '-a 256')"
@@ -35,7 +37,9 @@ function fetch_params {
         echo "Retrieving: $url"
         if [[ $(sw_vers -productName) == "Mac OS X" ]]; then
             curl \
+                --retry 3 --retry-delay 15 \
                 --output "$dlname" \
+                -O \
                 -# -L\
                 "$url"
         else
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ Eleos-* @@
     zcash*
     zend*
     zclassicd
+    eleos.htpasswd
     # Logs
     logs
@@ Expand Down @@