diff --git a/.snyk b/.snyk index 5435352d..169cbb71 100644 --- a/.snyk +++ b/.snyk @@ -511,6 +511,10 @@ ignore: - webpack > node-libs-browser > crypto-browserify > create-ecdh > elliptic: reason: Will correct with master rebase. expires: '2020-08-20T15:29:55.052Z' + SNYK-JS-MARKED-584281: + - markdown-loader > marked: + reason: No remidiation available. + expires: '2020-08-28T19:50:57.722Z' # patches apply the minimum changes required to fix a vulnerability patch: SNYK-JS-AXIOS-174505: diff --git a/CONFIGURATION.md b/CONFIGURATION.md index 379017ec..7902e65c 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -13,9 +13,6 @@ To change the title of the website change the `title` property in `/config/site/ ## api code-gov-front-end is the front-end and needs to communicate with a backend. You can specify the base endpoint and api key. For example, [code.gov](https://code.gov) sets `base` to `https://api.code.gov/` and sets `key` to our public api key. -## style -You can also configure the style sheets that your version of code-gov-front-end uses. The `style` property takes a value of the name of the npm package to use for styles. The easiest way to create your own style is to fork [code-gov-style](https://github.com/GSA/code-gov-style) and npm install it into your version. - ## twitter handle You can add the handle for your twitter account. This is used to generate the link for the Twitter icon in the top right of each page. diff --git a/LICENSE.md b/LICENSE.md index a0496432..8e6f1852 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,8 +2,6 @@ ### Files licensed under the SIL Open Font License -The FontAwesome SVG's are found inside code-gov-font's font files. [Font Awesome](http://fontawesome.io/) is by Dave Gandy under the [SIL Open Font License 1.1](http://scripts.sil.org/OFL). - The TT Lakes font files in `src/assets/fonts` are from [Fontspring](https://www.fontspring.com/fonts/typetype/tt-lakes), licensed under the [Fontspring Font License](https://www.fontspring.com/lic/lv4e5lv2k2), and copyright The Foundry. ### Project dependencies diff --git a/README.md b/README.md index 1cd9c541..a3d29d2d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ Here’s how you can help contribute to code.gov: - Code.gov - To provide feedback on code-gov-front-end, please checkout our [Contributing Guildelines](CONTRIBUTING.md). - - To contribute to the Code.gov style guide, head over to the [code-gov-style](https://github.com/GSA/code-gov-style) repo. - To contribute to the Code.gov data, go to the [code-gov-data] repo at (https://github.com/GSA/code-gov-data) - Checkout [code-gov](https://github.com/GSA/code-gov) for a list of additional project repositories. If you aren't sure where your question or idea fits, this is a good place to share it. @@ -57,16 +56,6 @@ with several additional custom file types. When creating new files, be sure to add your file and any necessary templates, styles, and tests to a directory dedicated to your new file in the appropriate place. -### Style Guide - -The bulk of the CSS for this application is at [Style Guide repository](https://github.com/GSA/code-gov-style) so that we can more easily keep things consistent and deploy changes more quickly. - -You'll need to clone/download the [Style Guide repository](https://github.com/GSA/code-gov-style) to get started. - -If you need to make CSS changes, make them within this directory and commit them to that repository. - -For more instructions on how to make changes, view the readme inside of the [Style Guide repository](https://github.com/GSA/code-gov-style). - ### Testing Unit testing is done using the [jest](https://github.com/facebook/jest) framework with [enzyme](https://github.com/airbnb/enzyme). diff --git a/assets/data/filters/tasks.json b/assets/data/filters/tasks.json index 62ee6609..146f7972 100644 --- a/assets/data/filters/tasks.json +++ b/assets/data/filters/tasks.json @@ -1 +1 @@ -{"agencies":[{"name":"Consumer Financial Protection Bureau","value":"CFPB"},{"name":"Department of Defense","value":"DOD"},{"name":"Department of Energy","value":"DOE"},{"name":"General Services Administration","value":"GSA"}],"categories":[{"name":"bug","value":"bug"},{"name":"content","value":"content"},{"name":"enhancement","value":"enhancement"},{"name":"good first issue","value":"good first issue"}],"languages":[],"skillLevels":[{"name":"Beginner","value":"beginner"},{"name":"Intermediate","value":"intermediate"},{"name":"Advanced","value":"advanced"}],"timeRequired":[{"name":"Small","value":"small"},{"name":"Medium","value":"medium"},{"name":"Large","value":"large"}]} \ No newline at end of file +{"agencies":[{"name":"Consumer Financial Protection Bureau","value":"CFPB"},{"name":"Department of Energy","value":"DOE"},{"name":"Department of Health and Human Services","value":"HHS"},{"name":"General Services Administration","value":"GSA"}],"categories":[{"name":"bug","value":"bug"},{"name":"enhancement","value":"enhancement"},{"name":"good first issue","value":"good first issue"}],"languages":[],"skillLevels":[{"name":"Beginner","value":"beginner"},{"name":"Intermediate","value":"intermediate"},{"name":"Advanced","value":"advanced"}],"timeRequired":[{"name":"Small","value":"small"},{"name":"Medium","value":"medium"},{"name":"Large","value":"large"}]} \ No newline at end of file diff --git a/config/site/examples/pub-code.json b/config/site/examples/pub-code.json index cbc287ec..527d50b3 100644 --- a/config/site/examples/pub-code.json +++ b/config/site/examples/pub-code.json @@ -4,7 +4,6 @@ "base": "https://api.code.gov/", "key": "eQjuCayvuIpnxRjFZ0ev0jDHoTvhidzrX0hL3ttC" }, - "style": "code-gov-style", "twitter": { "handle": "" }, @@ -15,9 +14,18 @@ "light": "./assets/img/logos/pub-code-light.svg" }, "links": [ - { "name": "Browse Projects", "url": "/#!/explore-code" }, - { "name": "Help Wanted", "url": "/#!/help-wanted" }, - { "name": "Roadmap", "url": "/#!/roadmap" } + { + "name": "Browse Projects", + "url": "/#!/explore-code" + }, + { + "name": "Help Wanted", + "url": "/#!/help-wanted" + }, + { + "name": "Roadmap", + "url": "/#!/roadmap" + } ] }, "home": { @@ -57,15 +65,26 @@ "description": "The GNEIMO methods and algorithms build up on the Spatial Operator Algebra (SOA) multibody dynamics framework.", "image": "/assets/img/featured-projects/Science.svg", "links": [ - { "name": "View Project", "url": "/#!/explore-code/agencies/NASA/repos/nasa_jpl_gneimo_advanced_techniques_for_constrained_internal_coordinate_molecular_dynamics" }, - { "name": "Go to Repo", "url": "https://software.nasa.gov/software/NPO-48712-1" } + { + "name": "View Project", + "url": "/#!/explore-code/agencies/NASA/repos/nasa_jpl_gneimo_advanced_techniques_for_constrained_internal_coordinate_molecular_dynamics" + }, + { + "name": "Go to Repo", + "url": "https://software.nasa.gov/software/NPO-48712-1" + } ] } ] }, "browse_projects": { - "agencies": ["DOE", "HHS", "NASA","USDA"], - "browse_by_text": "Browse by Agency" + "agencies": [ + "DOE", + "HHS", + "NASA", + "USDA" + ], + "browse_by_text": "Browse by Agency" }, "search": { "entities": [ @@ -114,17 +133,38 @@ "The Development Roadmap is organized into three categories – Near-term, Mid-term, and Long-term. Priorities are sorted into roadmap categories based on feedback we receive during user interviews. Dependencies and resources are also factors that affect placement on the roadmap." ], "near": [ - { "name": "Create Prototype", "status": "Released" }, - { "name": "Roadmap on site", "status": "Released" }, - { "name": "Create Metadata Schema", "status": "In Progress" }, - { "name": "Create MVP", "status": "In Progress" } + { + "name": "Create Prototype", + "status": "Released" + }, + { + "name": "Roadmap on site", + "status": "Released" + }, + { + "name": "Create Metadata Schema", + "status": "In Progress" + }, + { + "name": "Create MVP", + "status": "In Progress" + } ], "mid": [ - { "name": "Integrate Quality Metric", "status": null } + { + "name": "Integrate Quality Metric", + "status": null + } ], "long": [ - { "name": "Integrate literature highlighting by Bowtie v Bowtie2", "status": null }, - { "name": "Integrate u-INDEX by Callahan et al. (2018)", "status": null } + { + "name": "Integrate literature highlighting by Bowtie v Bowtie2", + "status": null + }, + { + "name": "Integrate u-INDEX by Callahan et al. (2018)", + "status": null + } ], "disclaimer": "This Development Roadmap (Roadmap) is for informational purposes only. The PubCode team will update the Roadmap as frequently as possible but, given that it’s subject to change at any time, the information presented by the Roadmap should not be used for planning purposes. The information presented in the Roadmap does not represent a solicitation or similar contract vehicle. All items in the Roadmap will be developed and released at the sole discretion of PubCode, the Presidential Innovation Fellows, the National Center for Biotechnology Information, and the United States Federal Government." } @@ -132,4 +172,4 @@ "images": { "background": "./assets/img/pubcode-home.png" } -} +} \ No newline at end of file diff --git a/config/site/examples/your-city.json b/config/site/examples/your-city.json index d035b7bc..6414bc8c 100644 --- a/config/site/examples/your-city.json +++ b/config/site/examples/your-city.json @@ -4,7 +4,6 @@ "base": "https://api.code.gov/", "key": "OC457325hyT6DpFm5HBBZ1i8SR6gtp5U2CdqtHZQ" }, - "style": "code-gov-style", "twitter": { "handle": "yourcitydotgov" }, @@ -15,9 +14,18 @@ "light": "./assets/img/logos/your-city-light.svg" }, "links": [ - { "name": "Browse Projects", "url": "/#!/explore-code" }, - { "name": "Help Wanted", "url": "/#!/help-wanted" }, - { "name": "Roadmap", "url": "/#!/roadmap" } + { + "name": "Browse Projects", + "url": "/#!/explore-code" + }, + { + "name": "Help Wanted", + "url": "/#!/help-wanted" + }, + { + "name": "Roadmap", + "url": "/#!/roadmap" + } ] }, "home": { @@ -57,8 +65,14 @@ "description": "A website with resource and tools for starting your own business in Your City", "image": "/assets/img/featured-projects/biz_400x400.png", "links": [ - { "name": "View Project", "url": "/#!/explore-code/agencies/" }, - { "name": "Go to Repo", "url": "https://github.com/"} + { + "name": "View Project", + "url": "/#!/explore-code/agencies/" + }, + { + "name": "Go to Repo", + "url": "https://github.com/" + } ] }, { @@ -68,8 +82,14 @@ "description": "A mobile-friendly online interactive map that shows transportation routes and current locations of public transportation options", "image": "/assets/img/featured-projects/transportation_409x409.png", "links": [ - { "name": "View Project", "url": "/#!/explore-code/agencies/" }, - { "name": "Go to Repo", "url": "https://github.com" } + { + "name": "View Project", + "url": "/#!/explore-code/agencies/" + }, + { + "name": "Go to Repo", + "url": "https://github.com" + } ] } ] @@ -111,17 +131,38 @@ "The Development Roadmap is organized into three categories – Near-term, Mid-term, and Long-term. Priorities are sorted into roadmap categories based on feedback we receive during user interviews. Dependencies and resources are also factors that affect placement on the roadmap. If you want to join the code.yourcity.gov user testing group, please email us at code@yourcity.gov." ], "near": [ - { "name": "Feature 1", "status": "Released" }, - { "name": "Feature 2", "status": "Released" } + { + "name": "Feature 1", + "status": "Released" + }, + { + "name": "Feature 2", + "status": "Released" + } ], "mid": [ - { "name": "Feature 3", "status": "In Progress" }, - { "name": "Feature 4", "status": null }, - { "name": "Feature 5", "status": "In Progress" } + { + "name": "Feature 3", + "status": "In Progress" + }, + { + "name": "Feature 4", + "status": null + }, + { + "name": "Feature 5", + "status": "In Progress" + } ], "long": [ - { "name": "Feature 6", "status": null }, - { "name": "Feature 7", "status": null } + { + "name": "Feature 6", + "status": null + }, + { + "name": "Feature 7", + "status": null + } ], "disclaimer": "This Development Roadmap (Roadmap) is for informational purposes only. The code.yourcity.gov team will update the Roadmap as frequently as possible but, given that it’s subject to change at any time, the information presented by the Roadmap should not be used for planning purposes. The information presented in the Roadmap does not represent a solicitation or similar contract vehicle. All items in the Roadmap will be developed and released at the sole discretion of code.yourcity.gov, the Your City Innovation Office and the Your City Office of the Mayor." } @@ -129,4 +170,4 @@ "images": { "background": "./assets/img/yourcity.jpg" } -} +} \ No newline at end of file diff --git a/config/site/site.json b/config/site/site.json index c24b1e9b..5bc299ee 100644 --- a/config/site/site.json +++ b/config/site/site.json @@ -4,7 +4,6 @@ "base": "https://api.code.gov/", "key": "OC457325hyT6DpFm5HBBZ1i8SR6gtp5U2CdqtHZQ" }, - "style": "code-gov-style", "twitter": { "handle": "codedotgov" }, @@ -440,5 +439,8 @@ ], "disclaimer": "This Development Roadmap (Roadmap) is for informational purposes only. The Code.gov team will update the Roadmap as frequently as possible but it is subject to change at any time. The information presented by the Roadmap should not be used for planning purposes. The information presented in the Roadmap does not represent a solicitation or similar contract vehicle. All items in the Roadmap will be developed and released at the sole discretion of Code.gov and the U.S. General Services Administration." } + }, + "images": { + "background": "./assets/img/logos/code-gov-light.svg" } -} +} \ No newline at end of file diff --git a/cypress.json b/cypress.json index d1ab2fc0..5fcc12f7 100644 --- a/cypress.json +++ b/cypress.json @@ -1,3 +1,4 @@ { - "baseUrl": "http://localhost:8080" -} + "baseUrl": "http://localhost:8080", + "video": false +} \ No newline at end of file diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json new file mode 100644 index 00000000..da18d935 --- /dev/null +++ b/cypress/fixtures/example.json @@ -0,0 +1,5 @@ +{ + "name": "Using fixtures to represent data", + "email": "hello@cypress.io", + "body": "Fixtures are a great way to mock data for responses to routes" +} \ No newline at end of file diff --git a/cypress/screenshots/about-page.spec.js/about page tests -- visits the about page (failed).png b/cypress/screenshots/about-page.spec.js/about page tests -- visits the about page (failed).png deleted file mode 100644 index 0c90a6bd..00000000 Binary files a/cypress/screenshots/about-page.spec.js/about page tests -- visits the about page (failed).png and /dev/null differ diff --git a/cypress/videos/about-page.spec.js.mp4 b/cypress/videos/about-page.spec.js.mp4 deleted file mode 100644 index 8b13360b..00000000 Binary files a/cypress/videos/about-page.spec.js.mp4 and /dev/null differ diff --git a/cypress/videos/browse-projects-direct-nav.spec.js.mp4 b/cypress/videos/browse-projects-direct-nav.spec.js.mp4 deleted file mode 100644 index 8a4c408f..00000000 Binary files a/cypress/videos/browse-projects-direct-nav.spec.js.mp4 and /dev/null differ diff --git a/cypress/videos/browse-projects-page.spec.js.mp4 b/cypress/videos/browse-projects-page.spec.js.mp4 deleted file mode 100644 index 431e9526..00000000 Binary files a/cypress/videos/browse-projects-page.spec.js.mp4 and /dev/null differ diff --git a/cypress/videos/compliance-dashboard-direct-nav.spec.js.mp4 b/cypress/videos/compliance-dashboard-direct-nav.spec.js.mp4 deleted file mode 100644 index 0c7226a7..00000000 Binary files a/cypress/videos/compliance-dashboard-direct-nav.spec.js.mp4 and /dev/null differ diff --git a/cypress/videos/federal-agencies-page.spec.js.mp4 b/cypress/videos/federal-agencies-page.spec.js.mp4 deleted file mode 100644 index 3673112a..00000000 Binary files a/cypress/videos/federal-agencies-page.spec.js.mp4 and /dev/null differ diff --git a/cypress/videos/homepage-search-box.spec.js.mp4 b/cypress/videos/homepage-search-box.spec.js.mp4 deleted file mode 100644 index 00dc629e..00000000 Binary files a/cypress/videos/homepage-search-box.spec.js.mp4 and /dev/null differ diff --git a/cypress/videos/open-tasks-direct-nav.spec.js.mp4 b/cypress/videos/open-tasks-direct-nav.spec.js.mp4 deleted file mode 100644 index 203ffa13..00000000 Binary files a/cypress/videos/open-tasks-direct-nav.spec.js.mp4 and /dev/null differ diff --git a/cypress/videos/open-tasks-page.spec.js.mp4 b/cypress/videos/open-tasks-page.spec.js.mp4 deleted file mode 100644 index 4396c628..00000000 Binary files a/cypress/videos/open-tasks-page.spec.js.mp4 and /dev/null differ diff --git a/dependency_licenses.json b/dependency_licenses.json index 9a552acf..db2e92eb 100644 --- a/dependency_licenses.json +++ b/dependency_licenses.json @@ -661,20 +661,6 @@ "path": "/Users/josephcastle/Development/DevCode/code-gov-front-end/node_modules/@code.gov/cautious", "licenseFile": "node_modules/@code.gov/cautious/README.md" }, - "@code.gov/code-gov-font@0.10.0": { - "licenses": "CC0-1.0", - "repository": "https://github.com/GSA/code-gov-font", - "publisher": "Daniel J. Dufour", - "path": "/Users/josephcastle/Development/DevCode/code-gov-front-end/node_modules/@code.gov/code-gov-style/node_modules/@code.gov/code-gov-font", - "licenseFile": "node_modules/@code.gov/code-gov-style/node_modules/@code.gov/code-gov-font/LICENSE.md" - }, - "@code.gov/code-gov-font@0.10.1": { - "licenses": "CC0-1.0", - "repository": "https://github.com/GSA/code-gov-font", - "publisher": "Daniel J. Dufour", - "path": "/Users/josephcastle/Development/DevCode/code-gov-front-end/node_modules/@code.gov/code-gov-font", - "licenseFile": "node_modules/@code.gov/code-gov-font/LICENSE.md" - }, "@code.gov/code-gov-front-end@1.2.0": { "licenses": "CC0-1.0", "repository": "https://github.com/GSA/code-gov-front-end", @@ -682,13 +668,6 @@ "path": "/Users/josephcastle/Development/DevCode/code-gov-front-end", "licenseFile": "LICENSE.md" }, - "@code.gov/code-gov-style@2.0.5": { - "licenses": "CC0-1.0", - "repository": "https://github.com/GSA/code-gov-style", - "publisher": "Daniel J. Dufour", - "path": "/Users/josephcastle/Development/DevCode/code-gov-front-end/node_modules/@code.gov/code-gov-style", - "licenseFile": "node_modules/@code.gov/code-gov-style/LICENSE.md" - }, "@code.gov/site-map-generator@1.0.12": { "licenses": "CC0-1.0", "repository": "https://github.com/GSA/code-gov-site-map-generator", @@ -15105,4 +15084,4 @@ "path": "/Users/josephcastle/Development/DevCode/code-gov-front-end/node_modules/yauzl", "licenseFile": "node_modules/yauzl/LICENSE" } -} +} \ No newline at end of file diff --git a/index.html b/index.html index 03e29e6f..47749bef 100644 --- a/index.html +++ b/index.html @@ -1,148 +1,133 @@ -
- - - + + + - - - - - - -