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.

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

[Fix]: 디스코드 연동 마이너 이슈 수정 #75

Merged
merged 3 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion src/components/discordConnect/DiscordName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const DiscordName = ({ onNext }: { onNext: () => void }) => {
setError('discordUsername', {
type: 'manual',
message:
'이미 가입된 사용자명이에요. 이전에 가입한 적이 있으신 경우, 채널톡으로 문의해주세요.'
'이미 가입된 사용자명이에요. 이전에 가입한 적이 있으신 경우, 카카오톡 채널로 문의해주세요.'
});
} else {
onNext();
Expand Down
2 changes: 1 addition & 1 deletion src/components/discordConnect/DiscordNickName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const TextSection = memo(() => (
<Image src={DiscordImage} alt="discord-nickname" width={325} height={157} />
<Text typo="body1">
가입이 완료되면 가입 신청서에 제출하신 별명으로 자동으로 수정될 거예요.
추후 별명을 수정하고 싶다면 채널톡으로 코어멤버에게 연락 주세요.
추후 별명을 수정하고 싶다면 카카오톡 채널로 코어멤버에게 연락 주세요.
</Text>
</>
));
Expand Down
4 changes: 3 additions & 1 deletion src/components/discordConnect/JoinServer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { css } from '@emotion/react';
import { useFormContext } from 'react-hook-form';
import useGetDiscordJoined from '@/hooks/query/useGetDiscordJoined';
import { DiscordFormValues } from '@/types/discord';
import RoutePath from '@/routes/routePath';

export const JoinServer = ({ onNext }: { onNext: () => void }) => {
const { getValues } = useFormContext<DiscordFormValues>();
Expand All @@ -28,6 +29,7 @@ export const JoinServer = ({ onNext }: { onNext: () => void }) => {
<TextButton
text=" GDSC Hongik 공식 디스코드 서버↗︎"
style={{ color: color.discord }}
onClick={() => window.open(RoutePath.GDSCHongikDiscord, '_blank')}
/>

<Button
Expand All @@ -46,7 +48,7 @@ export const JoinServer = ({ onNext }: { onNext: () => void }) => {
text-align: center;
`}>
합류가 확인되지 않을 경우 <br />
채널톡을 통해 코어멤버에게 문의해주세요!
카카오톡 채널을 통해 코어멤버에게 문의해주세요!
</Text>
</Flex>
</>
Expand Down
3 changes: 2 additions & 1 deletion src/hooks/query/useGetDiscordJoined.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { useQuery } from '@tanstack/react-query';
export default function useGetDiscordJoined(username: string) {
const query = useQuery({
queryKey: [QueryKeys.DiscordJoined],
queryFn: () => discordApi.GET_DISCORD_JOIN(username)
queryFn: () => discordApi.GET_DISCORD_JOIN(username),
refetchOnWindowFocus: true
});

return query;
Expand Down
1 change: 1 addition & 0 deletions src/routes/routePath.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const RoutePath = {
AuthServerRedirect: '/social-login/redirect',
StudentVerificationServerRedirect: '/onboarding/verify-email',
GDSCHongikLink: 'https://www.gdschongik.com',
GDSCHongikDiscord: 'https://discord.gg/dSV6vSEuGU',
GitHubGuideLink: 'https://www.gdschongik.com/guide/github',
StudentEmailLinkGuideLink: 'https://www.gdschongik.com/guide/student-email',
CommunityGuideLink:
Expand Down
Loading