Merge pull request #123 from serverdev-bewe/develop

Develop

Author: ManHyuk

FRONTEND/ReactReduxVer_1/src/components/CMS/ContentsCard.js

@@ -1,6 +1,10 @@
-import React from 'react';
+import React, { Component } from 'react';
 import { Card, CardImg, CardTitle, Badge, CardText, CardImgOverlay, Button } from 'reactstrap';
 import Moment from 'react-moment';
+import {postGamePurchase} from '../../actions/store/StoreAction';
+import {connect} from 'react-redux';
+
+
 
 function renderBadge(genre) {
   let color = '';
@@ -20,26 +24,35 @@ function renderBadge(genre) {
   )
 }
 
-const ContentsCard = (props) => {
-  return (
-    <Card className="store-game-wrapper">    
-      <div className="store-game-image-wrapper">
-        <CardImg className="avatar-image" src={(props.image) ? props.image : "http://genknews.genkcdn.vn/zoom/220_160/2017/thumbnail-4x3-34722014736-2d241425f9-k-1495531031736-crop-1495531041612.jpg"} alt="Card image cap" />
-      </div>
-      <div className="store-game-info-wrapper">
-        <CardTitle>{props.title}</CardTitle> 
-        <Moment className="store-game-created-at" format="YYYY/MM/DD">{props.created_at}</Moment>       
-        <hr />    
-        <CardText>
-          {props.description}
-        </CardText>    
-      </div>  
-      <Button color="primary" outline>구입하기</Button>    
-      <CardImgOverlay>
-          <div className="store-game-badge">{renderBadge(props.genre)}</div>
-      </CardImgOverlay>    
-    </Card>
-  )
+class ContentsCard extends Component{
+  render() {
+    return (
+      <Card className="store-game-wrapper">
+        <div className="store-game-image-wrapper">
+          <CardImg className="avatar-image"
+                   src={(this.props.image) ? this.props.image : "http://genknews.genkcdn.vn/zoom/220_160/2017/thumbnail-4x3-34722014736-2d241425f9-k-1495531031736-crop-1495531041612.jpg"}
+                   alt="Card image cap"/>
+        </div>
+        <div className="store-game-info-wrapper">
+          <CardTitle>{this.props.title}</CardTitle>
+          <Moment className="store-game-created-at" format="YYYY/MM/DD">{this.props.created_at}</Moment>
+          <hr/>
+          <CardText>
+            {this.props.description}
+          </CardText>
+        </div>
+        {/*<Button onClick={() => {this.postGamePurchase(props.idx)}} color="primary" outline>구입하기</Button>*/}
+        <CardImgOverlay>
+          <div className="store-game-badge">{renderBadge(this.props.genre)}</div>
+        </CardImgOverlay>
+        <Button onClick={() => {
+          this.props.postGamePurchase(this.props.idx)
+        }}>구입하기</Button>
+      </Card>
+    )
+  }
 }
 
-export default ContentsCard;
+// export default ContentsCard;
+
+export default connect(null, {postGamePurchase})(ContentsCard);

FRONTEND/ReactReduxVer_1/src/components/CMS/ContentsList.js

@@ -19,7 +19,7 @@ class ContentsList extends Component{
     return this.props.contents.map((data, index) => {
       return (
         <ContentsDetail
-          key={data.idx}
+          idx={data.idx}
           index={index+1}
           flag={data.flag}
           title={data.title}

FRONTEND/ReactReduxVer_1/src/components/store/StoreLists.js

@@ -16,9 +16,10 @@ class StoreLists extends Component{
 
   renderLists(){
     return this.props.contents.map((data, index) => {
+      console.log('data',data);
       return (
           <ContentsCard
-            key={data.key}
+            idx={data.idx}
             index={index+1}
             title={data.title}
             genre={data.genre}

FRONTEND/ReactReduxVer_1/src/components/users/dashboard/profile/UserGame.js

@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { PulseLoader } from 'react-spinners';
 
 import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom';