diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e856c6ee..bae29612 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,10 +2,9 @@ We're so glad you're thinking about contributing to a U.S. Government open source project! If you're unsure about anything, just ask -- or submit the issue or pull request anyway. The worst that can happen is you'll be politely asked to change something. We love all friendly contributions. -We encourage you to read this project's CONTRIBUTING policy (you are here), its [LICENSE](LICENSE.md), and its [README](README.md). - ## How to contribute to code-gov-web +- We want to ensure a welcoming environment for all of our projects. Our staff follows this [Code of Conduct](CODE_OF_CONDUCT.md) and all contributors should do the same. - Report bugs and request features via [Github Issues](https://github.com/GSA/code-gov-web/issues). - If you are not sure that the issue is related to the website you can [create the issue in our general repository](https://github.com/gsa/code-gov/issue/new): [code-gov](https://github.com/gsa/code-gov) - Join the [mailing list](http://code.us15.list-manage.com/subscribe?u=57dec439b29289fc14396b8db&id=a317168ea7) and stay up to date with our latest news. diff --git a/README.md b/README.md index b951fe64..e04de46c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ -# Code.gov - Unlocking the potential of the Federal Government’s software. +# DEPRECATED +## This project repo is no longer being maintained. The front end of code.gov is now located at [code-gov-front-end](https://github.com/GSA/code-gov-front-end). + + +## Code.gov - Unlocking the potential of the Federal Government’s software. [![Build Status](https://circleci.com/gh/presidential-innovation-fellows/code-gov-web.svg?style=shield)](https://circleci.com/gh/presidential-innovation-fellows/code-gov-web) [![Code Climate](https://codeclimate.com/github/presidential-innovation-fellows/code-gov-web/badges/gpa.svg)](https://codeclimate.com/github/presidential-innovation-fellows/code-gov-web) diff --git a/config/code-gov-config.json b/config/code-gov-config.json deleted file mode 120000 index a9121095..00000000 --- a/config/code-gov-config.json +++ /dev/null @@ -1 +0,0 @@ -examples/code-dot-gov.json \ No newline at end of file diff --git a/config/code-gov-config.json b/config/code-gov-config.json new file mode 100644 index 00000000..c0171f12 --- /dev/null +++ b/config/code-gov-config.json @@ -0,0 +1,230 @@ +{ + "title": "code.gov", + "api": { + "base": "https://api.code.gov/", + "key": "OC457325hyT6DpFm5HBBZ1i8SR6gtp5U2CdqtHZQ" + }, + "style": "code-gov-style", + "twitter": { + "handle": "codedotgov" + }, + "content": { + "header": { + "fork_me_url": "https://github.com/GSA/code-gov-web", + "logos": { + "dark": "./assets/img/logos/code-gov-dark.svg", + "light": "./assets/img/logos/code-gov-light.svg" + }, + "menu": [ + { + "name": "about", + "links": [ + { "name": "Source Code Policy", "url": "/#!/policy-guide/docs/overview/introduction" }, + { "name": "Open Source Pilot", "url": "/#!/policy-guide/docs/open-source/introduction" } + ] + }, + { + "name": "Browse Projects", + "url": "/#!/browse-projects" + }, + { + "name": "federal agencies", + "links": [ + { "name": "How to Inventory Code", "url": "/#!/policy-guide/docs/compliance/inventory-code" }, + { "name": "Tools", "url": "/#!/policy-guide/docs/compliance/inventory-code/tools/validate-schema" }, + { "name": "Compliance Dashboard", "url": "/#!/policy-guide/docs/compliance/dashboard"} + ] + }, + { + "name": "developers", + "links": [ + { "name": "code.gov API", "url": "https://developers.code.gov/basics.html" }, + { "name": "Open Tasks", "url": "/#!/open-tasks" }, + { "name": "Notebooks", "url": "https://beta.observablehq.com/search?query=%22code.gov%22" }, + { "name": "Resources", "url": "https://github.com/GSA/code-gov/wiki/Tools-&-Resources" } + ] + }, + { + "name": "community", + "links": [ + { "name": "code.gov Repo", "url": "http://github.com/GSA/code-gov-web" }, + { "name": "Blog", "url": "https://medium.com/codedotgov" }, + { "name": "LinkedIn", "url": "https://www.linkedin.com/company/code-gov" }, + { "name": "Twitter", "url": "https://twitter.com/codedotgov" }, + { "name": "Contact Us", "url": "mailto:code@gsa.gov" } + ] + } + ] + }, + "home": { + "banner": { + "motto": "Sharing America's Code", + "subtitle": "Unlock the tremendous potential of the Federal Government’s software.", + "help_wanted": { + "title": "Ready. Set. Code!", + "description": "Whether you are a beginner or an experienced coder, join the open source community. Help improve America's Code.", + "button": "Explore Open Tasks" + }, + "search_description_text": "Search thousands of Federal Government projects", + "search_description_text_mobile": "Search projects", + "search_placeholder_text": "e.g. JavaScript, NASA, web standards", + "browse_by_text": "Browse by Agency", + "issue_url": "https://github.com/GSA/code-gov-web/issues" + }, + "mission": "Code.gov leverages the power of code sharing and collaboration to help the US Government cut down on duplicative software development and save millions of taxpayer dollars for the American people.", + "about": [ + { + "title": "About Us", + "description": "Code.gov is on track to become the nation’s primary platform for sharing America’s code. Find out how we’ll get there.", + "link": "/policy-guide/docs/overview/introduction", + "image": "/assets/img/icons/info_bl.png" + }, + { + "title": "Policy Info", + "description": "The Federal Source Code Policy helps government agencies reduce duplicative software development and save taxpayer dollars.", + "link": "/policy-guide/policy/introduction", + "image": "/assets/img/icons/policy_bl.png" + }, + { + "title": "Progress Report", + "description": "Government agencies are working hard to unlock the potential of code sharing and collaboration. Here’s a quick snapshot of their progress.", + "link": "/policy-guide/docs/compliance/dashboard", + "image": "/assets/img/icons/check_bl.png" + } + ], + "featured": [ + { + "short_name": "WNTR", + "verbose_name": "Water Network Tool for Resilience", + "author": "Environmental Protection Agency", + "description": "A python package designed to simulate and analyze resilience of water distribution networks.", + "image": "/assets/img/featured-projects/pipes4.png", + "links": [ + { "name": "View Project", "url": "/#!/explore-code/agencies/DOE/repos/doe_sandia_national_laboratories_snl_water_network_tool_for_resilience_v_1_0" }, + { "name": "Go to Repo", "url": "https://github.com/usepa/wntr"} + ] + }, + { + "short_name": "ITS ODE", + "verbose_name": "Intelligent Transportation Systems Operational Data Environment", + "author": "Department of Transportation", + "description": "A real-time virtual data router that ingests and processes operational data from various connected devices including vehicles, infrastructure, and traffic management centers and distributes it to other devices and subscribing transportation management applications.", + "image": "/assets/img/featured-projects/smartcity4.png", + "links": [ + { "name": "View Project", "url": "/#!/explore-code/agencies/DOT/repos/dot_fhwa_intelligent_transportation_systems_operational_data_environment_its_ode_" }, + { "name": "Go to Repo", "url": "https://github.com/usdot-jpo-ode/jpo-ode" } + ] + }, + { + "short_name": "WALKOFF", + "verbose_name": "", + "author": "National Security Agency", + "description": "Enables security teams to integrate apps, workflows, and analytics tools that would otherwise need to be created from scratch.", + "image": "/assets/img/featured-projects/WALKOFF.png", + "links": [ + { "name": "View Project", "url": "/#!/explore-code/agencies/NSA/repos/nsa_walkoff" }, + { "name": "Go to Repo", "url": "https://github.com/iadgov/WALKOFF" } + ] + } + ], + "press": { + "quote": "It’s the latest in a long line of high-profile victories for the open source movement.", + "attribution": { + "image": "assets/img/logos/press/wired.svg", + "alt": "wired magazine", + "url": "https://www.wired.com/2016/08/open-source-won-now/" + }, + "links": [ + { + "image": "assets/img/logos/press/techcrunch.jpg", + "alt": "techcrunch", + "url": "https://techcrunch.com/2016/08/08/the-white-house-just-released-the-federal-source-code-policy-to-help-government-agencies-go-open-source/" + }, + { + "image": "assets/img/logos/press/pcmag.png", + "alt": "pc magazine", + "url": "http://www.pcmag.com/news/346860/white-house-releases-open-source-software-policy" + }, + { + "image": "assets/img/logos/press/fcw.png", + "alt": "federal computer week", + "url": "https://fcw.com/articles/2016/08/08/open-source-rockwell.aspx" + } + ] + } + }, + "footer": { + "links": [ + { + "name": "Privacy Policy", + "url": "/#!/privacy-policy" + }, + { + "name": "Roadmap", + "url": "/#!/roadmap" + }, + { + "name": "Visit Project Page", + "url": "https://github.com/GSA/code-gov-web" + } + ], + "logos": [ + { + "image": "/assets/img/logos/whitehouse.png", + "name": "The White House", + "url": "https://whitehouse.gov/" + }, + { + "image": "/assets/img/logos/PIF.png", + "name": "Presidential Innovation Fellows", + "url": "https://presidentialinnovationfellows.gov/" + }, + { + "image": "/assets/img/logos/GSA.png", + "name": "U.S. General Services Administration", + "url": "https://www.gsa.gov/" + } + ] + }, + "browse_projects": { + "browse_by_text": "Browse by Agency" + }, + "help_wanted": { + "title": "Open Tasks", + "subtitle": "Ready. Set. Code!" + }, + "roadmap": { + "overview": [ + "At Code.gov, we know it’s important to keep an open dialogue with our users. That’s why we’re sharing our plans for the future through this Development Roadmap. Hopefully, it will help you better understand our priorities for the platform.", + "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.gov user testing group, please email us at Code@gsa.gov." + ], + "near": [ + { "name": "Code.gov configurability with Angular", "status": "Released" }, + { "name": "Update Navigation and Homepage content", "status": "Released" }, + { "name": "Usability sessions, round 1", "status": "Released" }, + { "name": "Phase 1 SEO improvements", "status": "In Progress" }, + { "name": "Licenses documentation", "status": "In Progress" }, + { "name": "Search scoring phase 1", "status": "In Progress" }, + { "name": "Update search filters", "status": "In Progress" } + ], + "mid": [ + { "name": "Update open tasks phase 1", "status": null }, + { "name": "Update UI for search results", "status": null }, + { "name": "Usability sessions, round 2", "status": null } + ], + "long": [ + { "name": "States and cities pilot program", "status": null }, + { "name": "Phase 2 SEO improvements", "status": null }, + { "name": "User profiles", "status": null }, + { "name": "Gamification/badges", "status": null }, + { "name": "Chatbot", "status": null }, + { "name": "Code.json creator tool", "status": null }, + { "name": "Search scoring phase 2", "status": null } + ], + "disclaimer": "This Development Roadmap (Roadmap) is for informational purposes only. The Code.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.gov, the General Services Agency, the Office of Management and Budget, and the United States Federal Government." + } + }, + "images": { + "background": "./assets/img/american_flag_1920x1280_gradient.jpg" + } +} diff --git a/config/examples/code-dot-gov.json b/config/examples/code-dot-gov.json index 5600e880..c0171f12 100644 --- a/config/examples/code-dot-gov.json +++ b/config/examples/code-dot-gov.json @@ -39,8 +39,9 @@ "name": "developers", "links": [ { "name": "code.gov API", "url": "https://developers.code.gov/basics.html" }, - { "name": "Contribute", "url": "/#!/help-wanted" }, - { "name": "Notebooks", "url": "https://beta.observablehq.com/search?query=%22code.gov%22" } + { "name": "Open Tasks", "url": "/#!/open-tasks" }, + { "name": "Notebooks", "url": "https://beta.observablehq.com/search?query=%22code.gov%22" }, + { "name": "Resources", "url": "https://github.com/GSA/code-gov/wiki/Tools-&-Resources" } ] }, { @@ -207,7 +208,7 @@ { "name": "Update search filters", "status": "In Progress" } ], "mid": [ - { "name": "Update help wanted phase 1", "status": null }, + { "name": "Update open tasks phase 1", "status": null }, { "name": "Update UI for search results", "status": null }, { "name": "Usability sessions, round 2", "status": null } ], diff --git a/config/examples/pub-code.json b/config/examples/pub-code.json index cbc287ec..90fbb4b0 100644 --- a/config/examples/pub-code.json +++ b/config/examples/pub-code.json @@ -16,7 +16,7 @@ }, "links": [ { "name": "Browse Projects", "url": "/#!/explore-code" }, - { "name": "Help Wanted", "url": "/#!/help-wanted" }, + { "name": "Open Tasks", "url": "/#!/open-tasks" }, { "name": "Roadmap", "url": "/#!/roadmap" } ] }, @@ -105,7 +105,7 @@ ] }, "help_wanted": { - "title": "Help Wanted", + "title": "Open Tasks", "subtitle": "Discover how you can get involved and make America's Scientific Code better" }, "roadmap": { diff --git a/config/examples/your-city.json b/config/examples/your-city.json index 9589dd88..7f561d6d 100644 --- a/config/examples/your-city.json +++ b/config/examples/your-city.json @@ -16,7 +16,7 @@ }, "links": [ { "name": "Browse Projects", "url": "/#!/explore-code" }, - { "name": "Help Wanted", "url": "/#!/help-wanted" }, + { "name": "Open Taks", "url": "/#!/open-tasks" }, { "name": "Roadmap", "url": "/#!/roadmap" } ] }, @@ -102,7 +102,7 @@ "browse_by_text": "Browse by Department" }, "help_wanted": { - "title": "Help Wanted", + "title": "Open Tasks", "subtitle": "Discover how you can get involved and make Your City's Code better" }, "roadmap": { diff --git a/package-lock.json b/package-lock.json index 05882a90..80f369a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "code-gov-web", - "version": "2.8.0", + "version": "2.9.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -164,13 +164,14 @@ "integrity": "sha512-C6j2UBRrNU/PmELdfTCXrmx4Su9jxKxAs+DD4ZRHIuaa2YrmoKCVTEGpu4QYmc0fNWxPQsDBHur0Vle4DMZV5w==" }, "@code.gov/code-gov-style": { - "version": "1.9.5", - "resolved": "https://registry.npmjs.org/@code.gov/code-gov-style/-/code-gov-style-1.9.5.tgz", - "integrity": "sha512-FKIgz4YrHzo6LOqkzs+qwxfPqrKwQFf8pCfOojRiTja8WkfuOBcTQdbG7dAK6LP/LFDDyFSsa4KMLnDVx1d4lw==", + "version": "1.9.8", + "resolved": "https://registry.npmjs.org/@code.gov/code-gov-style/-/code-gov-style-1.9.8.tgz", + "integrity": "sha512-DE0MFehy4RV5Ce8yhGSOTbMEb2qANUoB6qBivOsJmyH/WkT5SaXRNk9uudhu7BCqShull2l7n4eYHJN30TieBQ==", "requires": { "@babel/polyfill": "^7.0.0", "@code.gov/code-gov-font": "0.7.0", - "@webcomponents/custom-elements": "^1.2.0", + "@webcomponents/custom-elements": "^1.2.1", + "custom-event-polyfill": "^1.0.6", "prismjs": "^1.15.0" }, "dependencies": { @@ -319,9 +320,9 @@ } }, "@webcomponents/custom-elements": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.2.0.tgz", - "integrity": "sha512-KegC4y9/xlZNlEcKNtMmKXxNNMMLROzVntX55NfSgMhaXjwNf8EG8ypA2lt20ZQ/LoL0QuGxMZnf3kO5DdQjEQ==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@webcomponents/custom-elements/-/custom-elements-1.2.1.tgz", + "integrity": "sha512-flmTp4rVbBkcUIF3eBO3LNoAaYvleTdhPZKzdzr6iztWLLrxCctcK+7MAQeC3/SPjc3JDdC3jYLMRF4R6C3f9g==" }, "JSONStream": { "version": "1.3.3", @@ -3349,6 +3350,11 @@ "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", "dev": true }, + "custom-event-polyfill": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-1.0.6.tgz", + "integrity": "sha512-3FxpFlzGcHrDykwWu+xWVXZ8PfykM/9/bI3zXb953sh+AjInZWcQmrnmvPoZgiqNjmbtTm10PWvYqvRW527x6g==" + }, "cyclist": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", diff --git a/package.json b/package.json index 02251e14..c961491b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "code-gov-web", - "version": "2.8.0", + "version": "2.9.4", "description": "Code.gov is a website promoting good practices in code development, collaboration, and reuse across the U.S. Government. Code.gov will provide tools and guidance to help agencies implement the [Federal Source Code Policy](https://sourcecode.cio.gov). It will include an inventory of the government's custom code to promote reuse between agencies and will provide tools to help government and the public collaborate on open source projects.", "keywords": [ "angular2", @@ -96,7 +96,7 @@ "clear-gh-pages-cache": "rm -fr node_modules/gh-pages/.cache", "update-fonts": "cp node_modules/@code.gov/code-gov-font/font/* src/assets/fonts/.", "update-languages": "CODE_GOV_LANGUAGES=$(curl -s https://raw.githubusercontent.com/GSA/code-gov-data/master/languages.txt) node -e 'console.log(JSON.stringify(process.env.CODE_GOV_LANGUAGES.split(`\n`)))' > src/enums/languages.json", - "update-web-components": "cp node_modules/@code.gov/code-gov-style/assets/js/web_components.js src/assets/js/.", + "update-web-components": "cp node_modules/@code.gov/code-gov-style/dist/js/polyfills.js src/assets/js/. && cp node_modules/@code.gov/code-gov-style/dist/js/code-gov-web-components.js src/assets/js/.", "switch-to-code-dot-gov": "cp config/examples/code-dot-gov.json config/code-gov-config.json && cp src/assets/help-wanted-code-dot-gov.json src/assets/help-wanted.json && cp src/app/components/privacy-policy/privacy-policy-code-dot-gov.md src/app/components/privacy-policy/privacy-policy.md" }, "dependencies": { @@ -115,7 +115,7 @@ "@angularclass/hmr-loader": "~3.0.2", "@code.gov/api-client": "^0.1.1", "@code.gov/code-gov-font": "0.6.3", - "@code.gov/code-gov-style": "1.9.5", + "@code.gov/code-gov-style": "1.9.8", "@ngx-meta/core": "^0.4.0-rc.2", "@types/jasminewd2": "^2.0.2", "angulartics2": "1.4.3", diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index 2eb4feb1..09c47999 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -30,7 +30,7 @@ export const ROUTES: Routes = [ { path: 'faqs', component: FaqsComponent }, { path: 'roadmap', component: RoadmapComponent }, { path: 'browse-projects', component: BrowseProjectsComponent }, - { path: 'help-wanted', component: HelpWantedComponent }, + { path: 'open-tasks', component: HelpWantedComponent }, { path: '**', component: FourOhFourComponent }, ] }, diff --git a/src/app/components/browse-projects/browse-projects.styles.scss b/src/app/components/browse-projects/browse-projects.styles.scss index 856aea70..765a8442 100644 --- a/src/app/components/browse-projects/browse-projects.styles.scss +++ b/src/app/components/browse-projects/browse-projects.styles.scss @@ -1,2 +1,3 @@ @import '~@code.gov/code-gov-style/_sass/_variables'; @import '../base-filter-page/base-filter-page.styles.scss'; +@import '../search-results/search-results.styles.scss'; \ No newline at end of file diff --git a/src/app/components/browse-projects/browse-projects.template.html b/src/app/components/browse-projects/browse-projects.template.html index aefc6ade..0e7b37a7 100644 --- a/src/app/components/browse-projects/browse-projects.template.html +++ b/src/app/components/browse-projects/browse-projects.template.html @@ -11,13 +11,15 @@
The same way you contribute to open source programs. You can submit an issue or initiate at pull request. Our Help Wanted page list projects agencies specifically need help on, however your contributions should not be limited to the projects on this page. If you see something in a repository and want to go to work, please do.
+The same way you contribute to open source programs. You can submit an issue or initiate at pull request. Our Open Tasks page lists projects agencies specifically need help on, however your contributions should not be limited to the projects on this page. If you see something in a repository and want to go to work, please do.
Code.gov offers users the ability to search the government’s inventory of software. Software is then identified as exempt from policy, available for re-use, or open source. Our search capabilities allow users to search for code by language, project type, as well as filter results based on a number of criteria. Code.gov’s Help Wanted Page allows users to give back to their country through code by finding projects that interest them and working on them. The government will then review the code and accept it Code.gov offers users GitHub integration when repositories are housed on GitHub.
+Code.gov offers users the ability to search the government’s inventory of software. Software is then identified as exempt from policy, available for re-use, or open source. Our search capabilities allow users to search for code by language, project type, as well as filter results based on a number of criteria. Code.gov’s Open Tasks Page allows users to give back to their country through code by finding projects that interest them and working on them. The government will then review the code and accept it Code.gov offers users GitHub integration when repositories are housed on GitHub.