diff --git a/packages/concordia-app/src/components/PostCreate/styles.css b/packages/concordia-app/src/components/PostCreate/styles.css index f121f10..9dd9dfb 100644 --- a/packages/concordia-app/src/components/PostCreate/styles.css +++ b/packages/concordia-app/src/components/PostCreate/styles.css @@ -10,6 +10,7 @@ #post-button { float: right; + margin-top: 1rem; } #post-button button { diff --git a/packages/concordia-app/src/components/PostList/PostListRow/styles.css b/packages/concordia-app/src/components/PostList/PostListRow/styles.css index c8d78c0..9fc10c1 100644 --- a/packages/concordia-app/src/components/PostList/PostListRow/styles.css +++ b/packages/concordia-app/src/components/PostList/PostListRow/styles.css @@ -1,10 +1,9 @@ .post-list-row { - padding: 1rem 0 !important; + padding: 1rem 0.1rem 1rem 0.6rem !important; } .post-profile-picture { margin-top: 1rem; - margin-left: 0.75rem; } .post-profile-picture img { diff --git a/packages/concordia-app/src/components/TopicList/index.jsx b/packages/concordia-app/src/components/TopicList/index.jsx index 15dde57..6bb8c4f 100644 --- a/packages/concordia-app/src/components/TopicList/index.jsx +++ b/packages/concordia-app/src/components/TopicList/index.jsx @@ -3,8 +3,7 @@ import React, { } from 'react'; import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; -import { useHistory } from 'react-router'; -import { Button, List } from 'semantic-ui-react'; +import { List } from 'semantic-ui-react'; import TopicListRow from './TopicListRow'; import { drizzle } from '../../redux/store'; import { FORUM_CONTRACT } from '../../constants/contracts/ContractNames'; @@ -17,8 +16,6 @@ const TopicList = (props) => { const [getTopicCallHashes, setGetTopicCallHashes] = useState([]); const drizzleInitialized = useSelector((state) => state.drizzleStatus.initialized); const drizzleInitializationFailed = useSelector((state) => state.drizzleStatus.failed); - const hasSignedUp = useSelector((state) => state.user.hasSignedUp); - const history = useHistory(); useEffect(() => { if (drizzleInitialized && !drizzleInitializationFailed) { @@ -55,21 +52,9 @@ const TopicList = (props) => { }), [getTopicCallHashes, topicIds]); return ( -
- {hasSignedUp && history.location.pathname === '/home' && ( -
+ + {topics} + ); }; diff --git a/packages/concordia-app/src/components/TopicList/styles.css b/packages/concordia-app/src/components/TopicList/styles.css index 3ffc2e8..5fae8a7 100644 --- a/packages/concordia-app/src/components/TopicList/styles.css +++ b/packages/concordia-app/src/components/TopicList/styles.css @@ -4,8 +4,3 @@ clear: both; } -#new-topic-button{ - float:right; - margin-bottom: 2em; - -} diff --git a/packages/concordia-app/src/views/Home/Board/index.jsx b/packages/concordia-app/src/views/Home/Board/index.jsx index 7a8b074..f7daaa8 100644 --- a/packages/concordia-app/src/views/Home/Board/index.jsx +++ b/packages/concordia-app/src/views/Home/Board/index.jsx @@ -1,22 +1,43 @@ import React, { useMemo } from 'react'; -import { Header } from 'semantic-ui-react'; +import { Button, Header } from 'semantic-ui-react'; +import { useSelector } from 'react-redux'; +import { useHistory } from 'react-router'; import _ from 'lodash'; import { useTranslation } from 'react-i18next'; -import { useSelector } from 'react-redux'; import PropTypes from 'prop-types'; + import TopicList from '../../../components/TopicList'; +import './styles.css'; + const Board = (props) => { const { numberOfTopics } = props; - const userHasSignedUp = useSelector((state) => state.user.hasSignedUp); + const hasSignedUp = useSelector((state) => state.user.hasSignedUp); + const history = useHistory(); const { t } = useTranslation(); const boardContents = useMemo(() => { if (numberOfTopics > 0) { - return (); - } if (!userHasSignedUp) { return ( -
+ <> + {hasSignedUp + ? ( +