Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
shopping-mall
Commits
e6b07325
Commit
e6b07325
authored
Jan 27, 2021
by
kusang96
Browse files
Merge remote-tracking branch 'origin/sangho' into ourMaster
parents
d5d8b7c2
0208334c
Changes
4
Show whitespace changes
Inline
Side-by-side
client/src/Components/MainNav.js
View file @
e6b07325
...
...
@@ -16,10 +16,14 @@ function MainNav() {
{
user
?
<>
<
Nav
.
Link
className
=
"
text-light
"
onClick
=
{()
=>
handleLogout
()}
>
Logout
<
/Nav.Link
>
<
Nav
.
Link
className
=
"
text-light
"
href
=
"
/account
"
>
Mypage
<
/Nav.Link
>
{
admin
?
''
:
(
<
Nav
.
Link
className
=
"
text-light
"
href
=
"
/account
"
>
Mypage
<
/Nav.Link>
,
<
Nav
.
Link
href
=
"
/shoppingcart
"
>
<
img
alt
=
"
카트
"
src
=
"
/icon/cart.svg
"
width
=
"
30
"
height
=
"
30
"
/>
<
/Nav.Link
>
)}
<
/
>
:
(
<>
...
...
client/src/Components/OrderCard.js
View file @
e6b07325
...
...
@@ -19,25 +19,29 @@ function OrderCard(props) {
<
Card
.
Header
className
=
"
font-weight-bold mb-3 text-center
"
style
=
{{
background
:
'
#F7F3F3
'
}}
>
{
e
.
products
[
0
].
productId
.
pro_name
}
<
/Card.Header>
)
}
<
Card
.
Text
>
<
Col
>
<
Row
>
<
Card
.
Text
>
주문번호
:
<
strong
>
{
e
.
_id
}
<
/strong> </
Card
.
Text
>
<
/Row
>
<
Row
>
<
Card
.
Text
>
결제금액
:
<
strong
>
{
e
.
total
}
원
<
/strong> </
Card
.
Text
>
<
/Row
>
<
Row
>
<
Card
.
Text
>
배송지
:
<
strong
>
{
e
.
receiverInfo
.
address
}
-
{
e
.
receiverInfo
.
address2
}
<
/strong> </
Card
.
Text
>
<
/Row
>
<
Row
>
<
Card
.
Text
>
주문날짜
:
<
strong
>
{
e
.
createdAt
.
substring
(
0
,
10
)}
<
/strong> </
Card
.
Text
>
<
Row
className
=
''
>
<
Col
sm
=
{
4
}
xs
=
{
4
}
className
=
'
p-1
'
>
주문번호
:
<
/Col
>
<
Col
sm
=
{
8
}
xs
=
{
8
}
className
=
'
p-1
'
><
strong
>
{
e
.
_id
}
<
/strong></
Col
>
<
Col
sm
=
{
4
}
xs
=
{
4
}
className
=
'
p-1
'
>
결제금액
:
<
/Col
>
<
Col
sm
=
{
8
}
xs
=
{
8
}
className
=
'
p-1
'
><
strong
>
{
e
.
total
}
원
<
/strong></
Col
>
<
Col
sm
=
{
4
}
xs
=
{
4
}
className
=
'
p-1
'
>
배송지
:
<
/Col
>
<
Col
sm
=
{
8
}
xs
=
{
8
}
className
=
'
p-1
'
><
strong
>
{
e
.
receiverInfo
.
address
}
/ </
strong
><
strong
><
small
>
{
e
.
receiverInfo
.
address2
}
<
/small></
strong
><
/Col
>
<
Col
sm
=
{
4
}
xs
=
{
4
}
className
=
'
p-1
'
>
주문날짜
:
<
/Col
>
<
Col
sm
=
{
8
}
xs
=
{
8
}
className
=
'
p-1
'
><
strong
>
{
e
.
createdAt
.
substring
(
0
,
10
)}
<
/strong></
Col
>
<
/Row
>
<
/Col
>
<
/Card.Text
>
<
/Card.Body
>
)
)
}
<
/Card
>
)
}
...
...
client/src/Pages/Account.js
View file @
e6b07325
...
...
@@ -180,9 +180,9 @@ function Account() {
<
/Col
>
<
/Row
>
<
/Card
>
<
Card
>
<
div
className
=
'
m-2 mb-5
'
>
<
OrderCard
ordered
=
{
ordered
}
/
>
<
/
Card
>
<
/
div>
<
/Container
>
)
}
...
...
client/src/Pages/Product.js
View file @
e6b07325
...
...
@@ -18,7 +18,6 @@ function Product({ match, location }) {
let
history
=
useHistory
();
const
handleClose
=
()
=>
setShow
(
false
);
const
handleShow
=
()
=>
setShow
(
true
);
const
replace
=
product
.
description
.
replaceAll
(
'
{
\n\n
}
'
,
'
<br />
'
)
useEffect
(()
=>
{
if
(
size
&&
color
)
{
...
...
@@ -230,12 +229,12 @@ function Product({ match, location }) {
{
product
.
name
}
<
/div
>
<
Image
src
=
{
`/images/
${
product
.
main_img
}
`
}
className
=
'
d-flex justify-content-center p-4
'
style
=
{{
objectFit
:
"
contain
"
,
maxWidth
:
"
100%
"
,
margin
:
'
auto
'
}}
/
>
<
Card
style
=
{{
width
:
'
7
0%
'
,
margin
:
'
auto
'
}}
className
=
'
my-4
'
>
<
Card
style
=
{{
width
:
'
8
0%
'
,
margin
:
'
auto
'
}}
className
=
'
my-4
'
>
<
Card
.
Header
className
=
'
text-center
'
style
=
{{
background
:
'
#CDC5C2
'
}}
>
<
h5
className
=
'
m-0
'
style
=
{{
whiteSpace
:
'
nowrap
'
}}
>
[
Description
]
<
/h5
>
<
/Card.Header
>
<
Card
.
Body
className
=
'
text-center m-
4
'
style
=
{{
whiteSpace
:
"
pre-line
"
,
background
:
'
#F7F3F3
'
,
fontSize
:
'
1vw
'
}}
>
<
small
>
{
replace
}
<
/small
>
<
Card
.
Body
className
=
'
text-center m-
2
'
style
=
{{
whiteSpace
:
"
pre-line
"
,
background
:
'
#F7F3F3
'
,
fontSize
:
'
1vw
'
}}
>
<
small
>
{
product
.
description
}
<
/small
>
<
/Card.Body
>
<
/Card
>
<
Col
className
=
'
p-5
'
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment