Skip to content

Commit 24f035c

Browse files
gudusolgudusol
authored
Merge pull request #1181 from sopt-makers/develop
v1.2.2
2 parents a78d6f8 + 531e3c9 commit 24f035c

File tree

257 files changed

+638
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+638
-488
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# the repo. Unless a later match takes precedence,
33
# @global-owner1 and @global-owner2 will be requested for
44
# review when someone opens a pull request.
5-
* @j-nary @minjeoong
5+
* @j-nary @gudusol @constantly-dev

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 4 deletions

‎pages/_app.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { authToken } from '@/stores/tokenStore';
22
import { getUserProfile } from '@api/user';
3-
import Loader from '@components/@common/loader/Loader';
4-
import { MentionProvider } from '@components/feed/Mention/MentionContext';
5-
import { SearchMentionProvider } from '@components/form/SearchMention/SearchMentionContext';
6-
import Header from '@components/header/Header';
7-
import SEO from '@components/seo/SEO';
8-
import { setAccessTokens } from '@components/util/auth';
9-
import { OverlayProvider } from '@hooks/useOverlay/OverlayProvider';
10-
import useScrollRestoration from '@hooks/useScrollRestoration';
3+
import Loader from '@common/loader/Loader';
4+
import { OverlayProvider } from '@hook/useOverlay/OverlayProvider';
5+
import useScrollRestoration from '@hook/useScrollRestoration';
116
import { useStore } from '@nanostores/react';
7+
import { MentionProvider } from '@shared/feed/Mention/MentionContext';
8+
import { SearchMentionProvider } from '@shared/form/SearchMention/SearchMentionContext';
9+
import Header from '@shared/header/Header';
10+
import SEO from '@shared/seo/SEO';
11+
import { setAccessTokens } from '@shared/util/auth';
1212
import { DialogProvider, ToastProvider } from '@sopt-makers/ui';
1313
import '@sopt-makers/ui/dist/index.css';
1414
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
15-
import { GTM_ID, pageview } from '@utils/gtm';
15+
import { GTM_ID, pageview } from '@util/gtm';
1616
import type { AppProps } from 'next/app';
1717
import { useRouter } from 'next/router';
1818
import Script from 'next/script';

‎pages/_document.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import React from 'react';
2-
import NextDocument, { Html, Head, Main, NextScript } from 'next/document';
1+
import { GTM_ID } from '@util/gtm';
2+
import NextDocument, { Head, Html, Main, NextScript } from 'next/document';
33
import { getCssText } from '../stitches.config';
4-
import { GTM_ID } from '@utils/gtm';
54

65
export default class Document extends NextDocument {
76
render() {

‎pages/detail/flash/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useFlashQueryOption } from '@api/flash/query';
22
import { GetFlash } from '@api/flash/type';
3-
import CommonDetail from '@components/page/detail';
3+
import CommonDetail from '@domain/detail';
44
import { useQuery } from '@tanstack/react-query';
55
import dayjs from 'dayjs';
66
import 'dayjs/locale/ko';

‎pages/detail/index.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useMeetingQueryOption } from '@api/meeting/query';
22
import { GetMeeting } from '@api/meeting/type';
3-
import CommonDetail from '@components/page/detail';
3+
import CommonDetail from '@domain/detail';
44
import { useQuery } from '@tanstack/react-query';
55
import dayjs from 'dayjs';
66
import 'dayjs/locale/ko';

‎pages/edit/flash/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { usePutFlashMutation } from '@api/flash/mutation';
22
import { useFlashQueryOption } from '@api/flash/query';
33
import BungaeIcon from '@assets/svg/bungae.svg';
4-
import Loader from '@components/@common/loader/Loader';
5-
import FlashPresentation from '@components/form/Presentation/FlashPresentation';
4+
import Loader from '@common/loader/Loader';
65
import { zodResolver } from '@hookform/resolvers/zod';
6+
import FlashPresentation from '@shared/form/Presentation/FlashPresentation';
77
import { useQuery } from '@tanstack/react-query';
88
import { FlashFormType, flashSchema } from '@type/form';
9-
import { formatCalendarDate } from '@utils/dayjs';
9+
import { formatCalendarDate } from '@util/dayjs';
1010
import dynamic from 'next/dynamic';
1111
import { useRouter } from 'next/router';
1212
import { useEffect } from 'react';

