Merge branch 'master' of https://github.com/swarmcity/sc-terminal

swarmcity · Feb 8, 2017 · 6598c5e · 6598c5e
2 parents 1f904d9 + b5f2702
commit 6598c5e
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 19 deletions.
diff --git a/src/ac-intro.html b/src/ac-intro.html
@@ -121,6 +121,11 @@
       @apply(--layout-vertical);
       @apply(--layout-center-center);
     }
+
+    .mobileverysmall {
+      font-size: 12px;
+      line-height: 14px;
+    }
   }
 
     </style>
@@ -170,11 +175,23 @@ <h1 class="bold grey4 logotitle">swarm<template is="dom-if" if="{{!phoneview}}">
             <div class="whitespace"></div>
           </template>
 
-          <h1 class="bold yellow">You must bee<br>new here</h1>
+          <h1 class="bold yellow">You must bee
+          <template is="dom-if" if="{{!phoneview}}">
+            <br>
+          </template>
+            new here</h1>
           <div class="whitespace"></div>
-          <p class="reg maxwidth">There’s no user found on this device.</p><p>When creating a new user, you declare being aware of the <a href="" class="reg blue">legal aspect of swarm.city</a>.</p>
+          <p class="reg maxwidth">There’s no user found on this device.
+            <br>
+            <span class="light mobileverysmall grey3">When creating a new user, you declare being aware of the </span><a href="https://legal.swarm.city" target="_blank" class="reg blue mobileverysmall">legal aspect of swarm.city</a>.</p>
           <div class="flex"></div>
-          <paper-button on-tap="totokenquestion" class="grey4 lighter bigbtn" noink>Create new user</paper-button>
+          <template is="dom-if" if="{{phoneview}}">
+          <paper-button on-tap="totokenquestion" class="grey4 lighter shadow" noink>Create new user</paper-button>
+          </template>
+          <template is="dom-if" if="{{!phoneview}}">
+          <paper-button on-tap="totokenquestion" class="grey4 lighter bigbtn shadow" noink>Create new user</paper-button>
+          </template>
+
           <div class="whitespace"></div>
             <p on-tap="torestore" class="reg grey3 small underliner">restore a backup-file</p>
 <!--           <p on-tap="torestore" class="grey3 small"></p> -->

diff --git a/src/ac-tokenreceive.html b/src/ac-tokenreceive.html
@@ -339,7 +339,7 @@
 
           <div class="announce">
             <div class="item totalwidth">
-              <p class="topmsg grey4 hairline">You received {{formatpong(receivedamount)}} tokens.</p>
+              <p class="topmsg grey4 hairline">You received {{formatpong(receivedamount)}} SWT.</p>
 
               <template is="dom-if" if="{{phoneview}}">
                 <div class="minispace"></div>

diff --git a/src/ac-vault.html b/src/ac-vault.html
@@ -369,7 +369,7 @@ <h1 class="bold blue">ARC-wallet as a json-file</h1>
           </template>
 
 
-            <template is="dom-if" if="{{pkshowpassw}}">
+<!--             <template is="dom-if" if="{{pkshowpassw}}">
               <p class="grey4 semibold blueborder">{{walletfilename}}</p>
               <div class="whitespace"></div>
               <div class="totalwidth horizont end startjust maxwidth">
@@ -382,7 +382,7 @@ <h1 class="bold blue">ARC-wallet as a json-file</h1>
               <paper-icon-button icon="sc-icons:arrowright" class="big whiteback shadow blue" on-tap="pkreceived" noink>next</paper-icon-button>
               </div>
 
-            </template>
+            </template> -->
 
 
           <template is="dom-if" if="{{uploadingwallet}}">
@@ -407,16 +407,17 @@ <h1 class="bold blue">ARC-wallet as a json-file</h1>
           </div>
           <div class="pascanvasunderexit vertic centercenter paddingsides">        
             <a id="downloadAnchorElem" style="display:none"></a>
-            <template is="dom-if" if="{{backup_download}}">
+            <template is="dom-if" if="{{!backup_unavailable}}">
+
+<!--             <template is="dom-if" if="{{backup_download}}"> -->
               <paper-button on-tap="downloadvault" class="blue bigbtn lighter centertxt backupbtn" noink>Download your backup-file</paper-button>
-            </template>
-            <template is="dom-if" if="{{backup_unavailable}}">
-              <p class="bold">Oops!</p>
+<!--             </template> -->
+              <!-- <p class="bold">Oops!</p>
               <div class="whitespace"></div>
               <p class="centertxt">You can not download your backup on this device/operating system.</p>
               <div class="whitespace"></div>
-              <div class="whitespace"></div>
-              <paper-button on-tap="backupexit" class="grey4 grey1back small shadow" noink>back to profile</paper-button>
+              <div class="whitespace"></div> -->
+<!--               <paper-button on-tap="backupexit" class="grey4 grey1back small shadow" noink>back to profile</paper-button> -->
             </template>
             <div class="whitespace"></div>
             <paper-button on-tap="vaulttoipfsroute" class="blue bigbtn lighter centertxt backupbtn" noink>Backup to IPFS</paper-button>            
@@ -569,6 +570,32 @@ <h1 class="bold blue">Alright!</h1>
       </div>    
     </neon-animatable>
 
+    <neon-animatable data-page="unlockipfs">
+        <div class="total vertic centercenter">
+          <div class="topbar">
+            <span class="flex"></span>
+              <iron-icon class="grey4" icon="sc-icons:decline" on-tap="exit">back</iron-icon>
+          </div>
+          <div class="pascanvasunderexit vertic start paddingsides">
+            <div class="whitespace"></div>
+            <template is="dom-if" if="{{!phoneview}}">
+              <div class="whitespace"></div>
+            </template>
+
+            <div class="maxwidth">
+              <h1 class="bold blue">Great!</h1>
+              <div class="whitespace"></div>
+              <p>Found your user on IPFS. You need to unlock it with its password.</p>
+            </div>
+            <div class="flex"></div>
+            <ac-password id="newuser" passwordlabel="Password of your user" sessionname="vaultpassword" on-password-received="unlockvault" wrongpass="[[unlockpasswordwrong]]"></ac-password>
+          </div>
+          <div class="tenspace"></div>
+          <div class="tenspace"></div>
+        </div>         
+    </neon-animatable>
+
+
     <neon-animatable data-page="uploadunlock">
         <div class="total vertic centercenter">
           <div class="topbar">
@@ -591,12 +618,7 @@ <h1 class="bold blue">Great!</h1>
           </div>
           <div class="tenspace"></div>
           <div class="tenspace"></div>
-        </div>
-      <!--        
-        TOT HIER
-           -->
-
-
+        </div>         
     </neon-animatable>
 
   </neon-animated-pages>
@@ -764,7 +786,7 @@ <h1 class="bold blue">Great!</h1>
           if (self._parseVault(data)) {
             self.saveVault();
             self.status = 'locked';
-            self.set('route.path', '/uploadunlock');
+            self.set('route.path', '/unlockipfs');
           }
         });
       },