refactor: move interfaces & types to a separate file

Bonamente · Dec 20, 2021 · b600fc8 · b600fc8
1 parent b0de1f9
commit b600fc8
Show file tree

Hide file tree

Showing 25 changed files with 678 additions and 682 deletions.
diff --git a/christmas-task-part1/src/app/app.ts b/christmas-task-part1/src/app/app.ts
@@ -1,44 +1,11 @@
-import { IToy, Data, data } from './data';
-import renderPage from './renders/page-render';
+import toysData from './toysData.json';
+
+import { IState } from './types';
 
+import renderPage from './renders/page-render';
 import createCountSLider from './sliders/count-slider';
 import createYearSlider from './sliders/year-slider';
 
-interface IValueFilters {
-  [key: string]: Record<string, boolean>;
-}
-
-export interface IState {
-  activePage: string;
-
-  searchInput: string;
-  uiState: {
-    searchedToys: Set<IToy[]>;
-  };
-
-  valueFilter: IValueFilters;
-
-  rangeFilters: {
-    countFilter: {
-      initMin: number;
-      initMax: number;
-      min: number;
-      max: number;
-    };
-    yearFilter: {
-      initMin: number;
-      initMax: number;
-      min: number;
-      max: number;
-    };
-  };
-
-  sortingType: string;
-  toys: Data;
-  filteredAndSortedToys: Set<IToy[]>;
-  favoritesIds: Set<number>;
-}
-
 export const favoritesMaxCount = 20;
 
 export const app = () => {
@@ -92,7 +59,7 @@ export const app = () => {
     },
 
     sortingType: 'name-ascending',
-    toys: [...data],
+    toys: toysData,
     filteredAndSortedToys: new Set(),
     favoritesIds: new Set(),
   };

diff --git a/christmas-task-part1/src/app/builders/cards/card.ts b/christmas-task-part1/src/app/builders/cards/card.ts
@@ -1,5 +1,5 @@
-import { IToy } from '../../data';
-import { IState, favoritesMaxCount } from '../../app';
+import { IToy, IState } from '../../types';
+import { favoritesMaxCount } from '../../app';
 import setLocalStorage from '../../utils/set-local-storage';
 
 const buildCard = (state: IState, toy: IToy): Node => {

diff --git a/christmas-task-part1/src/app/builders/cards/cards.ts b/christmas-task-part1/src/app/builders/cards/cards.ts
@@ -1,4 +1,5 @@
-import { IState } from '../../app';
+import { IState } from '../../types';
+
 import buildCard from './card';
 import getFilteredItems from '../../utils/filter';
 import getSortedItems from '../../utils/sorter';

diff --git a/christmas-task-part1/src/app/builders/controls/range-filters.ts b/christmas-task-part1/src/app/builders/controls/range-filters.ts
@@ -1,4 +1,4 @@
-import { IState } from '../../app';
+import { IState } from '../../types';
 
 const buildRangeFilters = (state: IState): Node => {
   const rangeSection = document.createElement('section');

diff --git a/christmas-task-part1/src/app/builders/controls/sort-section.ts b/christmas-task-part1/src/app/builders/controls/sort-section.ts
@@ -1,4 +1,4 @@
-import { IState } from '../../app';
+import { IState } from '../../types';
 
 import createCountSLider from '../../sliders/count-slider';
 import createYearSlider from '../../sliders/year-slider';

diff --git a/christmas-task-part1/src/app/builders/controls/value-filters/form.ts b/christmas-task-part1/src/app/builders/controls/value-filters/form.ts
@@ -1,4 +1,4 @@
-import { IState } from '../../../app';
+import { IState } from '../../../types';
 
 const buildHtmlForFormElement = (state: IState): string => {
   const { valueFilter } = state;

diff --git a/christmas-task-part1/src/app/builders/controls/value-filters/value-filters.ts b/christmas-task-part1/src/app/builders/controls/value-filters/value-filters.ts
@@ -1,4 +1,4 @@
-import { IState } from '../../../app';
+import { IState } from '../../../types';
 import setLocalStorage from '../../../utils/set-local-storage';
 import buildHtmlForFormElement from './form';
 import renderCards from '../../../renders/render-cards';

diff --git a/christmas-task-part1/src/app/builders/header.ts b/christmas-task-part1/src/app/builders/header.ts
@@ -1,4 +1,4 @@
-import { IState } from '../app';
+import { IState } from '../types';
 import getSearchedItems from '../utils/search-filter';
 import renderSearchedCards from '../renders/render-searched-cards';
 

diff --git a/christmas-task-part1/src/app/builders/page-content.ts b/christmas-task-part1/src/app/builders/page-content.ts
@@ -1,4 +1,4 @@
-import { IState } from '../app';
+import { IState } from '../types';
 import buildToysPageContent from '../pages/toys-page/toys-page';
 
 const buildPageContent = (state: IState): Node => {