Browse Source

Update tab on change

pull/234/head
Thomas 4 years ago
parent
commit
f2fb139254
  1. 2
      apps/client/src/app/app.component.scss
  2. 6
      apps/client/src/app/pages/home/home-page.component.ts
  3. 3
      apps/client/src/app/pages/home/home-page.html
  4. 2
      apps/client/src/app/pages/home/home-page.scss
  5. 6
      apps/client/src/app/pages/zen/zen-page.component.ts
  6. 14
      apps/client/src/app/pages/zen/zen-page.html

2
apps/client/src/app/app.component.scss

@ -9,7 +9,7 @@
padding-top: 5rem; padding-top: 5rem;
.create-account-container { .create-account-container {
height: 2.5rem; height: 3.5rem;
margin-top: -0.5rem; margin-top: -0.5rem;
.create-account-box { .create-account-box {

6
apps/client/src/app/pages/home/home-page.component.ts

@ -67,7 +67,6 @@ export class HomePageComponent implements AfterViewInit, OnDestroy, OnInit {
public performance: PortfolioPerformance; public performance: PortfolioPerformance;
public positions: { [symbol: string]: PortfolioPosition }; public positions: { [symbol: string]: PortfolioPosition };
public routeQueryParams: Subscription; public routeQueryParams: Subscription;
public showPositionsButton: boolean;
public user: User; public user: User;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -163,6 +162,10 @@ export class HomePageComponent implements AfterViewInit, OnDestroy, OnInit {
this.update(); this.update();
} }
public onTabChanged() {
this.update();
}
public ngOnDestroy() { public ngOnDestroy() {
this.unsubscribeSubject.next(); this.unsubscribeSubject.next();
this.unsubscribeSubject.complete(); this.unsubscribeSubject.complete();
@ -234,7 +237,6 @@ export class HomePageComponent implements AfterViewInit, OnDestroy, OnInit {
this.positions = response; this.positions = response;
this.hasPositions = this.hasPositions =
this.positions && Object.keys(this.positions).length > 1; this.positions && Object.keys(this.positions).length > 1;
this.showPositionsButton = this.hasPositions;
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
}); });

3
apps/client/src/app/pages/home/home-page.html

@ -3,6 +3,7 @@
class="position-absolute" class="position-absolute"
headerPosition="below" headerPosition="below"
mat-align-tabs="center" mat-align-tabs="center"
(selectedTabChange)="onTabChanged()"
> >
<mat-tab> <mat-tab>
<ng-template mat-tab-label> <ng-template mat-tab-label>
@ -79,7 +80,7 @@
</ng-template> </ng-template>
<div class="container justify-content-center pb-3 px-3 positions"> <div class="container justify-content-center pb-3 px-3 positions">
<h3 <h3
*ngIf="hasPositions === true" *ngIf="hasPositions !== false"
class="d-flex justify-content-center mb-3" class="d-flex justify-content-center mb-3"
i18n i18n
> >

2
apps/client/src/app/pages/home/home-page.scss

@ -7,7 +7,7 @@
position: relative; position: relative;
&.with-create-account-container { &.with-create-account-container {
min-height: calc(100vh - 5rem - 2.5rem); min-height: calc(100vh - 5rem - 3.5rem);
} }
.mat-tab-group { .mat-tab-group {

6
apps/client/src/app/pages/zen/zen-page.component.ts

@ -41,7 +41,6 @@ export class ZenPageComponent implements AfterViewInit, OnDestroy, OnInit {
public isLoadingPerformance = true; public isLoadingPerformance = true;
public performance: PortfolioPerformance; public performance: PortfolioPerformance;
public positions: { [symbol: string]: PortfolioPosition }; public positions: { [symbol: string]: PortfolioPosition };
public showPositionsButton: boolean;
public user: User; public user: User;
private unsubscribeSubject = new Subject<void>(); private unsubscribeSubject = new Subject<void>();
@ -93,6 +92,10 @@ export class ZenPageComponent implements AfterViewInit, OnDestroy, OnInit {
.subscribe((fragment) => this.viewportScroller.scrollToAnchor(fragment)); .subscribe((fragment) => this.viewportScroller.scrollToAnchor(fragment));
} }
public onTabChanged() {
this.update();
}
public ngOnDestroy() { public ngOnDestroy() {
this.unsubscribeSubject.next(); this.unsubscribeSubject.next();
this.unsubscribeSubject.complete(); this.unsubscribeSubject.complete();
@ -132,7 +135,6 @@ export class ZenPageComponent implements AfterViewInit, OnDestroy, OnInit {
this.positions = response; this.positions = response;
this.hasPositions = this.hasPositions =
this.positions && Object.keys(this.positions).length > 1; this.positions && Object.keys(this.positions).length > 1;
this.showPositionsButton = this.hasPositions;
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();
}); });

14
apps/client/src/app/pages/zen/zen-page.html

@ -3,6 +3,7 @@
class="position-absolute" class="position-absolute"
headerPosition="below" headerPosition="below"
mat-align-tabs="center" mat-align-tabs="center"
(selectedTabChange)="onTabChanged()"
> >
<mat-tab> <mat-tab>
<ng-template mat-tab-label> <ng-template mat-tab-label>
@ -58,11 +59,14 @@
<ng-template mat-tab-label> <ng-template mat-tab-label>
<ion-icon name="wallet-outline" size="large"></ion-icon> <ion-icon name="wallet-outline" size="large"></ion-icon>
</ng-template> </ng-template>
<div <div class="container justify-content-center pb-3 px-3 positions">
*ngIf="hasPositions === true" <h3
class="container justify-content-center pb-3 px-3 positions" *ngIf="hasPositions !== false"
> class="d-flex justify-content-center mb-3"
<h3 class="d-flex justify-content-center mb-3" i18n>Positions</h3> i18n
>
Positions
</h3>
<div class="row"> <div class="row">
<div class="align-items-center col"> <div class="align-items-center col">
<mat-card *ngIf="hasPositions === true" class="p-0"> <mat-card *ngIf="hasPositions === true" class="p-0">

Loading…
Cancel
Save