From 2533cd28cc2194418bce98ded9ec61f8f77eaade Mon Sep 17 00:00:00 2001 From: data Date: Tue, 9 Jul 2019 22:16:10 +0200 Subject: [PATCH] show selected Article with Comments --- src/App.js | 22 ++++++++++++++++++++++ src/components/article.js | 30 ++++++++++++++++++++++++++++++ src/components/index.js | 1 + src/components/update-article.js | 2 +- 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/components/article.js diff --git a/src/App.js b/src/App.js index 70937a1..c2254d1 100644 --- a/src/App.js +++ b/src/App.js @@ -8,6 +8,12 @@ import { selectArticle, } from './controllers/articles' +import { + addTag, + selectTag, + removeTag, +} from './controllers/tags' + import { createTask, updateTask, @@ -28,6 +34,7 @@ import { updateProfile } from './controllers/profile' import { About, Articles, + Article, UpdateArticle, Tasks, UpdateTask, @@ -66,6 +73,9 @@ class App extends React.Component { this.updateArticle = updateArticle.bind(this) this.deleteArticle = deleteArticle.bind(this) + this.addTag = addTag.bind(this) + this.removeTag = removeTag.bind(this) + this.createTask = createTask.bind(this) this.updateTask = updateTask.bind(this) this.deleteTask = deleteTask.bind(this) @@ -198,6 +208,16 @@ class App extends React.Component { /> ) } + renderArticle() { + return (
+ ) + } renderUpdateArticle() { return ( t.id === props.selectedArticleId) + this.state = article + } + + render() { + return ( +
+ +

{this.state.title}

+
{this.state.text}
+ +
    +

    Comments

    + {this.props.comments ? this.props.comments.map(comment=>( +
  • + {comment.text} +
  • + )) : "No comments yet." + } +
+
+ ) + } +} +export default Article diff --git a/src/components/index.js b/src/components/index.js index c97176a..d85688d 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,6 +1,7 @@ export { default as Navbar } from './navbar' export { default as About } from './about' export { default as Articles } from './articles' +export { default as Article } from './article' export { default as UpdateArticle } from './update-article' export { default as Tasks } from './tasks' export { default as UpdateTask } from './update-task' diff --git a/src/components/update-article.js b/src/components/update-article.js index a314856..8b4e99f 100644 --- a/src/components/update-article.js +++ b/src/components/update-article.js @@ -19,7 +19,7 @@ class UpdateArticle extends React.Component { render() { return (
- this.props.navigate('articles')}>« back +

Article {this.state.id}