diff --git a/README.md b/README.md index eaec4ced..783f8952 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,9 @@ This repo contains the code, processes, and documentation for the data and tech ## Status January 2025 -The old CEJST has been taken offline by the incoming adminsitration. This fork is maintained by communities who stillrequire access to the tool, and who hope to gradually improve it. +The old CEJST has been taken offline by the incoming adminsitration. This fork is maintained by communities who still require access to the tool, and who hope to gradually improve it. -**Many of the instructions in the README are not appropriate at the current stage of development.** In particular, the use of Docker and docker-compose is not advised. Instead, in this initial stage, we are only building the main web server (found in `client`). This is a Gatsby website, which uses React components to build a static site in the `client/public` folder. Further instructions are coming soon. For now, thank you for your interest! Please use Github issues to track problems and feature requests. +**Many of the instructions in the README are not appropriate at the current stage of development.** In particular, the use of Docker and docker-compose is not advised. Instead, in this initial stage, we are only building the main web server (found in `client`). This is a Gatsby website, which uses React components to build a static site in the `client/public` folder. Further instructions are coming soon. For now, thank you for your interest! Please use [Github issues](https://github.com/edgi-govdata-archiving/j40-cejst-2/issues) to track problems and feature requests. ------------- diff --git a/client/src/components/DatasetContainer/index.tsx b/client/src/components/DatasetContainer/index.tsx index 95fe3ea2..764cde8a 100644 --- a/client/src/components/DatasetContainer/index.tsx +++ b/client/src/components/DatasetContainer/index.tsx @@ -8,8 +8,8 @@ import {hyphenizeString} from '../../../cypress/integration/common/helpers'; import * as styles from './dsContainer.module.scss'; import * as METHODOLOGY_COPY from '../../data/copy/methodology'; -import {PAGES_ENDPOINTS, DATA_SURVEY_LINKS} from '../../data/constants'; -import DatasetsButton from '../DatasetsButton'; +import {PAGES_ENDPOINTS} from '../../data/constants'; +// import DatasetsButton from '../DatasetsButton'; const DatasetContainer = () => { @@ -35,7 +35,7 @@ const DatasetContainer = () => { - + {/* */} diff --git a/client/src/components/J40Footer/J40Footer.tsx b/client/src/components/J40Footer/J40Footer.tsx index 2cf818b1..808791f9 100644 --- a/client/src/components/J40Footer/J40Footer.tsx +++ b/client/src/components/J40Footer/J40Footer.tsx @@ -1,6 +1,6 @@ import { - Address, - Logo, + // Address, + // Logo, NavList, } from '@trussworks/react-uswds'; import {useIntl} from 'gatsby-plugin-intl'; @@ -9,19 +9,20 @@ import React from 'react'; import {hyphenizeString} from '../../../cypress/integration/common/helpers'; import J40MainGridContainer from '../J40MainGridContainer'; import LinkTypeWrapper from '../LinkTypeWrapper'; -import SurveyButton from '../SurveyButton'; +// import SurveyButton from '../SurveyButton'; // @ts-ignore import {GITHUB_LINK, GITHUB_LINK_ES} from '../../constants'; -import {PAGES_ENDPOINTS} from '../../data/constants'; -import * as ABOUT_COPY from '../../data/copy/about'; +/* import {PAGES_ENDPOINTS} from '../../data/constants'; + */import * as ABOUT_COPY from '../../data/copy/about'; import * as COMMON_COPY from '../../data/copy/common'; -import whitehouseIcon from '../../images/eop-seal.svg'; +// import whitehouseIcon from '../../images/eop-seal.svg'; const J40Footer = () => { const intl = useIntl(); const NAVLINKS = [ + /* [ intl.formatMessage(COMMON_COPY.FOOTER.CONTACT),
{ key={'contactlink'} dataCy={hyphenizeString(COMMON_COPY.FOOTER.FIND_CONTACT.defaultMessage)} />, - ], + ], */ [ intl.formatMessage(COMMON_COPY.FOOTER.CONTRIBUTE), { -
+ {/*
{ } /> -
- +
*/} + {/* */} ); }; diff --git a/client/src/components/J40Header/J40Header.tsx b/client/src/components/J40Header/J40Header.tsx index 34fc93fd..1ad86851 100644 --- a/client/src/components/J40Header/J40Header.tsx +++ b/client/src/components/J40Header/J40Header.tsx @@ -222,13 +222,6 @@ const J40Header = ({location}:IJ40Header) => { , , , - - {intl.formatMessage(COMMON_COPY.HEADER.CONTACT)} - ,
, diff --git a/client/src/constants.tsx b/client/src/constants.tsx index e5db74f1..be89b512 100644 --- a/client/src/constants.tsx +++ b/client/src/constants.tsx @@ -1,2 +1,2 @@ -export const GITHUB_LINK = 'https://github.com/DOI-DO/ceq-j40-cejst-2'; +export const GITHUB_LINK = 'https://github.com/edgi-govdata-archiving/j40-cejst-2'; export const GITHUB_LINK_ES = `${GITHUB_LINK}/blob/main/README-es.md`; diff --git a/client/src/data/copy/about.tsx b/client/src/data/copy/about.tsx index 0381ddbd..7fa654bf 100644 --- a/client/src/data/copy/about.tsx +++ b/client/src/data/copy/about.tsx @@ -42,8 +42,7 @@ export const CONTENT = { {

{intl.formatMessage(ABOUT_COPY.PAGE.TITLE)}

- + {/* */}
@@ -97,7 +97,7 @@ const AboutPage = ({location}: IAboutPageProps) => { - + {/*

{intl.formatMessage(ABOUT_COPY.GET_INVOLVED.TITLE)}

{
- + */} ); }; diff --git a/client/src/pages/downloads.tsx b/client/src/pages/downloads.tsx index f625e064..40121b17 100644 --- a/client/src/pages/downloads.tsx +++ b/client/src/pages/downloads.tsx @@ -3,13 +3,13 @@ import {useIntl} from 'gatsby-plugin-intl'; import * as React from 'react'; import {useWindowSize} from 'react-use'; -import DatasetsButton from '../components/DatasetsButton'; +// import DatasetsButton from '../components/DatasetsButton'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; import ReleaseUpdate from '../components/ReleaseUpdate'; import SubPageNav from '../components/SubPageNav'; -import {DATA_SURVEY_LINKS, PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; +import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; import * as DOWNLOADS_COPY from '../data/copy/downloads'; interface IDownloadsPageProps { location: Location; @@ -26,7 +26,7 @@ const DownloadsPage = ({location}: IDownloadsPageProps) => {

{intl.formatMessage(DOWNLOADS_COPY.PAGE_INTRO.PAGE_HEADING1)}

- + {/* */}
diff --git a/client/src/pages/frequently-asked-questions.tsx b/client/src/pages/frequently-asked-questions.tsx index 05c52103..3eeffdfc 100644 --- a/client/src/pages/frequently-asked-questions.tsx +++ b/client/src/pages/frequently-asked-questions.tsx @@ -4,12 +4,12 @@ import {useIntl} from 'gatsby-plugin-intl'; import * as React from 'react'; import {useWindowSize} from 'react-use'; -import DatasetsButton from '../components/DatasetsButton'; +// import DatasetsButton from '../components/DatasetsButton'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; import SubPageNav from '../components/SubPageNav'; -import {DATA_SURVEY_LINKS, PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; +import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; import {SIDE_PANEL_INIT_STATE_ICON_ALT_TEXT} from '../data/copy/explore'; import * as FAQS_COPY from '../data/copy/faqs'; @@ -138,13 +138,7 @@ const FAQPage = ({location}: IFAQPageProps) => { ), ( <> -

{FAQS_COPY.FAQ_ANSWERS.Q15_P1}

-
    -
  • {FAQS_COPY.FAQ_ANSWERS.Q15_P1_1}
  • -
  • {FAQS_COPY.FAQ_ANSWERS.Q15_P1_2}
  • -
  • {FAQS_COPY.FAQ_ANSWERS.Q15_P1_3}
  • -
  • {FAQS_COPY.FAQ_ANSWERS.Q15_P1_4}
  • -
+ ), ( @@ -197,7 +191,7 @@ const FAQPage = ({location}: IFAQPageProps) => {

{intl.formatMessage(FAQS_COPY.PAGE_INTRO.PAGE_TILE)}

- + {/* */}
diff --git a/client/src/pages/index.tsx b/client/src/pages/index.tsx index 33bd6db7..9acb9b88 100644 --- a/client/src/pages/index.tsx +++ b/client/src/pages/index.tsx @@ -6,10 +6,10 @@ import ExploreDataBox from '../components/ExploreDataBox'; import J40Map from '../components/J40Map'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; -import DatasetsButton from '../components/DatasetsButton'; +// import DatasetsButton from '../components/DatasetsButton'; import * as EXPLORE_COPY from '../data/copy/explore'; -import {DATA_SURVEY_LINKS} from '../data/constants'; +// import {DATA_SURVEY_LINKS} from '../data/constants'; interface IMapPageProps { location: Location; @@ -27,7 +27,7 @@ const ExporeToolPage = ({location}: IMapPageProps) => {

{intl.formatMessage(EXPLORE_COPY.PAGE_INTRO.PAGE_HEADING)}

- + {/* */}
diff --git a/client/src/pages/methodology.tsx b/client/src/pages/methodology.tsx index b2209d31..4774ff0f 100644 --- a/client/src/pages/methodology.tsx +++ b/client/src/pages/methodology.tsx @@ -5,12 +5,12 @@ import {useWindowSize} from 'react-use'; import Categories from '../components/Categories'; import DatasetContainer from '../components/DatasetContainer'; -import DatasetsButton from '../components/DatasetsButton'; +// import DatasetsButton from '../components/DatasetsButton'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; import SubPageNav from '../components/SubPageNav'; -import {DATA_SURVEY_LINKS, PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; +import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; import * as METHODOLOGY_COPY from '../data/copy/methodology'; interface MethodPageProps { @@ -29,7 +29,7 @@ const IndexPage = ({location}: MethodPageProps) => {

{intl.formatMessage(METHODOLOGY_COPY.PAGE.HEADING)}

- + {/* */}
diff --git a/client/src/pages/previous-versions.tsx b/client/src/pages/previous-versions.tsx index 2c02766a..8a8e08da 100644 --- a/client/src/pages/previous-versions.tsx +++ b/client/src/pages/previous-versions.tsx @@ -3,14 +3,14 @@ import {useIntl} from 'gatsby-plugin-intl'; import {useWindowSize} from 'react-use'; import {Card, CardBody, CardFooter, CardGroup, CardHeader, Grid, Button} from '@trussworks/react-uswds'; -import DatasetsButton from '../components/DatasetsButton'; +// import DatasetsButton from '../components/DatasetsButton'; import DownloadButton from '../components/DownloadButton'; import J40MainGridContainer from '../components/J40MainGridContainer'; import Layout from '../components/layout'; import SubPageNav from '../components/SubPageNav'; import * as PREV_VER_COPY from '../data/copy/previousVer'; -import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS, DATA_SURVEY_LINKS} from '../data/constants'; +import {PAGES_ENDPOINTS, USWDS_BREAKPOINTS} from '../data/constants'; import {getDownloadFileUrl} from '../data/copy/downloads'; import {VERSIONS} from '../data/copy/methodology'; // @ts-ignore @@ -36,7 +36,7 @@ const PreviousVersions = ({location}: IPreviousVersionsProps) => {

{intl.formatMessage(PREV_VER_COPY.PAGE.TITLE)}

- + {/* */}