Move files

Yadro · Yadro · commit 1e5a8bb3a60b · 2021-11-27T23:56:46.000+03:00
diff --git a/src/components/CircleButton.tsx b/src/components/CircleButton.tsx
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
@@ -5,10 +5,10 @@ import { observer } from 'mobx-react';
 import useMediaQuery from 'react-hook-media-query';
 import { createUseStyles } from 'react-jss';
 
-import HeaderLink from '../HeaderLink/HeaderLink';
-import Profile from '../Profile/Profile';
-import TaskControl from '../TaskControl/TaskControl';
-import ProgressBar from '../ProgressBar/ProgressBar';
+import HeaderLink from './HeaderLink';
+import Profile from './Profile';
+import TaskControl from './TaskControl';
+import ProgressBar from './ProgressBar';
 
 const { Header: HeaderBase } = Layout;
 
diff --git a/src/components/HeaderLink.tsx b/src/components/HeaderLink.tsx
diff --git a/src/components/IconTile.tsx b/src/components/IconTile.tsx
diff --git a/src/components/PlayStopButton.tsx b/src/components/PlayStopButton.tsx
@@ -3,9 +3,9 @@ import { CaretRightFilled, PauseOutlined } from '@ant-design/icons';
 import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 
-import CircleButton from '../CircleButton/CircleButton';
-import rootStore from '../../modules/RootStore';
-import TaskModel from '../../modules/tasks/models/TaskModel';
+import CircleButton from './CircleButton';
+import rootStore from '../modules/RootStore';
+import TaskModel from '../modules/tasks/models/TaskModel';
 
 const { tasksStore } = rootStore;
 
diff --git a/src/components/Profile.tsx b/src/components/Profile.tsx
@@ -3,9 +3,9 @@ import { Space } from 'antd';
 import { SettingOutlined } from '@ant-design/icons';
 import { createUseStyles } from 'react-jss';
 
-import rootStore from '../../modules/RootStore';
-import useModal from '../../hooks/ModalHook';
-import SettingsModal from '../SettingsModal/SettingsModal';
+import rootStore from '../modules/RootStore';
+import useModal from '../hooks/ModalHook';
+import SettingsModal from './SettingsModal/SettingsModal';
 
 const { settingsStore } = rootStore;
 
diff --git a/src/components/ProgressBar.tsx b/src/components/ProgressBar.tsx
@@ -4,11 +4,11 @@ import { Slider } from 'antd';
 import { isSameDay } from 'date-fns';
 import { createUseStyles } from 'react-jss';
 
-import rootStore from '../../modules/RootStore';
-import { useInterval } from '../../hooks/UseInterval';
-import { getStartWorkingTime, getTimeItems } from '../../helpers/TaskHelper';
-import TaskTimeService from '../../services/TaskTimeService';
-import { toTimeFormat } from '../../helpers/DateTime';
+import rootStore from '../modules/RootStore';
+import { useInterval } from '../hooks/UseInterval';
+import { getStartWorkingTime, getTimeItems } from '../helpers/TaskHelper';
+import TaskTimeService from '../services/TaskTimeService';
+import { toTimeFormat } from '../helpers/DateTime';
 
 const { tasksStore, settingsStore } = rootStore;
 
diff --git a/src/components/SelectDate.tsx b/src/components/SelectDate.tsx
diff --git a/src/components/TaskControl.tsx b/src/components/TaskControl.tsx
@@ -2,10 +2,10 @@ import React, { useMemo } from 'react';
 import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 
-import rootStore from '../../modules/RootStore';
-import * as TaskHooks from '../../hooks/TaskHooks';
-import PlayStopButton from '../PlayStopButton/PlayStopButton';
-import { PURPLE_COLOR } from '../../consts';
+import rootStore from '../modules/RootStore';
+import * as TaskHooks from '../hooks/TaskHooks';
+import PlayStopButton from './PlayStopButton';
+import { PURPLE_COLOR } from '../consts';
 
 const { tasksStore, projectStore } = rootStore;
 
