Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feat/#848] 광고 구좌 캐러셀 dot botton 색상 변경 #849

Merged
merged 4 commits into from
Sep 16, 2024
Merged

[Feat/#848] 광고 구좌 캐러셀 dot botton 색상 변경 #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c175105
feat: window - mac CRLF 차이 해결
ocahs9 Sep 11, 2024
6f19fdd
fix: dotButton을 gray50 으로 변경
ocahs9 Sep 11, 2024
a88d4fc
chore: install-state.gz 으로 인한 충돌 해결
ocahs9 Sep 16, 2024
eaa613b
fix: install-state.gz 포함하지 않도록 변경
ocahs9 Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
}
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file modified .yarn/install-state.gz
View file
Open in desktop
Binary file not shown.
50 changes: 25 additions & 25 deletions pages/post/index.tsx
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

여기 파일은 왜 수정 사항이 생겼을까요~? 이번 기능과 관련 없는 수정이라면, 제외 후 pr 올려주세요!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

기능과는 관련 없는데, "source.organizeImports": true 옵션을 통해서 정리한 모습입니다!
import 문을 보기 좋게 정렬하면 좋을 것 같아서 반영해둔건데, 생각해보니 다른사람과 동시에 같은 파일을 작업해야한다면 충돌 문제가 날 수 있겠네요.. 이번만 반영해두고 다음부터는 해당 옵션 꺼두도록 하겠습니다!

Original file line number Diff line number Diff line change
@@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/components/page/meetingList/Advertisement/AdCarouselDotBtn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const SDotButton = styled('button', {
borderRadius: '10px',
'&.embla__dot--selected': {
boxShadow: '$inset $textBody',
backgroundColor: 'white',
backgroundColor: '$gray50',
opacity: '1',
},
});
Loading