diff --git a/src/App.tsx b/src/App.tsx index f20ac14d..2389bc8d 100644 --- a/src/App.tsx +++ b/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'; diff --git a/src/components/molecules/SimpleSelect/SimpleSelect.js b/src/components/molecules/SimpleSelect/SimpleSelect.js index 6dbb9351..6c8563f0 100644 --- a/src/components/molecules/SimpleSelect/SimpleSelect.js +++ b/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: { diff --git a/src/components/organisms/GroupBox/GroupBox.styled.js b/src/components/organisms/GroupBox/GroupBox.styled.js index 98c1e6c6..80e34c8e 100644 --- a/src/components/organisms/GroupBox/GroupBox.styled.js +++ b/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'; diff --git a/src/components/organisms/GroupBox/GroupBoxS.js b/src/components/organisms/GroupBox/GroupBoxS.js index 52d9a867..fe1f3353 100644 --- a/src/components/organisms/GroupBox/GroupBoxS.js +++ b/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'; diff --git a/src/components/organisms/MemberItem/MemberItem.js b/src/components/organisms/MemberItem/MemberItem.js index 40657aaa..b88a75cc 100644 --- a/src/components/organisms/MemberItem/MemberItem.js +++ b/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'; diff --git a/src/components/organisms/SearchSelect/SearchSelect.js b/src/components/organisms/SearchSelect/SearchSelect.js index 279893e1..cf9f8caa 100644 --- a/src/components/organisms/SearchSelect/SearchSelect.js +++ b/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'; diff --git a/src/components/organisms/ZaboCard/ZaboCardL.js b/src/components/organisms/ZaboCard/ZaboCardL.js index 9b3272d5..1d2bab7c 100644 --- a/src/components/organisms/ZaboCard/ZaboCardL.js +++ b/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'; diff --git a/src/components/organisms/ZaboCard/ZaboCardM.js b/src/components/organisms/ZaboCard/ZaboCardM.js index b93b354a..1dede1a5 100644 --- a/src/components/organisms/ZaboCard/ZaboCardM.js +++ b/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'; diff --git a/src/components/pages/AdminPage/GroupAdminPage.js b/src/components/pages/AdminPage/GroupAdminPage.js index 7cec0a66..2669955d 100644 --- a/src/components/pages/AdminPage/GroupAdminPage.js +++ b/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'; diff --git a/src/components/pages/AdminPage/GroupDetailPage.js b/src/components/pages/AdminPage/GroupDetailPage.js index 2ff56d31..f4fbabac 100644 --- a/src/components/pages/AdminPage/GroupDetailPage.js +++ b/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'; diff --git a/src/components/pages/AdminPage/UserCard.js b/src/components/pages/AdminPage/UserCard.js index 41dac131..c04f0d79 100644 --- a/src/components/pages/AdminPage/UserCard.js +++ b/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'; diff --git a/src/components/pages/AdminPage/UserDetailPage.js b/src/components/pages/AdminPage/UserDetailPage.js index 6d95863a..69a1c843 100644 --- a/src/components/pages/AdminPage/UserDetailPage.js +++ b/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'; diff --git a/src/components/pages/AuthPage/AuthPage.js b/src/components/pages/AuthPage/AuthPage.js index d278b006..19ee10c5 100644 --- a/src/components/pages/AuthPage/AuthPage.js +++ b/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'; diff --git a/src/components/pages/HomePage/HomePage.js b/src/components/pages/HomePage/HomePage.js index fff17b9d..f1650cf1 100644 --- a/src/components/pages/HomePage/HomePage.js +++ b/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'; diff --git a/src/components/pages/LandingPage/LandingPage.js b/src/components/pages/LandingPage/LandingPage.js index 12ed1d83..b53fd31c 100644 --- a/src/components/pages/LandingPage/LandingPage.js +++ b/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'; diff --git a/src/components/pages/LandingPage/LandingPage.styled.js b/src/components/pages/LandingPage/LandingPage.styled.js index 972f4b42..f00d7832 100644 --- a/src/components/pages/LandingPage/LandingPage.styled.js +++ b/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'; diff --git a/src/components/pages/ProfilePage/GroupProfilePage.js b/src/components/pages/ProfilePage/GroupProfilePage.js index 2d106d0d..3e18151b 100644 --- a/src/components/pages/ProfilePage/GroupProfilePage.js +++ b/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'; diff --git a/src/components/pages/ProfilePage/Main.js b/src/components/pages/ProfilePage/Main.js index 8ca660b9..3f21335a 100644 --- a/src/components/pages/ProfilePage/Main.js +++ b/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'; diff --git a/src/components/pages/ProfilePage/ProfilePage.js b/src/components/pages/ProfilePage/ProfilePage.js index 5266dfca..0b5ed8c2 100644 --- a/src/components/pages/ProfilePage/ProfilePage.js +++ b/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'; diff --git a/src/components/pages/ProfilePage/UserProfilePage.js b/src/components/pages/ProfilePage/UserProfilePage.js index 1821291c..2953d208 100644 --- a/src/components/pages/ProfilePage/UserProfilePage.js +++ b/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'; diff --git a/src/components/pages/SearchPage/SearchPage.js b/src/components/pages/SearchPage/SearchPage.js index 6c007270..5308b3f2 100644 --- a/src/components/pages/SearchPage/SearchPage.js +++ b/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'; diff --git a/src/components/pages/SettingsPage/GroupApply.js b/src/components/pages/SettingsPage/GroupApply.js index 8bb72221..e4372533 100644 --- a/src/components/pages/SettingsPage/GroupApply.js +++ b/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'; diff --git a/src/components/pages/SettingsPage/GroupMembersSetting.js b/src/components/pages/SettingsPage/GroupMembersSetting.js index 642d34a2..99fcac5b 100644 --- a/src/components/pages/SettingsPage/GroupMembersSetting.js +++ b/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'; diff --git a/src/components/pages/SettingsPage/GroupProfileSetting.js b/src/components/pages/SettingsPage/GroupProfileSetting.js index bc760fb9..7ba16827 100644 --- a/src/components/pages/SettingsPage/GroupProfileSetting.js +++ b/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'; diff --git a/src/components/pages/SettingsPage/Main.js b/src/components/pages/SettingsPage/Main.js index b9f23371..e18dfbce 100644 --- a/src/components/pages/SettingsPage/Main.js +++ b/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'; diff --git a/src/components/pages/SettingsPage/ProfileSetting.js b/src/components/pages/SettingsPage/ProfileSetting.js index 1407183b..7b2f7ba6 100644 --- a/src/components/pages/SettingsPage/ProfileSetting.js +++ b/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'; diff --git a/src/components/pages/SettingsPage/withGroupProfile.js b/src/components/pages/SettingsPage/withGroupProfile.js index 74917f02..0c259572 100644 --- a/src/components/pages/SettingsPage/withGroupProfile.js +++ b/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'; diff --git a/src/components/pages/ZaboPage/Main.js b/src/components/pages/ZaboPage/Main.js index 088d2bd0..30dc0109 100644 --- a/src/components/pages/ZaboPage/Main.js +++ b/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'; diff --git a/src/components/pages/ZaboPage/ZaboDetailPage.js b/src/components/pages/ZaboPage/ZaboDetailPage.js index 5fedb281..c4d31baf 100644 --- a/src/components/pages/ZaboPage/ZaboDetailPage.js +++ b/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'; diff --git a/src/components/pages/ZaboPage/ZaboEditPage.js b/src/components/pages/ZaboPage/ZaboEditPage.js index a196b368..2df55fa6 100644 --- a/src/components/pages/ZaboPage/ZaboEditPage.js +++ b/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'; diff --git a/src/components/pages/ZaboUploadPage/ZaboUploadPage.js b/src/components/pages/ZaboUploadPage/ZaboUploadPage.js index a6aa6b74..fe0801e3 100644 --- a/src/components/pages/ZaboUploadPage/ZaboUploadPage.js +++ b/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, diff --git a/src/components/templates/Footer/Footer.js b/src/components/templates/Footer/Footer.js index 5667169a..c680a199 100644 --- a/src/components/templates/Footer/Footer.js +++ b/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'; diff --git a/src/components/templates/Header/Header.js b/src/components/templates/Header/Header.js index 6bbb7e8c..1aae8556 100644 --- a/src/components/templates/Header/Header.js +++ b/src/components/templates/Header/Header.js @@ -5,8 +5,8 @@ import { useDispatch, useSelector } from 'react-redux'; import { css } from 'styled-components'; import get from 'lodash.get'; -import Container from 'atoms/Container'; -import SVG from 'atoms/SVG'; +import Container from 'components/atoms/Container'; +import SVG from 'components/atoms/SVG'; import { setCurrentGroup } from 'store/reducers/auth'; import { isAuthedSelector } from 'lib/utils'; diff --git a/src/components/templates/SearchBar/SearchBar.js b/src/components/templates/SearchBar/SearchBar.js index 6a85502c..bdb7c0b5 100644 --- a/src/components/templates/SearchBar/SearchBar.js +++ b/src/components/templates/SearchBar/SearchBar.js @@ -6,7 +6,7 @@ import { Link, useHistory, useLocation } from 'react-router-dom'; import AwesomeDebouncePromise from 'awesome-debounce-promise'; import queryString from 'query-string'; -import TagList from 'atoms/TagList'; +import TagList from 'components/atoms/TagList'; import { searchSimpleAPI } from 'lib/api/search'; import { parseQuery } from 'lib/utils'; diff --git a/src/components/templates/ZaboList/ZaboList.js b/src/components/templates/ZaboList/ZaboList.js index dd54cbef..4e45dd4f 100644 --- a/src/components/templates/ZaboList/ZaboList.js +++ b/src/components/templates/ZaboList/ZaboList.js @@ -4,7 +4,7 @@ import MasonryZaboList from 'react-masonry-infinite'; import SquareLoader from 'react-spinners/SquareLoader'; import styled from 'styled-components'; -import ZaboCard from 'organisms/ZaboCard'; +import ZaboCard from 'components/organisms/ZaboCard'; import withStackMaster from './withStackMaster'; import ZaboListWrapper from './ZaboList.styled'; diff --git a/src/components/templates/ZaboUpload/InfoForm.js b/src/components/templates/ZaboUpload/InfoForm.js index d087caa4..a39b0b46 100644 --- a/src/components/templates/ZaboUpload/InfoForm.js +++ b/src/components/templates/ZaboUpload/InfoForm.js @@ -8,9 +8,9 @@ import { KeyboardDateTimePicker, MuiPickersUtilsProvider } from '@material-ui/pi import get from 'lodash.get'; import moment from 'moment'; -import ToggleButton from 'atoms/ToggleButton'; -import SimpleSelect from 'molecules/SimpleSelect'; -import StyledQuill from 'organisms/StyledQuill'; +import ToggleButton from 'components/atoms/ToggleButton'; +import SimpleSelect from 'components/molecules/SimpleSelect'; +import StyledQuill from 'components/organisms/StyledQuill'; import { setInfo } from 'store/reducers/upload'; import { gridLayoutCompareFunction } from 'lib/utils'; diff --git a/tsconfig.paths.json b/tsconfig.paths.json index a0c4b3a1..ec2332eb 100644 --- a/tsconfig.paths.json +++ b/tsconfig.paths.json @@ -1,8 +1,5 @@ { "compilerOptions": { - "baseUrl": "src", - "paths": { - "*": ["*", "components/*"] - } + "baseUrl": "src" } }