‎pages/edit/index.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { usePutMeetingMutation } from '@api/meeting/mutation';
22
import { useMeetingQueryOption } from '@api/meeting/query';
33
import CheckIcon from '@assets/svg/check.svg';
4-
import Loader from '@components/@common/loader/Loader';
5-
import Presentation from '@components/form/Presentation';
6-
import TableOfContents from '@components/form/TableOfContents';
4+
import Loader from '@common/loader/Loader';
75
import { parts } from '@data/options';
86
import { zodResolver } from '@hookform/resolvers/zod';
7+
import Presentation from '@shared/form/Presentation';
8+
import TableOfContents from '@shared/form/TableOfContents';
99
import { useQuery } from '@tanstack/react-query';
1010
import { FormType, schema } from '@type/form';
11-
import { formatCalendarDate } from '@utils/dayjs';
11+
import { formatCalendarDate } from '@util/dayjs';
1212
import dynamic from 'next/dynamic';
1313
import { useRouter } from 'next/router';
1414
import { useEffect } from 'react';

‎pages/index.tsx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import { useFlashListQueryOption } from '@api/flash/query';
22
import { useGetPostListInfiniteQuery } from '@api/post/query';
3-
import CrewTab from '@components/CrewTab';
4-
import FloatingButton from '@components/FloatingButton';
5-
import Carousel from '@components/groupBrowsing/Carousel/Carousel';
6-
import GroupBrowsingSlider from '@components/groupBrowsingSlider/groupBrowsingSlider';
7-
import GuideButton from '@components/GuideButton';
8-
import DesktopFeedListSkeleton from '@components/page/detail/Feed/Skeleton/DesktopFeedListSkeleton';
9-
import MobileFeedListSkeleton from '@components/page/detail/Feed/Skeleton/MobileFeedListSkeleton';
10-
import HomeCardList from '@components/page/home/HomeCardList';
11-
import QuickMenu from '@components/page/home/QuickMenu';
12-
import { Flex } from '@components/util/layout/Flex';
13-
import { TAKE_COUNT } from '@constants/feed';
14-
import { useDisplay } from '@hooks/useDisplay';
3+
import { TAKE_COUNT } from '@constant/feed';
4+
import DesktopFeedListSkeleton from '@domain/detail/Feed/Skeleton/DesktopFeedListSkeleton';
5+
import MobileFeedListSkeleton from '@domain/detail/Feed/Skeleton/MobileFeedListSkeleton';
6+
import HomeCardList from '@domain/home/HomeCardList';
7+
import QuickMenu from '@domain/home/QuickMenu';
8+
import { useDisplay } from '@hook/useDisplay';
9+
import CrewTab from '@shared/CrewTab';
10+
import FloatingButton from '@shared/FloatingButton';
11+
import Carousel from '@shared/groupBrowsing/Carousel/Carousel';
12+
import GroupBrowsingSlider from '@shared/groupBrowsingSlider/groupBrowsingSlider';
13+
import GuideButton from '@shared/GuideButton';
14+
import { Flex } from '@shared/util/layout/Flex';
1515
import { useQuery } from '@tanstack/react-query';
1616
import type { NextPage } from 'next';
1717
import { useEffect } from 'react';

‎pages/list/index.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import CardSkeleton from '@components/page/list/Card/Skeleton';
2-
import Filter from '@components/page/list/Filter';
3-
import GridLayout from '@components/page/list/Grid/Layout';
4-
import { MeetingListOfAll } from '@components/page/list/Grid/List';
5-
import { SSRSafeSuspense } from '@components/util/SSRSafeSuspense';
1+
import CardSkeleton from '@domain/list/Card/Skeleton';
2+
import Filter from '@domain/list/Filter';
3+
import GridLayout from '@domain/list/Grid/Layout';
4+
import { MeetingListOfAll } from '@domain/list/Grid/List';
5+
import CrewTab from '@shared/CrewTab';
6+
import { SSRSafeSuspense } from '@shared/util/SSRSafeSuspense';
67
import type { NextPage } from 'next';
78
import { styled } from 'stitches.config';
8-
import CrewTab from '@components/CrewTab';
99

10-
import FloatingButton from '@components/FloatingButton';
11-
import KeywordsSettingButton from '@components/KeywordsSettingButton';
10+
import FloatingButton from '@shared/FloatingButton';
11+
import KeywordsSettingButton from '@shared/KeywordsSettingButton';
1212

1313
const Home: NextPage = () => {
1414
return (

0 commit comments

Comments
 (0)