From 2c4df90d8d0db6283f3ab4248553b66c1885df85 Mon Sep 17 00:00:00 2001
From: William Brawner <me@wbrawner.com>
Date: Fri, 5 Feb 2021 20:35:04 -0700
Subject: [PATCH] Remove budgets prefix from paths

---
 src/app/app-routing.module.ts                      | 14 +++++++-------
 .../budget-details/budget-details.component.html   | 12 ++++++------
 .../category-details.component.html                |  4 ++--
 .../category-list/category-list.component.html     |  2 +-
 .../new-transaction/new-transaction.component.ts   |  2 +-
 .../transaction-list.component.html                |  2 +-
 .../transaction-list/transaction-list.component.ts |  6 +++---
 src/app/transactions/transactions.component.html   |  4 ++--
 src/app/transactions/transactions.component.ts     |  8 ++++----
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 6b01b50..047ef94 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -22,13 +22,13 @@ const routes: Routes = [
   { path: 'budgets/new', component: NewBudgetComponent },
   { path: 'budgets/:id', component: BudgetDetailsComponent },
   { path: 'budgets/:id/edit', component: EditBudgetComponent },
-  { path: 'budgets/:budgetId/transactions', component: TransactionsComponent },
-  { path: 'budgets/:budgetId/transactions/new', component: NewTransactionComponent },
-  { path: 'budgets/:budgetId/transactions/:id', component: TransactionDetailsComponent },
-  { path: 'budgets/:budgetId/categories', component: CategoriesComponent },
-  { path: 'budgets/:budgetId/categories/new', component: NewCategoryComponent },
-  { path: 'budgets/:budgetId/categories/:id', component: CategoryDetailsComponent },
-  { path: 'budgets/:budgetId/categories/:id/edit', component: EditCategoryComponent },
+  { path: 'transactions', component: TransactionsComponent },
+  { path: 'transactions/new', component: NewTransactionComponent },
+  { path: 'transactions/:id', component: TransactionDetailsComponent },
+  { path: 'categories', component: CategoriesComponent },
+  { path: 'categories/new', component: NewCategoryComponent },
+  { path: 'categories/:id', component: CategoryDetailsComponent },
+  { path: 'categories/:id/edit', component: EditCategoryComponent },
 ];
 
 @NgModule({
diff --git a/src/app/budgets/budget-details/budget-details.component.html b/src/app/budgets/budget-details/budget-details.component.html
index 1b61030..fcbd8fa 100644
--- a/src/app/budgets/budget-details/budget-details.component.html
+++ b/src/app/budgets/budget-details/budget-details.component.html
@@ -8,14 +8,14 @@
     <app-category-breakdown [barChartLabels]="barChartLabels" [barChartData]="barChartData">
       </app-category-breakdown>
     <div class="transaction-navigation">
-      <a mat-button routerLink="/budgets/{{ budget.id }}/transactions" *ngIf="budget">View Transactions</a>
+      <a mat-button routerLink="/transactions" [queryParams]="{budgetIds: budget.id}" *ngIf="budget">View Transactions</a>
     </div>
   </mat-card>
   <mat-card class="dashboard-categories" [hidden]="!budget">
     <h3 class="categories">Income</h3>
-    <a mat-button routerLink="/budgets/{{ budget.id }}/categories/new" class="view-all" *ngIf="budget">Add Category</a>
+    <a mat-button routerLink="/categories/new" [queryParams]="{budgetId: budget.id}" class="view-all" *ngIf="budget">Add Category</a>
     <div class="no-categories" *ngIf="!income || income.length === 0">
-      <a mat-button routerLink="/budgets/{{ budget.id }}/categories/new" *ngIf="budget">
+      <a mat-button routerLink="/categories/new" [queryParams]="{budgetId: budget.id}" *ngIf="budget">
         <mat-icon>add</mat-icon>
         <p>Add categories to gain more insights into your income.</p>
       </a>
@@ -27,9 +27,9 @@
   </mat-card>
   <mat-card class="dashboard-categories" [hidden]="!budget">
     <h3 class="categories">Expenses</h3>
-    <a mat-button routerLink="/budgets/{{ budget.id }}/categories/new" class="view-all" *ngIf="budget">Add Category</a>
+    <a mat-button routerLink="/categories/new" [queryParams]="{budgetIds: budget.id, expense: true}" class="view-all" *ngIf="budget">Add Category</a>
     <div class="no-categories" *ngIf="!expenses || expenses.length === 0">
-      <a mat-button routerLink="/budgets/{{ budget.id }}/categories/new" *ngIf="budget">
+      <a mat-button routerLink="/categories/new" [queryParams]="{budgetIds: budget.id, expense: true}" *ngIf="budget">
         <mat-icon>add</mat-icon>
         <p>Add categories to gain more insights into your expenses.</p>
       </a>
@@ -40,6 +40,6 @@
     </div>
   </mat-card>
 </div>
-<a mat-fab routerLink="/budgets/{{ budget.id }}/transactions/new" *ngIf="budget">
+<a mat-fab routerLink="/transactions/new" [queryParams]="{budgetId: budget.id}" *ngIf="budget">
   <mat-icon aria-label="Add">add</mat-icon>
 </a>
\ No newline at end of file
diff --git a/src/app/categories/category-details/category-details.component.html b/src/app/categories/category-details/category-details.component.html
index a89dc9d..b280866 100644
--- a/src/app/categories/category-details/category-details.component.html
+++ b/src/app/categories/category-details/category-details.component.html
@@ -1,5 +1,5 @@
 <p class="category-description" *ngIf="category && category.description" [innerHtml]="category.description"></p>
-<app-transaction-list *ngIf="budgetId && category" [budgetId]="budgetId" [categoryId]="category.id"></app-transaction-list>
-<a mat-fab routerLink="/budgets/{{ budgetId }}/transactions/new">
+<app-transaction-list *ngIf="budgetId && category" [budgetIds]="[budgetId]" [categoryIds]="[category.id]"></app-transaction-list>
+<a mat-fab routerLink="/transactions/new" [queryParams]="{budgetId: budgetId}">
     <mat-icon aria-label="Add">add</mat-icon>
 </a>
\ No newline at end of file
diff --git a/src/app/categories/category-list/category-list.component.html b/src/app/categories/category-list/category-list.component.html
index b784b2e..20bb27c 100644
--- a/src/app/categories/category-list/category-list.component.html
+++ b/src/app/categories/category-list/category-list.component.html
@@ -1,5 +1,5 @@
 <mat-nav-list class="categories">
-  <a mat-list-item *ngFor="let category of categories" routerLink="/budgets/{{ budgetId }}/categories/{{ category.id }}">
+  <a mat-list-item *ngFor="let category of categories" routerLink="/categories/{{ category.id }}">
     <p matLine class="category-list-title">
     <span>
       {{ category.title }}
diff --git a/src/app/transactions/new-transaction/new-transaction.component.ts b/src/app/transactions/new-transaction/new-transaction.component.ts
index 5354cc3..c6c8bb3 100644
--- a/src/app/transactions/new-transaction/new-transaction.component.ts
+++ b/src/app/transactions/new-transaction/new-transaction.component.ts
@@ -17,7 +17,7 @@ export class NewTransactionComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    this.budgetId = this.route.snapshot.paramMap.get('budgetId');
+    this.budgetId = this.route.snapshot.queryParamMap.get('budgetId');
     this.transaction = new Transaction();
   }
 
diff --git a/src/app/transactions/transaction-list/transaction-list.component.html b/src/app/transactions/transaction-list/transaction-list.component.html
index 17c7bdf..bb02378 100644
--- a/src/app/transactions/transaction-list/transaction-list.component.html
+++ b/src/app/transactions/transaction-list/transaction-list.component.html
@@ -1,6 +1,6 @@
 <mat-nav-list *ngIf="transactions" class="transactions">
     <a mat-list-item *ngFor="let transaction of transactions"
-        routerLink="/budgets/{{ budgetId }}/transactions/{{ transaction.id }}">
+        routerLink="/transactions/{{ transaction.id }}">
         <div matLine class="list-row-one">
             <p>{{transaction.title}}</p>
             <p class="amount" [class.expense]="transaction.expense" [class.income]="!transaction.expense">
diff --git a/src/app/transactions/transaction-list/transaction-list.component.ts b/src/app/transactions/transaction-list/transaction-list.component.ts
index 3fd2975..82a5e8d 100644
--- a/src/app/transactions/transaction-list/transaction-list.component.ts
+++ b/src/app/transactions/transaction-list/transaction-list.component.ts
@@ -10,8 +10,8 @@ import { ActivatedRoute } from '@angular/router';
 })
 export class TransactionListComponent implements OnInit {
 
-  @Input() budgetId: string;
-  @Input() categoryId?: string;
+  @Input() budgetIds: string[];
+  @Input() categoryIds?: string[];
   public transactions: Transaction[];
 
   constructor(
@@ -52,7 +52,7 @@ export class TransactionListComponent implements OnInit {
       }
     }
 
-    this.twigsService.getTransactions(this.budgetId, this.categoryId, null, from, to).subscribe(transactions => {
+    this.twigsService.getTransactions(this.budgetIds.join(','), this.categoryIds.join(','), null, from, to).subscribe(transactions => {
       this.transactions = transactions;
     });
   }
diff --git a/src/app/transactions/transactions.component.html b/src/app/transactions/transactions.component.html
index 3194c12..a328b51 100644
--- a/src/app/transactions/transactions.component.html
+++ b/src/app/transactions/transactions.component.html
@@ -1,4 +1,4 @@
-<app-transaction-list [budgetId]="budgetId" [categoryId]="categoryId"></app-transaction-list>
-<a mat-fab routerLink="/budgets/{{ budgetId }}/transactions/new">
+<app-transaction-list [budgetIds]="budgetId" [categoryIds]="categoryId"></app-transaction-list>
+<a mat-fab routerLink="/transactions/new" [queryParams]="{budgetId: budgetId}">
   <mat-icon aria-label="Add">add</mat-icon>
 </a>
\ No newline at end of file
diff --git a/src/app/transactions/transactions.component.ts b/src/app/transactions/transactions.component.ts
index 4e49dca..ff9f337 100644
--- a/src/app/transactions/transactions.component.ts
+++ b/src/app/transactions/transactions.component.ts
@@ -9,8 +9,8 @@ import { ActivatedRoute } from '@angular/router';
 })
 export class TransactionsComponent implements OnInit {
 
-  budgetId: number;
-  categoryId?: number;
+  budgetId?: string;
+  categoryId?: string;
 
   constructor(
     private route: ActivatedRoute,
@@ -18,8 +18,8 @@ export class TransactionsComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    this.budgetId = Number.parseInt(this.route.snapshot.paramMap.get('budgetId'));
-    this.categoryId = Number.parseInt(this.route.snapshot.queryParamMap.get('categoryId'));
+    this.budgetId = this.route.snapshot.queryParamMap.get('budgetIds');
+    this.categoryId = this.route.snapshot.queryParamMap.get('categoryIds');
     this.app.setBackEnabled(true);
     this.app.setTitle('Transactions')
   }