diff --git a/src/components/TimeRangeModal/TimeRangeDuration.tsx b/src/components/TimeRangeModal/TimeRangeDuration.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import * as TaskHooks from '../../../hooks/TaskHooks';
-import { ITimeRangeModel } from '../../../modules/tasks/models/TaskModel';
+import * as TaskHooks from '../../hooks/TaskHooks';
+import { ITimeRangeModel } from '../../modules/tasks/models/TaskModel';
 
 interface TimeRangeDurationProps {
   timeRange?: ITimeRangeModel;
diff --git a/src/components/TimeRangeModal/TimeRangeModal.tsx b/src/components/TimeRangeModal/TimeRangeModal.tsx
@@ -10,7 +10,7 @@ import rootStore from '../../modules/RootStore';
 import TaskTimeItemModel from '../../modules/tasks/models/TaskTimeItemModel';
 import { ITimeRangeModel } from '../../modules/tasks/models/TaskModel';
 import { Undefined } from '../../types/CommonTypes';
-import TimeRangeDuration from './components/TimeRangeDuration';
+import TimeRangeDuration from './TimeRangeDuration';
 import IModalProps from '../../types/IModalProps';
 
 const { tasksStore } = rootStore;
diff --git a/src/screens/Main.tsx b/src/screens/Main.tsx
@@ -6,7 +6,7 @@ import ProjectsScreen from './projects/ProjectsScreen';
 import HoursScreen from './hours/HoursScreen';
 import Dashboard from './dashboard/Dashboard';
 import GaService from '../services/gaService/GaService';
-import Header from '../components/Header/Header';
+import Header from '../components/Header';
 
 const Main = () => {
   const location = useLocation();
diff --git a/src/screens/dashboard/Dashboard.tsx b/src/screens/dashboard/Dashboard.tsx
@@ -3,7 +3,7 @@ import { createUseStyles } from 'react-jss';
 import { Layout, Space } from 'antd';
 import { observer } from 'mobx-react';
 
-import SelectDate from '../../components/SelectDate/SelectDate';
+import SelectDate from '../../components/SelectDate';
 import rootStore from '../../modules/RootStore';
 import { getTasksWithTotalTimeForDay } from '../../helpers/TaskHelper';
 import HoursWithDuration from './components/HoursWithDuration';
diff --git a/src/screens/hours/HoursScreen.tsx b/src/screens/hours/HoursScreen.tsx
@@ -5,7 +5,7 @@ import { observer } from 'mobx-react';
 import rootStore from '../../modules/RootStore';
 import HoursCard from './components/HoursCard/HoursCard';
 import { getTimeItems } from '../../helpers/TaskHelper';
-import SelectDate from '../../components/SelectDate/SelectDate';
+import SelectDate from '../../components/SelectDate';
 import TimeRangeModal from '../../components/TimeRangeModal/TimeRangeModal';
 import TaskTimeItemModel from '../../modules/tasks/models/TaskTimeItemModel';
 import { Undefined } from '../../types/CommonTypes';
diff --git a/src/screens/hours/components/HoursCard/HoursCard.tsx b/src/screens/hours/components/HoursCard/HoursCard.tsx
@@ -4,7 +4,7 @@ import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 
 import TaskTimeItemModel from '../../../../modules/tasks/models/TaskTimeItemModel';
-import PlayStopButton from '../../../../components/PlayStopButton/PlayStopButton';
+import PlayStopButton from '../../../../components/PlayStopButton';
 import rootStore from '../../../../modules/RootStore';
 import { msToTime, toTimeFormat } from '../../../../helpers/DateTime';
 import { getTaskTitlesPath } from '../../../../helpers/TaskHelper';
diff --git a/src/screens/projects/components/DrawerTask/DrawerTask.tsx b/src/screens/projects/components/DrawerTask/DrawerTask.tsx
@@ -7,7 +7,7 @@ import { createUseStyles } from 'react-jss';
 import TaskModel from '../../../../modules/tasks/models/TaskModel';
 import rootStore from '../../../../modules/RootStore';
 import HoursByTask from '../HoursByTask/HoursByTask';
-import IconTile from '../../../../components/IconTile/IconTile';
+import IconTile from '../../../../components/IconTile';
 import Duration from './components/Duration';
 import TimeRangeModal from '../../../../components/TimeRangeModal/TimeRangeModal';
 import { Undefined } from '../../../../types/CommonTypes';
diff --git a/src/screens/projects/components/DrawerTask/components/Duration.tsx b/src/screens/projects/components/DrawerTask/components/Duration.tsx
@@ -3,8 +3,8 @@ import { ClockCircleOutlined } from '@ant-design/icons';
 import { observer } from 'mobx-react';
 import { createUseStyles } from 'react-jss';
 
-import IconTile from '../../../../../components/IconTile/IconTile';
-import PlayStopButton from '../../../../../components/PlayStopButton/PlayStopButton';
+import IconTile from '../../../../../components/IconTile';
+import PlayStopButton from '../../../../../components/PlayStopButton';
 import TaskModel from '../../../../../modules/tasks/models/TaskModel';
 import * as TaskHooks from '../../../../../hooks/TaskHooks';
 import { PURPLE_COLOR } from '../../../../../consts';
diff --git a/src/screens/projects/components/HoursByTask/HoursByTask.tsx b/src/screens/projects/components/HoursByTask/HoursByTask.tsx
@@ -12,7 +12,7 @@ import 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 IconTile from '../../../../components/IconTile';
 import { calcDuration, msToTime } from '../../../../helpers/DateTime';
 
 function dateFormat(date: Date) {
diff --git a/src/screens/projects/components/ProjectModals/ProjectModal.tsx b/src/screens/projects/components/ProjectModals/ProjectModal.tsx
@@ -34,6 +34,7 @@ export default observer(function ProjectModal({
         children: [],
         expanded: true,
         deletable: true,
+        parent: undefined,
       })
     );
     onClose();
