Merge pull request #100 from TEAM-Hearus/develop

fix: 말줄임표시 추가, useValidation 이동
TEAM-Hearus · Oct 22, 2024 · 9703b3a · 9703b3a
2 parents 8cb39a7 + 6d99d27
commit 9703b3a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/components/molecules/ScriptItem/ScriptItem.module.scss b/src/components/molecules/ScriptItem/ScriptItem.module.scss
@@ -26,7 +26,6 @@
   height: 200px;
   padding: 3px 10px;
   overflow: hidden;
-  text-overflow: ellipsis;
   display: -webkit-box;
   line-clamp: 9;
   -webkit-line-clamp: 9;

diff --git a/src/components/molecules/ScriptItem/ScriptItem.tsx b/src/components/molecules/ScriptItem/ScriptItem.tsx
@@ -9,11 +9,15 @@ interface IScriptProps {
   lectureDate: string;
 }
 const ScriptItem = ({ name, processedScript, lectureDate }: IScriptProps) => {
+  const text =
+    processedScript[0].length > 99
+      ? processedScript[0] + '...'
+      : processedScript[0];
   return (
     <article className={styles.postItContainer}>
       <p className={styles.title}>{name}</p>
       <div className={styles.content}>
-        <HighlightedText text={processedScript[0] + '...'} isPreview />
+        <HighlightedText text={text} isPreview />
       </div>
       <p className={styles.date}>{formatScriptDate(lectureDate)}</p>
     </article>

diff --git a/...nts/atoms/useValidation/useValidation.tsx → src/hooks/useValidation.ts b/...nts/atoms/useValidation/useValidation.tsx → src/hooks/useValidation.ts
diff --git a/src/pages/Auth/AuthForm/AuthForm.tsx b/src/pages/Auth/AuthForm/AuthForm.tsx
@@ -3,7 +3,7 @@ import { Link, useNavigate } from 'react-router-dom';
 import { useMutation } from '@tanstack/react-query';
 import { API_URL } from '../../../apis';
 import { useAlertStore } from '../../../store/useAlertStore';
-import useValidation from '../../../components/atoms/useValidation/useValidation';
+import useValidation from '../../../hooks/useValidation';
 import InputField from '../../../components/atoms/inputs/AuthInput/AuthInputField';
 import AlertComponent from '../../../components/molecules/GlobalAlert/GlobalAlert';
 import Google from '../../../assets/images/logo/google.png';