Skip to content

Commit

Permalink
Merge pull request #464 from GSA/release-1.3.0
Browse files Browse the repository at this point in the history
Release 1.3.0 to staging
  • Loading branch information
Sean authored Aug 6, 2020
2 parents e4075c5 + 4e62d69 commit d8aaa50
Show file tree
Hide file tree
Showing 24 changed files with 250 additions and 209 deletions.
4 changes: 4 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions CONFIGURATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 0 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion assets/data/filters/tasks.json
Original file line number Diff line number Diff line change
@@ -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"}]}
{"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"}]}
72 changes: 56 additions & 16 deletions config/site/examples/pub-code.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"base": "https://api.code.gov/",
"key": "eQjuCayvuIpnxRjFZ0ev0jDHoTvhidzrX0hL3ttC"
},
"style": "code-gov-style",
"twitter": {
"handle": ""
},
Expand All @@ -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": {
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -114,22 +133,43 @@
"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."
}
},
"images": {
"background": "./assets/img/pubcode-home.png"
}
}
}
73 changes: 57 additions & 16 deletions config/site/examples/your-city.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"base": "https://api.code.gov/",
"key": "OC457325hyT6DpFm5HBBZ1i8SR6gtp5U2CdqtHZQ"
},
"style": "code-gov-style",
"twitter": {
"handle": "yourcitydotgov"
},
Expand All @@ -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": {
Expand Down Expand Up @@ -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/"
}
]
},
{
Expand All @@ -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"
}
]
}
]
Expand Down Expand Up @@ -111,22 +131,43 @@
"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 <a href='mailto:[email protected]'>[email protected]</a>."
],
"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."
}
},
"images": {
"background": "./assets/img/yourcity.jpg"
}
}
}
6 changes: 4 additions & 2 deletions config/site/site.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"base": "https://api.code.gov/",
"key": "OC457325hyT6DpFm5HBBZ1i8SR6gtp5U2CdqtHZQ"
},
"style": "code-gov-style",
"twitter": {
"handle": "codedotgov"
},
Expand Down Expand Up @@ -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"
}
}
}
5 changes: 3 additions & 2 deletions cypress.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"baseUrl": "http://localhost:8080"
}
"baseUrl": "http://localhost:8080",
"video": false
}
5 changes: 5 additions & 0 deletions cypress/fixtures/example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "Using fixtures to represent data",
"email": "[email protected]",
"body": "Fixtures are a great way to mock data for responses to routes"
}
Binary file not shown.
Binary file removed cypress/videos/about-page.spec.js.mp4
Binary file not shown.
Binary file not shown.
Binary file removed cypress/videos/browse-projects-page.spec.js.mp4
Binary file not shown.
Binary file not shown.
Binary file removed cypress/videos/federal-agencies-page.spec.js.mp4
Binary file not shown.
Binary file removed cypress/videos/homepage-search-box.spec.js.mp4
Binary file not shown.
Binary file removed cypress/videos/open-tasks-direct-nav.spec.js.mp4
Binary file not shown.
Binary file removed cypress/videos/open-tasks-page.spec.js.mp4
Binary file not shown.
23 changes: 1 addition & 22 deletions dependency_licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -661,34 +661,13 @@
"path": "/Users/josephcastle/Development/DevCode/code-gov-front-end/node_modules/@code.gov/cautious",
"licenseFile": "node_modules/@code.gov/cautious/README.md"
},
"@code.gov/[email protected]": {
"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/[email protected]": {
"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/[email protected]": {
"licenses": "CC0-1.0",
"repository": "https://github.com/GSA/code-gov-front-end",
"publisher": "Daniel J. Dufour",
"path": "/Users/josephcastle/Development/DevCode/code-gov-front-end",
"licenseFile": "LICENSE.md"
},
"@code.gov/[email protected]": {
"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/[email protected]": {
"licenses": "CC0-1.0",
"repository": "https://github.com/GSA/code-gov-site-map-generator",
Expand Down Expand Up @@ -15105,4 +15084,4 @@
"path": "/Users/josephcastle/Development/DevCode/code-gov-front-end/node_modules/yauzl",
"licenseFile": "node_modules/yauzl/LICENSE"
}
}
}
Loading

0 comments on commit d8aaa50

Please sign in to comment.