diff --git a/.history/src/App_20211119000405.js b/.history/src/App_20211119000405.js
deleted file mode 100644
index e991c8a..0000000
--- a/.history/src/App_20211119000405.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//style
-import { GlobalStyles } from './GlobalStyles';
-import CartPage from './components/CartPage';
-
-function App() {
- return (
- <>
-
-
- >
- );
-}
-
-export default App;
\ No newline at end of file
diff --git a/.history/src/App_20211119173638.js b/.history/src/App_20211119173638.js
deleted file mode 100644
index 6b53f58..0000000
--- a/.history/src/App_20211119173638.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//style
-import { GlobalStyles } from './GlobalStyles';
-import CartPage from './components/CartPage';
-export
-function App() {
- return (
- <>
-
-
- >
- );
-}
-
-export default App;
\ No newline at end of file
diff --git a/.history/src/App_20211119173640.js b/.history/src/App_20211119173640.js
deleted file mode 100644
index e991c8a..0000000
--- a/.history/src/App_20211119173640.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//style
-import { GlobalStyles } from './GlobalStyles';
-import CartPage from './components/CartPage';
-
-function App() {
- return (
- <>
-
-
- >
- );
-}
-
-export default App;
\ No newline at end of file
diff --git a/.history/src/App_20211119173648.js b/.history/src/App_20211119173648.js
deleted file mode 100644
index 0c61f56..0000000
--- a/.history/src/App_20211119173648.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//style
-import { GlobalStyles } from './GlobalStyles';
-import ProfilePage from './components/CartPage';
-
-function App() {
- return (
- <>
-
-
- >
- );
-}
-
-export default App;
\ No newline at end of file
diff --git a/.history/src/App_20211119173654.js b/.history/src/App_20211119173654.js
deleted file mode 100644
index 9257064..0000000
--- a/.history/src/App_20211119173654.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//style
-import { GlobalStyles } from './GlobalStyles';
-import ProfilePage from './components/ProfilePage';
-
-function App() {
- return (
- <>
-
-
- >
- );
-}
-
-export default App;
\ No newline at end of file
diff --git a/.history/src/App_20211119173659.js b/.history/src/App_20211119173659.js
deleted file mode 100644
index 7e0c9bf..0000000
--- a/.history/src/App_20211119173659.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//style
-import { GlobalStyles } from './GlobalStyles';
-import ProfilePage from './components/ProfilePage';
-
-function App() {
- return (
- <>
-
-
- >
- );
-}
-
-export default App;
\ No newline at end of file
diff --git a/.history/src/components/CartPage/CartPage.styled_20211119133502.js b/.history/src/components/CartPage/CartPage.styled_20211119133502.js
deleted file mode 100644
index 0225928..0000000
--- a/.history/src/components/CartPage/CartPage.styled_20211119133502.js
+++ /dev/null
@@ -1,213 +0,0 @@
-import styled from 'styled-components';
-
-export const Wrapper = styled.div`
- /* border:1px solid black; */
- margin:0 auto;
- display:flex;
- flex-direction:column;
- width:80%;
- h1 {
- margin-top: 73px;
- font-size: 36px;
- color:black;
- margin-bottom:30px;
- }
- h2 {
- font-size: 18px;
- line-height: 25px;
- color: #613D2B;
- margin-bottom: 15px;
- }
-`
-
-export const WrapContent = styled.div`
- width: 100%;
- height: 47px;
- display:flex;
- justify-content: space-between;
- button {
- @import url('https://fonts.googleapis.com/css2?family=Abhaya+Libre:wght@800&family=Shippori+Antique+B1&display=swap');
- font-family: 'Shippori Antique B1', sans-serif;
- width: 222px;
- height: 47px;
- background: #433434;
- border-radius: 5px;
- border:none;
- color:white;
- text-align:justify;
- text-align:center;
- font-weight: 800;
- font-size: 14px;
- line-height: 19px;
- img {
- margin-left:11px;
- }
- }
- div {
- width: 77%;
- height: 47px;
- background:white;
- border-radius: 5px;
- text-align:justify;
- p{
- @import url('https://fonts.googleapis.com/css2?family=Abhaya+Libre:wght@800&family=Shippori+Antique+B1&display=swap');
- font-family: 'Abhaya Libre', serif;
- padding-left: 10px;
- font-weight: normal;
- font-size: 14px;
- line-height: 19px;
- }
- }
-`
-export const WrapOrder = styled.div`
- display:flex;
- width: 100%;
- height:433px;
- .over {
- padding-right: 10px;
- overflow-x: hidden;
- overflow-y: auto;
- max-height: 433px;
- &::-webkit-scrollbar-track
- {
- -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
- background-color: #F5F5F5;
- }
-
- &::-webkit-scrollbar
- {
- width: 6px;
- background-color: #F5F5F5;
- }
-
- &::-webkit-scrollbar-thumb
- {
- background-color: #000000;
- }
-
- }
-`
-export const WrapOrder2 = styled.table`
- display:flex;
- flex-direction: column;
- border-collapse: collapse;
- border-bottom: 0.1mm solid black;
- border-top: 0.1mm solid black;
- border-collapse: collapse;
-`
-export const Flex = styled.td`
- display:flex;
- max-width: 660px;
- height: 119px;
- border-bottom: 0.1mm solid black;
- border-top: 0.1mm solid black;
- border-collapse: collapse;
-`
-export const Wrap1 = styled.div`
- display: flex;
- align-items: center;
- justify-content: space-between;
- img {
- width: 80px;
- height: 80px;
- }
-`
-export const Wrap2 = styled.div`
- margin-left: 13px ;
- display:flex;
- flex-direction: column;
- /* border:1px solid black; */
- width: 567px;
- height:80px;
-`
-export const Wrap3 = styled.div`
- flex:100%;
- /* border:1px solid red; */
- width: 100%;
- height: 30px;
- display:flex;
- padding-top: 10px;
- align-items: center;
- justify-content: space-between;
- p {
- padding-bottom: 10px;
- color:red;
- }
- div {
- display: flex;
- }
- button {
- background: none;
- border: none;
- color:#4F3D31;
- img {
- height:25px;
- width:12px;
- }
- }
- img {
- height:20px;
- width:20px;
- }
- .pinkBg{
- /* padding-top: 2px;
- margin: 0 auto; */
- text-align: center;
- width: 30px;
- height: 20px;
- background: #F6E6DA;
- border-radius: 5px;
- }
-`
-
-
-export const FlexCollum = styled.div`
- /* border:1px solid black; */
- display:flex;
- flex-direction: column;
- width: 30%;
- margin-left: 35px;
- tb {
- display:flex;
- flex-direction: column;
- justify-content: space-evenly;
- height: 119px;
- border-bottom: 2px solid black;
- border-top: 2px solid black;
- border-collapse: collapse;
- }
-`
-export const Pp = styled.p`
- @import url('https://fonts.googleapis.com/css2?family=Abhaya+Libre:wght@800&family=Montserrat:ital,wght@1,100&family=Shippori+Antique+B1&display=swap');
- font-family: 'Montserrat', sans-serif;
- color: ${props => props.r? 'red !important' : 'black !important'};
- font-size: 14px;
- font-weight: ${props => props.b? 'bold' : null};
-`
-
-export const Orderbtn = styled.div`
- /* border:1px solid black; */
- width:auto;
- margin-top:76px;
- margin-bottom:126px;
- display: flex;
- justify-content: flex-end;
- button {
- width: 260px;
- height: 40px;
- background: #433434;
- border-radius: 5px;
- border:none;
- color: #FFFFFF;
- font-weight: bold;
- font-size: 14px;
- line-height: 17px;
- font-family: 'Montserrat', sans-serif;
- &:hover {
- color: #433434;
- background: none;
- border:1px solid #433434;
- }
- }
-
-`
diff --git a/.history/src/components/CartPage/CartPage.styled_20211119173256.js b/.history/src/components/CartPage/CartPage.styled_20211119173256.js
deleted file mode 100644
index 30ba1ba..0000000
--- a/.history/src/components/CartPage/CartPage.styled_20211119173256.js
+++ /dev/null
@@ -1,213 +0,0 @@
-import styled from 'styled-components';
-
-export const Wrapper = styled.div`
- /* border:1px solid black; */
- margin:0 auto;
- display:flex;
- flex-direction:column;
- width:80%;
- h1 {
- margin-top: 73px;
- font-size: 36px;
- color:black;
- margin-bottom:30px;
- }
- h2 {
- font-size: 18px;
- line-height: 25px;
- color: #613D2B;
- margin-bottom: 15px;
- }
-`
-
-export const WrapContent = styled.div`
- width: 100%;
- height: 47px;
- display:flex;
- justify-content: space-between;
- button {
- @import url('https://fonts.googleapis.com/css2?family=Abhaya+Libre:wght@800&family=Shippori+Antique+B1&display=swap');
- font-family: 'Shippori Antique B1', sans-serif;
- width: 222px;
- height: 47px;
- background: #433434;
- border-radius: 5px;
- border:none;
- color:white;
- text-align:justify;
- text-align:center;
- font-weight: 800;
- font-size: 14px;
- line-height: 19px;
- img {
- margin-left:11px;
- }
- }
- div {
- width: 77%;
- height: 47px;
- background:white;
- border-radius: 5px;
- text-align:justify;
- p{
- @import url('https://fonts.googleapis.com/css2?family=Abhaya+Libre:wght@800&family=Shippori+Antique+B1&display=swap');
- font-family: 'Abhaya Libre', serif;
- padding-left: 10px;
- font-weight: normal;
- font-size: 14px;
- line-height: 19px;
- }
- }
-`
-export const WrapOrder = styled.div`
- display:flex;
- width: 100%;
- height:433px;
- .over {
- padding-right: 10px;
- overflow-x: hidden;
- overflow-y: auto;
- max-height: 433px;
- &::-webkit-scrollbar-track
- {
- box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
- background-color: #F5F5F5;
- }
-
- &::-webkit-scrollbar
- {
- width: 6px;
- background-color: #F5F5F5;
- }
-
- &::-webkit-scrollbar-thumb
- {
- background-color: #000000;
- }
-
- }
-`
-export const WrapOrder2 = styled.table`
- display:flex;
- flex-direction: column;
- border-collapse: collapse;
- border-bottom: 0.1mm solid black;
- border-top: 0.1mm solid black;
- border-collapse: collapse;
-`
-export const Flex = styled.td`
- display:flex;
- max-width: 660px;
- height: 119px;
- border-bottom: 0.1mm solid black;
- border-top: 0.1mm solid black;
- border-collapse: collapse;
-`
-export const Wrap1 = styled.div`
- display: flex;
- align-items: center;
- justify-content: space-between;
- img {
- width: 80px;
- height: 80px;
- }
-`
-export const Wrap2 = styled.div`
- margin-left: 13px ;
- display:flex;
- flex-direction: column;
- /* border:1px solid black; */
- width: 567px;
- height:80px;
-`
-export const Wrap3 = styled.div`
- flex:100%;
- /* border:1px solid red; */
- width: 100%;
- height: 30px;
- display:flex;
- padding-top: 10px;
- align-items: center;
- justify-content: space-between;
- p {
- padding-bottom: 10px;
- color:red;
- }
- div {
- display: flex;
- }
- button {
- background: none;
- border: none;
- color:#4F3D31;
- img {
- height:25px;
- width:12px;
- }
- }
- img {
- height:20px;
- width:20px;
- }
- .pinkBg{
- /* padding-top: 2px;
- margin: 0 auto; */
- text-align: center;
- width: 30px;
- height: 20px;
- background: #F6E6DA;
- border-radius: 5px;
- }
-`
-
-
-export const FlexCollum = styled.div`
- /* border:1px solid black; */
- display:flex;
- flex-direction: column;
- width: 30%;
- margin-left: 35px;
- tb {
- display:flex;
- flex-direction: column;
- justify-content: space-evenly;
- height: 119px;
- border-bottom: 2px solid black;
- border-top: 2px solid black;
- border-collapse: collapse;
- }
-`
-export const Pp = styled.p`
- @import url('https://fonts.googleapis.com/css2?family=Abhaya+Libre:wght@800&family=Montserrat:ital,wght@1,100&family=Shippori+Antique+B1&display=swap');
- font-family: 'Montserrat', sans-serif;
- color: ${props => props.r? 'red !important' : 'black !important'};
- font-size: 14px;
- font-weight: ${props => props.b? 'bold' : null};
-`
-
-export const Orderbtn = styled.div`
- /* border:1px solid black; */
- width:auto;
- margin-top:76px;
- margin-bottom:126px;
- display: flex;
- justify-content: flex-end;
- button {
- width: 260px;
- height: 40px;
- background: #433434;
- border-radius: 5px;
- border:none;
- color: #FFFFFF;
- font-weight: bold;
- font-size: 14px;
- line-height: 17px;
- font-family: 'Montserrat', sans-serif;
- &:hover {
- color: #433434;
- background: none;
- border:1px solid #433434;
- }
- }
-
-`
diff --git a/.history/src/components/CartPage/index_20211119133045.js b/.history/src/components/CartPage/index_20211119133045.js
deleted file mode 100644
index 0287d77..0000000
--- a/.history/src/components/CartPage/index_20211119133045.js
+++ /dev/null
@@ -1,169 +0,0 @@
-import { React, useState, useEffect } from 'react';
-
-import { Wrapper ,WrapContent , WrapOrder ,Orderbtn , Pp , WrapOrder2, Flex , FlexCollum , Wrap1 , Wrap2 , Wrap3} from './CartPage.styled'
-import map from '../../img/map.svg'
-import plus from '../../img/-.svg'
-import min from '../../img/+.svg'
-import trash from '../../img/Trash.svg'
-import Header from '../Header';
-const CartPage = () => {
- return (
- <>
-
-
- Geprek Bensu, Menus
- Delivery Location
-
-
-
-
- Review Your Order
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Subtotal
- Rp.35.000
-
-
- Qty
- 2
-
-
- Ongkir
- Rp.10.000
-
-
-
- TOTAL
- Rp.10.000
-
-
-
-
-
-
-
- >
- )
-}
-
-export default CartPage
\ No newline at end of file
diff --git a/.history/src/components/CartPage/index_20211119154623.js b/.history/src/components/CartPage/index_20211119154623.js
deleted file mode 100644
index 3cab0b9..0000000
--- a/.history/src/components/CartPage/index_20211119154623.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import { React, useState, useEffect } from 'react';
-
-import { Wrapper ,WrapContent , WrapOrder ,Orderbtn , Pp , WrapOrder2, Flex , FlexCollum , Wrap1 , Wrap2 , Wrap3} from './CartPage.styled'
-import map from '../../img/map.svg'
-import plus from '../../img/-.svg'
-import min from '../../img/+.svg'
-import trash from '../../img/Trash.svg'
-import Header from '../Header';
-import Map from '../Map';
-const CartPage = () => {
- return (
- <>
-
-
- Geprek Bensu, Menus
- Delivery Location
-
-
-
-
- Review Your Order
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Subtotal
- Rp.35.000
-
-
- Qty
- 2
-
-
- Ongkir
- Rp.10.000
-
-
-
- TOTAL
- Rp.10.000
-
-
-
-
-
-
-
- >
- )
-}
-
-export default CartPage
\ No newline at end of file
diff --git a/.history/src/components/CartPage/index_20211119154631.js b/.history/src/components/CartPage/index_20211119154631.js
deleted file mode 100644
index c70f7b7..0000000
--- a/.history/src/components/CartPage/index_20211119154631.js
+++ /dev/null
@@ -1,171 +0,0 @@
-import { React, useState, useEffect } from 'react';
-
-import { Wrapper ,WrapContent , WrapOrder ,Orderbtn , Pp , WrapOrder2, Flex , FlexCollum , Wrap1 , Wrap2 , Wrap3} from './CartPage.styled'
-import map from '../../img/map.svg'
-import plus from '../../img/-.svg'
-import min from '../../img/+.svg'
-import trash from '../../img/Trash.svg'
-import Header from '../Header';
-import Map from '../Map';
-const CartPage = () => {
- return (
- <>
-
-
- Geprek Bensu, Menus
- Delivery Location
-
-
-
-
- Review Your Order
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Paket Geprek
- Rp.15.000
-
-
-
-
-
1
-
-
-
-
-
-
-
-
-
-
-
-
- Subtotal
- Rp.35.000
-
-
- Qty
- 2
-
-
- Ongkir
- Rp.10.000
-
-
-
- TOTAL
- Rp.10.000
-
-
-
-
-
-
-
- >
- )
-}
-
-export default CartPage
\ No newline at end of file
diff --git a/.history/src/components/CartPage/index_20211119154634.js b/.history/src/components/CartPage/index_20211119154634.js
deleted file mode 100644
index 5b0cd9c..0000000
--- a/.history/src/components/CartPage/index_20211119154634.js
+++ /dev/null
@@ -1,171 +0,0 @@
-import { React, useState, useEffect } from 'react';
-
-import { Wrapper ,WrapContent , WrapOrder ,Orderbtn , Pp , WrapOrder2, Flex , FlexCollum , Wrap1 , Wrap2 , Wrap3} from './CartPage.styled'
-import map from '../../img/map.svg'
-import plus from '../../img/-.svg'
-import min from '../../img/+.svg'
-import trash from '../../img/Trash.svg'
-import Header from '../Header';
-import Map from '../Map';
-const CartPage = () => {
- return (
- <>
-