diff --git a/src/generic/sub-header/SubHeader.jsx b/src/generic/sub-header/SubHeader.jsx index a0146fcd57..81d4c619ba 100644 --- a/src/generic/sub-header/SubHeader.jsx +++ b/src/generic/sub-header/SubHeader.jsx @@ -18,7 +18,7 @@ const SubHeader = ({ {subtitle} {title} {titleActions && ( - + {titleActions} )} diff --git a/src/generic/sub-header/SubHeader.scss b/src/generic/sub-header/SubHeader.scss index 693d5603b9..3957423112 100644 --- a/src/generic/sub-header/SubHeader.scss +++ b/src/generic/sub-header/SubHeader.scss @@ -33,6 +33,6 @@ display: flex; justify-content: space-between; align-items: center; - margin-top: 1.5rem; margin-bottom: 12px; } + diff --git a/src/index.jsx b/src/index.jsx index 7ab07a46ca..46ba868924 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -78,7 +78,7 @@ const App = () => { render={({ match }) => { const { params: { taxonomyId } } = match; return ( - + ); }} /> diff --git a/src/taxonomy/TaxonomyCard.jsx b/src/taxonomy/TaxonomyCard.jsx index 8038071ef2..f3c0cbb173 100644 --- a/src/taxonomy/TaxonomyCard.jsx +++ b/src/taxonomy/TaxonomyCard.jsx @@ -42,7 +42,7 @@ const TaxonomyCard = ({ className, original, intl }) => { ); return ( - + ( + + + + + + +); + +TagListTable.propTypes = { + tags: Proptypes.array.isRequired, +}; + +export default TagListTable; diff --git a/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx b/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx index 55b5804a71..d422efde18 100644 --- a/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx +++ b/src/taxonomy/taxonomy-detail/TaxonomyDetailPage.jsx @@ -1,6 +1,7 @@ import React from 'react'; import { Container, + Layout, } from '@edx/paragon'; import Proptypes from 'prop-types'; @@ -8,6 +9,8 @@ import PermissionDeniedAlert from '../../generic/PermissionDeniedAlert'; import Loading from '../../generic/Loading'; import Header from '../../header'; import SubHeader from '../../generic/sub-header/SubHeader'; +import TaxonomyDetailSideCard from './TaxonomyDetailSideCard'; +import TagListTable from './TagListTable'; import { useTaxonomyDetailDataResponse, useTaxonomyDetailDataStatus } from '../api/hooks/selectors'; const TaxonomyDetailContent = ({ taxonomyId }) => { @@ -42,16 +45,22 @@ const TaxonomyDetailContent = ({ taxonomyId }) => { /> -
- - { - taxonomy ? ( -
-
{JSON.stringify(taxonomy, null, 2)}
-
- ) : (<>Taxonomy not found) - } -
+
+ + + + + + + + +
); diff --git a/src/taxonomy/taxonomy-detail/TaxonomyDetailSideCard.jsx b/src/taxonomy/taxonomy-detail/TaxonomyDetailSideCard.jsx new file mode 100644 index 0000000000..3a27180ff5 --- /dev/null +++ b/src/taxonomy/taxonomy-detail/TaxonomyDetailSideCard.jsx @@ -0,0 +1,27 @@ +import { + Card, +} from '@edx/paragon'; +import Proptypes from 'prop-types'; + +const TaxonomyDetailSideCard = ({ taxonomy }) => ( + + + + {taxonomy.name} + + + + {taxonomy.description} + + + + No copyright added + + +); + +TaxonomyDetailSideCard.propTypes = { + taxonomy: Proptypes.object.isRequired, +}; + +export default TaxonomyDetailSideCard;