Merge branch 'dev' into chore/sentry

GDSC-Hongik · Aug 3, 2024 · 44619d7 · 44619d7
2 parents 6acb94a + d05a763
commit 44619d7
Show file tree

Hide file tree

Showing 9 changed files with 134 additions and 159 deletions.
diff --git a/package.json b/package.json
@@ -30,8 +30,8 @@
     "react-toastify": "^10.0.4",
     "wowds-icons": "^0.1.0",
     "wowds-tokens": "^0.0.9",
-    "wowds-ui": "^0.1.7",
     "zustand": "^4.5.0"
+    "wowds-ui": "^0.1.8",
   },
   "devDependencies": {
     "@sentry/react": "^8.22.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git 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 }) => (
-        <DropDown
-          {...field}
-          label="학과"
-          placeholder="선택하세요"
-          onChange={({ selectedValue }) => {
-            field.onChange(selectedValue);
-          }}>
-          <React.Fragment key={`${field}-option`}>
-            {departmentList.map((department, index) => {
-              return (
-                <DropDownOption
-                  key={`${index}-dropdownOption`}
-                  text={department.name}
-                  value={department.code}
-                />
-              );
-            })}
-          </React.Fragment>
-        </DropDown>
+        <InputFormWrapper>
+          <DropDown
+            {...field}
+            label="학과"
+            placeholder="선택하세요"
+            onChange={({ selectedValue }) => {
+              field.onChange(selectedValue);
+            }}>
+            <React.Fragment key={`${field}-option`}>
+              {departmentList.map((department, index) => {
+                return (
+                  <DropDownOption
+                    key={`${index}-dropdownOption`}
+                    text={department.name}
+                    value={department.code}
+                  />
+                );
+              })}
+            </React.Fragment>
+          </DropDown>
+        </InputFormWrapper>
       )}
     />
   );
 };
 
 export default DepartmentSelect;
+
+const InputFormWrapper = styled.div`
+  height: 84.8px;
+  width: 100%;
+`;
diff --git a/src/components/chatbot/ChannelService.ts b/src/components/chatbot/ChannelService.ts
diff --git a/src/components/chatbot/Chatbot.tsx b/src/components/chatbot/Chatbot.tsx
diff --git 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
@@ -10,7 +10,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: {