Skip to content

Commit 21ec454

Browse files
authored
Merge pull request #32 from ArielMAJ/release/0.6.1
Release/0.6.1
2 parents e810041 + 4401f6a commit 21ec454

File tree

4 files changed

+31
-23
lines changed

4 files changed

+31
-23
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "finances-manager",
3-
"version": "0.6.0",
3+
"version": "0.6.1",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",

src/app/components/header/header.component.ts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
import { Component } from '@angular/core';
22
import { Router } from '@angular/router';
3+
import { User } from '../../Models/User';
34
import { FinancialTransactionService } from '../../services/financialTransaction.service';
45
import { UserService } from '../../services/user.service';
5-
import { User } from '../../Models/User';
66

77
@Component({
88
selector: 'app-header',
99
templateUrl: './header.component.html',
1010
styleUrl: './header.component.scss',
1111
})
1212
export class HeaderComponent {
13-
currentUser!: User;
14-
totalTransactionValue!: Number;
13+
currentUser: User = {
14+
id: 0,
15+
name: '',
16+
accountNumber: 0,
17+
email: '',
18+
createdAt: new Date(),
19+
age: 0,
20+
};
21+
totalTransactionValue: Number = 0;
1522

1623
constructor(
1724
private router: Router,
@@ -21,23 +28,12 @@ export class HeaderComponent {
2128
) {}
2229

2330
ngOnInit(): void {
24-
this.currentUser = {
25-
id: 0,
26-
name: '',
27-
accountNumber: 0,
28-
email: '',
29-
createdAt: new Date(),
30-
age: 0,
31-
} as User;
3231
this.userService.getCurrentUser().subscribe((data) => {
3332
this.currentUser = data;
3433
});
3534
this.financialTransactionService
3635
.getTotalTransactionValue()
37-
.subscribe(
38-
(value) =>
39-
(this.totalTransactionValue = value)
40-
);
36+
.subscribe((value) => (this.totalTransactionValue = value));
4137
}
4238

4339
logout() {

src/app/pages/dashboard/dashboard.component.css

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ h1 {
1515
}
1616

1717
.dashboard-header {
18-
1918
margin-top: 40px;
2019
}
2120
.search-bar {
@@ -63,7 +62,9 @@ tr:nth-child(odd) {
6362
border: none;
6463
}
6564

66-
mat-card, .dashboard-header, .search-bar {
65+
mat-card,
66+
.dashboard-header,
67+
.search-bar {
6768
margin-right: auto;
6869
margin-left: auto;
6970
width: min(1000px, 90vw);
@@ -74,7 +75,6 @@ mat-card, .dashboard-header, .search-bar {
7475
display: flex;
7576
justify-content: center;
7677
margin: auto;
77-
7878
}
7979

8080
*::-webkit-scrollbar {
@@ -110,6 +110,8 @@ th,
110110

111111
.description-cell {
112112
width: auto;
113+
max-width: 40vw;
114+
overflow-wrap: break-word;
113115
}
114116

115117
.create-item-icon,
@@ -148,17 +150,27 @@ th,
148150
bottom: 38px;
149151
right: 28px;
150152
}
153+
154+
.description-cell {
155+
max-width: 26vw;
156+
}
151157
}
152158

153159
@media (max-width: 432px) {
154-
mat-card, table {
160+
mat-card,
161+
table {
155162
width: 90vw;
156163
margin: auto;
157164
padding: 0;
158165
}
159166

160-
mat-icon, .table-actions-cell {
167+
mat-icon,
168+
.table-actions-cell {
161169
margin: 0;
162170
padding: 0;
163171
}
172+
173+
.description-cell {
174+
max-width: 23vw;
175+
}
164176
}

0 commit comments

Comments
 (0)