ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 02:08:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #103 from ClaytonWWilson/others_topic

Browse Source 
changed color if user is following the same topic
This commit is contained in:
Leon Liang 2019-12-03 19:16:17 -05:00 committed by GitHub
commit f3fcd5ee8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
twistter-frontend/src/pages/otherUser.js
View File

@ -21,6 +21,7 @@ import Typography from "@material-ui/core/Typography";
import AddCircle from "@material-ui/icons/AddCircle"; import AddCircle from "@material-ui/icons/AddCircle";
import TextField from "@material-ui/core/TextField"; import TextField from "@material-ui/core/TextField";
import VerifiedIcon from "@material-ui/icons/CheckSharp"; import VerifiedIcon from "@material-ui/icons/CheckSharp";
import DoneIcon from "@material-ui/icons/Done";
// component // component
import "../App.css"; import "../App.css";
@ -75,7 +76,8 @@ class user extends Component {
topics: null, topics: null,
user: null, user: null,
following: null, following: null,
posts: null posts: null,
myTopics: null
}; };
} }
@ -128,7 +130,10 @@ class user extends Component {
.get("/user") .get("/user")
.then(res => { .then(res => {
this.setState({ this.setState({
following: res.data.credentials.following.includes(this.state.profile) following: res.data.credentials.following.includes(
this.state.profile
),
myTopics: res.data.credentials.followedTopics
}); });
}) })
.catch(err => console.log(err)); .catch(err => console.log(err));
@ -171,9 +176,31 @@ class user extends Component {
) : ( ) : (
<p>loading username...</p> <p>loading username...</p>
); );
console.log(this.state.topics);
console.log(this.state.myTopics);
let topicsMarkup = this.state.topics ? ( let topicsMarkup = this.state.topics ? (
this.state.topics.map( this.state.topics.map(
topic => <MyChip label={topic} key={{ topic }.topic.id} /> // console.log({ topic }.topic.id) topic =>
this.state.myTopics ? (
this.state.myTopics.includes(topic) ? (
<MyChip
label={topic}
key={{ topic }.topic.id}
onDelete
deleteIcon={<DoneIcon />}
/>
) : (
<MyChip
label={topic}
key={{ topic }.topic.id}
color="secondary"
/>
)
) : (
<p></p>
)
// topic => <MyChip label={topic} key={{ topic }.topic.id} /> // console.log({ topic }.topic.id)
) )
) : ( ) : (
<p> no topic yet</p> <p> no topic yet</p>