From 968f987470635876e9f4c1703d91fedb0197b719 Mon Sep 17 00:00:00 2001 From: pymit Date: Tue, 16 Jul 2019 19:40:59 +0530 Subject: [PATCH 1/6] adding icon button --- src/main/Homepage/feedback/cardview.js | 2 +- src/main/Homepage/feedback/divider.js | 71 +++++++++++--------------- src/main/Homepage/feedback/index.js | 2 +- 3 files changed, 31 insertions(+), 44 deletions(-) diff --git a/src/main/Homepage/feedback/cardview.js b/src/main/Homepage/feedback/cardview.js index 251aa53..058c3ba 100644 --- a/src/main/Homepage/feedback/cardview.js +++ b/src/main/Homepage/feedback/cardview.js @@ -19,7 +19,7 @@ const useStyles = makeStyles({ export default function Maincard(props) { const classes = useStyles(); var pingDividerMain; - if(typeof props.data !=='undefined') + if(typeof props.data !=='undefined') // It checks wether the argument passed contains any array data or not { pingDividerMain = ; } diff --git a/src/main/Homepage/feedback/divider.js b/src/main/Homepage/feedback/divider.js index 197cf15..1fe44b3 100644 --- a/src/main/Homepage/feedback/divider.js +++ b/src/main/Homepage/feedback/divider.js @@ -6,63 +6,50 @@ import ListItemAvatar from "@material-ui/core/ListItemAvatar"; import Avatar from "@material-ui/core/Avatar"; import Icon from "@material-ui/core/Icon"; import Divider from "@material-ui/core/Divider"; +import IconButton from "@material-ui/core/IconButton"; export class DividerMain extends Component { constructor(props) { super(props); this.state = { - contents: null, + contents: null }; } - - componentWillMount() { + componentWillMount() { this.setState({ contents: this.props.data }); - } - + } render() { - const someData = [{"id":18,"suggestedName":"Bill Gates","upvote":0,"downvote":0,"feedback":"6c2c99a1-6510-4584-9c05-6b87d4106565"},{"id":19,"suggestedName":"Bill Gates","upvote":0,"downvote":0,"feedback":"6c2c99a1-6510-4584-9c05-6b87d4106565"}]; - // const testdata = JSON.parse(JSON.stringify( this.state.contents)) - // console.log(this.state.contents.length) - console.log(typeof(this.state.contents)) - - if(typeof this.props.data !=='undefined') - { - console.log("oh no") - console.log( this.props.data.length) + // const someData = [{"id":18,"suggestedName":"Bill Gates","upvote":0,"downvote":0,"feedback":"6c2c99a1-6510-4584-9c05-6b87d4106565"},{"id":19,"suggestedName":"Bill Gates","upvote":0,"downvote":0,"feedback":"6c2c99a1-6510-4584-9c05-6b87d4106565"}]; + // const testdata = JSON.parse(JSON.stringify( this.state.contents)) + // console.log(this.state.contents.length) + const receivedData = this.state.contents; - this.props.data.map(o => ( - console.log(o) - )) - } return (
- - - { someData.map(o => ( -

- {o.upvote} {o.suggestedName} {o.downvote} -

- )) - } - - - - - - - thumb_up - - - - - - thumb_down - - - + {receivedData.map(out => ( + + + + {" "} + thumb_up + + + + + + {" "} + thumb_down + + + + + ))}
); diff --git a/src/main/Homepage/feedback/index.js b/src/main/Homepage/feedback/index.js index 8bc5aa1..d97782c 100644 --- a/src/main/Homepage/feedback/index.js +++ b/src/main/Homepage/feedback/index.js @@ -41,7 +41,7 @@ class FeedBack extends Component { data={this.state.test.data} /> -
feedback {indexId}
+
feedback
); From 415f1b4b8f59f85952bee3f3edfc73859fb7f293 Mon Sep 17 00:00:00 2001 From: pymit Date: Wed, 17 Jul 2019 06:59:51 +0530 Subject: [PATCH 2/6] adding onclick handler for upvote and downvote system --- src/main/Homepage/feedback/cardview.js | 27 ++++++++++---------------- src/main/Homepage/feedback/divider.js | 19 ++++++++++++++---- src/main/Homepage/feedback/index.css | 18 ++++++++++++----- src/main/Homepage/feedback/index.js | 1 - 4 files changed, 38 insertions(+), 27 deletions(-) diff --git a/src/main/Homepage/feedback/cardview.js b/src/main/Homepage/feedback/cardview.js index 058c3ba..3be9928 100644 --- a/src/main/Homepage/feedback/cardview.js +++ b/src/main/Homepage/feedback/cardview.js @@ -19,13 +19,11 @@ const useStyles = makeStyles({ export default function Maincard(props) { const classes = useStyles(); var pingDividerMain; - if(typeof props.data !=='undefined') // It checks wether the argument passed contains any array data or not - { - pingDividerMain = ; - } - else - { - pingDividerMain = ""; + if (typeof props.data !== "undefined") { + // It checks wether the argument passed contains any array data or not + pingDividerMain = ; + } else { + pingDividerMain = ""; } return ( @@ -40,19 +38,14 @@ export default function Maincard(props) { /> - - + + + ); + } +}