Fix: 충돌 해결 Footer, 프리티어 설정 파일 재업로드

Fixes: #15
LETSCAREER-C · Sep 4, 2024 · f99c01f · f99c01f
1 parent a403d45
commit f99c01f
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 29 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,8 @@
+{
+  "singleQuote": true,
+  "parser": "typescript",
+  "semi": true,
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "printWidth": 100
+}
diff --git a/src/components/Footer/Footer.tsx b/src/components/Footer/Footer.tsx
@@ -1,15 +1,14 @@
-import React from 'react';
 import { FunctionComponent } from 'react';
 
 const Footer: FunctionComponent = () => {
   return (
-    <footer className="border-t w-full border-neutral-800 bg-neutral-200 px-5 pb-6 pt-10 lg:px-10 xl:px-52">
-      <div className="flex flex-col lg:flex-row justify-between w-full max-w-6xl mx-auto">
+    <footer className=" w-full bg-neutral-200 font-pretendard px-5 pb-6 pt-10 lg:px-10 xl:px-28">
+      <div className="flex flex-col-reverse justify-between sm:flex-row w-full max-w-6xl mx-auto">
         {/* 왼쪽 섹션: 로고와 사업자 정보 */}
-        <div className="flex flex-col gap-5 lg:w-1/3">
+        <div className="flex flex-col gap-5 mt-[52px] lg:w-1/3 md:mt-0 px-5">
           <div className="flex items-center gap-2">
-            <img className="w-[34px]" alt="Logo" src="https://via.placeholder.com/34" />
-            <img className="w-[79px]" alt="Career" src="https://via.placeholder.com/79x35" />
+            <img className="w-[34px]" alt="Logo" src="/svg/Lets.svg" />
+            <img className="w-[79px]" alt="Career" src="/svg/Career.svg " />
           </div>
           <div className="text-neutral-800 text-xs">
             <span>아이앤지 사업자 정보</span>
@@ -18,16 +17,43 @@ const Footer: FunctionComponent = () => {
         </div>
 
         {/* 오른쪽 섹션: 사이트맵과 고객센터 */}
-        <div className="flex flex-col lg:flex-row gap-8 lg:w-2/3">
+        <div className="flex flex-col desktop:flex-row gap-8 px-5">
           <div className="flex flex-col gap-3">
-            <a className="text-sm font-medium" href="/about">렛츠커리어 스토리</a>
-            <a className="text-sm font-medium" href="/program">프로그램</a>
-            <a className="text-sm font-medium" href="/blog/list">블로그</a>
+            <a className="text-sm font-medium" href="/about">
+              렛츠커리어 스토리
+            </a>
+            <a className="text-sm font-medium" href="/program">
+              프로그램
+            </a>
+            <a className="text-sm font-medium" href="/blog/list">
+              블로그
+            </a>
           </div>
           <div className="flex flex-col gap-3">
-            <a className="text-sm font-medium" href="https://letscareer.oopy.io" target="_blank" rel="noopener noreferrer">공지사항</a>
-            <a className="text-sm font-medium" href="https://docs.google.com/forms/d/e/1FAIpQLSeHM_d3yd0cOiH2aSqhprtSFmidIYFziyIxf5-9j7rgZCobvA/viewform" target="_blank" rel="noopener noreferrer">광고/제휴 문의</a>
-            <a className="text-sm font-medium" href="https://letscareer.oopy.io" target="_blank" rel="noopener noreferrer">자주 묻는 질문</a>
+            <a
+              className="text-sm font-medium"
+              href="https://letscareer.oopy.io"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              공지사항
+            </a>
+            <a
+              className="text-sm font-medium"
+              href="https://docs.google.com/forms/d/e/1FAIpQLSeHM_d3yd0cOiH2aSqhprtSFmidIYFziyIxf5-9j7rgZCobvA/viewform"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              광고/제휴 문의
+            </a>
+            <a
+              className="text-sm font-medium"
+              href="https://letscareer.oopy.io"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              자주 묻는 질문
+            </a>
             <div className="text-xs text-neutral-800">
               <p>1:1 채팅 상담: 우측 하단 [문의하기] 클릭</p>
               <p>- 평일 및 주말 09:00-21:00 상담 가능</p>

diff --git a/src/pages/DetailPage/DetailPage.tsx b/src/pages/DetailPage/DetailPage.tsx
@@ -15,9 +15,8 @@ export default function DetailPage() {
     const fetchDetail = async () => {
       try {
         const res = await axios.get(`https://letmec.p-e.kr/program/${programId}`);
-        setDetailData(res.data.result);
 
-        console.log('데이터 확인', detailData);
+        setDetailData(res.data.result);
       } catch (error) {
         console.log('에러 발생', error);
       }
@@ -26,6 +25,8 @@ export default function DetailPage() {
     fetchDetail();
   }, []);
 
+  console.log('데이터 확인', detailData);
+
   return (
     <main>
       <DetailThumbnail />

diff --git a/src/pages/ReviewPage/ReviewPage.tsx b/src/pages/ReviewPage/ReviewPage.tsx
@@ -1,19 +1,21 @@
-import React from 'react'
-import ReviewBox from '../../components/Review/\bReviewBox';
+import React from 'react';
+import ReviewBox from '../../components/Review/ReviewBox';
 
 const ReviewPage: React.FC = () => {
   return (
     <div>
-      <ReviewBox review={{
-        id: 0,
-        number_of_star: 0,
-        program_name: '',
-        review_date: '',
-        user_name: '',
-        contents: ''
-      }} />
+      <ReviewBox
+        review={{
+          id: 0,
+          number_of_star: 0,
+          program_name: '',
+          review_date: '',
+          user_name: '',
+          contents: '',
+        }}
+      />
     </div>
-  )
-}
+  );
+};
 
-export default ReviewPage;
+export default ReviewPage;
diff --git a/src/types/ProgramDetailType.ts b/src/types/ProgramDetailType.ts
@@ -56,7 +56,7 @@ export interface Curriculum {
   content: string;
 }
 
-// 리뷰 타입 정의
+// 리뷰 타입 정의 -> 리뷰 작성 시간
 export interface Review {
   userName: string;
   content: string;