refactor: aggregate state into separate folder

src/app/app.config.ts

@@ -11,12 +11,12 @@ import { provideStoreDevtools } from '@ngrx/store-devtools';
 
 import { environment as env } from '../environments/environment';
 import { routes } from './app.routes';
-import { ReportEffects } from './reports/data-access/report.effects';
-import { reportReducer } from './reports/data-access/report.reducers';
-import { BudgetEffects } from './reports/feature/budget-cards/budget-cards.effects';
-import { budgetsReducers } from './reports/feature/budget-cards/budget-cards.reducers';
-import { formReducer } from './reports/feature/dashboard/reports-form/dashboard-form.reducers';
 import { authInterceptor } from './shared/services/auth/auth.interceptor';
+import { BudgetEffects } from './state/effects/budget-cards.effects';
+import { ReportEffects } from './state/effects/report.effects';
+import { budgetsReducers } from './state/reducers/budget-cards.reducers';
+import { formReducer } from './state/reducers/dashboard-form.reducers';
+import { reportReducer } from './state/reducers/report.reducers';
 
 export const appConfig: ApplicationConfig = {
   providers: [

src/app/reports/feature/budget-cards/budget-cards.component.ts

@@ -6,8 +6,8 @@ import { RouterModule } from '@angular/router';
 
 import { Store } from '@ngrx/store';
 
-import { budgetActions } from './budget-cards.actions';
-import { selectBudgets } from './budget-cards.selectors';
+import { budgetActions } from '../../../state/actions/budget-cards.actions';
+import { selectBudgets } from '../../../state/selectors/budget-cards.selectors';
 
 @Component({
   selector: 'app-budgets',

src/app/reports/feature/dashboard/bar-chart/bar-horizontal.component.spec.ts

@@ -8,7 +8,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { Account } from '../../../../shared/services/ynab/interfaces/accounts/account';
 import { CategoryGroup } from '../../../../shared/services/ynab/interfaces/categories/categoryGroup';
 import { Transaction } from '../../../../shared/services/ynab/interfaces/transactions/transaction';
-import { selectSortedResults } from '../../../data-access/report.selectors';
+import { selectSortedResults } from '../../../../state/selectors/report.selectors';
 import { ChartsBarHorizontalComponent } from './bar-horizontal.component';
 
 describe('ChartsBarHorizontalComponent', () => {

src/app/reports/feature/dashboard/bar-chart/bar-horizontal.component.ts

@@ -6,7 +6,7 @@ import { Store } from '@ngrx/store';
 import { BarChartModule } from '@swimlane/ngx-charts';
 import { Observable } from 'rxjs';
 
-import { selectSortedResults } from '../../../data-access/report.selectors';
+import { selectSortedResults } from '../../../../state/selectors/report.selectors';
 
 @Component({
   selector: 'app-charts-bar-horizontal',

src/app/reports/feature/dashboard/bar-chart/bar-vertical.component.spec.ts

@@ -8,7 +8,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { Account } from '../../../../shared/services/ynab/interfaces/accounts/account';
 import { CategoryGroup } from '../../../../shared/services/ynab/interfaces/categories/categoryGroup';
 import { Transaction } from '../../../../shared/services/ynab/interfaces/transactions/transaction';
-import { selectSortedResults } from '../../../data-access/report.selectors';
+import { selectSortedResults } from '../../../../state/selectors/report.selectors';
 import { ChartsBarVerticalComponent } from './bar-vertical.component';
 
 describe('ChartsBarVerticalComponent', () => {

src/app/reports/feature/dashboard/bar-chart/bar-vertical.component.ts

@@ -6,7 +6,7 @@ import { Store } from '@ngrx/store';
 import { BarChartModule } from '@swimlane/ngx-charts';
 import { Observable } from 'rxjs';
 
-import { selectSortedResults } from '../../../data-access/report.selectors';
+import { selectSortedResults } from '../../../../state/selectors/report.selectors';
 
 @Component({
   selector: 'app-charts-bar-vertical',

src/app/reports/feature/dashboard/dashboard.component.ts

@@ -6,8 +6,8 @@ import { Store } from '@ngrx/store';
 
 import { Observable } from 'rxjs';
 
-import { reportActions } from '../../data-access/report.actions';
-import { selectChartType } from '../../data-access/report.selectors';
+import { reportActions } from '../../../state/actions/report.actions';
+import { selectChartType } from '../../../state/selectors/report.selectors';
 import { ChartsBarHorizontalComponent } from './bar-chart/bar-horizontal.component';
 import { ChartsBarVerticalComponent } from './bar-chart/bar-vertical.component';
 import { ChartsPieChartComponent } from './pie-chart/pie-chart.component';

src/app/reports/feature/dashboard/pie-chart/pie-chart.component.ts

@@ -6,7 +6,7 @@ import { Store } from '@ngrx/store';
 import { PieChartModule } from '@swimlane/ngx-charts';
 import { Observable } from 'rxjs';
 
-import { selectSortedResults } from '../../../data-access/report.selectors';
+import { selectSortedResults } from '../../../../state/selectors/report.selectors';
 
 @Component({
   selector: 'app-charts-pie-chart',

src/app/reports/feature/dashboard/reports-form/dashboard-form.component.ts

@@ -12,13 +12,13 @@ import { Observable, Subject, combineLatest, startWith, takeUntil } from 'rxjs';
 
 import { Account } from '../../../../shared/services/ynab/interfaces/accounts/account';
 import { Category } from '../../../../shared/services/ynab/interfaces/categories/category';
+import { formActions } from '../../../../state/actions/dashboard-form.actions';
+import { FormState } from '../../../../state/app.state';
 import {
   selectEarliestTransactionDate,
   selectReportAccounts,
   selectReportCategories,
-} from '../../../data-access/report.selectors';
-import { formActions } from './dashboard-form.actions';
-import { FormState } from './dashboard-form.interface';
+} from '../../../../state/selectors/report.selectors';
 
 @Component({
   selector: 'app-reports-dashboard-form',

src/app/reports/feature/budget-cards/budget-cards.actions.ts → src/app/state/actions/budget-cards.actions.ts

@@ -1,6 +1,6 @@
 import { createActionGroup, emptyProps, props } from '@ngrx/store';
 
-import { BudgetSummary } from '../../../shared/services/ynab/interfaces/budgets/summary/budgetSummary';
+import { BudgetSummary } from '../../shared/services/ynab/interfaces/budgets/summary/budgetSummary';
 
 export const budgetActions = createActionGroup({
   source: 'Budget Page',

src/app/reports/feature/dashboard/reports-form/dashboard-form.actions.ts → src/app/state/actions/dashboard-form.actions.ts

@@ -1,6 +1,6 @@
 import { createActionGroup, props } from '@ngrx/store';
 
-import { FormState } from './dashboard-form.interface';
+import { FormState } from '../app.state';
 
 export const formActions = createActionGroup({
   source: 'Form Page',

src/app/state/app.state.ts

@@ -0,0 +1,28 @@
+import { Account } from '../shared/services/ynab/interfaces/accounts/account';
+import { BudgetSummary } from '../shared/services/ynab/interfaces/budgets/summary/budgetSummary';
+import { CategoryGroup } from '../shared/services/ynab/interfaces/categories/categoryGroup';
+import { Transaction } from '../shared/services/ynab/interfaces/transactions/transaction';
+
+export interface BudgetState {
+  budgets: BudgetSummary[];
+}
+
+export interface FormState {
+  start: string | null;
+  end: string | null;
+  sort?: 'asc' | 'desc' | null;
+  account: string[] | null;
+  category: string[] | null;
+  chartType: string | null;
+}
+
+export interface ReportState {
+  categoryGroups: CategoryGroup[];
+  accounts: Account[];
+  transactions: Transaction[];
+}
+
+export interface AppState {
+  form: FormState;
+  report: ReportState;
+}

src/app/reports/feature/budget-cards/budget-cards.effects.spec.ts → src/app/state/effects/budget-cards.effects.spec.ts

@@ -7,9 +7,9 @@ import { provideMockStore } from '@ngrx/store/testing';
 
 import { Observable, of } from 'rxjs';
 
-import { YnabService } from '../../../shared/services/ynab/ynab.service';
-import { mockBudgets } from '../../../shared/utils/mocks';
-import { budgetActions } from './budget-cards.actions';
+import { YnabService } from '../../shared/services/ynab/ynab.service';
+import { mockBudgets } from '../../shared/utils/mocks';
+import { budgetActions } from '../actions/budget-cards.actions';
 import { BudgetEffects } from './budget-cards.effects';
 
 describe('BudgetEffects', () => {

src/app/reports/feature/budget-cards/budget-cards.effects.ts → src/app/state/effects/budget-cards.effects.ts

@@ -5,8 +5,8 @@ import { Store } from '@ngrx/store';
 
 import { of, switchMap } from 'rxjs';
 
-import { YnabService } from '../../../shared/services/ynab/ynab.service';
-import { budgetActions } from './budget-cards.actions';
+import { YnabService } from '../../shared/services/ynab/ynab.service';
+import { budgetActions } from '../actions/budget-cards.actions';
 
 export class BudgetEffects {
   actions$ = inject(Actions);

src/app/reports/data-access/report.effects.spec.ts → src/app/state/effects/report.effects.spec.ts

@@ -14,7 +14,7 @@ import {
   mockId,
   mockTransactions,
 } from '../../shared/utils/mocks';
-import { reportActions } from './report.actions';
+import { reportActions } from '../actions/report.actions';
 import { ReportEffects } from './report.effects';
 
 describe('ReportEffects', () => {

src/app/reports/data-access/report.effects.ts → src/app/state/effects/report.effects.ts

@@ -8,7 +8,7 @@ import { forkJoin, mergeMap, of, switchMap } from 'rxjs';
 
 import { selectRouteNestedParam } from '../../router.selectors';
 import { YnabService } from '../../shared/services/ynab/ynab.service';
-import { reportActions } from './report.actions';
+import { reportActions } from '../actions/report.actions';
 
 export class ReportEffects {
   actions$ = inject(Actions);

src/app/reports/feature/budget-cards/budget-cards.reducers.spec.ts → src/app/state/reducers/budget-cards.reducers.spec.ts

@@ -1,4 +1,4 @@
-import { budgetActions } from './budget-cards.actions';
+import { budgetActions } from '../actions/budget-cards.actions';
 import * as fromReducer from './budget-cards.reducers';
 
 describe('Budget Cards Reducers', () => {

src/app/reports/feature/budget-cards/budget-cards.reducers.ts → src/app/state/reducers/budget-cards.reducers.ts

@@ -1,11 +1,7 @@
 import { createReducer, on } from '@ngrx/store';
 
-import { BudgetSummary } from '../../../shared/services/ynab/interfaces/budgets/summary/budgetSummary';
-import { budgetActions } from './budget-cards.actions';
-
-export interface BudgetState {
-  budgets: BudgetSummary[];
-}
+import { budgetActions } from '../actions/budget-cards.actions';
+import { BudgetState } from '../app.state';
 
 export const initialState: BudgetState = {
   budgets: [],

src/app/reports/feature/dashboard/reports-form/dashboard-form.reducers.ts → src/app/state/reducers/dashboard-form.reducers.ts

@@ -1,7 +1,7 @@
 import { createReducer, on } from '@ngrx/store';
 
-import { formActions } from './dashboard-form.actions';
-import { FormState } from './dashboard-form.interface';
+import { formActions } from '../actions/dashboard-form.actions';
+import { FormState } from '../app.state';
 
 const initialState: FormState = {
   start: null,

src/app/reports/data-access/report.reducers.spec.ts → src/app/state/reducers/report.reducers.spec.ts

@@ -1,5 +1,5 @@
 import { mockAccounts, mockCategoryGroups, mockTransactions } from '../../shared/utils/mocks';
-import { reportActions } from './report.actions';
+import { reportActions } from '../actions/report.actions';
 import * as fromReducer from './report.reducers';
 
 describe('Report Reducer', () => {

src/app/reports/data-access/report.reducers.ts → src/app/state/reducers/report.reducers.ts

@@ -1,15 +1,7 @@
 import { createReducer, on } from '@ngrx/store';
 
-import { Account } from '../../shared/services/ynab/interfaces/accounts/account';
-import { CategoryGroup } from '../../shared/services/ynab/interfaces/categories/categoryGroup';
-import { Transaction } from '../../shared/services/ynab/interfaces/transactions/transaction';
-import { reportActions } from './report.actions';
-
-interface ReportState {
-  categoryGroups: CategoryGroup[];
-  accounts: Account[];
-  transactions: Transaction[];
-}
+import { reportActions } from '../actions/report.actions';
+import { ReportState } from '../app.state';
 
 export const initialState: ReportState = {
   categoryGroups: [],

src/app/reports/feature/budget-cards/budget-cards.selectors.spec.ts → src/app/state/selectors/budget-cards.selectors.spec.ts

@@ -1,4 +1,4 @@
-import { BudgetState } from './budget-cards.reducers';
+import { BudgetState } from '../app.state';
 import { selectBudgets } from './budget-cards.selectors';
 
 describe('Budget Cards Selectors', () => {

src/app/reports/feature/budget-cards/budget-cards.selectors.ts → src/app/state/selectors/budget-cards.selectors.ts

@@ -1,6 +1,6 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store';
 
-import { BudgetState } from './budget-cards.reducers';
+import { BudgetState } from '../app.state';
 
 export const selectBudgetState = createFeatureSelector<BudgetState>('budget');
 

src/app/reports/data-access/report.selectors.spec.ts → src/app/state/selectors/report.selectors.spec.ts

@@ -1,7 +1,8 @@
 import { mockAccounts, mockCategoryGroups, mockTransactions } from '../../shared/utils/mocks';
+import { AppState } from '../app.state';
 import * as fromSelectors from './report.selectors';
 
-const initialState: fromSelectors.AppState = {
+const initialState: AppState = {
   report: {
     categoryGroups: [],
     accounts: [],

src/app/reports/data-access/report.selectors.ts → src/app/state/selectors/report.selectors.ts

@@ -1,20 +1,6 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store';
 
-import { Account } from '../../shared/services/ynab/interfaces/accounts/account';
-import { CategoryGroup } from '../../shared/services/ynab/interfaces/categories/categoryGroup';
-import { Transaction } from '../../shared/services/ynab/interfaces/transactions/transaction';
-import { FormState } from '../feature/dashboard/reports-form/dashboard-form.interface';
-
-export interface ReportState {
-  categoryGroups: CategoryGroup[];
-  accounts: Account[];
-  transactions: Transaction[];
-}
-
-export interface AppState {
-  form: FormState;
-  report: ReportState;
-}
+import { FormState, ReportState } from '../app.state';
 
 export const selectFormState = createFeatureSelector<FormState>('form');