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

client/src/Components/ListCard.js

@@ -15,7 +15,7 @@ function ListCard({ id, name, price, main_img }) {
             <Card.Body>
                 <Card.Title style={{ whiteSpace: "nowrap", overflow: "hidden", textOverflow: "ellipsis" }}>{name}</Card.Title>
                 <Card.Text>{price} 원</Card.Text>
-                <Button className="float-right" onClick={handleDelete}>삭제</Button>
+                {/* <Button className="float-right" onClick={handleDelete}>삭제</Button> */}
             </Card.Body>
         </Card>
     )

client/src/Pages/Account.js

@@ -13,15 +13,17 @@ const INIT_ACCOUNT = {
 function Account() {
     const [account, setAccount] = useState(INIT_ACCOUNT)
     const [show, setShow] = useState(false);
+    const [proshow, setProshow] = useState(false)
     const [error, setError] = useState("")
     const userId = isAuthenticated()
+    const [ordered, setOrdered] = useState('')
 
     async function getUsername(user) {
         // console.log("tlg")
         try {
             const response = await axios.get(`/api/users/account/${user}`)
             setAccount(response.data)
-            // console.log('555555555', response.data);
+            console.log('555555555', response.data);
         } catch (error) {
             catchError(error, setError)
             // console.log('error2222', error)
@@ -30,6 +32,7 @@ function Account() {
 
     useEffect(() => {
         getUsername(userId)
+        getOrdered(userId)
     }, [userId])
 
     const handleChange = (event) => {
@@ -80,6 +83,17 @@ function Account() {
         }
     }
 
+    async function getOrdered({}) {
+        console.log("object")
+        try {
+            const response = await axios.get(`/api/users/addorder`)
+            setOrdered(response.data)
+            console.log('@@@@', response.data);
+        } catch (error) {
+            catchError(error, setError)
+        }
+    }
+
     return (
         <Container className="px-3">
             <style type="text/css">
@@ -104,8 +118,8 @@ function Account() {
                                 )}
                         </Button>
                         <Modal show={show} onHide={() => setShow(false)}>
-                            <Modal.Header closeButton>
-                                <Modal.Title>이미지를 변경하시겠습니까?</Modal.Title>
+                            <Modal.Header closeButton style={{ background: "#F7F3F3" }}>
+                                <Modal.Title >이미지를 변경하시겠습니까?</Modal.Title>
                             </Modal.Header>
                             <Form onSubmit={handleSubmit}>
                                 <Modal.Body>
@@ -127,7 +141,28 @@ function Account() {
                         <Row className="mt-4 text-center">
                             <Col>
                                 <h2>
-                                    <strong>{account.name}</strong> <small>({account.id}){" "}님</small>
+                                    <strong title='회원정보' style={{ cursor: "pointer", textDecoration: 'underline' }} onClick={() => setProshow(true)}>
+                                        {account.name}
+                                    </strong>
+                                    <Modal
+
+                                        size="sm"
+                                        show={proshow}
+                                        onHide={() => setProshow(false)}>
+                                        <Modal.Header closeButton style={{ background: "#F7F3F3" }}>
+                                            <Modal.Title>회원정보</Modal.Title>
+                                        </Modal.Header>
+                                        <Modal.Body>
+                                            <Col className="p-1">
+                                                <li><strong>Role :</strong> {account.role}</li>
+                                                <li><strong>ID :</strong> {account.id}</li>
+                                                <li><strong>Username :</strong> {account.name}</li>
+                                                <li><strong>Email :</strong> {account.email}</li>
+                                                <li><strong>Tel :</strong> {account.tel}</li>
+                                            </Col>
+                                        </Modal.Body>
+                                    </Modal>
+                                    <small>{' '}({account.id}){" "}님</small>
                                 </h2>
                             </Col>
                         </Row>

client/src/Pages/Login.js

@@ -89,8 +89,8 @@ function Login() {
                                     </Form.Control.Feedback>
                             </Form.Row>
                         </Form.Group>
-                        <Button style={{ background: '#91877F', borderColor: '#91877F' }} type="submit" block>Login</Button>
-                        <div className="loginLine">
+                        <Button style={{ background: '#91877F', borderColor: '#91877F' }} type="submit" block >Login</Button>
+                        <div className="loginLine m-1">
                             <Link to="/signup" style={{ color: '#91877F' }}>회원이 아니십니까?</Link>
                         </div>
                     </Form>

client/src/Pages/Payment.js

@@ -2,14 +2,14 @@ import axios from 'axios';
 import React, { useState, useEffect, useRef } from 'react';
 import DaumPostcode from "react-daum-postcode";
 import { Container, Card, Row, Col, Button, Form, FormGroup } from 'react-bootstrap';
-import { Redirect } from 'react-router-dom';
+import { Redirect, Link } from 'react-router-dom';
 import PaymentCard from '../Components/PaymentCard';
 import { isAuthenticated } from '../utils/auth';
 import catchErrors from '../utils/catchErrors';
 
 function Payment({ match, location }) {
-    const [cart, setCart] = useState(location.state)
-    const [order, setOrder] = useState({products: location.state})
+    const [cart, setCart] = useState([])
+    const [order, setOrder] = useState({products: []})
     const [userData, setUserData] = useState({})
     const [error, setError] = useState()
     const [paymentWay, setPaymentWay] = useState([])
@@ -25,18 +25,31 @@ function Payment({ match, location }) {
 
     useEffect(() => {
         getUser()
+        getCart()
+    }, [user])
+
+    useEffect(() => {
         let price = 0
         cart.map((el) => {
             price = Number(el.count) * Number(el.productId.price) + price
         })
         setFinalPrice(price)
-    }, [user])
+    }, [cart])
 
     async function getUser() {
+        const name = localStorage.getItem('name')
+        const tel = localStorage.getItem('tel')
+        // const email = localStorage.getItem('email')
+        setUserData({ name: name, tel: tel })
+    }
+
+    async function getCart() {
         try {
-            const response = await axios.get(`/api/users/getuser/${user}`)
+            const response = await axios.get(`/api/cart/showcart/${user}`)
             console.log(response.data)
-            setUserData(response.data)
+            const preCart = response.data.filter((el) => el.checked === true)
+            setCart(preCart)
+            setOrder({ products: preCart })
         } catch (error) {
             catchErrors(error, setError)
         }
@@ -44,8 +57,8 @@ function Payment({ match, location }) {
 
     function handleReceiverInfo(e) {
         const { name, value } = e.target
-        console.log(name,value)
-        setOrder({ ...order, receiverInfo: {...order.receiverInfo, [name]: value } })
+        console.log(name, value)
+        setOrder({ ...order, receiverInfo: { ...order.receiverInfo, [name]: value } })
     }
 
     function postClick() {
@@ -77,7 +90,7 @@ function Payment({ match, location }) {
             fullAddress += extraAddress !== "" ? ` (${extraAddress})` : "";
         }
         setAddress({ full: fullAddress, code: data.zonecode });
-        setOrder({ ...order, receiverInfo: {...order.receiverInfo, address: fullAddress, postalCode: data.zonecode  } })
+        setOrder({ ...order, receiverInfo: { ...order.receiverInfo, address: fullAddress, postalCode: data.zonecode } })
         console.log(fullAddress);
     }
 
@@ -124,6 +137,12 @@ function Payment({ match, location }) {
     }
 
     async function kakaopay() {
+        let itemNames = ""
+        if (cart.length > 1) {
+            itemNames = cart[0].productId.pro_name + ' 외 ' + String(cart.length - 1) + '개'
+        } else {
+            itemNames = cart[0].productId.pro_name
+        }
         const response = await fetch('/api/kakaopay/test/single', {
             method: "POST",
             headers: {
@@ -132,15 +151,15 @@ function Payment({ match, location }) {
             body: JSON.stringify({
                 cid: 'TC0ONETIME',
                 partner_order_id: 'partner_order_id',
-                partner_user_id: 'partner_user_id',
-                item_name: '앙고라 반목 폴라 베이직 모헤어 니트 (T)',
-                quantity: 1,
-                total_amount: 22000,
+                partner_user_id: user,
+                item_name: itemNames,
+                quantity: cart.length,
+                total_amount: finalPrice + 2500,
                 vat_amount: 200,
                 tax_free_amount: 0,
-                approval_url: 'http://localhost:3000/account',
-                fail_url: 'http://localhost:3000/shoppingcart',
-                cancel_url: 'http://localhost:3000/kakaopay/payment',
+                approval_url: 'http://localhost:3000/payment',
+                fail_url: 'http://localhost:3000/payment',
+                cancel_url: 'http://localhost:3000/payment',
             })
         })
         const data = await response.json()
@@ -149,19 +168,31 @@ function Payment({ match, location }) {
         // setRedirect(data.redirect_url)
     }
 
-    async function paymentCompleted(){
-        console.log(user)
+    async function paymentCompleted() {
         console.log(order)
-        console.log(finalPrice)
+        const cartIds = []
+        order.products.map((el) => {
+            cartIds.push(el._id)
+        })
         try {
             const response = await axios.post(`/api/order/addorder`, {
-                userId : user,
+                userId: user,
                 ...order,
-                total : finalPrice+2500
+                total: finalPrice + 2500
+            })
+            const response2 = await axios.post(`/api/cart/deletecart2`, {
+                userId: user,
+                cartId: cartIds
+            })
+            const response3 = await axios.post(`/api/product/pluspurchase`, {
+                products: order.products
             })
             console.log(response.data)
+            alert("주문이 완료되었습니다.")
+            return <Redirect to={'/account'} />
         } catch (error) {
             catchErrors(error, setError)
+            alert("주문에 실패하셨습니다. 다시 확인해주세요.")
         }
     }
 
@@ -259,7 +290,7 @@ function Payment({ match, location }) {
 
                 <div>
                     <h5 className="font-weight-bold py-3 border-top border-bottom text-center" style={{ background: '#F7F3F3' }}>결제수단</h5>
-                    <div className="text-center mt-5">
+                    <div className="text-center m-3">
                         <Button variant="success" className="align-top" onClick={handleClick} >무통장입금</Button>
                         <input type="image" alt="카카오페이결제" src="icon/payment_icon_yellow_small.png" onClick={kakaopay} />
                     </div>

client/src/Pages/Product.js

 import axios from 'axios';
 import React, { useState, useEffect, useRef } from 'react';
-import { Row, Col, Form, Card, Button } from 'react-bootstrap';
+import { Row, Col, Form, Card, Button, Image } from 'react-bootstrap';
 import { Redirect } from 'react-router-dom';
 import catchErrors from '../utils/catchErrors';
 
@@ -14,6 +14,7 @@ function Product({ match, location }) {
     const [selected, setSelected] = useState({ sizes: false, colors: false })
     const [count, setCount] = useState(1)
     const [price, setPrice] = useState(0)
+    // let price = 0
 
     useEffect(() => {
         if (size && color) {
@@ -22,16 +23,16 @@ function Product({ match, location }) {
         }
     }, [size, color])
 
-
     function handleClick(e) {
         const box = e.target.parentNode.parentNode
         box.style.display = "none"
     }
 
     function pushOptions() {
-        setCart([...cart, { color, size, productId: product.id }])
+        setCart([...cart, { color, size, productId: product.id, count: 1 }])
         selected.sizes = false
         selected.colors = false
+        console.log(product)
         setColor("")
         setSize("")
         setPrice(product.price + price)
@@ -50,19 +51,28 @@ function Product({ match, location }) {
 
     function deleteOption(e) {
         e.preventDefault()
+        let preprice = 0
         const asd = cart.filter((el) => el.color !== e.target.id || el.size !== e.target.name)
+        asd.map((el) => {
+            preprice = preprice + el.count * product.price
+        })
         setCart(asd)
+        setPrice(Number(preprice))
     }
 
     function handleCount(e) {
-        e.preventDefault()
-        const addCount = cart.map((el)=>{
-            if(el.color !== e.target.id || el.size !== e.target.name){
-                return {el}
+        const addCount = cart.map((el) => {
+            if (el.color !== e.target.id || el.size !== e.target.name) {
+                return { ...el }
             } else {
-                return {...el, count : e.target.value}
+                return { ...el, count: e.target.value }
             }
         })
+        let preprice = 0
+        addCount.map((el) => {
+            preprice = preprice + el.count * product.price
+        })
+        setPrice(Number(preprice))
         setCart(addCount)
         setCount(e.value)
     }
@@ -90,7 +100,7 @@ function Product({ match, location }) {
 
     return (
         <div>
-            {/* {console.log("match=", match.params, "location=", location.state, "product=", product)} */}
+            {console.log(cart)}
             <style type="text/css">
                 {`
                 .btn {
@@ -129,14 +139,15 @@ function Product({ match, location }) {
                             </Form.Control>
                         </Form.Group>
                         {cart.map((e) => (
-                            <div>
-                                <span>{e.color}/{e.size}</span>
-                                <input onClick={deleteOption} id={e.color} name={e.size} type="image" alt="삭제버튼" src="https://img.icons8.com/fluent-systems-regular/24/000000/close-window.png" className="float-right align-middle" />
-                                <span>{e.price}원</span>
-                                <span className="float-right mx-2">
+                            <Row className="mx-1">
+                                <Col xs={6}>{e.color}/{e.size}</Col>
+                                <Col xs={4} className="text-right" >
                                     <input type='number' id={e.color} name={e.size} onChange={handleCount} value={count} style={{ width: '3rem' }} className="text-center" />
-                                </span>
-                            </div>
+                                </Col>
+                                <Col xs={2} className="text-right">
+                                    <input onClick={deleteOption} id={e.color} name={e.size} type="image" alt="삭제버튼" src="https://img.icons8.com/fluent-systems-regular/24/000000/close-window.png" className="align-middle" />
+                                </Col>
+                            </Row>
 
                         ))}
                         <Row className="justify-content-between mx-0 my-3" style={{ width: "100%" }}>
@@ -152,14 +163,30 @@ function Product({ match, location }) {
             </Row>
             <Row className="justify-content-center mt-5 mx-0">
                 <Col sm={11} md={8}>
-                    <h3 style={{ borderBottom: "1px solid #91877F", paddingBottom: "5px", marginBottom: "1em" }}>설명</h3>
-                    <div></div>
+                    <h3 style={{ borderBottom: "1px solid #91877F", paddingBottom: "5px", marginBottom: "1em" }} className="p-3">
+                        설명
+                        </h3>
+                    <Col className='m-3 text-center d-flex justify-content-center'>
+                        <div style={{ wordBreak: 'break-all', wordWrap: 'break-word', fontFamily: "맑은 고딕" }} className="p-3">
+                            <h1 className='m-3'>{product.name} </h1>
+                            <>
+                            <Image src={`/images/${product.main_img}`} style={{ objectFit: "contain", width: '100%'}} />
+                            </>
+                            <Card className='m-3 d-flex justify-content-center'>
+                                <Card.Body>
+                                    {product.description}
+                                </Card.Body>
+                            </Card>
+                            <h3 className='mt-5'>[ Detail Images ]</h3>
+                            <Image src={`/images/${product.detail_imgs}`} style={{ objectFit: "contain"}} className='m-3' />
+                        </div>
+                    </Col>
                 </Col>
             </Row>
             <Row className="justify-content-center mx-0 pt-3 px-2" style={{ position: "fixed", bottom: "0", width: "100%", backgroundColor: "#fff" }}>
                 <Col sm={12} md={9}>
                     <h6 style={{ borderBottom: "1px solid", paddingBottom: "5px", marginBottom: "1em" }}>회원님이 선호할만한 상품 추천
-                        <a className="close float-right" onClick={(e) => handleClick(e)} style={{ fontSize: "1rem" }}>X</a>
+                        <a className="close float-right" onClick={(e) => handleClick(e)} style={{ fontSize: "1rem", cursor: "pointer" }}>X</a>
                     </h6>
                     <Row className="justify-content-space mx-0" style={{ flexWrap: "nowrap", width: "100%", overflowX: "auto" }}>
                         <Col as={Card} style={{ minWidth: "10rem", marginRight: "1rem" }}>

client/src/Pages/ProductRegist.js

@@ -133,7 +133,7 @@ function ProductsRegist() {
         for (let key in product) {
             if (key === "main_image" || key === "detail_image") {
                 formData.append(key, product[key][0])
-            } else if(key === "sizes" || key === "colors"){
+            } else if(key === "sizes" || key === "colors" || key === 'sub_category'){
                 for (let i = 0; i < product[key].length ; i++){
                     formData.append([key], product[key][i])
                 }

client/src/Pages/ProductsList.js

@@ -30,8 +30,9 @@ function ProductsList({ match }) {
             const response = await axios.get(`/api/categories/sub/${mainCategory}`)
             setSubcategory(Object.values(response.data)[0])
 
-            console.log("response data=", response.data)
-            console.log("object value=", Object.values(response.data));
+            // console.log("response data=", response.data)
+            // console.log("object value=", Object.values(response.data));
+            // console.log("object value=2", Object.values(response.data)[0]);
 
         } catch (error) {
             catchError(error, setError)
@@ -39,9 +40,10 @@ function ProductsList({ match }) {
     }
 
     async function getProductlist() {
+        console.log("tlfgpd")
         try {
-            const response = await axios.get(`/api/product/getproduct/${mainCategory}`)
-            console.log("response.data=", response.data)
+            const response = await axios.get(`/api/product/getproduct/main/${mainCategory}`)
+            console.log("response.data=main", response.data)
             setProductlist(response.data)
 
         } catch (error) {
@@ -49,6 +51,46 @@ function ProductsList({ match }) {
         }
     }
 
+    async function handleSubname(e) {
+        const subname = e.target.name
+        console.log("subname=", subname)
+        try {
+            console.log("first test!!!!!!!!")
+            const response = await axios.get(`/api/product/getproduct/sub/${subname}`)
+            console.log("subname response data=", response.data)
+            setProductlist([response.data])
+        } catch (error) {
+            console.log("error22")
+        }
+
+
+        // const listvalue = Object.values(productlist)
+        // for (let i = 0; i < listvalue.length; i++) {
+        //     const list = listvalue[i].sub_category[0]
+        //     console.log("list=", list)
+
+        //     console.log("include=", subcategory.includes("LONG DRESS"))
+        // if (listvalue[i].sub_category[0] === subcategory[0]) {
+        //     console.log("yes")
+        // }
+        // else {
+        //     console.log("no")
+        // }
+    }
+    // if (productlist.sub_category) {
+
+    // }
+    // console.log("list", list)
+    // for (let i = 0; i < list.length; i++) {
+    //     if (response.data[i] === "subcategory") {
+    //         console.log("handlesub=", response.data[i].sub_category)
+    //     }
+    //     else {
+    //         console.log("handlesub=2 ", response.data[i].sub_category)
+    //     }
+    // }
+    // }
+
     return (
         <div>
             <style type="text/css">
@@ -74,8 +116,8 @@ function ProductsList({ match }) {
                     <Col sm={10} xs={12} >
                         <h1 style={{ fontSize: "3rem" }} className="text-center">{mainCategory}</h1>
                         <div className="text-center">
-                            <ButtonGroup className="d-flex flex-wrap" variant="outline-light secondary">
-                                {subcategory.map(el => (<Button className="m-1" variant="secondary">{el}</Button>))}
+                            <ButtonGroup className="m-3" variant="outline-light secondary" style={{ display: "inline-block" }}>
+                                {subcategory.map(el => (<Button className="m-1" variant="secondary" name={el} onClick={handleSubname}>{el}</Button>))}
                             </ButtonGroup>
                         </div>
                     </Col>
@@ -99,7 +141,20 @@ function ProductsList({ match }) {
                 </Row>
                 <Row md={8} sm={12} className="justify-content-center m-2">
                     {productlist.map(pro => (
-                        <ListCard as={Link} id={pro._id} name={pro.pro_name} price={pro.price} main_img={pro.main_imgUrl} to={{
+                        // <ListCard as={Link} id={pro._id} name={pro.pro_name} price={pro.price} main_img={pro.main_imgUrl} to={{
+                        //     pathname: `/product/${pro._id}`,
+                        //     state: {
+                        //         id: pro._id,
+                        //         name: pro.pro_name,
+                        //         price: pro.price,
+                        //         colors: pro.colors,
+                        //         sizes: pro.sizes,
+                        //         description: pro.description,
+                        //         main_img: pro.main_imgUrl,
+                        //         detail_imgs: pro.detail_imgUrls
+                        //     }
+                        // }} />
+                        <Link to={{
                             pathname: `/product/${pro._id}`,
                             state: {
                                 id: pro._id,
@@ -111,7 +166,9 @@ function ProductsList({ match }) {
                                 main_img: pro.main_imgUrl,
                                 detail_imgs: pro.detail_imgUrls
                             }
-                        }} />
+                        }}>
+                            <ListCard id={pro._id} name={pro.pro_name} price={pro.price} main_img={pro.main_imgUrl} />
+                        </Link>
                     ))}
                 </Row>
             </Container>

client/src/Pages/ShoppingCart.js

@@ -75,6 +75,7 @@ function ShoppingCart() {
 
     async function getCart() {
         try {
+            setError('')
             const response = await axios.get(`/api/cart/showcart/${user}`)
             const addChecked = response.data.map((el) => {
                     return { ...el, checked: false }
@@ -86,8 +87,22 @@ function ShoppingCart() {
         }
     }
 
+    function putCheckedCart(){
+        try {
+            setError('')
+            const response =  axios.post(`/api/cart/changecart`, {
+                userId:user,
+                products: cart
+            })
+            console.log(response.data)
+        } catch (error) {
+            catchErrors(error, setError)
+        }
+    }
+
     return (
         <div>
+            {console.log(cart)}
             <Container className="justify-content-center">
                 <h1 className="my-5 font-weight-bold text-center">장바구니</h1>
                 <div>
@@ -116,7 +131,7 @@ function ShoppingCart() {
                     <Button as={Link} to={{
                         pathname: `/payment`,
                         state: finalCart 
-                    }} className="px-5" style={{ background: "#91877F", borderColor: '#91877F' }} block>결제하기</Button>
+                    }} className="px-5" style={{ background: "#91877F", borderColor: '#91877F' }} onClick={putCheckedCart} block>결제하기</Button>
                 </div>
             </Container>
         </div>

client/src/Pages/Signup.js

@@ -10,7 +10,8 @@ const INIT_USER = {
     id: '',
     password: '',
     password2: '',
-    tel: ''
+    tel: '',
+    email: ''
 }
 
 function Signup() {
@@ -61,134 +62,160 @@ function Signup() {
 
     if (success) {
         alert('회원가입 되었습니다.')
-        return <Redirect to='/login'/>
+        return <Redirect to='/login' />
     }
 
-return (
-    <div>
-        <Container className="my-5">
+    return (
+        <div>
+            <Container className="my-5">
 
-            <Row className="justify-content-center">
-                <Col md={6} xs={10} className="border" style={{ background: '#F7F3F3' }}>
-                    <h2 className="text-center mt-5">Sign Up</h2>
-                    {error && <Alert variant='danger'>
-                        {error}
-                    </Alert>}
-                    <Form
-                        noValidate validated={validated}
-                        onSubmit={handleSubmit}
-                        className="p-5">
-                        <Form.Group controlId="formBasicName">
-                            <Form.Row>
-                                <Col sm={4} xs={6} as={Form.Label} for="id">이 름</Col>
-                                <Col sm={8} xs={12} as={Form.Control}
-                                    required type="text"
-                                    name="name"
-                                    placeholder="Name"
-                                    style={{ width: '160px' }}
-                                    value={user.name}
-                                    onChange={handleChange} />
-                                <Form.Control.Feedback type="invalid">이름을 입력하세요. </Form.Control.Feedback>
-                            </Form.Row>
-                        </Form.Group>
-                        <Form.Group controlId="formBasicNumber">
-                            <Form.Row>
-                                <Col sm={4} xs={6} as={Form.Label} for="number">주민등록번호</Col>
-                                <Col as={Row} sm={8} xs={10} >
-                                    <Form.Control
+                <Row className="justify-content-center">
+                    <Col md={6} xs={10} className="border" style={{ background: '#F7F3F3' }}>
+                        <h2 className="text-center m-5">Sign Up</h2>
+                        {error && <Alert variant='danger'>
+                            {error}
+                        </Alert>}
+                        <Form
+                            noValidate validated={validated}
+                            onSubmit={handleSubmit}
+                            className="p-4">
+                            <Form.Group as={Col} controlId="formBasicName" className="justify-content-end">
+                                <Form.Row>
+                                    <Col sm={4} xs={6} as={Form.Label} for="id">이 름</Col>
+                                    <Col sm={8} xs={6} as={Form.Control}
                                         required type="text"
-                                        name="number1"
-                                        maxlength="6"
-                                        className="mx-2" style={{ width: '17 0px' }}
-                                        value={user.number1}
-                                        onChange={handleChange}>
-                                    </Form.Control>
-                                    -
-                                    <Form.Control
-                                        required type="text"
-                                        name="number2"
-                                        maxlength="1" className="mx-3"
-                                        style={{ width: '50px' }}
-                                        value={user.number2}
-                                        onChange={handleChange}>
-                                    </Form.Control>
-                                    ******
+                                        name="name"
+                                        placeholder="Name"
+                                        style={{ width: '160px' }}
+                                        value={user.name}
+                                        onChange={handleChange} />
+                                    <Form.Control.Feedback type="invalid" >이름을 입력하세요. </Form.Control.Feedback>
+                                </Form.Row>
+                            </Form.Group>
+                            <Form.Group as={Col} controlId="formBasicNumber">
+                                <Form.Row>
+                                    <Col sm={4} xs={6} as={Form.Label} for="number">주민등록번호</Col>
+                                    <Col xs={3}>
+                                        <Form.Control
+                                            required type="text"
+                                            name="number1"
+                                            maxlength="6"
+                                            className="ml-1 mr-3 p-1" style={{ width: '80px' }}
+                                            value={user.number1}
+                                            onChange={handleChange}>
+                                        </Form.Control>
+                                    </Col>
+                                    <Col xs={1}>
+                                        <div className='font-weight-bold d-flex align-items-center' style={{ text: 'center' }}>-</div>
+                                    </Col>
+                                    <Col xs={2}>
+                                        <Form.Control
+                                            required type="text"
+                                            name="number2"
+                                            maxlength="1" className="mx-3 p-1"
+                                            style={{ width: '30px' }}
+                                            value={user.number2}
+                                            onChange={handleChange}>
+                                        </Form.Control>
+                                    </Col>
+                                        <div className='font-weight-bold d-flex align-items-center'>* * * * * * </div>
                                     <Form.Control.Feedback type="invalid">주민등록번호를 입력하세요.</Form.Control.Feedback>
-                                </Col>
-                            </Form.Row>
-                        </Form.Group>
-                        <Form.Group controlId="formBasicId">
-                            <Form.Row>
-                                <Col sm={4} xs={6} as={Form.Label} for="id">아이디</Col>
-                                <Col sm={8} xs={12} as={Form.Control}
-                                    required
-                                    type="text"
-                                    name="id"
-                                    placeholder="ID"
-                                    style={{ width: '160px' }}
-                                    value={user.id}
-                                    onChange={handleChange} />
-                                <Form.Control.Feedback type="invalid"> 아이디를 입력하세요.</Form.Control.Feedback>
-                            </Form.Row>
-                        </Form.Group>
-                        <Form.Group controlId="formBasicPassword">
-                            <Form.Row>
-                                <Col sm={4} xs={6} as={Form.Label} for="password">비밀번호</Col>
-                                <Col sm={8} xs={12} as={Form.Control}
-                                    type="password"
-                                    name="password"
-                                    placeholder="Password"
-                                    style={{ width: '160px' }}
-                                    value={user.password}
-                                    required
-                                    onChange={handleChange}
-                                />
-                                <Form.Control.Feedback className="text-center" type="invalid">
-                                    비밀번호를 입력하세요.
+                                </Form.Row>
+                            </Form.Group>
+                            <Form.Group as={Col} controlId="formBasicId">
+                                <Form.Row>
+                                    <Col sm={4} xs={6} as={Form.Label} for="id">아이디</Col>
+                                    <Col sm={8} xs={12} as={Form.Control}
+                                        required
+                                        type="text"
+                                        name="id"
+                                        placeholder="ID"
+                                        style={{ width: '160px' }}
+                                        value={user.id}
+                                        onChange={handleChange} />
+                                    <Form.Control.Feedback type="invalid"> 아이디를 입력하세요.</Form.Control.Feedback>
+                                </Form.Row>
+                            </Form.Group>
+                            <Form.Group as={Col} controlId="formBasicPassword">
+                                <Form.Row>
+                                    <Col sm={4} xs={6} as={Form.Label} for="password">비밀번호</Col>
+                                    <Col sm={8} xs={12} as={Form.Control}
+                                        type="password"
+                                        name="password"
+                                        placeholder="Password"
+                                        style={{ width: '160px' }}
+                                        value={user.password}
+                                        required
+                                        onChange={handleChange}
+                                    />
+                                    <Form.Control.Feedback className="text-end" type="invalid">
+                                        비밀번호를 입력하세요.
+                                    </Form.Control.Feedback>
+                                </Form.Row>
+                            </Form.Group>
+                            <Form.Group as={Col} controlId="formBasicPassword2">
+                                <Form.Row>
+                                    <Col sm={4} xs={6} as={Form.Label} for="password">비밀번호 확인</Col>
+                                    <Col sm={8} xs={12} as={Form.Control}
+                                        type="password"
+                                        name="password2"
+                                        placeholder="Password"
+                                        style={{ width: '160px' }}
+                                        value={user.password2}
+                                        required
+                                        onChange={handleChange}
+                                    />
+                                    <Form.Control.Feedback type="invalid"> 비밀번호를 한번 더 입력하세요.
                                     </Form.Control.Feedback>
-                            </Form.Row>
-                        </Form.Group>
-                        <Form.Group controlId="formBasicPassword2">
-                            <Form.Row>
-                                <Col sm={4} xs={6} as={Form.Label} for="password">비밀번호 확인</Col>
-                                <Col sm={8} xs={12} as={Form.Control}
-                                    type="password"
-                                    name="password2"
-                                    placeholder="Password"
-                                    style={{ width: '160px' }}
-                                    value={user.password2}
-                                    required
-                                    onChange={handleChange}
-                                />
-                                <Form.Control.Feedback type="invalid"> 비밀번호를 한번 더 입력하세요.
+                                </Form.Row>
+                            </Form.Group>
+                            <Form.Group as={Col} controlId="formBasicEmail">
+                                <Form.Row>
+                                    <Col sm={4} xs={6} as={Form.Label} for="email">이메일</Col>
+                                    <Col sm={8} xs={12} as={Form.Control}
+                                        required type="email"
+                                        name="email"
+                                        placeholder="E-mail"
+                                        style={{ width: '160px' }}
+                                        value={user.email}
+                                        onChange={handleChange} />
+                                    <Form.Control.Feedback type="invalid"> 이메일 입력하세요. </Form.Control.Feedback>
+                                </Form.Row>
+                            </Form.Group>
+                            <Form.Group as={Col} controlId="formBasicTel">
+                                <Form.Row>
+                                    <Col sm={4} xs={6} as={Form.Label} for="tel">휴대전화</Col>
+                                    <Col sm={8} xs={12} style={{ width: '160px' }} className='p-0'>
+                                        <Col
+                                            as={Form.Control}
+                                            required type="text"
+                                            name="tel"
+                                            placeholder="Telephone"
+                                            className='p-1'
+                                            value={user.tel}
+                                            onChange={handleChange}>
+
+                                        </Col>
+                                        <div className='d-flex justify-content-end mt-1'><small >' - ' 를 함께 입력해주세요^^</small></div>
+                                    </Col>
+                                    <Form.Control.Feedback type="invalid"> 휴대전화를 입력하세요. </Form.Control.Feedback>
+                                </Form.Row>
+                                <Form.Control.Feedback className="text-end" type="invalid">
+                                    비밀번호를 입력하세요.
                                     </Form.Control.Feedback>
-                            </Form.Row>
-                        </Form.Group>
-                        <Form.Group controlId="formBasicTel">
-                            <Form.Row>
-                                <Col sm={4} xs={6} as={Form.Label} for="tel">휴대전화</Col>
-                                <Col sm={8} xs={12} as={Form.Control}
-                                    required
-                                    type="text"
-                                    name="tel"
-                                    size="sm" style={{ width: '160px' }}
-                                    value={user.tel}
-                                    onChange={handleChange} />
-                                <Form.Control.Feedback type="invalid"> 휴대전화를 입력하세요. </Form.Control.Feedback>
-                            </Form.Row>
-                        </Form.Group>
-                        <Button
-                            style={{ background: '#91877F', borderColor: '#91877F' }} type="submit" block
-                            onClick={checkPassword}
-                        >
-                            Sign Up
+                            </Form.Group >
+                            <Button
+                                style={{ background: '#91877F', borderColor: '#91877F' }} type="submit" block
+                                onClick={checkPassword}
+                            >
+                                Sign Up
                             </Button>
-                    </Form>
-                </Col>
-            </Row>
-        </Container>
-    </div>
-)
+                        </Form>
+                    </Col>
+                </Row>
+            </Container>
+        </div >
+    )
 }
 
 export default Signup
\ No newline at end of file

server/controllers/cart.controller.js

 import Cart from "../schemas/Cart.js";
 
-const addcart = async (req, res) => {
-    const { userId, products} = req.body
+const addCart = async (req, res) => {
+    const { userId, products } = req.body
     try {
         const cart = await Cart.findOne({ userId: userId })
         await Cart.updateOne(
             { _id: cart._id },
-            {$push: {products: products}}
+            { $push: { products: products } }
         )
         res.status(200).send('카트에 저장되었습니다.')
     } catch (error) {
@@ -15,31 +15,49 @@ const addcart = async (req, res) => {
     }
 }
 
-const showcart = async (req, res) => {
+const changeCart = async (req, res) => {
+    const { userId, products } = req.body
+    console.log(products)
     try {
+        const cart = await Cart.findOne({ userId: userId })
+        await Cart.updateOne(
+            { _id: cart._id },
+            { $set: { products: products } }
+        )
+        res.send("카트에 체크가 활성화되었습니다")
+    } catch (error) {
+        res.send("카트 체인지 실패")
+    }
+}
+
+const showCart = async (req, res) => {
+    try {
+        console.log("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@")
         const cart = await Cart.findOne({ userId: req.id }).populate({
             path: 'products.productId',
-            model: 'Product' 
+            model: 'Product'
         })
         res.status(200).json(cart.products)
+        console.log("cart-products : ", cart.products);
     } catch (error) {
+        console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
         console.log(error)
         res.status(500).send('쇼핑카트를 불러오지 못했습니다.')
     }
 }
 
-const deletecart = async (req, res) => {
+const deleteCart = async (req, res) => {
     console.log(req.body)
-    const { userId,cartId } = req.body
+    const { userId, cartId } = req.body
     try {
         const cart = await Cart.findOneAndUpdate(
             { userId: userId },
-            { $pull: { products: {_id:cartId} } },
+            { $pull: { products: { _id: cartId } } },
             { new: true }
-          ).populate({
+        ).populate({
             path: 'products.productId',
             model: 'Product'
-          })
+        })
         // res.send("삭제완료")
         res.json(cart)
     } catch (error) {
@@ -48,6 +66,29 @@ const deletecart = async (req, res) => {
 
     }
 }
+const deleteCart2 = async (req, res) => {
+    console.log(req.body)
+    const { userId, cartId } = req.body
+    try {
+        for( let i = 0; i < cartId.length; i++ ){
+            await Cart.findOneAndUpdate(
+                { userId: userId },
+                { $pull: { products: { _id: cartId[i] } } },
+                { new: true }
+            ).populate({
+                path: 'products.productId',
+                model: 'Product'
+            })
+        }
+        res.send("주문완료 쇼핑카트 삭제")
+        // res.json(cart)
+    } catch (error) {
+        console.log(error)
+        res.status(500).send('해당 카트를 삭제하지 못했습니다.')
+
+    }
+}
+
 const userById = async (req, res, next, id) => {
     try {
         const cart = await Cart.findOne({ userId: id })
@@ -63,4 +104,4 @@ const userById = async (req, res, next, id) => {
 }
 
 
-export default { addcart, showcart, deletecart, userById }
\ No newline at end of file
+export default { addCart, changeCart, showCart, deleteCart,deleteCart2, userById }
\ No newline at end of file

server/controllers/category.controller.js

@@ -3,7 +3,7 @@ import Category from "../schemas/Category.js";
 const getCategory = async (req, res) => {
     try {
         const category = await Category.find({}, { _id: 0 })
-        console.log("main= ", category);
+        // console.log("main= ", category);
         res.json(category)
     } catch (error) {
         console.log(error)
@@ -12,12 +12,12 @@ const getCategory = async (req, res) => {
 }
 
 const getSubCategory = async (req, res) => {
-    console.log("req.params=", req.params);
+     console.log("req.params=?(getsubcategory)", req.params);
     const { sub } = req.params
     try {
         const subcategory = await Category.findOne({}, { _id: 0}).select(`${sub}`)
-        console.log("sub= ",subcategory);
         res.json(subcategory);
+        console.log("sub= ",subcategory);
     } catch (error) {
         res.status(500).send('카테고리를 불러오지 못했습니다.')
     }
@@ -27,8 +27,8 @@ const getToHome = async (res, req) => {
     try {
         const bestProduct = await Product.find({}).sort({ purchase: 1 }).limit(6)
         const newProduct = await Product.find({}).sort({ createdAt: -1 }).limit(6)
-        console.log("best=", bestProduct)
-        console.log("new=", newProduct)
+        // console.log("best=", bestProduct)
+        // console.log("new=", newProduct)
         res.json(bestProduct, newProduct)
     } catch {
         res.status(500).send('상품을 불러오지 못했습니다.')

server/controllers/order.controller.js

@@ -13,6 +13,17 @@ const addorder = async (req, res) => {
     }
 }
 
+const Ordered = async (req, res) => {
+    const { db } = req.body
+    try {
+        const ordered = await req.body.findOne({}, { _id: 0}).select(`${db}`)
+        console.log("sub= ",ordered);
+        res.json(ordered);
+    } catch (error) {
+        res.status(500).send('카테고리를 불러오지 못했습니다.')
+    }
+}
+
 const showorder = async (req, res) => {
     try {
         const order = await Order.findOne({ userId: req.id }).populate({
@@ -30,4 +41,4 @@ const showorder = async (req, res) => {
 
 
 
-export default { addorder, showorder }
\ No newline at end of file
+export default { addorder, showorder, Ordered }
\ No newline at end of file

server/controllers/product.controller.js

@@ -33,8 +33,8 @@ const getToHome = async (req, res) => {
     try {
         const bestProduct = await Product.find({}).sort({ purchase: -1 }).limit(6)
         const newProduct = await Product.find({}).sort({ createdAt: -1 }).limit(6)
-        console.log("best=", bestProduct)
-        console.log("new=", newProduct)
+        // console.log("best=", bestProduct)
+        // console.log("new=", newProduct)
         res.json({ bestProduct, newProduct })
     } catch {
         res.status(500).send('상품을 불러오지 못했습니다.')
@@ -58,6 +58,15 @@ const getlist = (req, res) => {
     }
 }
 
+const subname = async (req, res) => {
+    try {
+        console.log("last subname::: LET ME SEE")
+        res.json(req.findsubname)
+    } catch (error) {
+        res.status(500).send('상품을 불러오지 못했습니다.')
+    }
+}
+
 const categoryId = async (req, res, next, category) => {
     try {
         const productslist = await Product.find({ main_category: category })
@@ -65,31 +74,62 @@ const categoryId = async (req, res, next, category) => {
             res.status(404).send('상품을 찾을 수 없습니다.')
         }
         req.productslist = productslist
+        console.log("nononono", req.productslist)
         next()
     } catch (error) {
         res.status(500).send('상품을 불러오지 못했습니다.')
     }
 }
 
-const subgetlist = (req, res) => {
+const subcategoryId = async (req, res, next, subname) => {
     try {
-        res.json(req.subproductslist)
+        console.log("Please===>>>", subname)
+        const findSubname = await Product.findOne({ sub_category: subname })
+        // const findSubname = await Product.find({ sub_category: { $elemMatch: { subname: req.subname }}})
+        console.log("findSubname111=", findSubname)
+        // const onlySub = findSubname.sub_category
+        // console.log(";;", onlySub)
+        // console.log(".", Object.values(onlySub))
+
+        if (!findSubname) {
+            console.log("ㅏㅁㄴ우하ㅣㅜㅁㄴ어ㅏㅣ훔ㄴ어ㅏㅣ휴")
+            const findSubname = {
+                _id: 'nothing',
+                pro_name: '상품준비중',
+                price: 0,
+                main_imgUrl:''
+            }
+            console.log("findSubname2222=", findSubname)
+            res.send(findSubname)
+        }
+        res.send(findSubname)
+        // next()
     } catch (error) {
-        res.status(500).send('상품을 불러오지 못했습니다.')
+        res.send('상품을 불러오지 못했습니다.')
     }
 }
+//https://docs.mongodb.com/manual/reference/operator/projection/elemMatch/index.html
 
-const subcategoryId = async (req, res, next, subcategory) => {
+const plusPurchase = async (req, res) => {
+    const { products } = req.body
+    // console.log(products)
     try {
-        const subproductslist = await Product.find({ sub_category: subcategory })
-        if (!subproductslist) {
-            res.status(404).send('상품을 찾을 수 없습니다.')
+        for (let i = 0; i < products.length; i++) {
+            const count = products[i].count
+            const product = await Product.findOne(
+                { _id: products[i].productId._id }
+            )
+            const purchase = product.purchase
+            await Product.updateOne(
+                { _id: products[i].productId._id },
+                { $set: { purchase: count + purchase } }
+            )
+            // console.log("i=", i)
         }
-        req.subproductslist = subproductslist
-        next()
+        res.send("구매수 늘리기 성공")
     } catch (error) {
-        res.status(500).send('상품을 불러오지 못했습니다.')
+        res.status(500).send('구매숫자를 늘리지 못함')
     }
 }
 
-export default { imageUpload, regist, getToHome, getAll, categoryId, getlist, subcategoryId, subgetlist }
\ No newline at end of file
+export default { imageUpload, regist, getToHome, getAll, categoryId, getlist, subcategoryId, subname, plusPurchase }
\ No newline at end of file

server/controllers/user.controller.js

@@ -31,8 +31,8 @@ const userById = async (req, res, next, id) => {
 
 
 const signup = async (req, res) => {
-    const { name, number1, number2, id, password, tel } = req.body
-    console.log(req.body)
+    const { name, number1, number2, id, password, tel, email } = req.body
+    console.log("whatup", req.body)
     try {
         if (!isLength(password, { min: 8, max: 15 })) {
             return res.status(422).send('비밀번호는 8-15자리로 입력해주세요.')
@@ -51,8 +51,9 @@ const signup = async (req, res) => {
             id,
             password: hash,
             tel,
+            email
         }).save()
-        await new Cart({ userId: newUser._id, role }).save()
+        await new Cart({ userId: newUser._id }).save()
         console.log(newUser)
         res.json(newUser)
 

server/routes/cart.routes.js

@@ -5,15 +5,20 @@ import cartCtrl from '../controllers/cart.controller.js';
 const router = express.Router()
 
 router.route('/addcart')
-    .put(cartCtrl.addcart)
+    .put(cartCtrl.addCart)
 // .get()
 
 router.route('/showcart/:userId')
-    .get(cartCtrl.showcart)
-router.param('userId', cartCtrl.userById)
+    .get(cartCtrl.showCart)
 
+router.route('/changecart')
+    .post(cartCtrl.changeCart)
 
 router.route('/deletecart')
-    .post(cartCtrl.deletecart)
-    
+    .post(cartCtrl.deleteCart)
+router.route('/deletecart2')
+    .post(cartCtrl.deleteCart2)
+
+router.param('userId', cartCtrl.userById)
+
 export default router
\ No newline at end of file

server/routes/product.routes.js

@@ -13,14 +13,16 @@ router.route('/getproduct')
 router.route('/getproduct/all')
     .get(productCtrl.getAll)
 
-router.route('/getproduct/:category')
+router.route('/getproduct/main/:category')
     .get(productCtrl.getlist)
 
-router.route('/getproduct/:subcategory')
-    .get(productCtrl.subgetlist)
+router.route('/getproduct/sub/:subname')
+    .get(productCtrl.subname)
 
-router.param('category', productCtrl.categoryId)
+router.route('/pluspurchase')
+    .post(productCtrl.plusPurchase)
 
-router.param('subcategory',productCtrl.subcategoryId)
+router.param('category', productCtrl.categoryId)
+router.param('subname',productCtrl.subcategoryId)
     
 export default router
\ No newline at end of file

server/schemas/Cart.js

@@ -22,6 +22,9 @@ const CartSchema = new mongoose.Schema({
                 },
                 color: {
                     type: String
+                },
+                checked: {
+                    type: Boolean
                 }
             }
         ]

server/schemas/Order.js

@@ -24,32 +24,35 @@ const OrderSchema = new mongoose.Schema({
             color: {
                 type: String,
                 required: true
+            },
+            checked: {
+                type: Boolean
             }
         }
     ],
-    receiverInfo: 
-        {
-            name: {
-                type:String,
-                required:true
-            },
-            tel: {
-                type: String,
-                required:true
-            },
-            postalCode:{
-                type:String,
-                required:true
-            },
-            address: {
-                type: String,
-                required: true
-            },
-            address2: {
-                type: String,
-                required: true
-            }
+    receiverInfo:
+    {
+        name: {
+            type: String,
+            required: true
+        },
+        tel: {
+            type: String,
+            required: true
+        },
+        postalCode: {
+            type: String,
+            required: true
+        },
+        address: {
+            type: String,
+            required: true
+        },
+        address2: {
+            type: String,
+            required: true
         }
+    }
     ,
     total: {
         type: Number,

server/schemas/User.js

@@ -34,6 +34,10 @@ const UserSchema = new mongoose.Schema({
         default: 'user',
         enum: ['user', 'admin', 'root']
     },
+    email : {
+        type : String,
+        required: true,
+    },
     avatarUrl: {
         type: String
     }

test/test.js

+const inventory = {
+    sibal: [
+        { name: 'apples', quantity: 2 },
+        { name: 'bananas', quantity: 4 },
+        { name: 'cherries', quantity: 9 }
+    ]
+}
+
+
+const result = inventory.find(fruit => fruit.name === 'cherries');
+const what = inventory.find({},{ sibal: { $elemMatch: { quantity: 2 } } })
+
+// db.schools.find( { zipcode: "63109" },
+//                  { students: { $elemMatch: { school: 102, age: { $gt: 10} } } } )
+console.log(result);
+console.log(what);
\ No newline at end of file