Merge pull request #86 from subutai-io/gw-wallet

Gw wallet

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "porto",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Porto is a browser extension library for Google Chrome,Firefox and Safari that allows to develop cross platform browser extension with ease.",
   "license": "ALS",
   "private": true,

chrome/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_ext_name__",
-  "version": "6.0.0",
-  "version_name": "6.0.0",
+  "version": "6.0.1",
+  "version_name": "6.0.1",
   "description": "__MSG_ext_description__",
   "homepage_url":"https://subutai.io",
   "manifest_version": 2,

common/res/defaults.json

@@ -1,5 +1,5 @@
 {
-  "version": "6.0.0",
+  "version": "6.0.1",
   "watch_list": [
     {
       "active": true,

common/ui/_popup-generate-key.html

@@ -29,7 +29,7 @@
       <div class="b-form-wrapper g-margin-bottom">
         <label for="password-confirm" class="b-form-label g-margin-right">Confirm password</label>
         <input id="password-confirm" type="password" class="b-form-input g-right"
-               placeholder="Confirm password">
+               placeholder="Confirm password" >
       </div>
 
     </div>

common/ui/_popup-show-gw-data.html

@@ -1,7 +1,7 @@
 <div class="b-popup">
   <div class="b-popup__header">
     <div class="b-title">
-      GoodWill info
+      GoodWill Information
       <a href="#" class="bp-close-modal-button g-right">
         <i class="fa fa-times"></i>
       </a>
@@ -10,7 +10,7 @@
   <div class="b-popup__body">
     <div class="b-form">
       <div class="b-form-wrapper g-margin-bottom-half">
-        <label for="address" class="b-form-label g-margin-right">GW address</label>
+        <label for="address" class="b-form-label g-margin-right">GoodWill address</label>
         <input id="address" type="text" readonly class="b-form-input b-form-input_fix-size-2 g-right">
       </div>
       <div class="b-form-wrapper g-margin-bottom-half">

common/ui/keys.html

@@ -92,6 +92,13 @@ <h1 class="b-title">Accounts</h1>
               <option value="public">Public keys</option>
               <option value="key-pair">Key pairs</option>
             </select>
+
+            <div class="g-right">
+              <a href="https://bazaar.subutai.io/users/goodwill/transfer">
+                <button class="b-btn b-btn_green g-right"><i class="fa"></i> Transfer GoodWill</button>
+              </a>
+            </div>
+
           </div>
         </div>
         <div class="b-main-table-border">
@@ -105,7 +112,7 @@ <h1 class="b-title">Accounts</h1>
               <th>Peers</th>
               <th>Export</th>
               <th>Information</th>
-              <th>GW Information</th>
+              <th>GoodWill Information</th>
               <th>Delete</th>
             </tr>
             </thead>

common/ui/keys.js

@@ -106,6 +106,8 @@ var options = options || null;
       buttonsStyling: false
     }, function (isConfirm) {
       if (isConfirm) {
+
+
         swal2.disableButtons();
         triggerGenerate();
       }
@@ -166,7 +168,15 @@ var options = options || null;
           exists = true;
           break;
         }
+      };
+
+      if (parameters.passphrase === ""){
+        $("#error-msg").text("Password can not be empty.");
+        $("#error-msg").show();
+        swal2.enableButtons();
+        return;
       }
+
       var errorMsgEmail = $("#error-msg");
       if (exists) {
         errorMsgEmail.text("Email already exists.");

e2e-plugin.safariextension/Info.plist

@@ -11,11 +11,11 @@
 	<key>CFBundleIdentifier</key>
 	<string>io.subutai.tooling.e2eplugin.sfx</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
+	<string>6.0.1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.0</string>
+	<string>6.0.1</string>
 	<key>CFBundleVersion</key>
-	<string>6.0.0</string>
+	<string>6.0.1</string>
 	<key>Chrome</key>
 	<dict>
 		<key>Global Page</key>

edge/Extension/manifest.json

@@ -1,8 +1,8 @@
 {
   "name": "Subutai E2E Plugin",
   "author": "Subutai Tooling",
-  "version": "6.0.0",
-  "version_name": "6.0.0",
+  "version": "6.0.1",
+  "version_name": "6.0.1",
   "description": "Effortlessly secure the doors to your Subutai Cloud",
   "homepage_url":"https://subutai.io",
   "manifest_version": 2,

edge/appxmanifest.xml

@@ -7,7 +7,7 @@
 	<Identity 
 		Name="4220subutai.SubutaiE2EPlugin" 
 		Publisher="CN=603E8A0B-F784-4A5D-9D3D-1BFF078160CB" 
-		Version="6.0.0" />
+		Version="6.0.1" />
 
 	<Properties> 
 		<DisplayName>Subutai E2E Plugin</DisplayName> 

firefox/manifest.json

@@ -6,7 +6,7 @@
     }
   },
   "name": "__MSG_ext_name__",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "__MSG_ext_description__",
   "homepage_url":"https://subutai.io",
   "manifest_version": 2,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "subutai",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Subutai E2E Plugin",
   "scripts": {
     "test": "grunt test"