Skip to content

Commit

Permalink
chore(upgrade): current working upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
valeriatoneva committed Feb 23, 2024
1 parent 135413f commit bcdbca3
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 31 deletions.
43 changes: 26 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"@igniteui/material-icons-extended": "^3.0.2",
"core-js": "^2.4.1",
"hammerjs": "^2.0.8",
"igniteui-angular": "^17.0.0",
"igniteui-angular-charts": "^17.0.0-beta.0",
"igniteui-angular-core": "^17.0.0-beta.0",
"igniteui-angular": "^17.1.0-rc.0",
"igniteui-angular-charts": "^17.2.1",
"igniteui-angular-core": "^17.2.1",
"igniteui-angular-i18n": "^17.0.0",
"minireset.css": "~0.0.4",
"rxfire": "^6.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
<span>
<div class="account-container" *ngIf="afAuth.authState | async as user; else showLogin">
<span *ngIf="innerWidth > 650">{{ name !== null ? 'Hey ' + name : '' }}</span>
<button igxButton="raised" igxRipple (click)="logout()">Logout</button>
<button igxButton="contained" igxRipple (click)="logout()">Logout</button>
</div>
<ng-template #showLogin>
<div><button igxButton="raised" igxRipple (click)="login()">Login</button></div>
<div><button igxButton="contained" igxRipple (click)="login()">Login</button></div>
</ng-template>
</span>
</igx-navbar>
Expand Down
4 changes: 2 additions & 2 deletions src/app/block-grid/block-grid.component.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="sample-wrapper">
<div class="sample-content">
<div class="buttons-container" *ngIf="!hideColumn; else elseBlock">
<button id="refresh" igxButton="raised" igxRipple (click)="refreshGrid()">
<button id="refresh" igxButton="contained" igxRipple (click)="refreshGrid()">
<igx-icon>refresh</igx-icon>
</button>
<button [igxTooltipTarget]="tooltipRef" id="exportButton" igxButton="raised" igxRipple (click)="exportGrid()">
<button [igxTooltipTarget]="tooltipRef" id="exportButton" igxButton="contained" igxRipple (click)="exportGrid()">
<img src="https://img.icons8.com/material/24/000000/ms-excel.png">
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/email/email.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<div class="signup-form-actions">
<a igxButton="flat" igxRipple routerLink="/login" id="goback">Go back</a>
<button id="loginBtn" igxButton="raised" igxRipple type="submit" [disabled]="!formData.valid"
<button id="loginBtn" igxButton="contained" type="submit" [disabled]="!formData.valid"
class="basic-btn">Log in</button>
</div>
<div class="sbPosition">
Expand Down
6 changes: 3 additions & 3 deletions src/app/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
<igx-icon id="lockIcon">lock_open</igx-icon>
<span class="error" *ngIf="error">{{ error }}</span>

<button class="button" igxButton="raised" igxRipple (click)="loginGoogle()" id="google">
<button class="button" igxButton="contained" igxRipple (click)="loginGoogle()" id="google">
<igx-icon class="s-logo" family="imx-icons" name="google"></igx-icon>
<span>Login With Google</span>
</button>

<button class="button" igxButton="raised" igxRipple (click)="loginFb()" id="google">
<button class="button" igxButton="contained" igxRipple (click)="loginFb()" id="google">
<igx-icon class="s-logo" family="imx-icons" name="facebook"></igx-icon>
<span>Login With Facebook</span>
</button>


<button class="button" igxButton="raised" igxRipple (click)="loginEmail()" id="email">
<button class="button" igxButton="contained" igxRipple (click)="loginEmail()" id="email">
<igx-icon class="s-logo">email</igx-icon>
<span>Email</span>
</button>
Expand Down
4 changes: 2 additions & 2 deletions src/app/portfolio/portfolio.component.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div class="sample-wrapper" igxOverlayOutlet>
<div class="sample-content">
<span>
<button id="refreshBtn" igxButton="raised" igxRipple (click)="updatePortfolio()">
<button id="refreshBtn" igxButton="contained" igxRipple (click)="updatePortfolio()">
<igx-icon>refresh</igx-icon>
<span>Total Portfolio Value: {{ calculateTotalPortfolio() | number:'0.2-2' }}
</span>
</button>
</span>

<span>
<button id="addBtn" igxButton="raised" igxRipple (click)="openDialog()">
<button id="addBtn" igxButton="contained" igxRipple (click)="openDialog()">
<igx-icon>playlist_add</igx-icon>
<span>Add coin</span>
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/app/signup/signup.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<div class="signup-form-actions">
<a igxButton="flat" igxRipple routerLink="/login" id="goback">Go back</a>
<button igxButton="raised" igxRipple type="submit" [disabled]="!formData.valid" class="basic-btn">Create my account</button>
<button igxButton="contained" igxRipple type="submit" [disabled]="!formData.valid" class="basic-btn">Create my account</button>
</div>

<div class="sbPosition">
Expand Down

0 comments on commit bcdbca3

Please sign in to comment.