[KAN-149] fix(-): resolve conflicts

Try-AngIe · Jul 15, 2024 · 22d8099 · 22d8099
1 parent fe5e459
commit 22d8099
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/client/src/components/common/ProductSelectField.jsx b/client/src/components/common/ProductSelectField.jsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import Checkbox from '@/components/common/CheckBox';
+import Checkbox from '@/components/common/inputs/CheckBox';
 
 const ProductSelectField = ({ label, required, options, onChange, selectedOptions, ...props }) => {
   const [isOpen, setIsOpen] = useState(false);

diff --git a/client/src/components/member/account/AccountInfo.jsx b/client/src/components/member/account/AccountInfo.jsx
@@ -1,4 +1,4 @@
-import Input from '@/components/common/Input';
+import Input from '@/components/common/inputs/Input';
 
 const AccountInfo = () => {
   return (

diff --git a/client/src/components/member/card/CardInfo.jsx b/client/src/components/member/card/CardInfo.jsx
@@ -1,4 +1,4 @@
-import Input from '@/components/common/Input';
+import { Input } from 'postcss';
 
 const CardInfo = () => {
   return (

diff --git a/client/src/pages/member/PaymentChoosePage.jsx b/client/src/pages/member/PaymentChoosePage.jsx
@@ -1,8 +1,8 @@
-import NextButton from '@/components/common/StatusNextButton';
-import PreviousButton from '@/components/common/StatusPreButton';
 import { useStatusStore } from '@/stores/useStatusStore';
 import useStatusStepper from '@/hooks/useStatusStepper';
 import { useState } from 'react';
+import PreviousButton from '@/components/common/buttons/StatusPreButton';
+import NextButton from '@/components/common/buttons/StatusNextButton';
 
 const PaymentChoosePage = () => {
   const start = 0;

diff --git a/client/src/pages/vendor/setting/SettingSimpConsentPage.jsx b/client/src/pages/vendor/setting/SettingSimpConsentPage.jsx
@@ -1,7 +1,7 @@
 import SimpConsentQrUrlModal from '@/components/vendor/modal/SimpConsentQrUrlModal';
 import { useState } from 'react';
 import ProductSelectField from '@/components/common/ProductSelectField';
-import Checkbox from '@/components/common/CheckBox';
+import Checkbox from '@/components/common/inputs/CheckBox';
 
 const SettingSimpConsentPage = () => {
   const [isShowModal, setIsShowModal] = useState(false);
@@ -74,6 +74,7 @@ const SettingSimpConsentPage = () => {
                   ))}
                 </div>
               </div>
+              []
             </div>
             <hr className='my-6 border-gray-400' />