diff --git a/src/app/transactions/transactions.component.spec.ts b/src/app/transactions/transactions.component.spec.ts
index 0e25803..6db67b9 100644
--- a/src/app/transactions/transactions.component.spec.ts
+++ b/src/app/transactions/transactions.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExpensesComponent } from './transactions.component';
+import { TransactionsComponent } from './transactions.component';
describe('ExpensesComponent', () => {
- let component: ExpensesComponent;
- let fixture: ComponentFixture
;
+ let component: TransactionsComponent;
+ let fixture: ComponentFixture;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ExpensesComponent ]
+ declarations: [ TransactionsComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(ExpensesComponent);
+ fixture = TestBed.createComponent(TransactionsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/transactions/transactions.component.ts b/src/app/transactions/transactions.component.ts
index 28cd5a3..8018a0b 100644
--- a/src/app/transactions/transactions.component.ts
+++ b/src/app/transactions/transactions.component.ts
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Transaction } from '../transaction';
import { TransactionType } from '../transaction.type';
import { TransactionService } from '../transaction.service';
-import { Location } from '@angular/common';
+import { AppComponent } from '../app.component';
@Component({
selector: 'app-transactions',
@@ -16,21 +16,19 @@ export class TransactionsComponent implements OnInit {
public transactions: Transaction[]
constructor(
+ private app: AppComponent,
private transactionService: TransactionService,
- private location: Location
) { }
ngOnInit() {
- this.getTransactions()
- }
-
- goBack(): void {
- this.location.back()
+ this.app.backEnabled = true;
+ this.app.title = 'Transactions';
+ this.getTransactions();
}
getTransactions(): void {
this.transactionService.getTransactions().subscribe(transactions => {
this.transactions = transactions;
- })
+ });
}
}
diff --git a/src/app/user.ts b/src/app/user.ts
new file mode 100644
index 0000000..0bd6f04
--- /dev/null
+++ b/src/app/user.ts
@@ -0,0 +1,6 @@
+export class User {
+ id: number;
+ name: string;
+ password: string;
+ email: string;
+}
diff --git a/src/app/user/user.component.css b/src/app/user/user.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/user/user.component.html b/src/app/user/user.component.html
new file mode 100644
index 0000000..5e7fd58
--- /dev/null
+++ b/src/app/user/user.component.html
@@ -0,0 +1,3 @@
+
+ user works!
+
diff --git a/src/app/user/user.component.spec.ts b/src/app/user/user.component.spec.ts
new file mode 100644
index 0000000..dd3b1d7
--- /dev/null
+++ b/src/app/user/user.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { UserComponent } from './user.component';
+
+describe('UserComponent', () => {
+ let component: UserComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ UserComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(UserComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/user/user.component.ts b/src/app/user/user.component.ts
new file mode 100644
index 0000000..204ccd2
--- /dev/null
+++ b/src/app/user/user.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-user',
+ templateUrl: './user.component.html',
+ styleUrls: ['./user.component.css']
+})
+export class UserComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/src/styles.css b/src/styles.css
index f5d2b41..a658861 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -1,5 +1,7 @@
/* You can add global styles to this file, and also import other style files */
-html, body {
+
+html,
+body {
background: #333333;
font-family: Roboto, "Helvetica Neue", sans-serif;
margin: 0;
@@ -11,6 +13,10 @@ p {
margin: 0;
}
+a.mat-button[hidden] {
+ display: none;
+}
+
a.mat-fab {
position: fixed;
right: 2em;
@@ -26,13 +32,15 @@ mat-toolbar {
box-shadow: 0px 3px 3px 1px #212121;
}
-mat-toolbar.mat-toolbar-row, mat-toolbar.mat-toolbar-single-row {
+mat-toolbar.mat-toolbar-row,
+mat-toolbar.mat-toolbar-single-row {
padding: 0;
}
mat-toolbar span {
display: flex;
- width: 33%;;
+ width: 33%;
+ ;
}
mat-toolbar span:nth-child(1) {
@@ -70,11 +78,40 @@ mat-toolbar .action-item a {
vertical-align: middle;
}
+mat-sidenav-container.mat-drawer-container {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+}
+
+mat-sidenav-container .mat-drawer-backdrop.mat-drawer-shown {
+ background-color: rgba(0, 0, 0, 0.8);
+}
+
.income {
- color: #81C784;
+ color: #81C784;
}
.expense {
- color: #E57373;
+ color: #E57373;
}
+/**
+ * Forms
+ */
+
+.form {
+ padding: 1em;
+ color: #F1F1F1;
+}
+
+.form .mat-form-field,
+.form .button {
+ display: block;
+}
+
+.form mat-radio-button {
+ padding-bottom: 15px;
+}
\ No newline at end of file