-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #88 from Clubber2024/feat/footer_qna
Feat/footer qna
- Loading branch information
Showing
9 changed files
with
281 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| REACT_APP_BASE_URL="http://13.125.141.171:8080" | ||
|
|
||
| REACT_APP_BASE_LOGO_URL=https://clubber-bucket.s3.ap-northeast-2.amazonaws.com/logo/soongsil_default.png | ||
|
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import { useEffect, useState } from 'react'; | ||
| import { customAxios } from '../../config/axios-config'; | ||
| import styles from './QnA.module.css'; | ||
|
|
||
| export default function QnA() { | ||
| const [faqData, setFaqData] = useState([]); | ||
|
|
||
| const getFaQData = async () => { | ||
| try { | ||
| const res = await customAxios.get(`/v1/faqs`); | ||
| //console.log(res.data.data); | ||
| setFaqData(res.data.data); | ||
| } catch (error) { | ||
| console.error('error:', error); | ||
| } | ||
| }; | ||
|
|
||
| useEffect(() => { | ||
| getFaQData(); | ||
| }); | ||
|
|
||
| return ( | ||
| <div className={styles.qna_div}> | ||
| <p className={styles.qna_title}>문의사항</p> | ||
| <p className={styles.faq_title}>자주 묻는 질문</p> | ||
|
|
||
| <div className={styles.faq_container} key={faqData.code}> | ||
| {faqData?.map((item) => ( | ||
| <div className={styles.faq_rectangle}> | ||
| <p className={styles.faq_Q}>Q</p> | ||
| <p className={styles.faq_question}>{item.question}</p> | ||
| </div> | ||
| ))} | ||
| </div> | ||
|
|
||
| <p className={styles.faq_title}>Q&A</p> | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| @media screen and (min-width: 768px) { | ||
| .qna_div { | ||
| margin-left: 10%; | ||
| } | ||
|
|
||
| .qna_title { | ||
| font-family: Noto Sans; | ||
| font-size: 26px; | ||
| font-weight: 700; | ||
| line-height: 35.41px; | ||
| text-align: center; | ||
| color: #202123; | ||
| margin-top: 47px; | ||
| } | ||
|
|
||
| .faq_title { | ||
| font-family: Noto Sans; | ||
| font-size: 26px; | ||
| font-weight: 700; | ||
| line-height: 35.41px; | ||
| text-align: left; | ||
| color: #202123; | ||
| margin-top: 65px; | ||
| } | ||
|
|
||
| .faq_container { | ||
| display: flex; | ||
| flex-direction: row; | ||
| margin-bottom: 50px; | ||
| } | ||
|
|
||
| .faq_rectangle { | ||
| width: 285px; | ||
| height: 97px; | ||
| border-radius: 20px; | ||
| background: #ffffff; | ||
| border: 1px solid #9c9c9c4d; | ||
| box-shadow: 0px 0px 2px 1px #0000000d; | ||
| margin-top: 36px; | ||
| margin-right: 20px; | ||
| display: flex; | ||
| flex-direction: row; | ||
| } | ||
|
|
||
| .faq_Q { | ||
| font-family: Plus Jakarta Sans; | ||
| font-size: 20px; | ||
| font-weight: 700; | ||
| line-height: 25.2px; | ||
| text-align: left; | ||
| color: #202123; | ||
| margin-left: 20px; | ||
| margin-top: 20px; | ||
| margin-right: 8px; | ||
| /* display: contents; */ | ||
| } | ||
|
|
||
| .faq_question { | ||
| font-family: Noto Sans KR; | ||
| font-size: 18px; | ||
| font-weight: 600; | ||
| line-height: 26.06px; | ||
| text-align: left; | ||
| margin-top: 20px; | ||
| color: #202123; | ||
| /* display: contents; */ | ||
| } | ||
| } | ||
|
|
||
| @media screen and (max-width: 768px) { | ||
| .qna_div { | ||
| margin-left: 10%; | ||
| } | ||
|
|
||
| .qna_title { | ||
| font-family: Noto Sans; | ||
| font-size: 26px; | ||
| font-weight: 700; | ||
| line-height: 35.41px; | ||
| text-align: center; | ||
| color: #202123; | ||
| margin-top: 47px; | ||
| } | ||
|
|
||
| .faq_title { | ||
| font-family: Noto Sans; | ||
| font-size: 26px; | ||
| font-weight: 700; | ||
| line-height: 35.41px; | ||
| text-align: left; | ||
| color: #202123; | ||
| margin-top: 65px; | ||
| } | ||
|
|
||
| .faq_container { | ||
| display: flex; | ||
| flex-direction: row; | ||
| margin-bottom: 50px; | ||
| } | ||
|
|
||
| .faq_rectangle { | ||
| width: 285px; | ||
| height: 97px; | ||
| border-radius: 20px; | ||
| background: #ffffff; | ||
| border: 1px solid #9c9c9c4d; | ||
| box-shadow: 0px 0px 2px 1px #0000000d; | ||
| margin-top: 36px; | ||
| margin-right: 20px; | ||
| display: flex; | ||
| flex-direction: row; | ||
| } | ||
|
|
||
| .faq_Q { | ||
| font-family: Plus Jakarta Sans; | ||
| font-size: 20px; | ||
| font-weight: 700; | ||
| line-height: 25.2px; | ||
| text-align: left; | ||
| color: #202123; | ||
| margin-left: 20px; | ||
| margin-top: 20px; | ||
| margin-right: 8px; | ||
| /* display: contents; */ | ||
| } | ||
|
|
||
| .faq_question { | ||
| font-family: Noto Sans KR; | ||
| font-size: 18px; | ||
| font-weight: 600; | ||
| line-height: 26.06px; | ||
| text-align: left; | ||
| margin-top: 20px; | ||
| color: #202123; | ||
| /* display: contents; */ | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,32 @@ | ||
| import React from 'react'; | ||
| //import { Link } from 'react-router-dom'; | ||
| import styles from './Footer.module.css'; | ||
| import { LinkItem } from '../branch/BranchCentral'; | ||
|
|
||
| function Footer() { | ||
| return ( | ||
| <div className={styles.footer}> | ||
| <div className={styles.footer_content}> | ||
| <p className={styles.text_ContactUs}>contact us</p> | ||
| <br /> | ||
| <p className={styles.p}>instagram:@clubber phone-number:010-1234-5678 email: [email protected]</p> | ||
| <> | ||
| <div className={styles.font_container}> | ||
| <p className={styles.font}>이용약관ㅣ</p> | ||
| <p className={styles.font}>개인정보처리방침ㅣ</p> | ||
| <p className={styles.font}>운영정책ㅣ</p> | ||
| <p className={styles.font}>공지사항ㅣ</p> | ||
| <LinkItem to={'/qna'}> | ||
| <p className={styles.font}>FAQ</p> | ||
| </LinkItem> | ||
| </div> | ||
| </div> | ||
| <div className={styles.footer}> | ||
| <div className={styles.footer_content}> | ||
| <div className={styles.circle_insta}> | ||
| <a href="https://www.instagram.com/clubber_ssu/"> | ||
| <img src={'/footer/insta.png'} alt="insta" className={styles.footer_insta} /> | ||
| </a> | ||
| </div> | ||
| <p className={styles.p}>상호 : (주)클로버 | 대표자명 : 클러버</p> | ||
| <br /> | ||
| </div> | ||
| </div> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| import QnA from '../component/QnA/QnA'; | ||
|
|
||
| export default function QnAPage() { | ||
| return ( | ||
| <> | ||
| <QnA /> | ||
| </> | ||
| ); | ||
| } |