+
-
+
add
\ No newline at end of file
diff --git a/src/app/dashboard/dashboard.component.ts b/src/app/dashboard/dashboard.component.ts
index 753c511..50ddb5a 100644
--- a/src/app/dashboard/dashboard.component.ts
+++ b/src/app/dashboard/dashboard.component.ts
@@ -1,11 +1,11 @@
import { Component, OnInit, Inject } from '@angular/core';
-import { Transaction } from '../transaction';
-import { TransactionService, TRANSACTION_SERVICE } from '../transaction.service';
-import { Category } from '../category';
+import { Transaction } from '../transactions/transaction';
+import { TransactionService, TRANSACTION_SERVICE } from '../transactions/transaction.service';
+import { Category } from '../categories/category';
import { AppComponent } from '../app.component';
-import { TransactionType } from '../transaction.type';
+import { TransactionType } from '../transactions/transaction.type';
import { Observable } from 'rxjs';
-import { CategoryService, CATEGORY_SERVICE } from '../category.service';
+import { CategoryService, CATEGORY_SERVICE } from '../categories/category.service';
@Component({
selector: 'app-dashboard',
@@ -72,4 +72,8 @@ export class DashboardComponent implements OnInit {
});
});
}
+
+ isLoggedIn(): boolean {
+ return this.app.isLoggedIn();
+ }
}
diff --git a/src/app/add-edit-transaction/add-edit-transaction.component.css b/src/app/transactions/add-edit-transaction/add-edit-transaction.component.css
similarity index 100%
rename from src/app/add-edit-transaction/add-edit-transaction.component.css
rename to src/app/transactions/add-edit-transaction/add-edit-transaction.component.css
diff --git a/src/app/add-edit-transaction/add-edit-transaction.component.html b/src/app/transactions/add-edit-transaction/add-edit-transaction.component.html
similarity index 100%
rename from src/app/add-edit-transaction/add-edit-transaction.component.html
rename to src/app/transactions/add-edit-transaction/add-edit-transaction.component.html
diff --git a/src/app/add-edit-transaction/add-edit-transaction.component.spec.ts b/src/app/transactions/add-edit-transaction/add-edit-transaction.component.spec.ts
similarity index 100%
rename from src/app/add-edit-transaction/add-edit-transaction.component.spec.ts
rename to src/app/transactions/add-edit-transaction/add-edit-transaction.component.spec.ts
diff --git a/src/app/add-edit-transaction/add-edit-transaction.component.ts b/src/app/transactions/add-edit-transaction/add-edit-transaction.component.ts
similarity index 90%
rename from src/app/add-edit-transaction/add-edit-transaction.component.ts
rename to src/app/transactions/add-edit-transaction/add-edit-transaction.component.ts
index 84ed2f1..f396ff9 100644
--- a/src/app/add-edit-transaction/add-edit-transaction.component.ts
+++ b/src/app/transactions/add-edit-transaction/add-edit-transaction.component.ts
@@ -2,10 +2,10 @@ import { Component, OnInit, Input, OnChanges, OnDestroy, Inject } from '@angular
import { Transaction } from '../transaction';
import { TransactionType } from '../transaction.type';
import { TransactionService, TRANSACTION_SERVICE } from '../transaction.service';
-import { Category } from '../category';
-import { AppComponent } from '../app.component';
-import { Actionable } from '../actionable';
-import { CATEGORY_SERVICE, CategoryService } from '../category.service';
+import { Category } from 'src/app/categories/category';
+import { Actionable } from 'src/app/actionable';
+import { AppComponent } from 'src/app/app.component';
+import { CATEGORY_SERVICE, CategoryService } from 'src/app/categories/category.service';
@Component({
selector: 'app-add-edit-transaction',
diff --git a/src/app/register/register.component.css b/src/app/transactions/new-transaction/new-transaction.component.css
similarity index 100%
rename from src/app/register/register.component.css
rename to src/app/transactions/new-transaction/new-transaction.component.css
diff --git a/src/app/new-transaction/new-transaction.component.html b/src/app/transactions/new-transaction/new-transaction.component.html
similarity index 100%
rename from src/app/new-transaction/new-transaction.component.html
rename to src/app/transactions/new-transaction/new-transaction.component.html
diff --git a/src/app/new-transaction/new-transaction.component.spec.ts b/src/app/transactions/new-transaction/new-transaction.component.spec.ts
similarity index 100%
rename from src/app/new-transaction/new-transaction.component.spec.ts
rename to src/app/transactions/new-transaction/new-transaction.component.spec.ts
diff --git a/src/app/new-transaction/new-transaction.component.ts b/src/app/transactions/new-transaction/new-transaction.component.ts
similarity index 89%
rename from src/app/new-transaction/new-transaction.component.ts
rename to src/app/transactions/new-transaction/new-transaction.component.ts
index 76e241c..a3d096d 100644
--- a/src/app/new-transaction/new-transaction.component.ts
+++ b/src/app/transactions/new-transaction/new-transaction.component.ts
@@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
-import { Transaction } from '../transaction'
+import { Transaction } from '../transaction';
@Component({
selector: 'app-new-transaction',
diff --git a/src/app/transaction-details/transaction-details.component.css b/src/app/transactions/transaction-details/transaction-details.component.css
similarity index 100%
rename from src/app/transaction-details/transaction-details.component.css
rename to src/app/transactions/transaction-details/transaction-details.component.css
diff --git a/src/app/transaction-details/transaction-details.component.html b/src/app/transactions/transaction-details/transaction-details.component.html
similarity index 100%
rename from src/app/transaction-details/transaction-details.component.html
rename to src/app/transactions/transaction-details/transaction-details.component.html
diff --git a/src/app/transaction-details/transaction-details.component.spec.ts b/src/app/transactions/transaction-details/transaction-details.component.spec.ts
similarity index 100%
rename from src/app/transaction-details/transaction-details.component.spec.ts
rename to src/app/transactions/transaction-details/transaction-details.component.spec.ts
diff --git a/src/app/transaction-details/transaction-details.component.ts b/src/app/transactions/transaction-details/transaction-details.component.ts
similarity index 100%
rename from src/app/transaction-details/transaction-details.component.ts
rename to src/app/transactions/transaction-details/transaction-details.component.ts
diff --git a/src/app/transaction.service.firebase.spec.ts b/src/app/transactions/transaction.service.firebase.spec.ts
similarity index 100%
rename from src/app/transaction.service.firebase.spec.ts
rename to src/app/transactions/transaction.service.firebase.spec.ts
diff --git a/src/app/transaction.service.firestore.ts b/src/app/transactions/transaction.service.firestore.ts
similarity index 100%
rename from src/app/transaction.service.firestore.ts
rename to src/app/transactions/transaction.service.firestore.ts
diff --git a/src/app/transaction.service.ts b/src/app/transactions/transaction.service.ts
similarity index 100%
rename from src/app/transaction.service.ts
rename to src/app/transactions/transaction.service.ts
diff --git a/src/app/transaction.ts b/src/app/transactions/transaction.ts
similarity index 86%
rename from src/app/transaction.ts
rename to src/app/transactions/transaction.ts
index fe05805..fde54c6 100644
--- a/src/app/transaction.ts
+++ b/src/app/transactions/transaction.ts
@@ -1,9 +1,8 @@
-import { ITransaction } from './budget-database';
-import { Category } from './category';
+import { Category } from '../categories/category';
import { TransactionType } from './transaction.type';
import * as firebase from 'firebase/app';
-export class Transaction implements ITransaction {
+export class Transaction {
id: string;
accountId: string;
remoteId: string;
diff --git a/src/app/transaction.type.ts b/src/app/transactions/transaction.type.ts
similarity index 100%
rename from src/app/transaction.type.ts
rename to src/app/transactions/transaction.type.ts
diff --git a/src/app/transactions/transactions.component.ts b/src/app/transactions/transactions.component.ts
index 7e2db72..267b4a2 100644
--- a/src/app/transactions/transactions.component.ts
+++ b/src/app/transactions/transactions.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit, Input, Inject } from '@angular/core';
-import { Transaction } from '../transaction';
-import { TransactionType } from '../transaction.type';
-import { TransactionService, TRANSACTION_SERVICE } from '../transaction.service';
+import { Transaction } from './transaction';
+import { TransactionType } from './transaction.type';
+import { TransactionService, TRANSACTION_SERVICE } from './transaction.service';
import { AppComponent } from '../app.component';
@Component({
diff --git a/src/app/auth.service.spec.ts b/src/app/users/auth.service.spec.ts
similarity index 100%
rename from src/app/auth.service.spec.ts
rename to src/app/users/auth.service.spec.ts
diff --git a/src/app/auth.service.ts b/src/app/users/auth.service.ts
similarity index 100%
rename from src/app/auth.service.ts
rename to src/app/users/auth.service.ts
diff --git a/src/app/user/user.component.css b/src/app/users/edit-profile/edit-profile.component.css
similarity index 100%
rename from src/app/user/user.component.css
rename to src/app/users/edit-profile/edit-profile.component.css
diff --git a/src/app/edit-profile/edit-profile.component.html b/src/app/users/edit-profile/edit-profile.component.html
similarity index 100%
rename from src/app/edit-profile/edit-profile.component.html
rename to src/app/users/edit-profile/edit-profile.component.html
diff --git a/src/app/edit-profile/edit-profile.component.spec.ts b/src/app/users/edit-profile/edit-profile.component.spec.ts
similarity index 100%
rename from src/app/edit-profile/edit-profile.component.spec.ts
rename to src/app/users/edit-profile/edit-profile.component.spec.ts
diff --git a/src/app/edit-profile/edit-profile.component.ts b/src/app/users/edit-profile/edit-profile.component.ts
similarity index 100%
rename from src/app/edit-profile/edit-profile.component.ts
rename to src/app/users/edit-profile/edit-profile.component.ts
diff --git a/src/app/users/login/login.component.css b/src/app/users/login/login.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/login/login.component.html b/src/app/users/login/login.component.html
similarity index 100%
rename from src/app/login/login.component.html
rename to src/app/users/login/login.component.html
diff --git a/src/app/login/login.component.spec.ts b/src/app/users/login/login.component.spec.ts
similarity index 100%
rename from src/app/login/login.component.spec.ts
rename to src/app/users/login/login.component.spec.ts
diff --git a/src/app/login/login.component.ts b/src/app/users/login/login.component.ts
similarity index 88%
rename from src/app/login/login.component.ts
rename to src/app/users/login/login.component.ts
index 910da31..87a3063 100644
--- a/src/app/login/login.component.ts
+++ b/src/app/users/login/login.component.ts
@@ -1,8 +1,8 @@
import { Component, OnInit, OnDestroy, OnChanges } from '@angular/core';
import { AuthService } from '../auth.service';
import { User } from '../user';
-import { Actionable } from '../actionable';
-import { AppComponent } from '../app.component';
+import { Actionable } from 'src/app/actionable';
+import { AppComponent } from 'src/app/app.component';
@Component({
selector: 'app-login',
diff --git a/src/app/users/register/register.component.css b/src/app/users/register/register.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/register/register.component.html b/src/app/users/register/register.component.html
similarity index 100%
rename from src/app/register/register.component.html
rename to src/app/users/register/register.component.html
diff --git a/src/app/register/register.component.spec.ts b/src/app/users/register/register.component.spec.ts
similarity index 100%
rename from src/app/register/register.component.spec.ts
rename to src/app/users/register/register.component.spec.ts
diff --git a/src/app/register/register.component.ts b/src/app/users/register/register.component.ts
similarity index 90%
rename from src/app/register/register.component.ts
rename to src/app/users/register/register.component.ts
index ae788f0..1bd2dc0 100644
--- a/src/app/register/register.component.ts
+++ b/src/app/users/register/register.component.ts
@@ -1,8 +1,8 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
import { User } from '../user';
-import { AppComponent } from '../app.component';
import { AuthService } from '../auth.service';
-import { Actionable } from '../actionable';
+import { Actionable } from 'src/app/actionable';
+import { AppComponent } from 'src/app/app.component';
@Component({
selector: 'app-register',
diff --git a/src/app/users/user.component.css b/src/app/users/user.component.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/user/user.component.html b/src/app/users/user.component.html
similarity index 100%
rename from src/app/user/user.component.html
rename to src/app/users/user.component.html
diff --git a/src/app/user/user.component.spec.ts b/src/app/users/user.component.spec.ts
similarity index 100%
rename from src/app/user/user.component.spec.ts
rename to src/app/users/user.component.spec.ts
diff --git a/src/app/user/user.component.ts b/src/app/users/user.component.ts
similarity index 100%
rename from src/app/user/user.component.ts
rename to src/app/users/user.component.ts
diff --git a/src/app/users/user.service.spec.ts b/src/app/users/user.service.spec.ts
new file mode 100644
index 0000000..b26195c
--- /dev/null
+++ b/src/app/users/user.service.spec.ts
@@ -0,0 +1,15 @@
+import { TestBed, inject } from '@angular/core/testing';
+
+import { UserService } from './user.service';
+
+describe('UserService', () => {
+ beforeEach(() => {
+ TestBed.configureTestingModule({
+ providers: [UserService]
+ });
+ });
+
+ it('should be created', inject([UserService], (service: UserService) => {
+ expect(service).toBeTruthy();
+ }));
+});
diff --git a/src/app/users/user.service.ts b/src/app/users/user.service.ts
new file mode 100644
index 0000000..1110336
--- /dev/null
+++ b/src/app/users/user.service.ts
@@ -0,0 +1,9 @@
+import { InjectionToken } from '@angular/core';
+import { Observable } from 'rxjs';
+import { User } from './user';
+
+export interface UserService {
+ getUsersByUsername(username: string): Observable
;
+}
+
+export let USER_SERVICE = new InjectionToken('user.service');
diff --git a/src/app/user.ts b/src/app/users/user.ts
similarity index 100%
rename from src/app/user.ts
rename to src/app/users/user.ts