Move models to modules

Yadro · Yadro · commit 3a20427736f2 · 2021-07-07T14:00:09.000+03:00
diff --git a/src/components/PlayStopButton/PlayStopButton.tsx b/src/components/PlayStopButton/PlayStopButton.tsx
@@ -6,7 +6,7 @@ import { createUseStyles } from 'react-jss';
 
 import CircleButton from '../CircleButton/CircleButton';
 import rootStore from '../../modules/RootStore';
-import TaskModel from '../../models/TaskModel';
+import TaskModel from '../../modules/tasks/models/TaskModel';
 
 const { tasksStore } = rootStore;
 
diff --git a/src/components/TimeRangeModal/TimeRangeModal.tsx b/src/components/TimeRangeModal/TimeRangeModal.tsx
@@ -7,8 +7,8 @@ import { observer } from 'mobx-react';
 import isBefore from 'date-fns/isBefore';
 
 import rootStore from '../../modules/RootStore';
-import TaskTimeItemModel from '../../models/TaskTimeItemModel';
-import { ITimeRangeModel } from '../../models/TaskModel';
+import TaskTimeItemModel from '../../modules/tasks/models/TaskTimeItemModel';
+import { ITimeRangeModel } from '../../modules/tasks/models/TaskModel';
 import { Undefined } from '../../types/CommonTypes';
 import TimeRangeDuration from './components/TimeRangeDuration';
 
