Skip to content

Commit

Permalink
Modified purple in dark theme, and fixed portfolio info for btc
Browse files Browse the repository at this point in the history
  • Loading branch information
Kallahan23 committed Apr 29, 2018
1 parent 757a18f commit d828235
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 13 deletions.
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.kallahan.alttrack" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.kallahan.alttrack" version="1.1.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>AltTrack</name>
<description>Cross platform app for tracking cryptocurrency prices.</description>
<author email="dankalnian23@hotmail.com" href="https://github.com/Kallahan23">Kallahan23</author>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "AltTrack",
"version": "1.0.0",
"version": "1.1.1",
"author": "Kallahan",
"homepage": "https://github.com/Kallahan23",
"private": true,
Expand Down
33 changes: 24 additions & 9 deletions src/pages/home/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,30 @@
<ion-label color="primary" stacked>Amount Invested ({{ global.state['baseCurrency'] }})</ion-label>
<ion-input (focusout)="updatePortfolio()" [(ngModel)]="portfolioAmountInvested" type="number" step="0.01" placeholder="The total amount of {{global.state['baseCurrency']}} invested"></ion-input>
</ion-item>
<p>
Break Even Point ({{ global.state['baseCurrency'] }}): {{ breakEvenPoint() | currency:'USD':symbol:'1.2' }}
</p>
<p>
Current Wallet Value ({{ global.state['baseCurrency'] }}): {{ walletValue() | currency:'USD':symbol:'1.2' }}
</p>
<p>
Profit ({{ global.state['baseCurrency'] }}): {{ profit() | currency:'USD':symbol:'1.2' }}
</p>
<!-- If baseCurrency is BTC -->
<div *ngIf="global.state['baseCurrency'] === 'BTC'">
<p>
Break Even Point ({{ global.state['baseCurrency'] }}): {{ breakEvenPoint() }}
</p>
<p>
Current Wallet Value ({{ global.state['baseCurrency'] }}): {{ walletValue() }}
</p>
<p>
Profit ({{ global.state['baseCurrency'] }}): {{ profit() }}
</p>
</div>
<!-- If baseCurrency is FIAT -->
<div *ngIf="!(global.state['baseCurrency'] === 'BTC')">
<p>
Break Even Point ({{ global.state['baseCurrency'] }}): {{ breakEvenPoint() | currency:'USD':symbol:'1.2' }}
</p>
<p>
Current Wallet Value ({{ global.state['baseCurrency'] }}): {{ walletValue() | currency:'USD':symbol:'1.2' }}
</p>
<p>
Profit ({{ global.state['baseCurrency'] }}): {{ profit() | currency:'USD':symbol:'1.2' }}
</p>
</div>
</div>

</ion-content>
Expand Down
3 changes: 1 addition & 2 deletions src/theme/theme.dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
color: #fff;
background-color: #1b1b1d;
}

}
ion-item {
color: #fff;
Expand Down Expand Up @@ -43,6 +42,6 @@

.header .toolbar-background {
border-color: #ff0fff;
background-color: #1b072b;
background-color: #24172F;
}
}

0 comments on commit d828235

Please sign in to comment.