);
};
diff --git a/src/pages/ErrorPage.jsx b/src/pages/ErrorPage.jsx
index e85c1d79..bbad306d 100644
--- a/src/pages/ErrorPage.jsx
+++ b/src/pages/ErrorPage.jsx
@@ -2,7 +2,7 @@ import React from 'react';
import { useNavigate } from 'react-router-dom';
import Loader from '../components/atoms/Loader';
import Footer from '../components/atoms/Footer';
-import Button from '../components/atoms/Button';
+import Button from '../components/atoms/button/Button';
import routes from '../constant/routes';
const ErrorPage = () => {
diff --git a/src/pages/HomePage.jsx b/src/pages/HomePage.jsx
index 26d80fa9..05cf5a75 100644
--- a/src/pages/HomePage.jsx
+++ b/src/pages/HomePage.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Link } from 'react-router-dom';
import Footer from '../components/atoms/Footer';
-import Nav from '../components/atoms/Nav';
+import Nav from '../components/atoms/nav/Nav';
import Card from '../components/atoms/Card';
import routes from '../constant/routes';
diff --git a/src/pages/LoginPage.jsx b/src/pages/LoginPage.jsx
index 0242ba24..28be64dd 100644
--- a/src/pages/LoginPage.jsx
+++ b/src/pages/LoginPage.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import loginIcon from '../assets/images/kakao_login_medium_wide.png';
-import LoginNav from '../components/atoms/LoginNav';
+import LoginNav from '../components/atoms/nav/LoginNav';
// 버튼을 눌러 개인정보 동의 후 계속하기를 하면 REDIRECT_URI로 리다이렉트 된다.
// 이후 주소에 카카오에서 보낸 인가 코드가 있는데, 이를 파싱해서 백엔드로 전송
@@ -17,10 +17,9 @@ const LoginPage = () => {
-
- 이제 편리하게
-
- 음료를 픽업하고, 픽업받아요!
+
+
이제 편리하게
+
음료를 픽업하고, 픽업받아요!
{
-
+
);
diff --git a/src/pages/PostWriteIntroPage.jsx b/src/pages/PostWriteIntroPage.jsx
index dab27c35..5881599f 100644
--- a/src/pages/PostWriteIntroPage.jsx
+++ b/src/pages/PostWriteIntroPage.jsx
@@ -1,6 +1,6 @@
import { Link } from 'react-router-dom';
-import Button from '../components/atoms/Button';
-import OtherNav from '../components/atoms/OtherNav';
+import Button from '../components/atoms/button/Button';
+import OtherNav from '../components/atoms/nav/OtherNav';
import routes from '../constant/routes';
import intro from '../constant/postWrite/intro';
@@ -10,8 +10,8 @@ const PostWriteIntroPage = () => {
-
{intro.TITLE}
-
{intro.SUB_TITLE}
+
{intro.TITLE}
+
{intro.SUB_TITLE}
diff --git a/src/pages/PostWritePage.jsx b/src/pages/PostWritePage.jsx
index 9b0ad89f..386c65d4 100644
--- a/src/pages/PostWritePage.jsx
+++ b/src/pages/PostWritePage.jsx
@@ -3,11 +3,11 @@ import { useNavigate } from 'react-router-dom';
import { useForm, FormProvider } from 'react-hook-form';
import { useMutation } from '@tanstack/react-query';
import Swal from 'sweetalert2';
-import OtherNav from '../components/atoms/OtherNav';
+import OtherNav from '../components/atoms/nav/OtherNav';
import BtnNavigate from '../components/molecules/BtnNavigate';
-import OrderInfo from '../components/templates/OrderInfo';
-import OrderRequest from '../components/templates/OrderRequest';
-import OrderDeadLine from '../components/templates/OrderDeadLine';
+import OrderInfo from '../components/templates/postWrite/OrderInfoTemplate';
+import OrderRequest from '../components/templates/postWrite/OrderRequestTemplate';
+import OrderDeadLine from '../components/templates/postWrite/OrderDeadLineTemplate';
import CircleNavigate from '../components/organisms/CircleNavigate';
import { STORE, BEVERAGE } from '../constant/postWrite/orderInfo';
import { DESTINATION } from '../constant/postWrite/orderRequest';
diff --git a/src/pages/RegisterBankPage.jsx b/src/pages/RegisterBankPage.jsx
index 124728b9..720e04fe 100644
--- a/src/pages/RegisterBankPage.jsx
+++ b/src/pages/RegisterBankPage.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import LoginNav from '../components/atoms/LoginNav';
+import LoginNav from '../components/atoms/nav/LoginNav';
import BankForm from '../components/molecules/BankForm';
const RegisterBankPage = () => {
diff --git a/src/pages/UploadStudentCardPage.jsx b/src/pages/UploadStudentCardPage.jsx
index 3d666943..f57cfc54 100644
--- a/src/pages/UploadStudentCardPage.jsx
+++ b/src/pages/UploadStudentCardPage.jsx
@@ -4,8 +4,8 @@ import { BsUpload } from 'react-icons/bs';
import Swal from 'sweetalert2';
import { useMutation, useQuery } from '@tanstack/react-query';
import { getUserAuth } from '../apis/myPage';
-import OtherNav from '../components/atoms/OtherNav';
-import Button from '../components/atoms/Button';
+import OtherNav from '../components/atoms/nav/OtherNav';
+import Button from '../components/atoms/button/Button';
import { useNavigate } from 'react-router-dom';
import routes from '../constant/routes';
import uploadCard from '../apis/uploadCard';
@@ -40,19 +40,11 @@ const CheckStudentCardPage = () => {
// 입력완료 누를 때 나타나는 모달창
const requestCardModal = () => {
- return Swal.fire({
- requestCardModalMessage,
- }).then((result) => {
+ return Swal.fire(requestCardModalMessage).then((result) => {
if (result.isConfirmed && imageSrc) {
- Swal.fire({
- successRequestCardMessage,
- }).then(mutate(imageSrc));
+ Swal.fire(successRequestCardMessage).then(mutate(imageSrc));
// 그리고 사진 보내고 기다림
mutate(formData);
- } else {
- Swal.fire({
- errorRequestCardMessage,
- });
}
});
};
diff --git a/src/utils/alert.js b/src/utils/alert.js
index 6a7815b4..d7778efa 100644
--- a/src/utils/alert.js
+++ b/src/utils/alert.js
@@ -44,6 +44,7 @@ export const unknownErrorMessage = {
};
export const requestCardModalMessage = {
title: '인증을 요청 하시겠습니까?',
+ icon: 'question',
showCancelButton: true,
cancelButtonText: '취소',
confirmButtonText: '확인',
diff --git a/src/components/atoms/Time.jsx b/src/utils/time.js
similarity index 65%
rename from src/components/atoms/Time.jsx
rename to src/utils/time.js
index 2f8411da..d8f38e56 100644
--- a/src/components/atoms/Time.jsx
+++ b/src/utils/time.js
@@ -1,8 +1,3 @@
-// Time.jsx
-// Figma 내용의 오늘 ~시 ~분까지를 띄우기 위한 코드
-// arrow function 으로 변경해 보았습니다!
-// * ms 단위이기 때문에 1000을 곱해주어야 합니다
-
const Time = (timestamp) => {
const time = timestamp;
const myDate = new Date(time * 1000);
diff --git a/tailwind.config.js b/tailwind.config.js
index 072097a3..e8d6f9c5 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -8,6 +8,16 @@ module.exports = {
blue: '#0075FF',
},
},
+ keyframes: {
+ fadeInMoveRight: {
+ '0%': { opacity: '0', transform: 'translateX(-10px)' },
+ '100%': { opacity: '1', transform: 'translateX(0)' },
+ },
+ },
+ animation: {
+ 'fade-in-move-right': 'fadeInMoveRight 1s ease-out forwards',
+ 'fade-in-move-right-delayed': 'fadeInMoveRight 1s ease-out 1s forwards',
+ },
},
// eslint-disable-next-line global-require
plugins: [require('tailwind-scrollbar-hide')],