diff --git a/src/components/TimeRangeModal/components/TimeRangeDuration.tsx b/src/components/TimeRangeModal/components/TimeRangeDuration.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import * as TaskHooks from '../../../hooks/TaskHooks';
-import { ITimeRangeModel } from '../../../models/TaskModel';
+import { ITimeRangeModel } from '../../../modules/tasks/models/TaskModel';
 
 interface TimeRangeDurationProps {
   timeRange?: ITimeRangeModel;
diff --git a/src/helpers/DateTime.ts b/src/helpers/DateTime.ts
@@ -1,4 +1,4 @@
-import { ITimeRangeModel } from '../models/TaskModel';
+import { ITimeRangeModel } from '../modules/tasks/models/TaskModel';
 import { format } from 'date-fns';
 import { iterPrevCurrent } from './ArrayHelper';
 
diff --git a/src/helpers/TaskHelper.ts b/src/helpers/TaskHelper.ts
@@ -1,9 +1,8 @@
-import isSameDay from 'date-fns/isSameDay';
+import { isSameDay, compareAsc } from 'date-fns';
 
-import TaskModel from '../models/TaskModel';
-import TaskTimeItemModel from '../models/TaskTimeItemModel';
-import compareAsc from 'date-fns/compareAsc';
-import TaskWithDurationModel from '../models/TaskWithDurationModel';
+import TaskModel from '../modules/tasks/models/TaskModel';
+import TaskTimeItemModel from '../modules/tasks/models/TaskTimeItemModel';
+import TaskWithDurationModel from '../modules/tasks/models/TaskWithDurationModel';
 
 /**
  * Returns TaskTimeItemModel contains time range
@@ -19,7 +18,7 @@ import TaskWithDurationModel from '../models/TaskWithDurationModel';
  */
 export function getTimeItems(
   tasks: TaskModel[],
-  date: Date
+  date: Date,
 ): TaskTimeItemModel[] {
   let taskTime: TaskTimeItemModel[] = [];
   tasks.forEach((task) => {
@@ -46,9 +45,9 @@ export function getTimeItems(
  */
 export function getTasksWithTotalTimeForDay(
   tasks: TaskModel[],
-  date: Date
+  date: Date,
 ): TaskWithDurationModel[] {
   return tasks.map(
-    (task) => new TaskWithDurationModel(task, task.getDurationByDate(date))
+    (task) => new TaskWithDurationModel(task, task.getDurationByDate(date)),
   );
 }
diff --git a/src/hooks/TaskHooks.ts b/src/hooks/TaskHooks.ts
@@ -2,8 +2,8 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { isBefore } from 'date-fns';
 
 import { calcDuration, calcDurationGaps, msToTime } from '../helpers/DateTime';
-import TaskModel, { ITimeRangeModel } from '../models/TaskModel';
-import TaskTimeItemModel from '../models/TaskTimeItemModel';
+import TaskModel, { ITimeRangeModel } from '../modules/tasks/models/TaskModel';
+import TaskTimeItemModel from '../modules/tasks/models/TaskTimeItemModel';
 
 export function useTaskDuration(model: TaskModel | undefined) {
   const intervalRef = useRef<NodeJS.Timeout>();
@@ -39,12 +39,12 @@ export function useTimeItemsDuration(taskTime: TaskTimeItemModel[]) {
 
   const calcTaskDuration = useCallback(
     () => calcDuration(taskTime.map((t) => t.time)),
-    [taskTime]
+    [taskTime],
   );
 
   const calcTaskGapsDuration = useCallback(
     () => calcDurationGaps(taskTime.map((t) => t.time)),
-    [taskTime]
+    [taskTime],
   );
 
   const setTimes = useCallback(() => {
@@ -78,7 +78,7 @@ export function useTimeRangeDuration(timeRange: ITimeRangeModel | undefined) {
 
   const calcTimeRangeDuration = useCallback(
     () => msToTime(timeRange ? calcDuration([timeRange]) : 0),
-    [timeRange]
+    [timeRange],
   );
 
   useEffect(() => {
@@ -104,7 +104,7 @@ export function useTimeRangeDuration(timeRange: ITimeRangeModel | undefined) {
 }
 
 export function useStartWorkingTime(
-  timeItems: TaskTimeItemModel[]
+  timeItems: TaskTimeItemModel[],
 ): Date | undefined {
   return useMemo(() => {
     let minTime: Date | undefined;
diff --git a/src/modules/RootStore.ts b/src/modules/RootStore.ts
@@ -1,6 +1,6 @@
 import TaskStore from './tasks/TaskStore';
 import ProjectStore from './projects/ProjectStore';
-import ProjectModel from '../models/ProjectModel';
+import ProjectModel from './projects/ProjectModel';
 
 class RootStore {
   tasksStore = new TaskStore();
diff --git a/src/modules/projects/ProjectModel.ts b/src/modules/projects/ProjectModel.ts
@@ -1,5 +1,5 @@
-import AbstractModel from '../base/AbstractModel';
-import { ITreeItem } from '../types/ITreeItem';
+import AbstractModel from '../../base/AbstractModel';
+import { ITreeItem } from '../../types/ITreeItem';
 
 interface IJsonProjectItem extends ITreeItem<IJsonProjectItem> {
   color: string;
diff --git a/src/modules/projects/ProjectService.ts b/src/modules/projects/ProjectService.ts
@@ -1,5 +1,5 @@
 import IService from '../../base/IService';
-import ProjectModel from '../../models/ProjectModel';
+import ProjectModel from './ProjectModel';
 import ProjectFactory from './ProjectFactory';
 import ProjectRepository from './ProjectRepository';
 
diff --git a/src/modules/projects/ProjectStore.ts b/src/modules/projects/ProjectStore.ts
@@ -1,6 +1,6 @@
 import { makeAutoObservable } from 'mobx';
 
-import ProjectModel from '../../models/ProjectModel';
+import ProjectModel from './ProjectModel';
 import ProjectService from './ProjectService';
 import TreeModelStoreHelper from '../../base/TreeModelStoreHelper';
 import { Undefined } from '../../types/CommonTypes';
diff --git a/src/modules/tasks/TaskFactory.ts b/src/modules/tasks/TaskFactory.ts
@@ -1,6 +1,6 @@
 import AbstractFactory from '../../base/AbstractFactory';
-import TasksByProject from '../../models/TasksByProject';
-import TaskModel from '../../models/TaskModel';
+import TasksByProject from './models/TasksByProject';
+import TaskModel from './models/TaskModel';
 
 export default class TaskFactory extends AbstractFactory {
   createTasks(data: TasksByProject): TasksByProject {
diff --git a/src/modules/tasks/TaskStore.ts b/src/modules/tasks/TaskStore.ts
@@ -1,8 +1,8 @@
 import { makeAutoObservable } from 'mobx';
 
 import TaskService from './TaskService';
-import TaskModel, { ITimeRangeModel } from '../../models/TaskModel';
-import TasksByProject from '../../models/TasksByProject';
+import TaskModel, { ITimeRangeModel } from './models/TaskModel';
+import TasksByProject from '../../modules/tasks/models/TasksByProject';
 import TreeModelStoreHelper from '../../base/TreeModelStoreHelper';
 import BadgeService from '../BadgeService';
 
@@ -88,7 +88,7 @@ export default class TaskStore {
       if (this.tasks.hasOwnProperty(projectKey)) {
         this.tasks[projectKey] = TreeModelStoreHelper.deleteItems(
           this.tasks[projectKey],
-          condition
+          condition,
         );
       }
     }
@@ -131,7 +131,7 @@ export default class TaskStore {
     if (Array.isArray(this.tasks[projectId])) {
       return TreeModelStoreHelper.getFlatItemsRecursive(
         this.tasks[projectId],
-        condition
+        condition,
       ).map((task) => task.key);
     }
     return [];
diff --git a/src/modules/tasks/models/TaskModel.ts b/src/modules/tasks/models/TaskModel.ts
@@ -1,8 +1,8 @@
 import { action, computed, makeObservable, observable } from 'mobx';
 import isSameDay from 'date-fns/isSameDay';
 
-import AbstractModel from '../base/AbstractModel';
-import { ITreeItem } from '../types/ITreeItem';
+import AbstractModel from '../../../base/AbstractModel';
+import { ITreeItem } from '../../../types/ITreeItem';
 import { startOfDay } from 'date-fns';
 
 export interface IJsonTimeRangeModel {
diff --git a/src/modules/tasks/models/TaskTimeItemModel.ts b/src/modules/tasks/models/TaskTimeItemModel.ts
@@ -4,6 +4,6 @@ export default class TaskTimeItemModel {
   constructor(
     public task: TaskModel,
     public time: ITimeRangeModel,
-    public index: number
+    public index: number,
   ) {}
 }
diff --git a/src/modules/tasks/models/TaskWithDurationModel.ts b/src/modules/tasks/models/TaskWithDurationModel.ts
diff --git a/src/modules/tasks/models/TasksByProject.ts b/src/modules/tasks/models/TasksByProject.ts
diff --git a/src/screens/hours/HoursScreen.tsx b/src/screens/hours/HoursScreen.tsx
@@ -7,12 +7,12 @@ import HoursCard from './components/HoursCard/HoursCard';
 import { getTimeItems } from '../../helpers/TaskHelper';
 import SelectDate from '../../components/SelectDate/SelectDate';
 import TimeRangeModal from '../../components/TimeRangeModal/TimeRangeModal';
-import TaskTimeItemModel from '../../models/TaskTimeItemModel';
+import TaskTimeItemModel from '../../modules/tasks/models/TaskTimeItemModel';
 import { Undefined } from '../../types/CommonTypes';
 import TotalHours from './components/TotalHours/TotalHours';
 import { createUseStyles } from 'react-jss';
 import { mapCurrentNext } from '../../helpers/ArrayHelper';
-import { ITimeRangeModel } from '../../models/TaskModel';
+import { ITimeRangeModel } from '../../modules/tasks/models/TaskModel';
 import { msToTime } from '../../helpers/DateTime';
 
 const { tasksStore } = rootStore;
diff --git a/src/screens/projects/ProjectsScreen.tsx b/src/screens/projects/ProjectsScreen.tsx
@@ -8,8 +8,8 @@ import { PlusOutlined } from '@ant-design/icons';
 import TaskInput from './components/TaskInput';
 import rootStore from '../../modules/RootStore';
 import TreeList from './components/TreeList';
-import TaskModel from '../../models/TaskModel';
-import ProjectModel from '../../models/ProjectModel';
+import TaskModel from '../../modules/tasks/models/TaskModel';
+import ProjectModel from '../../modules/projects/ProjectModel';
 import ProjectModal from './components/ProjectModals/ProjectModal';
 import TaskNode from './components/TaskNode/TaskNode';
 import DrawerTask from './components/DrawerTask/DrawerTask';
diff --git a/src/screens/projects/components/DrawerTask/DrawerTask.tsx b/src/screens/projects/components/DrawerTask/DrawerTask.tsx
@@ -4,14 +4,14 @@ import { observer } from 'mobx-react';
 import { ProjectOutlined } from '@ant-design/icons';
 import { createUseStyles } from 'react-jss';
 
-import TaskModel from '../../../../models/TaskModel';
+import TaskModel from '../../../../modules/tasks/models/TaskModel';
 import rootStore from '../../../../modules/RootStore';
 import HoursByTask from '../HoursByTask/HoursByTask';
 import IconTile from '../../../../components/IconTile/IconTile';
 import Duration from './components/Duration';
 import TimeRangeModal from '../../../../components/TimeRangeModal/TimeRangeModal';
 import { Undefined } from '../../../../types/CommonTypes';
-import TaskTimeItemModel from '../../../../models/TaskTimeItemModel';
+import TaskTimeItemModel from '../../../../modules/tasks/models/TaskTimeItemModel';
 
 const { projectStore } = rootStore;
 
diff --git a/src/screens/projects/components/DrawerTask/components/Duration.tsx b/src/screens/projects/components/DrawerTask/components/Duration.tsx
@@ -5,7 +5,7 @@ import { createUseStyles } from 'react-jss';
 
 import IconTile from '../../../../../components/IconTile/IconTile';
 import PlayStopButton from '../../../../../components/PlayStopButton/PlayStopButton';
-import TaskModel from '../../../../../models/TaskModel';
+import TaskModel from '../../../../../modules/tasks/models/TaskModel';
 import * as TaskHooks from '../../../../../hooks/TaskHooks';
 
 interface DurationProps {
diff --git a/src/screens/projects/components/HoursByTask/HoursByTask.tsx b/src/screens/projects/components/HoursByTask/HoursByTask.tsx
@@ -6,12 +6,12 @@ import format from 'date-fns/format';
 import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 
-import TaskModel, { ITimeRangeModel } from '../../../../models/TaskModel';
+import TaskModel, { ITimeRangeModel } from '../../../../modules/tasks/models/TaskModel';
+import TaskTimeItemModel from '../../../../modules/tasks/models/TaskTimeItemModel';
 import { mapPrevCurrent } from '../../../../helpers/ArrayHelper';
 import HoursItem from './components/HoursItem';
 import IconTile from '../../../../components/IconTile/IconTile';
 import { calcDuration, msToTime } from '../../../../helpers/DateTime';
-import TaskTimeItemModel from '../../../../models/TaskTimeItemModel';
 
 function dateFormat(date: Date) {
   return format(date, 'dd.MM.yyyy');
diff --git a/src/screens/projects/components/HoursByTask/components/HoursItem.tsx b/src/screens/projects/components/HoursByTask/components/HoursItem.tsx
@@ -5,7 +5,7 @@ import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 
 import { msToTime } from '../../../../../helpers/DateTime';
-import { ITimeRangeModel } from '../../../../../models/TaskModel';
+import { ITimeRangeModel } from '../../../../../modules/tasks/models/TaskModel';
 
 function hoursFormat(date: Date) {
   return format(date, 'HH:mm');
diff --git a/src/screens/projects/components/ProjectModals/EditProjectModal.tsx b/src/screens/projects/components/ProjectModals/EditProjectModal.tsx
@@ -3,7 +3,7 @@ import { Button, Input, Modal, Space } from 'antd';
 import { DeleteFilled } from '@ant-design/icons';
 import { observer } from 'mobx-react';
 
-import ProjectModel from '../../../../models/ProjectModel';
+import ProjectModel from '../../../../modules/projects/ProjectModel';
 import rootStore from '../../../../modules/RootStore';
 import ChooseColor from './components/ChooseColor';
 
@@ -24,7 +24,7 @@ const EditProjectModal = observer(({ project }: EditProjectModalProps) => {
       setTitle(editProject.title);
       setColor(editProject.color);
     }
-  }, [projectStore.editProject]);
+  }, []);
 
   useEffect(() => {
     setTitle(project?.title || '');
diff --git a/src/screens/projects/components/ProjectModals/ProjectModal.tsx b/src/screens/projects/components/ProjectModals/ProjectModal.tsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react';
 import { Input, Modal, Space } from 'antd';
 
 import rootStore from '../../../../modules/RootStore';
-import ProjectModel from '../../../../models/ProjectModel';
+import ProjectModel from '../../../../modules/projects/ProjectModel';
 import ChooseColor from './components/ChooseColor';
 
 const { projectStore } = rootStore;
diff --git a/src/screens/projects/components/ProjectNode/ProjectNode.tsx b/src/screens/projects/components/ProjectNode/ProjectNode.tsx
@@ -4,7 +4,7 @@ import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 import clsx from 'clsx';
 
-import ProjectModel from '../../../../models/ProjectModel';
+import ProjectModel from '../../../../modules/projects/ProjectModel';
 import rootStore from '../../../../modules/RootStore';
 
 const { projectStore } = rootStore;
diff --git a/src/screens/projects/components/TaskInput.tsx b/src/screens/projects/components/TaskInput.tsx
@@ -3,7 +3,7 @@ import { Input } from 'antd';
 import { observer } from 'mobx-react';
 
 import rootStore from '../../../modules/RootStore';
-import TaskModel from '../../../models/TaskModel';
+import TaskModel from '../../../modules/tasks/models/TaskModel';
 
 export default observer(function TaskInput() {
   const [text, setText] = useState('');
diff --git a/src/screens/projects/components/TaskNode/TaskNode.tsx b/src/screens/projects/components/TaskNode/TaskNode.tsx
@@ -7,7 +7,7 @@ import {
 import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 
-import TaskModel from '../../../../models/TaskModel';
+import TaskModel from '../../../../modules/tasks/models/TaskModel';
 import rootStore from '../../../../modules/RootStore';
 import * as TaskHooks from '../../../../hooks/TaskHooks';
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ITimeRangeModel } from '../models/TaskModel';`
	`1`	`+import { ITimeRangeModel } from '../modules/tasks/models/TaskModel';`
`2`	`2`	`import { format } from 'date-fns';`
`3`	`3`	`import { iterPrevCurrent } from './ArrayHelper';`
`4`	`4`