Merge pull request #858 from sopt-makers/develop

프러덕션 배포

.eslintrc.json

@@ -20,6 +20,12 @@
     "@typescript-eslint/explicit-module-boundary-types": "off",
     "@typescript-eslint/no-empty-function": "off",
     "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "warn"
+    "react-hooks/exhaustive-deps": "warn",
+    "prettier/prettier": [
+      "error",
+      {
+        "endOfLine": "auto"
+      }
+    ]
   }
 }

.gitignore

@@ -39,4 +39,6 @@ next-env.d.ts
 .vscode/
 
 # __generated__
-src/__generated__/open-api-specification.json
+src/__generated__/open-api-specification.json
+
+install-state.gz

ampli.json

@@ -11,4 +11,4 @@
   "Language": "TypeScript",
   "SDK": "@amplitude/analytics-browser@^1.0",
   "Path": "./src/ampli"
-}
+}

package.json

@@ -18,6 +18,7 @@
     "update-mds": "yarn up @sopt-makers/colors@latest @sopt-makers/fonts@latest @sopt-makers/playground-common@latest @sopt-makers/ui@latest @sopt-makers/icons@latest"
   },
   "dependencies": {
+    "@amplitude/ampli": "^1.35.0",
     "@amplitude/analytics-browser": "^2.3.2",
     "@egjs/react-infinitegrid": "^4.10.1",
     "@headlessui/react": "^1.7.3",

pages/_app.tsx

@@ -71,7 +71,7 @@ function MyApp({ Component, pageProps }: AppProps) {
           },
         }).promise;
         const { data: user } = await fetchMyProfile();
-        ampli.identify(user.data.orgId);
+        ampli.identify(user.orgId + '');
       }
     })();
   }, [isServiceReady]);

pages/detail/index.tsx

@@ -63,7 +63,7 @@ const DetailPage = () => {
           data-color="mono"
           data-shape="pc"
           data-support-multiple-densities="true"
-          style={{ position: 'fixed', bottom: '5%', right: '5%' }}
+          style={{ position: 'fixed', bottom: '2%', right: '5%' }}
         />
       </>
     );
