diff --git a/package.json b/package.json index b8b851d6..5c8f4952 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@civicactions/cmsds-open-data-components", - "version": "0.6.0", + "version": "0.7.0", "description": "Components for the open data catalog frontend using CMS Design System", "main": "lib/index.js", "scripts": { diff --git a/src/components/DatasetAdditionalInformation/index.jsx b/src/components/DatasetAdditionalInformation/index.jsx index 35b73ce9..6f5e0275 100644 --- a/src/components/DatasetAdditionalInformation/index.jsx +++ b/src/components/DatasetAdditionalInformation/index.jsx @@ -33,7 +33,7 @@ const DatasetAdditionalInformation = ({ datasetInfo }) => { return( -
+

Additional Information

diff --git a/src/components/DatasetDownloads/index.jsx b/src/components/DatasetDownloads/index.jsx index 9d14b442..33825d45 100644 --- a/src/components/DatasetDownloads/index.jsx +++ b/src/components/DatasetDownloads/index.jsx @@ -6,7 +6,7 @@ const DatasetDownloads = ({ downloadURL }) => {

Downloads

Resource

- Download this dataset (CSV) + Download this resource (CSV)
); } diff --git a/src/components/DatasetSearchListItem/index.jsx b/src/components/DatasetSearchListItem/index.jsx index 89b93e51..09af21e8 100644 --- a/src/components/DatasetSearchListItem/index.jsx +++ b/src/components/DatasetSearchListItem/index.jsx @@ -25,7 +25,7 @@ const DatasetSearchListItem = ({item, updateFacets}) => { Updated -

+

{

{/* 215 average character limit */} -

{description}

+

{keyword &&
    diff --git a/src/styles/scss/components/dataset-search-list-item.scss b/src/styles/scss/components/dataset-search-list-item.scss index e6a65a37..025e26ed 100644 --- a/src/styles/scss/components/dataset-search-list-item.scss +++ b/src/styles/scss/components/dataset-search-list-item.scss @@ -2,6 +2,13 @@ .dc-dataset-searchlist-item { + h3 a { + text-decoration: none; + &:hover { + text-decoration: underline; + } + } + ul { list-style: none; } diff --git a/src/styles/scss/templates/dataset-search.scss b/src/styles/scss/templates/dataset-search.scss index 0d24f87f..f2fe1060 100644 --- a/src/styles/scss/templates/dataset-search.scss +++ b/src/styles/scss/templates/dataset-search.scss @@ -4,6 +4,10 @@ list-style: none; } +.dc-c-clear-filters { + font-weight: 300; +} + .dc-fulltext--input-container { width: 100%; input { @@ -18,7 +22,7 @@ display: block; width: 48px; height: 4px; - margin: 8px 0; + margin: 16px 0; background-color: $color-primary-alt-light; } } diff --git a/src/templates/Dataset/index.jsx b/src/templates/Dataset/index.jsx index 0fff7c6b..15edddbe 100644 --- a/src/templates/Dataset/index.jsx +++ b/src/templates/Dataset/index.jsx @@ -14,7 +14,7 @@ import ResourceFooter from '../../components/ResourceFooter'; const Dataset = ({ id, rootUrl }) => { let apiDocs = useRef() const resourceOptions = { - limit: 25 + limit: 10 } const [tablePadding, setTablePadding] = useState('ds-u-padding-y--1') const { dataset, } = useMetastoreDataset(id, rootUrl); @@ -27,15 +27,15 @@ const Dataset = ({ id, rootUrl }) => { return (
    -
    +

    {dataset.title}

    -

    +

    {dataset.theme ? {dataset.theme[0].data} : null}

    -

    Updated

    +

    Updated

    -

    {dataset.description}

    +

    Resource Preview

    {dataset.distribution && ( @@ -60,7 +60,7 @@ const Dataset = ({ id, rootUrl }) => { } {dataset.identifier &&
    -

    Try out the API

    +

    Try the API

    { }
    -
    +
    {dataset.distribution && ( diff --git a/src/templates/DatasetSearch/index.jsx b/src/templates/DatasetSearch/index.jsx index 3a83c6c0..7591bbfa 100644 --- a/src/templates/DatasetSearch/index.jsx +++ b/src/templates/DatasetSearch/index.jsx @@ -77,11 +77,11 @@ const DatasetSearch = ({rootUrl, location}) => { return(
    -

    +

    Datasets

    -
    +
    {e.preventDefault(); () => setFulltext(filterText);}} className="ds-u-display--flex ds-u-justify-content--between ds-u-margin-bottom--2 " @@ -105,20 +105,25 @@ const DatasetSearch = ({rootUrl, location}) => { Search - +
    +

    + {selectedFacetsMessage(selectedFacets, {theme: 'Categories', keyword: 'Tags'})} +

    + +
    + {/*

    {`[${items.length} ${items.length === 1 ? 'entry' : 'entries'} total on page]`}

    */} {/* */} -

    - {selectedFacetsMessage(selectedFacets, {theme: 'Categories', keyword: 'Tags'})} -

    - +
      {items.map((item) => (
    1. @@ -126,7 +131,6 @@ const DatasetSearch = ({rootUrl, location}) => {
    2. ))}
    -

    {`[${items.length} ${items.length === 1 ? 'entry' : 'entries'} total on page]`}

    {totalItems && ( { />) }
    -
    +
    { let buttonRef = null; const options = location.search ? {...qs.parse(location.search)} : {conditions: []} return ( -
    +
    {Object.keys(resource).length && ( <> @@ -33,9 +33,9 @@ const FilteredResource = ({id, dist_id, location}) => { Back to {dataset.title}

    {resource.data.title}

    -

    {resource.data.description}

    -
    -
    +

    +

    +

    Create

    @@ -51,7 +51,7 @@ const FilteredResource = ({id, dist_id, location}) => {
    -
    +

    Access

    -
    +
    -

    Try API

    +

    Try API