From 909c3c5526ade2ffec76cf04e16303465c85b6e7 Mon Sep 17 00:00:00 2001
From: Eugene Kim <67894159+eugene028@users.noreply.github.com>
Date: Sat, 3 Aug 2024 20:26:15 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[Refactor]=20:=20=ED=95=99=EA=B5=90=20?=
=?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=9D=B8=EC=A6=9D=20=ED=8E=98?=
=?UTF-8?q?=EC=9D=B4=EC=A7=80=20QA=20=EA=B0=9C=EC=84=A0=20=EB=B0=98?=
=?UTF-8?q?=EC=98=81=20(#80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: email 인증 error코드 중복 제거
* refac: 스팸메일함 안내문구 추가
* chore: 채널톡 위젯 삭제
---
src/components/chatbot/ChannelService.ts | 64 -----------------------
src/components/chatbot/Chatbot.tsx | 17 ------
src/hooks/mutation/useSendStudentEmail.ts | 3 --
src/main.tsx | 2 -
src/pages/StudentVerification.tsx | 8 +--
5 files changed, 5 insertions(+), 89 deletions(-)
delete mode 100644 src/components/chatbot/ChannelService.ts
delete mode 100644 src/components/chatbot/Chatbot.tsx
diff --git a/src/components/chatbot/ChannelService.ts b/src/components/chatbot/ChannelService.ts
deleted file mode 100644
index 70e5326..0000000
--- a/src/components/chatbot/ChannelService.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-declare global {
- interface Window {
- ChannelIO: (arg0: string, arg1?: unknown, arg2?: unknown) => void;
- ChannelIOInitialized: boolean;
- }
-}
-
-class ChannelService {
- constructor() {
- this.loadScript();
- }
-
- loadScript() {
- const w = window;
- if (w.ChannelIOInitialized) {
- return;
- }
- const channelIO = function () {
- // eslint-disable-next-line prefer-rest-params
- channelIO.c(arguments);
- };
-
- channelIO.q = [] as any[];
- channelIO.c = function (args: any) {
- channelIO.q.push(args);
- };
- w.ChannelIO = channelIO;
- function initializeChannelIO() {
- if (w.ChannelIOInitialized) {
- return;
- }
- w.ChannelIOInitialized = true;
- const script = document.createElement("script");
- script.type = "text/javascript";
- script.async = true;
- script.src = "https://cdn.channel.io/plugin/ch-plugin-web.js";
- const firstScript = document.getElementsByTagName("script")[0];
- if (firstScript?.parentNode) {
- firstScript.parentNode.insertBefore(script, firstScript);
- }
- }
- if (document.readyState === "complete") {
- initializeChannelIO();
- } else {
- w.addEventListener("DOMContentLoaded", initializeChannelIO);
- w.addEventListener("load", initializeChannelIO);
- }
- }
- boot(settings: any, callback: any) {
- window.ChannelIO("boot", settings, callback);
- }
- onBadgeChanged(callback: (number: number) => void) {
- window.ChannelIO("onBadgeChanged", callback);
- }
- addTags(tags: string[]) {
- window.ChannelIO("addTags", tags);
- }
- shutdown() {
- window.ChannelIO("shutdown");
- }
-}
-
-export default ChannelService;
diff --git a/src/components/chatbot/Chatbot.tsx b/src/components/chatbot/Chatbot.tsx
deleted file mode 100644
index 422ef9e..0000000
--- a/src/components/chatbot/Chatbot.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useEffect } from 'react';
-
-import { CHANNELIO_PLUGIN_KEY } from '@constants/environment';
-
-import ChannelService from '@/components/chatbot/ChannelService';
-
-export default function Chatbot() {
- useEffect(() => {
- const channelTalk = new ChannelService();
-
- channelTalk.boot({ pluginKey: CHANNELIO_PLUGIN_KEY }, () => {});
-
- return () => channelTalk.shutdown();
- }, []);
-
- return ;
-}
diff --git a/src/hooks/mutation/useSendStudentEmail.ts b/src/hooks/mutation/useSendStudentEmail.ts
index 63aabf7..a8077b1 100644
--- a/src/hooks/mutation/useSendStudentEmail.ts
+++ b/src/hooks/mutation/useSendStudentEmail.ts
@@ -11,9 +11,6 @@ export default function useSendStudentEmail() {
onSuccess: () => {
toast('메일 전송이 완료되었습니다.');
navigation(RoutePath.Dashboard);
- },
- onError: (error) => {
- toast(error.message);
}
});
diff --git a/src/main.tsx b/src/main.tsx
index 44b13d4..7762635 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -8,7 +8,6 @@ import { GlobalStyle } from '@/styles';
import { Global } from '@emotion/react';
import { ToastContainer } from 'react-toastify';
import './styles/styles.scss';
-import Chatbot from '@/components/chatbot/Chatbot';
const queryClient = new QueryClient({
defaultOptions: {
@@ -24,7 +23,6 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
-
diff --git a/src/pages/StudentVerification.tsx b/src/pages/StudentVerification.tsx
index 9668a05..5b24c9e 100644
--- a/src/pages/StudentVerification.tsx
+++ b/src/pages/StudentVerification.tsx
@@ -17,7 +17,7 @@ export const StudentVerification = () => {
//TODO: 추후 pending 상태 백엔드 API 수정하면 반영해둘것.
const [, setPending] = useState(false);
const [isClicked, setIsClicked] = useState(false);
- const { onSubmit, control, isValid, onVerifyStudent, loading } =
+ const { onSubmit, control, isValid, onVerifyStudent, isPending } =
useStudentVerification();
const IsStudentVerified = async () => {
@@ -39,7 +39,7 @@ export const StudentVerification = () => {
onSubmit();
};
- if (loading) {
+ if (isPending) {
return 로딩중입니다...
;
}
@@ -90,12 +90,14 @@ export const StudentVerification = () => {
* 메일 전송이 최대 30분 가량 늦어질 수 있어요.
* 메일 전송이 되지 않을 경우 카카오톡 채널을 통해 코어 멤버에게
문의해 주세요.
+
* 인증메일이 스팸메일함에 전송될 수 있으니 확인해주세요.
학교 이메일이 무엇인가요?
@@ -130,7 +132,7 @@ const StudentGuideLink = styled(Link)`
color: ${color.sub};
}
&:visited {
- color: ${color.textBlack};
+ color: ${color.sub};
}
${typography.label2};
`;
From d05a763dcfdd5a194c0730159e33a1f02dfdc8bf Mon Sep 17 00:00:00 2001
From: Eugene Kim <67894159+eugene028@users.noreply.github.com>
Date: Sat, 3 Aug 2024 20:27:38 +0900
Subject: [PATCH 2/2] =?UTF-8?q?[Refactor]=20:=20Signup=20=ED=8E=98?=
=?UTF-8?q?=EC=9D=B4=EC=A7=80=20QA=20=EA=B0=9C=EC=84=A0=20=EB=B0=98?=
=?UTF-8?q?=EC=98=81=20(#79)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: 하단 absolute 처리
* fix: bottom간격 해결
* fix: signup QA
* chore: wow-ui 버전 업데이트
---
package.json | 2 +-
pnpm-lock.yaml | 26 ++++-
src/components/auth/DepartmentSelect.tsx | 46 +++++----
src/pages/SignUp.tsx | 126 ++++++++++++++---------
4 files changed, 129 insertions(+), 71 deletions(-)
diff --git a/package.json b/package.json
index 0fda0a7..041fdf7 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"react-toastify": "^10.0.4",
"zustand": "^4.5.0",
"wowds-tokens": "^0.0.9",
- "wowds-ui": "^0.1.7",
+ "wowds-ui": "^0.1.8",
"wowds-icons": "^0.1.0"
},
"devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4687c3b..5980945 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -57,8 +57,8 @@ dependencies:
specifier: ^0.0.9
version: 0.0.9
wowds-ui:
- specifier: ^0.1.7
- version: 0.1.7(next@14.2.4)(react@18.2.0)
+ specifier: ^0.1.8
+ version: 0.1.8(next@14.2.4)(react-dom@18.2.0)(react@18.2.0)
zustand:
specifier: ^4.5.0
version: 4.5.1(@types/react@18.2.58)(react@18.2.0)
@@ -7574,6 +7574,21 @@ packages:
dependencies:
js-tokens: 4.0.0
+ /lottie-react@2.4.0(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-pDJGj+AQlnlyHvOHFK7vLdsDcvbuqvwPZdMlJ360wrzGFurXeKPr8SiRCjLf3LrNYKANQtSsh5dz9UYQHuqx4w==}
+ peerDependencies:
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0
+ react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+ dependencies:
+ lottie-web: 5.12.2
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
+ dev: false
+
+ /lottie-web@5.12.2:
+ resolution: {integrity: sha512-uvhvYPC8kGPjXT3MyKMrL3JitEAmDMp30lVkuq/590Mw9ok6pWcFCwXJveo0t5uqYw1UREQHofD+jVpdjBv8wg==}
+ dev: false
+
/loupe@2.3.7:
resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
dependencies:
@@ -10001,15 +10016,18 @@ packages:
resolution: {integrity: sha512-fMGyb92sZ1iSf0TGSabQVym/MWsYyfetgBBNbZ0K6eGfESKtZF8AM1aDYRODmwyPkPSnt0SmOtRWMDxnPsnCqg==}
dev: false
- /wowds-ui@0.1.7(next@14.2.4)(react@18.2.0):
- resolution: {integrity: sha512-ls2SnsTVfZpF2IOVu1N0FSo+XdGtlxtp+YOTwdd/l2lLX+Mh99/HKLsH6Q36p+yRF9zu0iiHv5dIlX790jvkOg==}
+ /wowds-ui@0.1.8(next@14.2.4)(react-dom@18.2.0)(react@18.2.0):
+ resolution: {integrity: sha512-a6DSdxoQxZPRMkFodbY1GKYWxzuzCpSAir5WAKU0lPO3cmTmK1ILLXqlI+lANfI9fRAzCZDY9RoX5vdBl9yz7A==}
peerDependencies:
next: ^14.1.1
react: ^18.2.0
dependencies:
+ lottie-react: 2.4.0(react-dom@18.2.0)(react@18.2.0)
next: 14.2.4(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0)(sass@1.71.1)
react: 18.2.0
wowds-icons: 0.1.1
+ transitivePeerDependencies:
+ - react-dom
dev: false
/wrap-ansi@7.0.0:
diff --git a/src/components/auth/DepartmentSelect.tsx b/src/components/auth/DepartmentSelect.tsx
index 7c00368..a54256e 100644
--- a/src/components/auth/DepartmentSelect.tsx
+++ b/src/components/auth/DepartmentSelect.tsx
@@ -1,4 +1,5 @@
import React from 'react';
+import styled from '@emotion/styled';
import { useGetDepartmentList } from '@/hooks/query';
import { Control, Controller } from 'react-hook-form';
import DropDown from 'wowds-ui/DropDown';
@@ -32,28 +33,35 @@ const DepartmentSelect = ({ control }: DepartmentSelectProps) => {
}
}}
render={({ field }) => (
- {
- field.onChange(selectedValue);
- }}>
-
- {departmentList.map((department, index) => {
- return (
-
- );
- })}
-
-
+
+ {
+ field.onChange(selectedValue);
+ }}>
+
+ {departmentList.map((department, index) => {
+ return (
+
+ );
+ })}
+
+
+
)}
/>
);
};
export default DepartmentSelect;
+
+const InputFormWrapper = styled.div`
+ height: 84.8px;
+ width: 100%;
+`;
diff --git a/src/pages/SignUp.tsx b/src/pages/SignUp.tsx
index 220db89..71bf333 100644
--- a/src/pages/SignUp.tsx
+++ b/src/pages/SignUp.tsx
@@ -75,7 +75,7 @@ export const SignUp = () => {
style={{
display: 'flex',
flexDirection: 'column',
- gap: '24px',
+ gap: '10px',
width: '100%'
}}>
{
}
}}
render={({ field, fieldState }) => (
-
+
+
+
)}
/>
{
}}
render={({ field, fieldState }) => {
return (
-
+
+
+
);
}}
/>
@@ -153,16 +157,18 @@ export const SignUp = () => {
}
}}
render={({ field, fieldState }) => (
-
+
+
+
)}
/>
}>
@@ -205,22 +211,36 @@ export const SignUp = () => {
}
}}
render={({ field }) => (
- {
- field.onChange(selectedValue);
- }}
- defaultValue=""
- value={field.value}
- style={{ marginTop: '15px', flex: 1, width: '10rem' }}>
-
-
-
-
-
+
+ {
+ field.onChange(selectedValue);
+ }}
+ style={{ marginTop: '22px', flex: 1, width: '100%' }}>
+
+
+
+
+
+
)}
/>
@@ -231,6 +251,9 @@ export const SignUp = () => {
align="center"
css={css`
margin-top: 16px;
+ @media (max-height: 750px) {
+ bottom: 0rem;
+ }
position: absolute;
bottom: 1.75rem;
width: 100%;
@@ -316,6 +339,9 @@ export const SignUp = () => {
const Container = styled(Flex)`
position: relative;
flex-direction: column;
+ @media (max-height: 765px) {
+ min-height: 105vh;
+ }
min-height: calc(100vh - 54px);
justify-content: flex-start;
background-color: ${color.mono50};
@@ -346,8 +372,14 @@ const GuideLink = styled(Link)<{ color?: colorKey }>`
}
`;
+const InputFormWrapper = styled.div`
+ height: 84.8px;
+ width: 100%;
+`;
+
const TextFieldWrapper = styled.div`
flex: 1;
+ height: 84.8px;
width: 50%;
`;