Merge remote-tracking branch 'origin/feature/SP1' into SP1/#548-banner

src/Router.tsx

@@ -34,6 +34,10 @@ import HaveDesignCustomPage from './page/Custom/HaveDesign/HaveDesignCustomPage'
 import CommonCustomPage from './page/Custom/Common/CommonCustomPage';
 import ErrorPage from './page/Error/ErrorPage';
 import MagazinePage from './page/MagazinePage';
+import CartPage from './page/CartPage';
+// import CustomDirectDepositLayout from './components/Custom/Common/DirectDeposit/CustomDirectDepositLayout';
+import ExpirationPage from './page/Expiration/ExpirationPage';
+import OrderDepositPage from './page/Order/OrderDepositPage';
 
 const Router = () => {
   return (
@@ -71,7 +75,10 @@ const Router = () => {
         <Route path='/noDesign' element={<NoDesignCustomPage />} />
         <Route path='/custom' element={<CommonCustomPage />} />
         <Route path='/error' element={<ErrorPage />} />
+        <Route path='/expired' element={<ExpirationPage />} />
         <Route path='/article/:id' element={<MagazinePage />} />
+        <Route path='/cart' element={<CartPage />} />
+        <Route path='/order-deposit' element={<OrderDepositPage />} />
       </Routes>
     </BrowserRouter>
   );

src/assets/icon/index.ts

@@ -47,6 +47,8 @@ export { ReactComponent as IcBtnStepperPlusDark } from './ic_btn_plus_dark.svg';
 export { ReactComponent as IcBtnStepperMinusLight } from './ic_btn_minus_light.svg';
 export { ReactComponent as IcBtnStepperMinusDark } from './ic_btn_minus_dark.svg';
 export { ReactComponent as ImgWelcomeLogo } from './img_welcome_logo.svg';
+export { ReactComponent as IcCart } from './ic_cart.svg';
+export { ReactComponent as IcRadio } from './ic_radio.svg';
 
 // brush
 export { ReactComponent as IcBrushBoldSelected } from './ic_brush_bold_selected.svg';
@@ -78,4 +80,4 @@ export { ReactComponent as ImgStorage } from './img_storage.svg';
 export { ReactComponent as ImgPointCoupon } from './img_point_coupon.svg';
 export { ReactComponent as ImgHomeBanner } from './img_home_banner.svg';
 export { ReactComponent as IcInformation } from './ic_information.svg';
-export { ReactComponent as ImgTattourLogin } from './img_tattour_login.svg';
+export { ReactComponent as ImgTattourLogin } from './img_tattour_login.svg';