anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2718 from matiu/feat/splash-import

Browse source 
Feat/splash import
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-13 12:53:13 -03:00
commit ec7a1d8338
19 changed files with 58 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

7
public/views/add.html
View file

@ -29,13 +29,6 @@
<span translate>Import wallet </span>
</a>
</li>
<li>
<a title="Import wallet" ng-click="$root.go('importLegacy')">
<i class="fi-archive plus-fixed circle"></i>
<i class="icon-arrow-right3 size-18 right m20t"></i>
<span translate>Import from Copay Beta 0.9</span>
</a>
</li>
</ul>
</div>

12
public/views/import.html
View file

@ -49,11 +49,21 @@
<input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
name="password" ng-model="import.password">
</div>
<button translate type="submit" class="button radius expand black m0"
<button translate type="submit" class="button radius expand black"
ng-disabled="importForm.$invalid || !import.password">
Import backup
</button>
</form>
<div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
<p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
<button class=" outline dark-gray tiny" translate> Import here
<i class="icon-arrow-right3 size-14"></i>
</button>
</div>
</div>
</div>
</div>

14
public/views/importLegacy.html
View file

@ -1,19 +1,14 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Import legacy wallet'; goBackToState = 'add'; noColor = true">
ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
</div>
<div class="content p20v" ng-controller="importLegacyController as importLegacy">
<div class="row m20t">
<div class="large-5 large-centered medium-7 medium-centered columns">
<div class="logo-setup show-for-large-up">
<img src="img/logo-negative.svg" alt="Copay" width="100">
<div ng-include="'views/includes/version.html'"></div>
</div>
<div>
<div class="large-12 columns">
<div ng-show="importLegacy.importing">
<h1 class="m20b animated infinite flash" translate>Importing...</h1>
<ul>
@ -69,15 +64,16 @@
</div>
</form>
<a class="m20t button outline light-gray expand" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
<div class="text-center p20v">
<a class="m20t tiny button outline light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
Learn more about Wallet Migration
</a>
</div>
</div>
</div>
</div>
</div>

2
public/views/includes/topbar.html
View file

@ -20,7 +20,7 @@
</section>
<section class="middle tab-bar-section">
<h1 class="title ellipsis" ng-style="{'color': noColor ? '#4B6178' : index.backgroundColor}">
<h1 class="title ellipsis" ng-style="{'color': noColor ? '#7A8C9E' : index.backgroundColor}">
{{(titleSection|translate) || index.walletName}}
</h1>
</section>

8
public/views/preferences.html
View file

@ -8,14 +8,14 @@
<div class="content preferences" ng-controller="preferencesController as preferences">
<ul class="no-bullet m0 size-14">
<ul class="no-bullet m0 size-14" ng-show="!index.noFocusedWallet">
<h4 class="title m0" translate>{{index.walletName}} settings</h4>
<li class="line-b p20" ng-click="$root.go('preferencesColor')">
<span translate>Color</span>
<span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i>
<span ng-style="{'color':index.backgroundColor || '#1ABC9C'}">&block;</span>
<span ng-style="{'color':index.backgroundColor}">&block;</span>
</span>
</li>
<li class="line-b p20">
@ -23,7 +23,6 @@
<switch id="network-name" name="encrypt" ng-model="encrypt" class="green right"></switch>
</li>
<h4 class="title m0">&nbsp;</h4>
<li class="line-b p20" ng-click="$root.go('backup')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
@ -33,6 +32,8 @@
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>Advanced</span>
</li>
</ul>
<ul class="no-bullet m0 size-14">
<h4 class="title m0" translate>Global settings</h4>
@ -51,7 +52,6 @@
{{preferences.unitName}}
</span>
</li>
<li class="line-b p20" ng-click="$root.go('preferencesAltCurrency')">
<span translate>Alternative Currency</span>
<span class="right text-gray">

4
public/views/splash/1.html → public/views/splash.html
View file

@ -22,10 +22,12 @@
<div class="rect4"></div>
<div class="rect5"></div>
</div>
<span translate>Creating Wallet...</span>
<span translate>Creating Profile...</span>
</div>
</div>
<div class="row columns start-button" ng-show="!creatingProfile">
<button ng-click="create()" class="button black expand radius size-12 text-spacing" translate> GET STARTED </button>
<p class="text-gray m5b size-12" translate>Already have a wallet?</p>
<button ng-click="create(true)" class="outline dark-gray tiny" translate>Import backup </button>
</div>
</div>

3
public/views/splash/2.html
View file

@ -1,3 +0,0 @@
<div class="tour">
<img ng-click="$root.go('splash.four')" class="m15t" src="img/tour2.png" alt="tour1" width="90%">
</div>

3
public/views/splash/3.html
View file

@ -1,3 +0,0 @@
<div class="tour">
<img ng-click="$root.go('splash.four')" class="m15t" src="img/tour3.png" alt="tour1" width="90%">
</div>

3
public/views/splash/4.html
View file

@ -1,3 +0,0 @@
<div class="tour">
<img ng-click="$root.go('walletHome')" class="m15t" src="img/tour4.png" alt="tour1" width="90%">
</div>

15
public/views/splash/5.html
View file

@ -1,15 +0,0 @@
<div class="tour">
<img ng-click="$root.go('splash.finish')" class="m15t" src="img/tour5.png" alt="tour1" width="90%">
</div>
<div class="row tour5">
<div class="small-6 columns">
<button class="button outline light-gray radius expand">
SKIP
</button>
</div>
<div class="small-6 columns">
<button class="black radius expand">
SET A PIN
</button>
</div>
</div>

6
public/views/walletHome.html
View file

@ -10,6 +10,10 @@
<i class="fi-alert"></i> <span translate>You do not have any wallet</span>
</div>
<button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
<div class="text-center text-gray p20v" ng-click="$root.go('preferences')">
<button class=" outline dark-gray tiny" translate> Preferences </button>
</div>
</div>
<div class="onGoingProcess" ng-show="index.isOffline">
@ -465,4 +469,4 @@
</div>
</div>
<div class="extra-margin-bottom"></div>
<div ng-include="'views/includes/menu.html'"></div>
<div ng-include="'views/includes/menu.html'" ng-show="!index.noFocusedWallet"></div>