Remove Path alias

src/App.tsx

@@ -2,12 +2,11 @@ import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 import { Helmet } from 'react-helmet';
 
-import ChannelTalk from 'containers/ChannelTalk';
-import ScrollToTop from 'containers/ScrollToTop';
-import WindowResizeListener from 'containers/WindowResizeListener';
+import ChannelTalk from 'components/containers/ChannelTalk';
+import ScrollToTop from 'components/containers/ScrollToTop';
+import WindowResizeListener from 'components/containers/WindowResizeListener';
 import ErrorBoundary from 'components/ErrorBoundary';
-import AuthCallback from 'organisms/AuthCallback';
-import PWAPrompt from 'templates/PWAPrompt';
+import AuthCallback from 'components/organisms/AuthCallback';
 import {
   AdminPage,
   ApiPage,
@@ -20,7 +19,8 @@ import {
   SettingsPage,
   ZaboPage,
   ZaboUploadPage,
-} from 'pages';
+} from 'components/pages';
+import PWAPrompt from 'components/templates/PWAPrompt';
 
 import { AdminRoute, PrivateRoute, PublicRoute } from 'hoc/AuthRoutes';
 import pToP from 'hoc/paramsToProps';

src/components/molecules/SimpleSelect/SimpleSelect.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import Select from 'molecules/Select';
+import Select from 'components/molecules/Select';
 
 const sizes = {
   small: {

src/components/organisms/GroupBox/GroupBox.styled.js

@@ -1,7 +1,7 @@
 import { Link } from 'react-router-dom';
 import styled, { css } from 'styled-components';
 
-import ProfileStats from 'organisms/ProfileStats';
+import ProfileStats from 'components/organisms/ProfileStats';
 
 import * as mixins from 'lib/mixins';
 import { media } from 'lib/utils/style';

src/components/organisms/GroupBox/GroupBoxS.js

@@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import { useSelector } from 'react-redux';
 import get from 'lodash.get';
 
-import SuperTooltip from 'atoms/SuperTooltip';
+import SuperTooltip from 'components/atoms/SuperTooltip';
 
 import { GroupType } from 'lib/propTypes';
 import { isElemWidthOverflown } from 'lib/utils';

src/components/organisms/MemberItem/MemberItem.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import styled, { css } from 'styled-components';
 
-import SimpleSelect from 'molecules/SimpleSelect';
+import SimpleSelect from 'components/molecules/SimpleSelect';
 
 import useSetState from 'hooks/useSetState';
 import { colors } from 'lib/theme';

src/components/organisms/SearchSelect/SearchSelect.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { components } from 'react-select';
 
-import Select from 'molecules/Select';
+import Select from 'components/molecules/Select';
 
 import { media } from 'lib/utils/style';
 

src/components/organisms/ZaboCard/ZaboCardL.js

@@ -5,8 +5,8 @@ import Tooltip from '@material-ui/core/Tooltip';
 import get from 'lodash.get';
 import moment from 'moment';
 
-import { CategoryListW, CategoryW } from 'atoms/Category';
-import SuperTooltip from 'atoms/SuperTooltip';
+import { CategoryListW, CategoryW } from 'components/atoms/Category';
+import SuperTooltip from 'components/atoms/SuperTooltip';
 
 import { ZaboType } from 'lib/propTypes';
 import { isElemWidthOverflown } from 'lib/utils';

src/components/organisms/ZaboCard/ZaboCardM.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 
-import DueDate from 'atoms/DueDate';
-import StatBox from 'molecules/StatBox';
+import DueDate from 'components/atoms/DueDate';
+import StatBox from 'components/molecules/StatBox';
 
 import { ZaboType } from 'lib/propTypes';
 import { getLabeledTimeDiff, to2Digits } from 'lib/utils';

src/components/pages/AdminPage/GroupAdminPage.js

@@ -20,7 +20,7 @@ import clsx from 'clsx';
 import get from 'lodash.get';
 import moment from 'moment';
 
-import StyledQuill from 'organisms/StyledQuill';
+import StyledQuill from 'components/organisms/StyledQuill';
 
 import { acceptApplyGroup } from 'store/reducers/admin';
 

src/components/pages/AdminPage/GroupDetailPage.js

@@ -2,9 +2,9 @@ import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import get from 'lodash.get';
 
-import SuperTooltip from 'atoms/SuperTooltip';
-import StyledQuill from 'organisms/StyledQuill';
-import { Page } from 'pages/ProfilePage/Profile.styled';
+import SuperTooltip from 'components/atoms/SuperTooltip';
+import StyledQuill from 'components/organisms/StyledQuill';
+import { Page } from 'components/pages/ProfilePage/Profile.styled';
 
 import groupDefaultProfile from 'static/images/groupDefaultProfile.png';
 

src/components/pages/AdminPage/UserCard.js

@@ -13,7 +13,7 @@ import Typography from '@material-ui/core/Typography';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import clsx from 'clsx';
 
-import StyledQuill from 'organisms/StyledQuill';
+import StyledQuill from 'components/organisms/StyledQuill';
 
 import defaultProfile from 'static/images/defaultProfile.png';
 

src/components/pages/AdminPage/UserDetailPage.js

@@ -2,9 +2,9 @@ import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import get from 'lodash.get';
 
-import SuperTooltip from 'atoms/SuperTooltip';
-import Header from 'templates/Header';
-import { Page } from 'pages/ProfilePage/Profile.styled';
+import SuperTooltip from 'components/atoms/SuperTooltip';
+import { Page } from 'components/pages/ProfilePage/Profile.styled';
+import Header from 'components/templates/Header';
 
 import defaultProfile from 'static/images/defaultProfile.png';
 

src/components/pages/AuthPage/AuthPage.js

@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
 
-import { LoginPage } from 'pages';
+import { LoginPage } from 'components/pages';
 
 import AuthPageWrapper from './AuthPage.styled';
 

src/components/pages/HomePage/HomePage.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
-import Header from 'templates/Header';
-import ZaboList from 'templates/ZaboList';
+import Header from 'components/templates/Header';
+import ZaboList from 'components/templates/ZaboList';
 
 import HomePageWrapper from './HomePage.styled';
 

src/components/pages/LandingPage/LandingPage.js

@@ -10,13 +10,13 @@ import get from 'lodash.get';
 import moment from 'moment';
 import useSWR from 'swr';
 
-import { CategoryListW, CategoryW } from 'atoms/Category';
-import SVG from 'atoms/SVG';
-import TwoCol from 'atoms/TwoCol';
-import ScrollBtn from 'molecules/ScrollBtn';
-import ZaboCard from 'organisms/ZaboCard';
-import Header from 'templates/Header';
-import ZaboList from 'templates/ZaboList';
+import { CategoryListW, CategoryW } from 'components/atoms/Category';
+import SVG from 'components/atoms/SVG';
+import TwoCol from 'components/atoms/TwoCol';
+import ScrollBtn from 'components/molecules/ScrollBtn';
+import ZaboCard from 'components/organisms/ZaboCard';
+import Header from 'components/templates/Header';
+import ZaboList from 'components/templates/ZaboList';
 
 import { getHotZaboList as getHotZaboListAction } from 'store/reducers/zabo';
 import { getRecommendedGroups } from 'lib/api/group';

src/components/pages/LandingPage/LandingPage.styled.js

@@ -2,9 +2,9 @@ import PropTypes from 'prop-types';
 import { Link } from 'react-router-dom';
 import styled, { css } from 'styled-components';
 
-import ContainerAtom from 'atoms/Container';
-import TwoCol from 'atoms/TwoCol';
-import GroupBox from 'organisms/GroupBox';
+import ContainerAtom from 'components/atoms/Container';
+import TwoCol from 'components/atoms/TwoCol';
+import GroupBox from 'components/organisms/GroupBox';
 
 import * as mixins from 'lib/mixins';
 import { media } from 'lib/utils/style';

src/components/pages/ProfilePage/GroupProfilePage.js

@@ -6,11 +6,11 @@ import { Link, useHistory } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import get from 'lodash.get';
 
-import SuperTooltip from 'atoms/SuperTooltip';
-import ProfileStats from 'organisms/ProfileStats';
-import StyledQuill from 'organisms/StyledQuill';
-import Header from 'templates/Header';
-import ZaboList from 'templates/ZaboList';
+import SuperTooltip from 'components/atoms/SuperTooltip';
+import ProfileStats from 'components/organisms/ProfileStats';
+import StyledQuill from 'components/organisms/StyledQuill';
+import Header from 'components/templates/Header';
+import ZaboList from 'components/templates/ZaboList';
 
 import { followProfile } from 'store/reducers/profile';
 import { GroupType } from 'lib/propTypes';

src/components/pages/ProfilePage/Main.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Route, Switch, useRouteMatch } from 'react-router-dom';
 import styled from 'styled-components';
 
-import { NotFound } from 'pages';
+import { NotFound } from 'components/pages';
 
 import ProfilePage from './ProfilePage';
 

src/components/pages/ProfilePage/ProfilePage.js

@@ -3,7 +3,7 @@ import { useParams } from 'react-router-dom';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import get from 'lodash.get';
 
-import { NotFound } from 'pages';
+import { NotFound } from 'components/pages';
 
 import { getProfile } from 'store/reducers/profile';
 

src/components/pages/ProfilePage/UserProfilePage.js

@@ -5,12 +5,12 @@ import React, {
 import { useDispatch, useSelector } from 'react-redux';
 import get from 'lodash.get';
 
-import Button from 'atoms/Button';
-import SuperTooltip from 'atoms/SuperTooltip';
-import GroupList from 'organisms/GroupList';
-import ProfileStats from 'organisms/ProfileStats';
-import Header from 'templates/Header';
-import ZaboList from 'templates/ZaboList';
+import Button from 'components/atoms/Button';
+import SuperTooltip from 'components/atoms/SuperTooltip';
+import GroupList from 'components/organisms/GroupList';
+import ProfileStats from 'components/organisms/ProfileStats';
+import Header from 'components/templates/Header';
+import ZaboList from 'components/templates/ZaboList';
 
 import { logout as logoutAction } from 'store/reducers/auth';
 import { UserType } from 'lib/propTypes';

src/components/pages/SearchPage/SearchPage.js

@@ -5,10 +5,10 @@ import { useDispatch } from 'react-redux';
 import queryString from 'query-string';
 
 // import { searchAPI } from lib/api/search';
-import TagList from 'atoms/TagList';
-import GroupList from 'organisms/GroupList';
-import Header from 'templates/Header';
-import ZaboList from 'templates/ZaboList';
+import TagList from 'components/atoms/TagList';
+import GroupList from 'components/organisms/GroupList';
+import Header from 'components/templates/Header';
+import ZaboList from 'components/templates/ZaboList';
 
 import { getSearch } from 'store/reducers/zabo';
 import useSetState from 'hooks/useSetState';

src/components/pages/SettingsPage/GroupApply.js

@@ -7,10 +7,10 @@ import { useDispatch, useSelector } from 'react-redux';
 import Tooltip from '@material-ui/core/Tooltip';
 import get from 'lodash.get';
 
-import SimpleSelect from 'molecules/SimpleSelect';
-import StyledQuill from 'organisms/StyledQuill';
-import Footer from 'templates/Footer';
-import Header from 'templates/Header';
+import SimpleSelect from 'components/molecules/SimpleSelect';
+import StyledQuill from 'components/organisms/StyledQuill';
+import Footer from 'components/templates/Footer';
+import Header from 'components/templates/Header';
 
 import { applyNewGroup } from 'store/reducers/auth';
 import useSetState from 'hooks/useSetState';

src/components/pages/SettingsPage/GroupMembersSetting.js

@@ -2,11 +2,11 @@ import React, { useCallback } from 'react';
 import { useDispatch } from 'react-redux';
 import AwesomeDebouncePromise from 'awesome-debounce-promise';
 
-import SimpleSelect from 'molecules/SimpleSelect';
-import List from 'organisms/List';
-import MemberItem from 'organisms/MemberItem';
-import SearchSelect from 'organisms/SearchSelect';
-import Header from 'templates/Header';
+import SimpleSelect from 'components/molecules/SimpleSelect';
+import List from 'components/organisms/List';
+import MemberItem from 'components/organisms/MemberItem';
+import SearchSelect from 'components/organisms/SearchSelect';
+import Header from 'components/templates/Header';
 
 import * as profileActions from 'store/reducers/profile';
 import useSetState from 'hooks/useSetState';

src/components/pages/SettingsPage/GroupProfileSetting.js

@@ -5,10 +5,10 @@ import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 
-import SimpleSelect from 'molecules/SimpleSelect';
-import StyledQuill from 'organisms/StyledQuill';
-import Footer from 'templates/Footer';
-import Header from 'templates/Header';
+import SimpleSelect from 'components/molecules/SimpleSelect';
+import StyledQuill from 'components/organisms/StyledQuill';
+import Footer from 'components/templates/Footer';
+import Header from 'components/templates/Header';
 
 import { updateGroupInfo, updateGroupInfoWithImage } from 'store/reducers/auth';
 import useSetState from 'hooks/useSetState';

src/components/pages/SettingsPage/Main.js

@@ -5,7 +5,7 @@ import {
 } from 'react-router-dom';
 import styled from 'styled-components';
 
-import { NotFound } from 'pages';
+import { NotFound } from 'components/pages';
 
 import pToP from '../../../hoc/paramsToProps';
 import GroupApply from './GroupApply';

src/components/pages/SettingsPage/ProfileSetting.js

@@ -10,8 +10,8 @@ import FormHelperText from '@material-ui/core/FormHelperText';
 import AwesomeDebouncePromise from 'awesome-debounce-promise';
 import get from 'lodash.get';
 
-import Footer from 'templates/Footer';
-import Header from 'templates/Header';
+import Footer from 'components/templates/Footer';
+import Header from 'components/templates/Header';
 
 import { updateUserInfo, updateUserInfoWithImage } from 'store/reducers/auth';
 import useSetState from 'hooks/useSetState';

src/components/pages/SettingsPage/withGroupProfile.js

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import get from 'lodash.get';
 
-import { NotFound } from 'pages';
+import { NotFound } from 'components/pages';
 
 import { getProfile } from 'store/reducers/profile';
 

src/components/pages/ZaboPage/Main.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Route, Switch, useRouteMatch } from 'react-router-dom';
 
-import Header from 'templates/Header';
-import { NotFound, ZaboDetailPage, ZaboEditPage } from 'pages';
+import { NotFound, ZaboDetailPage, ZaboEditPage } from 'components/pages';
+import Header from 'components/templates/Header';
 
 import paramsToProps from '../../../hoc/paramsToProps';
 import { ZaboPageWrapper } from './ZaboPage.styled';

src/components/pages/ZaboPage/ZaboDetailPage.js

@@ -8,11 +8,11 @@ import Tooltip from '@material-ui/core/Tooltip';
 import get from 'lodash.get';
 import moment from 'moment';
 
-import Button from 'atoms/Button';
-import DueDate from 'atoms/DueDate';
-import StatBox from 'molecules/StatBox';
-import StyledQuill from 'organisms/StyledQuill';
-import ZaboList from 'templates/ZaboList';
+import Button from 'components/atoms/Button';
+import DueDate from 'components/atoms/DueDate';
+import StatBox from 'components/molecules/StatBox';
+import StyledQuill from 'components/organisms/StyledQuill';
+import ZaboList from 'components/templates/ZaboList';
 
 import { followProfile, getProfile } from 'store/reducers/profile';
 import { deleteZabo as deleteZaboAction } from 'store/reducers/zabo';

src/components/pages/ZaboPage/ZaboEditPage.js

@@ -6,9 +6,9 @@ import { Prompt, useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import isEqual from 'lodash.isequal';
 
-import Footer from 'templates/Footer';
-import ZaboUpload from 'templates/ZaboUpload';
-import { FooterStyle, PageWrapper } from 'pages/ZaboUploadPage/ZaboUploadPage.styled';
+import { FooterStyle, PageWrapper } from 'components/pages/ZaboUploadPage/ZaboUploadPage.styled';
+import Footer from 'components/templates/Footer';
+import ZaboUpload from 'components/templates/ZaboUpload';
 
 import { defaultSchedule } from 'store/reducers/upload';
 import { patchZabo } from 'store/reducers/zabo';

src/components/pages/ZaboUploadPage/ZaboUploadPage.js

@@ -10,9 +10,9 @@ import SwipeableViews from 'react-swipeable-views';
 import styled from 'styled-components';
 import get from 'lodash.get';
 
-import Footer from 'templates/Footer';
-import Header from 'templates/Header';
-import ZaboUpload from 'templates/ZaboUpload';
+import Footer from 'components/templates/Footer';
+import Header from 'components/templates/Header';
+import ZaboUpload from 'components/templates/ZaboUpload';
 
 import {
   reset,

src/components/templates/Footer/Footer.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { css } from 'styled-components';
 
-import Container from 'atoms/Container';
+import Container from 'components/atoms/Container';
 
 import FooterWrapper from './Footer.styled';