Skip to content

GitLab

Commit 221883bb authored by kusang96's avatar kusang96
Browse files

Merge remote-tracking branch 'origin/sangho' into ourMaster

parents 47900a5a 49c8863b
Show whitespace changes
Inline Side-by-side
client/src/Components/ListCard.js
View file @ 221883bb
...@@ -39,19 +39,20 @@ function ListCard(props) { ...@@ -39,19 +39,20 @@ function ListCard(props) {
{e.products[0].productId.pro_name} {e.products[0].productId.pro_name}
</Card.Header>)} </Card.Header>)}
<Card.Text> <Card.Text>
<Col> <Col className='justify-content-center'>
<Row className=''> <Row className='justify-content-center' >
<Col sm={4} xs={4} className='p-1'>주문번호 :</Col> <>
<Col sm={8} xs={8} className='p-1'><strong>{e._id}</strong></Col> <Col sm={3} xs={5} className='p-1'><li>주문번호 :</li></Col>
<Col sm={8} xs={6} 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={3} xs={5} className='p-1'><li>결제금액 :</li></Col>
<Col sm={8} xs={6} className='p-1'><strong>{e.total}원</strong></Col>
<Col sm={4} xs={4} className='p-1'>배송지 :</Col> <Col sm={3} xs={5} className='p-1'><li>배송지 :</li></Col>
<Col sm={8} xs={8} className='p-1'><strong> {e.receiverInfo.address} / </strong><strong><small> {e.receiverInfo.address2}</small></strong></Col> <Col sm={8} xs={6} className='p-1'><strong> {e.receiverInfo.address}</strong> <br />( {e.receiverInfo.address2} )</Col>
<Col sm={4} xs={4} className='p-1'>주문날짜 :</Col> <Col sm={3} xs={5} className='p-1'><li>주문날짜 :</li></Col>
<Col sm={8} xs={8} className='p-1'><strong>{e.createdAt.substring(0, 10)}</strong></Col> <Col sm={8} xs={6} className='p-1'><strong>{e.createdAt.substring(0, 10)}</strong></Col>
</Row> </Row>
</Col> </Col>
</Card.Text> </Card.Text>
......
client/src/Components/MainNav.js
View file @ 221883bb
...@@ -19,10 +19,13 @@ function MainNav() { ...@@ -19,10 +19,13 @@ function MainNav() {
{admin ? {admin ?
'' ''
: ( : (
<Nav.Link className="text-light" href="/account"> Mypage </Nav.Link>, <>
<Nav.Link className="text-light" href="/account"> Mypage </Nav.Link>
<Nav.Link href="/shoppingcart"> <Nav.Link href="/shoppingcart">
<img alt="카트" src="/icon/cart.svg" width="30" height="30" /> <img alt="카트" src="/icon/cart.svg" width="30" height="30" />
</Nav.Link> </Nav.Link>
</>
)} )}
</> </>
: ( : (
......
client/src/Components/Pagination.js
View file @ 221883bb
...@@ -7,6 +7,14 @@ function Paginations({ index, totalPages, handlePage }) { ...@@ -7,6 +7,14 @@ function Paginations({ index, totalPages, handlePage }) {
<Pagination className="d-flex justify-content-center"> <Pagination className="d-flex justify-content-center">
<style type="text/css"> <style type="text/css">
{` {`
@font-face {
font-family: 'Jal_Onuel';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10-21@1.0/Jal_Onuel.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body{font-family:'Jal_Onuel'}
.page-link, .page-link:hover { .page-link, .page-link:hover {
color: #91877F; color: #91877F;
margin: 0; margin: 0;
......
client/src/Components/SubNav.js
View file @ 221883bb
...@@ -28,6 +28,14 @@ function SubNav() { ...@@ -28,6 +28,14 @@ function SubNav() {
<Navbar sticky="top" className="flex-nowrap" style={{ top: "56px", paddingTop: "0", paddingBottom: "0", backgroundColor: "#fff" }}> <Navbar sticky="top" className="flex-nowrap" style={{ top: "56px", paddingTop: "0", paddingBottom: "0", backgroundColor: "#fff" }}>
<style type="text/css"> <style type="text/css">
{` {`
@font-face {
font-family: 'Jal_Onuel';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10-21@1.0/Jal_Onuel.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body{font-family:'Jal_Onuel'}
.nav-link, .nav-link:hover, .nav-link:active { .nav-link, .nav-link:hover, .nav-link:active {
color: #91877F; color: #91877F;
} }
......
client/src/Pages/Account.js
View file @ 221883bb
...@@ -92,6 +92,13 @@ function Account() { ...@@ -92,6 +92,13 @@ function Account() {
<Container className="px-3"> <Container className="px-3">
<style type="text/css"> <style type="text/css">
{` {`
@font-face {
font-family: 'Jal_Onuel';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10-21@1.0/Jal_Onuel.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body{font-family:'Jal_Onuel'}
a, a:hover, a:active { a, a:hover, a:active {
color: #91877F; color: #91877F;
text-decoration-color: #91877F; text-decoration-color: #91877F;
......
client/src/Pages/Admin.js
View file @ 221883bb
...@@ -68,6 +68,14 @@ function Admin() { ...@@ -68,6 +68,14 @@ function Admin() {
<Container> <Container>
<style type="text/css"> <style type="text/css">
{` {`
@font-face {
font-family: 'Jal_Onuel';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10-21@1.0/Jal_Onuel.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body{font-family:'Jal_Onuel'}
.btn { .btn {
background-color: #CDC5C2; background-color: #CDC5C2;
border-color: #CDC5C2; border-color: #CDC5C2;
......
client/src/Pages/Home.js
View file @ 221883bb
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect } from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import ListCard from '../Components/ListCard'; import ListCard from '../Components/ListCard';
import axios from 'axios'; import axios from 'axios';
...@@ -32,9 +32,20 @@ function Home() { ...@@ -32,9 +32,20 @@ function Home() {
<Container> <Container>
<style type="text/css"> <style type="text/css">
{` {`
@font-face {
font-family: 'Jal_Onuel';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10-21@1.0/Jal_Onuel.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body{font-family:'Jal_Onuel'}
a, a:hover, a:active { a, a:hover, a:active {
color: #000; color: #000;
text-decoration: none; text-decoration: none;
}
`} `}
</style> </style>
<div className="my-4"> <div className="my-4">
......
client/src/Pages/Product.js
View file @ 221883bb
...@@ -161,6 +161,13 @@ function Product({ match, location }) { ...@@ -161,6 +161,13 @@ function Product({ match, location }) {
color: #000; color: #000;
text-decoration: none; text-decoration: none;
} }
@font-face {
font-family: 'Jal_Onuel';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10-21@1.0/Jal_Onuel.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body{font-family:'Jal_Onuel'}
.btn { .btn {
background-color: #CDC5C2; background-color: #CDC5C2;
border-color: #CDC5C2; border-color: #CDC5C2;
...@@ -192,7 +199,7 @@ function Product({ match, location }) { ...@@ -192,7 +199,7 @@ function Product({ match, location }) {
</Modal> </Modal>
<Row className="justify-content-center mt-5 mx-0"> <Row className="justify-content-center mt-5 mx-0">
<Col sm={11} md={4}> <Col sm={11} md={4}>
<img src={`/images/${product.main_img}`} style={{ objectFit: "contain", width: "100%" }} /> <img src={`/images/${product.main_img}`} style={{ objectFit: "contain", maxWidth: "100%", height: 'auto' }} />
</Col> </Col>
<Col sm={11} md={4} className="align-middle mt-4"> <Col sm={11} md={4} className="align-middle mt-4">
<h3 className="mb-4">{product.name}</h3> <h3 className="mb-4">{product.name}</h3>
...@@ -242,23 +249,22 @@ function Product({ match, location }) { ...@@ -242,23 +249,22 @@ function Product({ match, location }) {
<h3 style={{ borderBottom: "1px solid #91877F", paddingBottom: "5px", marginBottom: "1em" }} className="p-3"> <h3 style={{ borderBottom: "1px solid #91877F", paddingBottom: "5px", marginBottom: "1em" }} className="p-3">
설명 설명
</h3> </h3>
<Col className='text-center' style={{ fontSize: '1px' }}> <Col className='text-center'>
<div className='p-2 text-center border' style={{ background: '#CDC5C2', width: '50%', margin: 'auto', fontSize: '3.5vmin' }} > <div className='p-2 text-center border' style={{ background: '#CDC5C2', width: '60%', margin: 'auto', fontSize: '3.5vmin' }} >
{product.name} {product.name}
</div> </div>
<Image src={`/images/${product.main_img}`} className='d-flex justify-content-center p-4' style={{ objectFit: "contain", maxWidth: "100%", margin: 'auto' }} /> <Image src={`/images/${product.main_img}`} className='d-flex justify-content-center p-4' style={{ objectFit: "contain", maxWidth: "100%", height: 'auto', margin: 'auto' }} />
<Card style={{ width: '80%', margin: 'auto' }} className='my-4' > <Card style={{ width: '80%', margin: 'auto' }} className='my-4' >
<Card.Header className='text-center' style={{ background: '#CDC5C2' }}> <Card.Header className='text-center' style={{ background: '#CDC5C2' }}>
<h5 className='m-0' style={{ whiteSpace: 'nowrap' }}> [ Description ]</h5> <h5 className='m-0' style={{ whiteSpace: 'nowrap' }}> [ Description ]</h5>
</Card.Header> </Card.Header>
<Card.Body className='text-center m-2' style={{ whiteSpace: "pre-line", background: '#F7F3F3', fontSize: '1vw' }}> <Card.Body className='text-center m-2' style={{ whiteSpace: "pre-line", background: '#F7F3F3', fontSize: '1.2vw' }}>
<small>{product.description}</small> {product.description}
</Card.Body> </Card.Body>
</Card> </Card>
<Col className='p-5'> <Col className='p-5'>
<div className='border p-2' style={{ width: '60%', margin: 'auto', fontSize: '3.5vmin' }}>[ Detail Images ]</div> <div className='border p-2' style={{ maxWidth: "100%", height: 'auto', margin: 'auto', fontSize: '3.5vmin' }}>[ Detail Images ]</div>
<Image src={`/images/${product.detail_imgs}`} style={{ objectFit: "contain", maxWidth: "100%", margin: 'auto' }} className='p-4 d-flex justify-content-center' /> <Image src={`/images/${product.detail_imgs}`} style={{ objectFit: "contain", maxWidth: "100%", height: 'auto', margin: 'auto' }} className='p-4 d-flex justify-content-center' />
</Col> </Col>
</Col> </Col>
</Col> </Col>
......
client/src/Pages/ProductsList.js
View file @ 221883bb
...@@ -148,6 +148,14 @@ function ProductsList({ match }) { ...@@ -148,6 +148,14 @@ function ProductsList({ match }) {
<Container> <Container>
<style type="text/css"> <style type="text/css">
{` {`
@font-face {
font-family: 'Jal_Onuel';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_20-10-21@1.0/Jal_Onuel.woff') format('woff');
font-weight: normal;
font-style: normal;
}
body{font-family:'Jal_Onuel'}
a, a:hover, a:active { a, a:hover, a:active {
color: #000; color: #000;
text-decoration: none; text-decoration: none;
...@@ -180,7 +188,7 @@ function ProductsList({ match }) { ...@@ -180,7 +188,7 @@ function ProductsList({ match }) {
<div className="text-center"> <div className="text-center">
<h1 style={{ fontSize: "5.5vmax" }} className="text-center m-1 py-3">{mainCategory}</h1> <h1 style={{ fontSize: "5.5vmax" }} className="text-center m-1 py-3">{mainCategory}</h1>
<ButtonGroup className="mb-3" style={{ display: "inline" }}> <ButtonGroup className="mb-3" style={{ display: "inline" }}>
{subCategory.map(el =>(<Button className="m-1" style={{ fontSize: "1.2vw" }} name={el} onClick={handleSubname}>{el}</Button>))} {subCategory.map(el => (<Button className="m-1" style={{ fontSize: "1.5vw" }} name={el} onClick={handleSubname}>{el}</Button>))}
</ButtonGroup> </ButtonGroup>
</div> </div>
</Col> </Col>
......
client/src/Pages/Signup.js
View file @ 221883bb
...@@ -86,9 +86,10 @@ function Signup() { ...@@ -86,9 +86,10 @@ function Signup() {
<Form.Group as={Row} controlId="formBasicNumber"> <Form.Group as={Row} controlId="formBasicNumber">
<Form.Label column sm="4" for='number'> <Form.Label column sm="4" for='number'>
주민등록번호 </Form.Label> 주민등록번호 </Form.Label>
<Col sm="4" xs='5'> <Row style={{ width: '300px'}} className='px-3'>
<Col sm="6" xs='5' className='pr-1'>
<Form.Control <Form.Control
className='pr-0' className='pl-2 pr-0'
required type="text" required type="text"
name="number1" name="number1"
maxlength="6" maxlength="6"
...@@ -98,9 +99,9 @@ function Signup() { ...@@ -98,9 +99,9 @@ function Signup() {
<Form.Control.Feedback type="invalid" >주민등록번호 입력하세요. </Form.Control.Feedback> <Form.Control.Feedback type="invalid" >주민등록번호 입력하세요. </Form.Control.Feedback>
</Col> </Col>
<strong className='pt-2 d-flex align-items-flex-start'>-</strong> <strong className='pt-2 d-flex align-items-flex-start'>-</strong>
<Col md="2" xs='3'> <Col md="2" xs='3' className='px-2'>
<Form.Control <Form.Control
className='pr-0' className='pl-2 pr-0'
required type="text" required type="text"
name="number2" name="number2"
maxlength="1" maxlength="1"
...@@ -108,6 +109,7 @@ function Signup() { ...@@ -108,6 +109,7 @@ function Signup() {
onChange={handleChange} /> onChange={handleChange} />
</Col> </Col>
<strong className='pt-2 d-flex align-items-flex-start'>* * * * * *</strong> <strong className='pt-2 d-flex align-items-flex-start'>* * * * * *</strong>
</Row>
</Form.Group> </Form.Group>
<Form.Group as={Row} controlId="formBasicId"> <Form.Group as={Row} controlId="formBasicId">
<Form.Label column sm="4" for='id'> <Form.Label column sm="4" for='id'>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment