Skip to content
This repository has been archived by the owner on Dec 15, 2024. It is now read-only.

feat : conflict resolver #22

Merged
merged 15 commits into from
Aug 7, 2024
Merged

feat : conflict resolver #22

merged 15 commits into from
Aug 7, 2024

Conversation

5ewon
Copy link
Member

@5ewon 5ewon commented Apr 27, 2024

Issue Number

What

문서 수정시 발생하는 충돌을 해소하는 컴포넌트를 구현했습니다.
디자인은 수정될 수 있습니다~~

How

ScreenShot

image

@Ubinquitous Ubinquitous changed the title Feat/conflict resolver feat : conflict resolver Apr 27, 2024
Copy link
Member

@Ubinquitous Ubinquitous left a comment

Choose a reason for hiding this comment

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

너무 수고많으셨습니다!!!

Comment on lines +6 to +8
<div className={styles.background}>
<ResolverContainer title={title} contents={contents} />
</div>
Copy link
Member

Choose a reason for hiding this comment

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

  • ResolverContainer에 styles.background를 주지 않고 이렇게 처리하신 이유가 있는지 궁금합니다!
  • 하나의 모듈만 사용할 때는 import * 대신 구조분해할당을 사용해 모듈을 들고오는 건 어떠신가요?
  • 간단한 �인터페이스 props를 받을 때에는 FC를 사용하는 컨벤션을 추천드립니다!!
const Merge = FC<{ title: string; contents: string; }>({ title, contents }) => {}

개인적인 생각으로는, 문서의 타입을 먼저 확인하면 ({ title, contents })를 보고나서 { title: string; contents: string; }를 한번
더 읽는 리소스가 발생하지 않을 거라고 생각합니다! 따라서 FC를 사용하시는 건 어떤지 여쭤보고 싶습니다 !!

Copy link
Member Author

Choose a reason for hiding this comment

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

  • 기존의 모달 구조를 재사용하다보니 미처 그부분을 생각치 못했네요.
  • 제가 FC사용에 익숙치 않아서 크게 고려해보질 못했네요. 찾아보겠습니다

apps/wiki/components/Container/index.tsx Outdated Show resolved Hide resolved
apps/wiki/components/FrameEditor/index.tsx Show resolved Hide resolved
apps/wiki/components/Resolver/index.tsx Outdated Show resolved Hide resolved

const ResolverContainer = ({ title, contents }: Props) => {
const queryClient = getQueryClient();
queryClient.prefetchQuery(docsQuery.conflicted(title, contents));
Copy link
Member

Choose a reason for hiding this comment

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

컴포넌트 async로 만들고 해당 라인에 await 붙여주셔야할 것 같습니다!

apps/wiki/services/auth/auth.api.ts Outdated Show resolved Hide resolved
apps/wiki/services/docs/docs.api.ts Show resolved Hide resolved
apps/wiki/services/docs/docs.api.ts Outdated Show resolved Hide resolved
apps/wiki/services/docs/docs.query.ts Outdated Show resolved Hide resolved
@Ubinquitous Ubinquitous merged commit eddea6c into main Aug 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants