diff --git a/src/newsreader/js/pages/homepage/components/feedlist/FeedList.js b/src/newsreader/js/pages/homepage/components/feedlist/FeedList.js
index a116c8d..e679eed 100644
--- a/src/newsreader/js/pages/homepage/components/feedlist/FeedList.js
+++ b/src/newsreader/js/pages/homepage/components/feedlist/FeedList.js
@@ -62,8 +62,8 @@ class FeedList extends React.Component {
);
} else {
return (
-
-
+
+
{this.props.isFetching &&
}
);
diff --git a/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js b/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js
index 4513589..8045272 100644
--- a/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js
+++ b/src/newsreader/js/pages/homepage/components/feedlist/PostItem.js
@@ -11,17 +11,16 @@ class PostItem extends React.Component {
const post = { ...this.props.post, rule: rule.id };
const publicationDate = formatDatetime(post.publicationDate);
const titleClassName = post.read
- ? 'posts-header__title posts-header__title--read'
- : 'posts-header__title';
+ ? 'posts__header posts__header--read'
+ : 'posts__header';
return (
-
{
- this.props.selectPost(post);
- }}
- >
-
+
+ this.props.selectPost(post)}
+ >
{post.title}
diff --git a/src/newsreader/js/pages/homepage/components/feedlist/RuleItem.js b/src/newsreader/js/pages/homepage/components/feedlist/RuleItem.js
deleted file mode 100644
index 0b08bda..0000000
--- a/src/newsreader/js/pages/homepage/components/feedlist/RuleItem.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-
-import PostItem from './PostItem.js';
-
-class RuleItem extends React.Component {
- render() {
- const posts = Object.values(this.props.posts).sort((firstEl, secondEl) => {
- return new Date(secondEl.publicationDate) - new Date(firstEl.publicationDate);
- });
-
- const postItems = posts.map(post => {
- return ;
- });
-
- return (
-
- );
- }
-}
-
-export default RuleItem;
diff --git a/src/newsreader/scss/components/index.scss b/src/newsreader/scss/components/index.scss
index 53e0f71..6f40563 100644
--- a/src/newsreader/scss/components/index.scss
+++ b/src/newsreader/scss/components/index.scss
@@ -1,28 +1,25 @@
-@import "body/index";
-@import "form/index";
-@import "main/index";
-@import "navbar/index";
-@import "loading-indicator/index";
+@import "./body/index";
+@import "./form/index";
+@import "./main/index";
+@import "./navbar/index";
+@import "./loading-indicator/index";
-@import "modal/index";
+@import "./modal/index";
-@import "card/index";
-@import "list/index";
-@import "messages/index";
-@import "section/index";
-@import "errorlist/index";
-@import "fieldset/index";
-@import "pagination/index";
-@import "sidebar/index";
-@import "table/index";
+@import "./card/index";
+@import "./list/index";
+@import "./messages/index";
+@import "./section/index";
+@import "./errorlist/index";
+@import "./fieldset/index";
+@import "./pagination/index";
+@import "./sidebar/index";
+@import "./table/index";
-@import "rules/index";
-@import "category/index";
+@import "./rules/index";
+@import "./category/index";
-@import "post/index";
-@import "post-block/index";
-@import "post-message/index";
-@import "posts/index";
-@import "posts-header/index";
-@import "posts-info/index";
-@import "posts-section/index";
+@import "./post/index";
+@import "./post-message/index";
+@import "./posts/index";
+@import "./posts-info/index";
diff --git a/src/newsreader/scss/components/post-block/_post-block.scss b/src/newsreader/scss/components/post-block/_post-block.scss
deleted file mode 100644
index 7dded15..0000000
--- a/src/newsreader/scss/components/post-block/_post-block.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.post-block {
- display: flex;
- flex-direction: column;
- align-items: center;
-
- width: 70%;
- margin: 0 0 2% 0;
-
- border-radius: 2px;
-}
diff --git a/src/newsreader/scss/components/post-block/index.scss b/src/newsreader/scss/components/post-block/index.scss
deleted file mode 100644
index e17b7a9..0000000
--- a/src/newsreader/scss/components/post-block/index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "post-block";
diff --git a/src/newsreader/scss/components/posts-header/_posts-header.scss b/src/newsreader/scss/components/posts-header/_posts-header.scss
deleted file mode 100644
index be0dac8..0000000
--- a/src/newsreader/scss/components/posts-header/_posts-header.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-.posts-header {
-
- &__title {
- width: 80%;
-
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- font-size: 16px;
-
- &--read {
- color: darken($gainsboro, +10%);
- }
- }
-}
diff --git a/src/newsreader/scss/components/posts-header/index.scss b/src/newsreader/scss/components/posts-header/index.scss
deleted file mode 100644
index 451a453..0000000
--- a/src/newsreader/scss/components/posts-header/index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "posts-header";
diff --git a/src/newsreader/scss/components/posts-section/_post-section.scss b/src/newsreader/scss/components/posts-section/_post-section.scss
deleted file mode 100644
index 8898743..0000000
--- a/src/newsreader/scss/components/posts-section/_post-section.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.posts-section {
- display: flex;
- flex-direction: column;
- width: 95%;
-
- margin: 20px;
- padding: 10px;
- border-radius: 5px;
-
- background-color: $white;
-
- &:first-child {
- padding: 0 10px 10px 10px;
- margin: 0 20px 20px 20px;
- }
-
- &__name {
- padding: 0 10px 10px 10px;
- }
-}
diff --git a/src/newsreader/scss/components/posts-section/index.scss b/src/newsreader/scss/components/posts-section/index.scss
deleted file mode 100644
index 945ed28..0000000
--- a/src/newsreader/scss/components/posts-section/index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "post-section";
diff --git a/src/newsreader/scss/components/posts/_posts.scss b/src/newsreader/scss/components/posts/_posts.scss
index 3bc24fb..0a8c6c9 100644
--- a/src/newsreader/scss/components/posts/_posts.scss
+++ b/src/newsreader/scss/components/posts/_posts.scss
@@ -1,11 +1,16 @@
.posts {
- display: flex;
- flex-direction: column;
+ width: 70%;
+ margin: 0 0 2% 0;
- list-style: none;
+ &__list {
+ display: flex;
+ flex-direction: column;
- width: 95%;
- padding: 0;
+ list-style: none;
+
+ width: 95%;
+ padding: 0;
+ }
&__item {
display: flex;
@@ -17,11 +22,6 @@
padding: 0 10px 10px 10px;
}
- &:hover {
- cursor: pointer;
- background-color: $gainsboro;
- }
-
& span {
font-size: small;
text-overflow: ellipsis;
@@ -37,4 +37,21 @@
border-bottom: 0;
}
}
+
+ &__header {
+ width: 80%;
+
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 16px;
+
+ &--read {
+ color: darken($gainsboro, +10%);
+ }
+
+ &:hover {
+ cursor: pointer;
+ }
+ }
}