@@ -73,7 +73,6 @@ const DetailPage = () => {
     <>
       <SDetailPage>
         <Carousel imageList={detailData?.imageURL} />
-
         <MeetingController
           detailData={detailData}
           mutateMeetingDeletion={mutateDeleteMeeting}
@@ -107,7 +106,7 @@ const DetailPage = () => {
         data-color="mono"
         data-shape="pc"
         data-support-multiple-densities="true"
-        style={{ position: 'fixed', bottom: '5%', right: '5%' }}
+        style={{ position: 'fixed', bottom: '2%', right: '5%' }}
       />
     </>
   );

pages/list/index.tsx

@@ -106,7 +106,7 @@ const Home: NextPage = () => {
         data-color="mono"
         data-shape="pc"
         data-support-multiple-densities="true"
-        style={{ position: 'fixed', bottom: '5%', right: '5%' }}
+        style={{ position: 'fixed', bottom: '2%', right: '5%' }}
       />
     </>
   );

pages/mine/index.tsx

@@ -110,7 +110,7 @@ const MinePage: NextPage = () => {
         data-color="mono"
         data-shape="pc"
         data-support-multiple-densities="true"
-        style={{ position: 'fixed', bottom: '5%', right: '5%' }}
+        style={{ position: 'fixed', bottom: '2%', right: '5%' }}
       />
     </div>
   );

pages/post/index.tsx

@@ -1,35 +1,35 @@
-import FeedPostViewer from '@components/feed/FeedPostViewer/FeedPostViewer';
-import Loader from '@components/loader/Loader';
-import { useRouter } from 'next/router';
-import { useToast } from '@sopt-makers/ui';
-import { useMutation } from '@tanstack/react-query';
-import { apiV2 } from '@api/index';
-import FeedCommentInput from '@components/feed/FeedCommentInput/FeedCommentInput';
+import { paths } from '@/__generated__/schema2';
+import { ampli } from '@/ampli';
+import { useQueryGetMeeting } from '@api/API_LEGACY/meeting/hooks';
 import { useQueryMyProfile } from '@api/API_LEGACY/user/hooks';
+import { apiV2 } from '@api/index';
+import { PostCommentWithMentionRequest } from '@api/mention';
+import { useMutationPostCommentWithMention } from '@api/mention/hooks';
 import { useInfinitePosts, useMutationPostLike, useMutationUpdateLike, useQueryGetPost } from '@api/post/hooks';
+import LikeButton from '@components/button/LikeButton';
+import FeedActionButton from '@components/feed/FeedActionButton/FeedActionButton';
+import FeedCommentContainer from '@components/feed/FeedCommentContainer/FeedCommentContainer';
+import FeedCommentInput from '@components/feed/FeedCommentInput/FeedCommentInput';
 import FeedCommentLikeSection from '@components/feed/FeedCommentLikeSection/FeedCommentLikeSection';
+import FeedPostViewer from '@components/feed/FeedPostViewer/FeedPostViewer';
+import { MentionContext } from '@components/feed/Mention/MentionContext';
+import FeedEditModal from '@components/feed/Modal/FeedEditModal';
+import Loader from '@components/loader/Loader';
+import ConfirmModal from '@components/modal/ConfirmModal';
+import FeedItem from '@components/page/meetingDetail/Feed/FeedItem';
+import MeetingInfo from '@components/page/meetingDetail/Feed/FeedItem/MeetingInfo';
+import { TAKE_COUNT } from '@constants/feed';
 import useComment from '@hooks/useComment/useComment';
-import { useIntersectionObserver } from '@hooks/useIntersectionObserver';
 import useCommentMutation from '@hooks/useComment/useCommentMutation';
-import FeedCommentContainer from '@components/feed/FeedCommentContainer/FeedCommentContainer';
-import { paths } from '@/__generated__/schema2';
-import FeedActionButton from '@components/feed/FeedActionButton/FeedActionButton';
-import { useOverlay } from '@hooks/useOverlay/Index';
-import ConfirmModal from '@components/modal/ConfirmModal';
-import { styled } from 'stitches.config';
-import FeedEditModal from '@components/feed/Modal/FeedEditModal';
-import { ampli } from '@/ampli';
-import { useQueryGetMeeting } from '@api/API_LEGACY/meeting/hooks';
-import React, { useContext, useEffect, useRef } from 'react';
 import { useDisplay } from '@hooks/useDisplay';
-import FeedItem from '@components/page/meetingDetail/Feed/FeedItem';
+import { useIntersectionObserver } from '@hooks/useIntersectionObserver';
+import { useOverlay } from '@hooks/useOverlay/Index';
+import { useToast } from '@sopt-makers/ui';
+import { useMutation } from '@tanstack/react-query';
 import Link from 'next/link';
-import LikeButton from '@components/button/LikeButton';
-import { TAKE_COUNT } from '@constants/feed';
-import { PostCommentWithMentionRequest } from '@api/mention';
-import { useMutationPostCommentWithMention } from '@api/mention/hooks';
-import MeetingInfo from '@components/page/meetingDetail/Feed/FeedItem/MeetingInfo';
-import { MentionContext } from '@components/feed/Mention/MentionContext';
+import { useRouter } from 'next/router';
+import React, { useContext, useEffect, useRef } from 'react';
+import { styled } from 'stitches.config';
 
 export default function PostPage() {
   const commentRef = useRef<HTMLTextAreaElement | null>(null);
@@ -42,7 +42,7 @@ export default function PostPage() {
 
   const { data: me } = useQueryMyProfile();
 
-  const postQuery = useQueryGetPost(query.id as string);
+  const { data: post } = useQueryGetPost(query.id as string);
 
   const commentQuery = useComment();
 
@@ -114,7 +114,6 @@ export default function PostPage() {
       callback();
     };
 
-  const post = postQuery.data;
   const { data: meeting } = useQueryGetMeeting({ params: { id: post?.meeting.id ? String(post.meeting.id) : '' } });
 
   const comments = commentQuery.data?.data?.comments?.filter(
@@ -223,7 +222,7 @@ export default function PostPage() {
           <FeedCommentLikeSection
             isLiked={post.isLiked}
             commentCount={commentQuery.data?.data?.comments.length || 0}
-            likeCount={post.likeCount}
+            likeCount={post.likeCount || 0}
             onClickComment={handleClickComment}
             onClickLike={handleClickPostLike}
           />