Merge pull request #11 from serverdevcamp/donggeun

20.02.17 로그인 회원가입, 상품 등록 및 수정 axios 연동

Author: ehdrms2034

laundry_owner/frontend/src/src/components/Common/Background.scss

@@ -7,3 +7,8 @@
   overflow: auto;
 }
 
+.defaultSpaceBetween{
+  display: flex;
+  flex-direction : row;
+  justify-content: space-between;
+}

laundry_owner/frontend/src/src/components/Common/CustomButton.js

@@ -13,7 +13,11 @@ const CustomButton = ({type, onClick, className, value}) => {
     _type = 'button';
 
   return (
-    <input type={_type} onClick={onClick} value={value} className={cx('customButtonDefault', className)}/>
+    <input type={_type}
+           onClick={onClick}
+           value={value}
+           className={cx('customButtonDefault', className)}
+    />
   )
 };
 

laundry_owner/frontend/src/src/components/ProductRegistrationView/RegisterItemForm.js

@@ -8,16 +8,27 @@ import CustomButton from "../Common/CustomButton";
 
 const cx = className.bind(style);
 
-const RegisterItemForm = ({}) => {
+const RegisterItemForm = ({
+                            price, material, name, information, mode,
+                            setPrice, setMaterial, setName, setInformation,
+                            registerItem, openRegistrationForm
+                          }) => {
+
+
   return (
-    <form className={cx('registerItemForm-form')}>
+    <form
+      className={cx('registerItemForm-form')}
+      action={"#"}
+      onSubmit={() => registerItem(mode, name, material, price, information)}
+    >
       <div className={cx('registerItemForm-leftPage')}>
         <div className={cx('registerItemForm-registerRow')}>
           <Typography variant={"h6"}> 제품 이름 </Typography>
           <Select
             style={{width: "50%"}}
-            value={'와이셔츠'}
+            value={name}
             defaultValue={'와이셔츠'}
+            onChange={(e) => setName(e.target.value)}
           >
             <MenuItem value={'와이셔츠'}> 와이셔츠</MenuItem>
             <MenuItem value={'청바지'}> 청바지</MenuItem>
@@ -27,23 +38,34 @@ const RegisterItemForm = ({}) => {
           <Typography variant={"h6"}> 제품 소재 </Typography>
           <Select
             style={{width: "50%"}}
-            value={'와이셔츠'}
+            value={material}
             defaultValue={'와이셔츠'}
+            onChange={(e) => setMaterial(e.target.value)}
           >
             <MenuItem value={'와이셔츠'}> 와이셔츠</MenuItem>
             <MenuItem value={'청바지'}> 청바지</MenuItem>
           </Select>
         </div>
         <div className={cx('registerItemForm-registerRow')}>
           <Typography variant={"h6"}> 제품 가격 </Typography>
-          <CustomInput className={cx('registerItemForm-priceInput')}/>
+          <CustomInput
+            className={cx('registerItemForm-priceInput')}
+            value={price}
+            onChangeEvent={setPrice}
+            required={true}
+          />
         </div>
       </div>
       <div className={cx('registerItemForm-rightPage')}>
         <Typography variant={"h6"}> 제품 특이사항 </Typography>
-        <textarea className={cx('registerItemForm-etcText')}/>
+        <textarea
+          className={cx('registerItemForm-etcText')}
+          value={information}
+          onChange={(e) => setInformation(e.target.value)}
+          required={true}
+        />
         <CustomButton
-          type={'submmit'}
+          type={'submit'}
           value={'제출하기'}
           className={cx('registerItemForm-submitBtn')}
         />

laundry_owner/frontend/src/src/components/ProductRegistrationView/RegisteredItemList.js

@@ -0,0 +1,27 @@
+import React from "react";
+import HorizontalScrollView from "./HorizontalScrollView";
+import RegisteredItemView from "./RegisteredItemView";
+import DefaultMainBody from "../Common/DefaultMainBody";
+
+const RegisteredItemList = ({items,openRegistrationForm}) => {
+
+  let index = 0;
+
+  return(
+    <HorizontalScrollView>
+      {
+        items.map(item => (
+          <RegisteredItemView
+            key={index++}
+            name={item.category}
+            material={item.material}
+            price={item.price}
+            openRegistrationForm = {openRegistrationForm}
+          />
+        ))
+      }
+    </HorizontalScrollView>
+  )
+};
+
+export default RegisteredItemList;

laundry_owner/frontend/src/src/components/ProductRegistrationView/RegisteredItemView.js

@@ -4,6 +4,7 @@ import style from './RegisterdItemView.scss';
 import className from 'classnames';
 import {makeStyles} from "@material-ui/core/styles";
 import {Typography} from "@material-ui/core";
+import {MODE} from "../../pages/ProductRegistrationView";
 
 const customStyle = makeStyles({
   card: {
@@ -28,21 +29,26 @@ const customStyle = makeStyles({
 
 const cx = className.bind(style);
 
-const RegisteredItemView = ({}) => {
+const RegisteredItemView = ({name,material,price,id,openRegistrationForm}) => {
   const customClasses = customStyle();
 
   return (
     <GridListTile style={{height: '275px'}}>
       <Card variant={"outlined"} className={customClasses.card}>
         <CardContent className={customClasses.cardContent}>
           <div className={cx('registeredItemView-img')}/>
-          <Typography>상품명</Typography>
+          <Typography>{name}</Typography>
           <div className={cx('registeredItemView-data')}>
-            <Typography>소재명 : XXXX </Typography>
-            <Typography>가격 : 3,000 원</Typography>
+            <Typography>소재명 : {material} </Typography>
+            <Typography>가격 : {price} 원</Typography>
           </div>
           <div className={cx('registeredItemView-dataModify')}>
-            <Typography variant={"button"} className={customClasses.cardButton}>수정하기</Typography>
+            <Typography
+              variant={"button"}
+              className={customClasses.cardButton}
+              onClick={()=>openRegistrationForm(MODE.MODIFY)}
+            >
+              수정하기</Typography>
             <Typography variant={"button"} className={customClasses.cardButton}>삭제하기</Typography>
           </div>
         </CardContent>

laundry_owner/frontend/src/src/components/ShopMenu/ShopMenu.js

@@ -18,6 +18,14 @@ const ShopMenu = ({menuIndex}) => {
         세탁소 관리
       </div>
       <List className={cx('shopMenuList')}>
+        <ListItem
+          alignItems={"center"}
+          button
+          selected={menuIndex === 0}
+          onClick={() => navigatePage("orderManagement")}
+        >
+          주문 관리
+        </ListItem>
         <ListItem
           alignItems={"center"}
           button
@@ -41,33 +49,40 @@ const ShopMenu = ({menuIndex}) => {
         >
           리뷰 관리
         </ListItem>
+        <ListItem
+          button
+          selected={menuIndex === 4}
+          onClick={() => navigatePage('chatList')}
+        >
+          채팅방 목록
+        </ListItem>
       </List>
       <div className={cx('shopMenuTitle')}>
         통계
       </div>
       <List>
         <ListItem
           button
-          selected={menuIndex === 4}
+          selected={menuIndex === 5}
           onClick={() => navigatePage('hourlySales')}
         >
           시간별 매출
         </ListItem>
         <ListItem
           button
-          selected={menuIndex === 5}
+          selected={menuIndex === 6}
         >
           시간별 주문량
         </ListItem>
         <ListItem
           button
-          selected={menuIndex === 6}
+          selected={menuIndex === 7}
         >
           위치별 매출
         </ListItem>
         <ListItem
           button
-          selected={menuIndex === 7}
+          selected={menuIndex === 8}
         >
           위치별 주문량
         </ListItem>

laundry_owner/frontend/src/src/components/SignUpView/SignUpInputForm.js

@@ -19,7 +19,7 @@ const SignUpInputForm = ({
                            onChangePassword, onChangePasswordConfirm, onChangeName, onChangeEmail, onChangeImage,
                            onChangeAddress, onChangeDetailAddress, onChangeTel,
                            onChangeInformation, addOperationTime, detailAddressRef,
-                           handleSignUp
+                           handleSignUp, checkDuplicate
                          }) => {
 
   const [isOpenedModal, setOpenModal] = useState(false);
@@ -183,7 +183,9 @@ const SignUpInputForm = ({
                         <CustomButton
                           className={cx('signUpIdCheckButton')}
                           type={'button'}
-                          value='중복검사'/>
+                          value='중복검사'
+                          onClick={()=>checkDuplicate(userName)}
+                        />
                     </span>
                 </span>
 

laundry_owner/frontend/src/src/modules/index.js

@@ -1,8 +1,9 @@
 import { combineReducers} from "redux";
 import temp from './temp';
+import profile from "./profile";
 
 const rootReducer = combineReducers({
-  temp
+  temp,profile
 });
 
 export default rootReducer;

laundry_owner/frontend/src/src/modules/profile.js

@@ -0,0 +1,27 @@
+const SETUSERNAME = 'Profile/SETUSERNAME';
+const SETSHOPID = 'Profile/SETSHOPID';
+
+export const setUserName = (userName) => ({type: SETUSERNAME, userName : userName});
+export const setShopId = (shopId) => ({type: SETSHOPID, shopId : shopId});
+
+const initialProfile = {
+  userName : 'a12',
+  shopId : '5',
+};
+
+const profile = (profile = initialProfile, action) =>{
+  switch(action.type){
+    case SETUSERNAME:
+      return Object.assign({},profile,{
+        userName: action.userName
+      });
+    case SETSHOPID:
+      return Object.assign({},profile,{
+        shopId : action.shopId
+      });
+    default:
+      return initialProfile;
+  }
+};
+
+export default profile;

laundry_owner/frontend/src/src/pages/ChatListView.js

@@ -129,7 +129,7 @@ class ChatListView extends React.Component {
     return (
       <div className={cx('defaultBackground')}>
         <DefaultHeader title={'채팅방 목록'}/>
-        <DefaultMainBody>
+        <DefaultMainBody menuIndex={4}>
           <ChatListTable
             chatRoomList={chatRoomList}
             setModalOpen={this.setModalOpen}