diff --git a/.gitignore b/.gitignore index b61a36b6f..74b0c3dd1 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ _team/jackie.md _team/alison.md _team/mbland.md /bin +/coverage diff --git a/.rubocop.yml b/.rubocop.yml index 587f669f1..5f5f1504e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -11,6 +11,7 @@ AllCops: Exclude: - 'bin/**/*' - 'db/schema.rb' + - '_site/**/*' UseCache: true Metrics/AbcSize: diff --git a/Accessibility Scanning Using Pa11y-ci.md b/Accessibility Scanning Using Pa11y-ci.md deleted file mode 100644 index ac8085365..000000000 --- a/Accessibility Scanning Using Pa11y-ci.md +++ /dev/null @@ -1,131 +0,0 @@ -## Accessibility Scanning Using Pa11y-ci - -### Introduction - -Building a website or application that is easy accessible toeveryone is not only an important of the user experience, but also a requirement of all federally funded projects. GSA provides a helpful [Section 508](https://section508.gov) portal. [Pa11y](https://github.com/pa11y/pa11y) is an automation tool that helps you scan your static web pages to check for accessibility problems and errors. It can be setup on your machine locally or remotely using a CI tool. - -### Installation and setup(For MacOS) - -1. [Concourse CI](https://concourse.ci/index.html) allows you to run multiple compliance scanning jobs on your machine using a virtual machine. It is highly recommended to go through its [excellent documentation and "Hello World" tutorial ](https://concourse.ci/hello-world.html) before writing custom jobs for your project. - -2. If you want to run locally Pa11y-ci you will need to : - - * install **vagrant** and **virtualbox** ](http://sourabhbajaj.com/mac-setup/Vagrant/README.html) - * use [The Fly CLI](https://concourse.ci/fly-cli.html) , a command line tool for Concourse which is used for a number of tasks from connecting to a shell in one of your build's containers to uploading new pipeline configuration into a running Concourse. - -3. If you're on MacOS , you will have to `chmod +x` the downloaded binary and put it in your `$PATH`. This can be done in one fell swoop with `install path/to/fly /usr/local/bin/fly` - -4. Run Vagrant - - ```sh - vagrant init concourse/lite # creates ./Vagrantfile - vagrant up # downloads the box and spins up the VM - ``` - -5. Login into fly - - `fly -t lite login -c http://192.168.100.4:8080` - - ​ - -### Running Pa11y-ci on your local machine - -1. Create a `.yml` file containing the job with tasks that you want to run - -`touch accessibility-scan.yml` - -`vim accessibility-scan.yml` - -```yml -jobs: - - name: accessibility-scan - plan: - - task: run-pa11y - config: - platform: linux - image_resource: - type: docker-image - source: - repository: node - run: - path: sh - args: - - -exc - - | - npm install -g pa11y-ci - npm install -g phantomjs - mkdir accessibility-scan - pa11y-ci --json --sitemap https://18f.gsa.gov/sitemap.xml > accessibility-scan/summary.txt - cat accessibility-scan/summary.txt -``` - -`type` is almost always going to be `docker-image` . `pa11y-ci` requires node, so we are using a `node` docker-image. - -`run` section contains a series of shell command that we are executing: - -* install pa11y-ci and phantomjsfrom the node package manager(npm) - -* making a directory and telling pa11y-ci to pipe the results of the scan into a `json` file - - the command is like so `pa11y-ci --json --sitemap https://[18f-static-site-url]/sitemap.xml > dir/file` - -* printing the results in our CLI `cat…` (for debugging purposes, optional) - -**Note that** we are using the `sitemap.xml` file instead of individual files(much more efficient) - -2. Run - -```shell -fly -t lite set-pipeline -p accessibility-scan -c accessibility-scan.yml -``` - -3. Go to the `URL` displayed on your CLI. **Click the plus sign on top right corner and toggle side bar and press play on your pipeline**. Pipelines are posed by default. - - ​ - -### Running Pa11y-ci with CircleCI(experimental) - -If you want to run Pa11y-ci per pull request on your project: - -1. Create a bash file `accessibility-scan.sh` in your project home directory to tell it to run either on a circleci supported branch or your localhost - - ```shell - if [[ -n $CIRCLE_BRANCH ]]; then - - echo "scanning site using sitemap from 18F/${CIRCLE_BRANCH}" - - pa11y-ci --sitemap https://federalist.18f.gov/preview/18F/18f.gsa.gov/${CIRCLE_BRANCH}/sitemap.xml - - else - - echo "scanning site using localhost sitemap" - pa11y-ci --sitemap http://localhost:4000/sitemap.xml - ``` - -2. Modify your `circle.yml` to add pa11y-ci - - ​ - - ```yaml - machine: - ruby: - version: - 2.2.3 - - dependencies: - pre: - - [Your-other-commands] - - nvm install stable && nvm alias default stable - - npm test - - npm install -g pa11y-ci - test: - pre: - - bundle exec htmlproofer _site --disable-external --allow-hash-href --empty-alt-ignore --url-ignore 18f@gsa.gov - - echo CIRCLE_BRANCH - - echo - - npm run --harmony accessibility-scan - ``` - - - -### Adding Pa11y-ci in The Compliance Viewer(In Progress) diff --git a/Gemfile b/Gemfile index 2bb8f6d26..62e544241 100644 --- a/Gemfile +++ b/Gemfile @@ -1,16 +1,16 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -ruby "2.3.1" -gem "redcarpet" -gem "jekyll", '~> 3.1' -gem "html-proofer" -gem "accesslint-ci", "0.2.6" +ruby '2.3.1' +gem 'redcarpet' +gem 'jekyll', '~> 3.1' +gem 'html-proofer' +gem 'accesslint-ci', '0.2.6' group :jekyll_plugins do if ENV['FAST_BUILDS'] == 'true' puts 'not using jekyll-archives because its sloooooooooow' else - gem 'jekyll-archives', :git => 'https://github.com/18F/jekyll-archives.git' + gem 'jekyll-archives', git: 'https://github.com/18F/jekyll-archives.git' end gem 'jekyll_pages_api' @@ -25,12 +25,17 @@ end gem 'jemoji' group :development do - gem "capybara" - gem "chromedriver-helper" - gem "colorize" - gem "pry" - gem "rack-jekyll" + gem 'capybara' + gem 'chromedriver-helper' + gem 'colorize' + gem 'pry' + gem 'rack-jekyll' gem 'rb-readline' - gem "rspec" - gem "selenium-webdriver" + gem 'rspec' + gem 'selenium-webdriver' +end + +group :test do + gem 'simplecov' + gem 'codeclimate-test-reporter', '~> 1.0.0' end diff --git a/Gemfile.lock b/Gemfile.lock index f6643aee1..3d4367b86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,11 +32,14 @@ GEM chromedriver-helper (1.0.0) archive-zip (~> 0.7.0) nokogiri (~> 1.6) + codeclimate-test-reporter (1.0.4) + simplecov coderay (1.1.1) colorator (1.1.0) colored (1.2) colorize (0.8.1) diff-lcs (1.2.5) + docile (1.1.5) domain_name (0.5.20161129) unf (>= 0.0.5, < 1.0.0) ethon (0.9.1) @@ -158,6 +161,11 @@ GEM childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) + simplecov (0.12.0) + docile (~> 1.1.0) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) slop (3.6.0) thor (0.19.4) thread_safe (0.3.5) @@ -180,6 +188,7 @@ DEPENDENCIES accesslint-ci (= 0.2.6) capybara chromedriver-helper + codeclimate-test-reporter (~> 1.0.0) colorize html-proofer jekyll (~> 3.1) @@ -199,9 +208,10 @@ DEPENDENCIES redcarpet rspec selenium-webdriver + simplecov RUBY VERSION ruby 2.3.1p112 BUNDLED WITH - 1.13.6 + 1.13.7 diff --git a/README.md b/README.md index d1344dd45..adc179402 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Code Climate](https://codeclimate.com/github/18F/micropurchase/badges/gpa.svg)](https://codeclimate.com/github/18F/18f.gsa.gov) +[![Code Climate](https://codeclimate.com/github/18F/18f.gsa.gov/badges/gpa.svg)](https://codeclimate.com/github/18F/18f.gsa.gov) [![Test Coverage](https://codeclimate.com/github/18F/18f.gsa.gov/badges/coverage.svg)](https://codeclimate.com/github/18F/18f.gsa.gov/coverage) # 18F’s flagship website diff --git a/_authors/18F.md b/_authors/18F.md index fc15d56a3..9babac6a6 100644 --- a/_authors/18F.md +++ b/_authors/18F.md @@ -8,7 +8,6 @@ city: state: github: 18F twitter: 18F -team: 18F redirect_from: "/team/18F/" published: true --- diff --git a/_authors/aaron.md b/_authors/aaron.md index cd5b46bed..fc1fbcee5 100644 --- a/_authors/aaron.md +++ b/_authors/aaron.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: 18F redirect_from: "/team/aaron/" alumni: true published: true diff --git a/_authors/ada-lovelace.md b/_authors/ada-lovelace.md index 28f5a8e73..5dde9f5da 100644 --- a/_authors/ada-lovelace.md +++ b/_authors/ada-lovelace.md @@ -6,7 +6,6 @@ name: ada-lovelace role: Developer city: London state: UK -team: Engineering april-fools: 2016 tags: april fools 2016 redirect_to: "/april-fools/2016/" diff --git a/_authors/adam-kendall.md b/_authors/adam-kendall.md index 74b213ff8..3193719a2 100644 --- a/_authors/adam-kendall.md +++ b/_authors/adam-kendall.md @@ -7,7 +7,6 @@ last_name: Kendall name: adam-kendall role: state: VA -team: Engineering twitter: redirect_from: "/team/adam-kendall/" published: false diff --git a/_authors/adrian-webb.md b/_authors/adrian-webb.md index dafb3cb71..7e24edc84 100644 --- a/_authors/adrian-webb.md +++ b/_authors/adrian-webb.md @@ -7,7 +7,6 @@ last_name: Webb name: adrian-webb role: Technical Architect state: D.C. -team: Consulting twitter: redirect_from: "/team/adrian-webb/" published: false diff --git a/_authors/afeld.md b/_authors/afeld.md index c03b15785..03ca18db1 100644 --- a/_authors/afeld.md +++ b/_authors/afeld.md @@ -8,7 +8,6 @@ city: New York City state: NY github: twitter: -team: Delivery redirect_from: "/team/afeld/" published: true --- diff --git a/_authors/alan-atlas.md b/_authors/alan-atlas.md index 457c62daf..74e099f7f 100644 --- a/_authors/alan-atlas.md +++ b/_authors/alan-atlas.md @@ -7,7 +7,6 @@ last_name: Atlas name: alan-atlas role: state: WA -team: twitter: redirect_from: "/team/alan-atlas/" published: true diff --git a/_authors/alan-brouilette.md b/_authors/alan-brouilette.md index 5fcbb2e5a..2a7386216 100644 --- a/_authors/alan-brouilette.md +++ b/_authors/alan-brouilette.md @@ -7,7 +7,6 @@ last_name: Brouilette name: alan-brouilette role: Product Manager state: IL -team: Product twitter: redirect_from: "/team/alan-brouilette/" published: true diff --git a/_authors/alan-turing.md b/_authors/alan-turing.md index c4fcdd925..660bfcd37 100644 --- a/_authors/alan-turing.md +++ b/_authors/alan-turing.md @@ -6,7 +6,6 @@ name: alan-turing role: Testing Lead city: Bletchley Park state: UK -team: Delivery april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/alan.md b/_authors/alan.md index 7591a613b..769627d9a 100644 --- a/_authors/alan.md +++ b/_authors/alan.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Consulting redirect_from: "/team/alan/" published: true --- diff --git a/_authors/alex-bisker.md b/_authors/alex-bisker.md index cd106d248..e4fc42fb9 100644 --- a/_authors/alex-bisker.md +++ b/_authors/alex-bisker.md @@ -7,7 +7,6 @@ last_name: Bisker name: alex-bisker role: state: New York -team: Delivery twitter: redirect_from: "/team/alex-bisker/" published: true diff --git a/_authors/alex-pandel.md b/_authors/alex-pandel.md index 5e2d2fe82..44868a79e 100644 --- a/_authors/alex-pandel.md +++ b/_authors/alex-pandel.md @@ -7,7 +7,6 @@ last_name: Pandel name: alex-pandel role: state: CA -team: twitter: redirect_from: "/team/alex-pandel/" published: false diff --git a/_authors/alexander-hamilton.md b/_authors/alexander-hamilton.md index fc3bbfbf5..c51dbdb2a 100644 --- a/_authors/alexander-hamilton.md +++ b/_authors/alexander-hamilton.md @@ -6,7 +6,6 @@ name: alexander-hamilton role: Product Lead city: New York state: NY -team: DevOps april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/alison.md b/_authors/alison.md index 55c5e3fb4..53174ba65 100644 --- a/_authors/alison.md +++ b/_authors/alison.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/alla.md b/_authors/alla.md index 89745dbaf..b2d97e0b4 100644 --- a/_authors/alla.md +++ b/_authors/alla.md @@ -7,7 +7,6 @@ last_name: Seiffert name: alla role: Deputy for Acquisition state: DC -team: Acquisition twitter: redirect_from: "/team/alla/" published: true diff --git a/_authors/amanda-robinson.md b/_authors/amanda-robinson.md index 98d356ad7..15ebe6dea 100644 --- a/_authors/amanda-robinson.md +++ b/_authors/amanda-robinson.md @@ -7,7 +7,6 @@ last_name: Robinson name: amanda-robinson role: Developer state: DC -team: Delivery twitter: aertzeid redirect_from: "/team/amanda-robinson/" published: false diff --git a/_authors/amanda-schonfeld.md b/_authors/amanda-schonfeld.md index c7643a22e..8394b8a4d 100644 --- a/_authors/amanda-schonfeld.md +++ b/_authors/amanda-schonfeld.md @@ -7,7 +7,6 @@ last_name: Schonfeld name: amanda-schonfeld role: state: IL -team: twitter: redirect_from: "/team/amanda-schonfeld/" published: false diff --git a/_authors/amber.md b/_authors/amber.md index e25e1941e..3f6310942 100644 --- a/_authors/amber.md +++ b/_authors/amber.md @@ -7,7 +7,6 @@ last_name: Reed name: amber role: state: -team: twitter: redirect_from: "/team/amber/" published: false diff --git a/_authors/amos.md b/_authors/amos.md index 7bfeacd62..7f5f92d29 100644 --- a/_authors/amos.md +++ b/_authors/amos.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Delivery redirect_from: "/team/amos/" published: true --- diff --git a/_authors/amy-wilson.md b/_authors/amy-wilson.md index 9196e5206..318c0e5ad 100644 --- a/_authors/amy-wilson.md +++ b/_authors/amy-wilson.md @@ -7,7 +7,6 @@ github: last_name: Wilson role: state: -team: twitter: redirect_from: published: true diff --git a/_authors/andre.md b/_authors/andre.md index 3241e89a2..e6b2f08be 100644 --- a/_authors/andre.md +++ b/_authors/andre.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: awfrancisco twitter: andrefrancisco -team: Outreach project: - 18F Blog - 18f.gsa.gov diff --git a/_authors/andrew.md b/_authors/andrew.md index a976c88a2..6037d532a 100644 --- a/_authors/andrew.md +++ b/_authors/andrew.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Presidential Innovation Fellowship redirect_from: "/team/andrew/" published: false --- diff --git a/_authors/andrewmaier.md b/_authors/andrewmaier.md index b51f4bcb5..f79f7e047 100644 --- a/_authors/andrewmaier.md +++ b/_authors/andrewmaier.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Design redirect_from: "/team/andrewmaier/" published: true --- diff --git a/_authors/andrewmcmahon.md b/_authors/andrewmcmahon.md index ecf9d2cfa..7edbaca87 100644 --- a/_authors/andrewmcmahon.md +++ b/_authors/andrewmcmahon.md @@ -5,7 +5,6 @@ last_name: McMahon full_name: Andrew McMahon city: San Francisco state: CA -team: GSA role: guest: true published: true diff --git a/_authors/angela-colter.md b/_authors/angela-colter.md index 91c0a5ddc..2140ce3a3 100644 --- a/_authors/angela-colter.md +++ b/_authors/angela-colter.md @@ -7,7 +7,6 @@ last_name: Colter name: angela-colter role: state: -team: twitter: redirect_from: "/team/angela-colter/" published: false diff --git a/_authors/anna.md b/_authors/anna.md index 39fe20961..d9af3e50f 100644 --- a/_authors/anna.md +++ b/_authors/anna.md @@ -8,7 +8,6 @@ state: DC role: Project Manager github: twitter: -team: Delivery redirect_from: "/team/anna/" published: true --- diff --git a/_authors/annalee.md b/_authors/annalee.md index 20942654b..166a00232 100644 --- a/_authors/annalee.md +++ b/_authors/annalee.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/annalee/" published: false --- diff --git a/_authors/anthony-garvan.md b/_authors/anthony-garvan.md index febb613e5..3076c988a 100644 --- a/_authors/anthony-garvan.md +++ b/_authors/anthony-garvan.md @@ -7,7 +7,6 @@ last_name: Garvan name: anthony-garvan role: state: -team: twitter: redirect_from: "/team/anthony-garvan/" published: true diff --git a/_authors/bateman.md b/_authors/bateman.md index 87fb24688..df34ca0a8 100644 --- a/_authors/bateman.md +++ b/_authors/bateman.md @@ -8,7 +8,6 @@ city: Washington state: DC github: batemapf twitter: -team: redirect_from: "/team/bateman/" published: false --- diff --git a/_authors/becky.md b/_authors/becky.md index 347a3eb90..79d0cf0ac 100644 --- a/_authors/becky.md +++ b/_authors/becky.md @@ -9,7 +9,6 @@ state: MA github: twitter: email: rebecca.sweger@gsa.gov -team: Delivery redirect_from: "/team/becky/" published: true --- diff --git a/_authors/ben.md b/_authors/ben.md index 61452a0c5..a4b2ac408 100644 --- a/_authors/ben.md +++ b/_authors/ben.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Presidential Innovation Fellows redirect_from: "/team/ben/" published: false --- diff --git a/_authors/betsy-ross.md b/_authors/betsy-ross.md index 29fa08477..0fce9dab0 100644 --- a/_authors/betsy-ross.md +++ b/_authors/betsy-ross.md @@ -6,7 +6,6 @@ name: betsy-ross role: Visual Designer city: Philadelphia state: PA -team: Design april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/bill.md b/_authors/bill.md index 820f8ada1..4243b0fcc 100644 --- a/_authors/bill.md +++ b/_authors/bill.md @@ -7,7 +7,6 @@ last_name: Rooney name: bill role: state: -team: twitter: redirect_from: "/team/bill/" published: true diff --git a/_authors/blacktm.md b/_authors/blacktm.md index dafb8c9b4..b68c2ea8a 100644 --- a/_authors/blacktm.md +++ b/_authors/blacktm.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Consulting redirect_from: "/team/blacktm/" published: true --- diff --git a/_authors/bob-ballance.md b/_authors/bob-ballance.md index c34ecd1a8..d298d0179 100644 --- a/_authors/bob-ballance.md +++ b/_authors/bob-ballance.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: project: redirect_from: published: true diff --git a/_authors/boone.md b/_authors/boone.md index 97c3dcdec..9ccaa82f5 100644 --- a/_authors/boone.md +++ b/_authors/boone.md @@ -8,7 +8,6 @@ city: Denver state: CO github: gboone twitter: gboone42 -team: Outreach project: - 18f.gsa.gov - Dashboard diff --git a/_authors/bradnunnally.md b/_authors/bradnunnally.md index ab3674167..a6a7bc54f 100644 --- a/_authors/bradnunnally.md +++ b/_authors/bradnunnally.md @@ -8,7 +8,6 @@ city: St. Louis state: MO github: twitter: -team: Design redirect_from: "/team/bradnunnally/" published: true --- diff --git a/_authors/brandon.md b/_authors/brandon.md index 120463fc5..8cc23c4e9 100644 --- a/_authors/brandon.md +++ b/_authors/brandon.md @@ -7,7 +7,6 @@ last_name: Kirby name: brandon role: Consultant state: GA -team: 18F Consulting twitter: redirect_from: "/team/brandon/" published: false diff --git a/_authors/brendan.md b/_authors/brendan.md index a71a12dd2..78404384b 100644 --- a/_authors/brendan.md +++ b/_authors/brendan.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Engineering redirect_from: "/team/brendan/" published: true --- diff --git a/_authors/bret.md b/_authors/bret.md index 8ee2a2c3e..9a0b1f534 100644 --- a/_authors/bret.md +++ b/_authors/bret.md @@ -8,7 +8,6 @@ state: CA role: Product Lead github: twitter: -team: DevOps redirect_from: "/team/bret/" published: true --- diff --git a/_authors/brethauer.md b/_authors/brethauer.md index 2617172b3..4e36908d8 100644 --- a/_authors/brethauer.md +++ b/_authors/brethauer.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Design redirect_from: "/team/brethauer/" published: true --- diff --git a/_authors/brian.md b/_authors/brian.md index 90ea33304..bc47651bc 100644 --- a/_authors/brian.md +++ b/_authors/brian.md @@ -7,7 +7,6 @@ last_name: Hedberg name: brian role: Developer state: MN -team: Delivery twitter: redirect_from: "/team/brian/" published: false diff --git a/_authors/britta-gustafson.md b/_authors/britta-gustafson.md index 861af01a1..9ca341852 100644 --- a/_authors/britta-gustafson.md +++ b/_authors/britta-gustafson.md @@ -7,7 +7,6 @@ last_name: Gustafson name: britta-gustafson role: Content Designer state: CA -team: Design twitter: '' redirect_from: "/team/britta-gustafson/" published: true diff --git a/_authors/captain-america.md b/_authors/captain-america.md index 3d24c1336..b58ade6e1 100644 --- a/_authors/captain-america.md +++ b/_authors/captain-america.md @@ -6,7 +6,6 @@ name: captain-america role: Developer city: Washington state: DC -team: Consulting april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/carlo-costino.md b/_authors/carlo-costino.md index f77813922..f1f655397 100644 --- a/_authors/carlo-costino.md +++ b/_authors/carlo-costino.md @@ -7,7 +7,6 @@ last_name: Costino name: carlo-costino role: Software engineer state: D.C. -team: Delivery twitter: redirect_from: "/team/carlo-costino/" published: false diff --git a/_authors/carolyn.md b/_authors/carolyn.md index bcb65580f..2e0bae2a4 100644 --- a/_authors/carolyn.md +++ b/_authors/carolyn.md @@ -8,7 +8,6 @@ state: GA role: User Experience Designer github: twitter: -team: Design redirect_from: "/team/carolyn/" published: true --- diff --git a/_authors/cat-langel.md b/_authors/cat-langel.md index 55321d5e7..f7530eed6 100644 --- a/_authors/cat-langel.md +++ b/_authors/cat-langel.md @@ -9,7 +9,6 @@ state: github: twitter: url: http://www.gsa.gov/portal/staffDirectory/contact/176573 -team: alumni: true redirect_from: published: true diff --git a/_authors/catherine.md b/_authors/catherine.md index 9f5e8b51f..4b221f2f6 100644 --- a/_authors/catherine.md +++ b/_authors/catherine.md @@ -8,7 +8,6 @@ city: Dayton state: Ohio github: catherinedevlin twitter: catherinedevlin -team: Delivery redirect_from: "/team/catherine/" published: true --- diff --git a/_authors/chrisc.md b/_authors/chrisc.md index 33b144aa4..77a67182f 100644 --- a/_authors/chrisc.md +++ b/_authors/chrisc.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Consulting redirect_from: "/team/chrisc/" published: true --- diff --git a/_authors/christine-cawthorne.md b/_authors/christine-cawthorne.md index 48e2a74f5..8fa2a2d88 100644 --- a/_authors/christine-cawthorne.md +++ b/_authors/christine-cawthorne.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: guest: true redirect_from: published: true diff --git a/_authors/christine.md b/_authors/christine.md index 04a6f8ed2..f30796255 100644 --- a/_authors/christine.md +++ b/_authors/christine.md @@ -8,7 +8,6 @@ city: Los Angeles state: CA github: twitter: -team: Delivery redirect_from: "/team/christine/" published: false --- diff --git a/_authors/christopher-goranson.md b/_authors/christopher-goranson.md index 073ae57cc..b07ab5f60 100644 --- a/_authors/christopher-goranson.md +++ b/_authors/christopher-goranson.md @@ -7,7 +7,6 @@ last_name: Goranson name: christopher-goranson role: Project Manager state: TN -team: 18F Consulting twitter: cgoranson redirect_from: "/team/christopher-goranson/" published: true diff --git a/_authors/clara-tsao.md b/_authors/clara-tsao.md index 3ed05e7cb..e8b08a399 100644 --- a/_authors/clara-tsao.md +++ b/_authors/clara-tsao.md @@ -7,7 +7,6 @@ github: last_name: Tsao role: state: -team: twitter: redirect_from: published: true diff --git a/_authors/clinton-troxel.md b/_authors/clinton-troxel.md index 821e2c048..a1c3af378 100644 --- a/_authors/clinton-troxel.md +++ b/_authors/clinton-troxel.md @@ -7,7 +7,6 @@ last_name: Troxel name: clinton-troxel role: Developer state: WY -team: Engineering twitter: redirect_from: "/team/clinton-troxel/" published: false diff --git a/_authors/cm.md b/_authors/cm.md index 1d7c69c6e..076b1bb6c 100644 --- a/_authors/cm.md +++ b/_authors/cm.md @@ -8,7 +8,6 @@ city: Pittsburgh state: PA github: cmc333333 twitter: -team: Delivery redirect_from: "/team/cm/" published: true --- diff --git a/_authors/colin-craig.md b/_authors/colin-craig.md index 321834838..780037c11 100644 --- a/_authors/colin-craig.md +++ b/_authors/colin-craig.md @@ -7,7 +7,6 @@ last_name: Craig name: colin-craig role: state: NC -team: Engineering twitter: redirect_from: "/team/colin-craig/" published: true diff --git a/_authors/colinmacarthur.md b/_authors/colinmacarthur.md index 34c49f2bb..b909779cc 100644 --- a/_authors/colinmacarthur.md +++ b/_authors/colinmacarthur.md @@ -8,7 +8,6 @@ city: Boston state: MA github: twitter: -team: Design redirect_from: "/team/colinmacarthur/" published: true --- diff --git a/_authors/corey-mahoney.md b/_authors/corey-mahoney.md index c3389b0ac..4013e8e61 100644 --- a/_authors/corey-mahoney.md +++ b/_authors/corey-mahoney.md @@ -7,7 +7,6 @@ last_name: Mahoney name: corey-mahoney role: Content designer state: CA -team: Design twitter: redirect_from: "/team/corey.mahoney/" published: true diff --git a/_authors/cristina.md b/_authors/cristina.md index 5b3e7fbfb..6a82a147e 100644 --- a/_authors/cristina.md +++ b/_authors/cristina.md @@ -7,7 +7,6 @@ last_name: Brydges name: cristina role: Deputy Director state: DC -team: Talent twitter: redirect_from: "/team/cristina/" published: false diff --git a/_authors/dahianna.md b/_authors/dahianna.md index 606849273..4166d5988 100644 --- a/_authors/dahianna.md +++ b/_authors/dahianna.md @@ -7,6 +7,5 @@ published: true role: city: state: -team: --- diff --git a/_authors/david.md b/_authors/david.md index cc6007006..130131a7c 100644 --- a/_authors/david.md +++ b/_authors/david.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/deniseroth.md b/_authors/deniseroth.md index c17416b43..0dca7b50b 100644 --- a/_authors/deniseroth.md +++ b/_authors/deniseroth.md @@ -9,7 +9,6 @@ state: github: twitter: url: http://www.gsa.gov/portal/content/100046 -team: redirect_from: published: true --- diff --git a/_authors/diego.md b/_authors/diego.md index 8d939c4ca..7451a4950 100644 --- a/_authors/diego.md +++ b/_authors/diego.md @@ -8,7 +8,6 @@ city: Austin state: TX github: dlapiduz twitter: dlapiduz -team: Products and Platforms project: - cloud.gov - DevOps Guild diff --git a/_authors/dmayercantu.md b/_authors/dmayercantu.md index 30b6d79d7..d06c637fd 100644 --- a/_authors/dmayercantu.md +++ b/_authors/dmayercantu.md @@ -4,7 +4,6 @@ full_name: Diego Mayer-Cantu first_name: Diego last_name: Mayer-Cantu role: -team: city: New York state: NY redirect_from: "/team/dmayercantu/" diff --git a/_authors/duane-rollins.md b/_authors/duane-rollins.md index 3aa72d664..501a073fa 100644 --- a/_authors/duane-rollins.md +++ b/_authors/duane-rollins.md @@ -7,7 +7,6 @@ last_name: Rollins name: duane-rollins role: state: -team: twitter: redirect_from: "/team/duane-rollins/" published: true diff --git a/_authors/ed-mullen.md b/_authors/ed-mullen.md index aa43d4180..4d0ed186a 100644 --- a/_authors/ed-mullen.md +++ b/_authors/ed-mullen.md @@ -7,7 +7,6 @@ last_name: Mullen name: ed-mullen role: Product Strategist state: New York -team: Change Strategy twitter: redirect_from: "/team/ed-mullen/" published: false diff --git a/_authors/egoodman.md b/_authors/egoodman.md index d976d9165..1fcc63f43 100644 --- a/_authors/egoodman.md +++ b/_authors/egoodman.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: esgoodman twitter: egoodman -team: Design redirect_from: "/team/egoodman/" published: true --- diff --git a/_authors/elaine.md b/_authors/elaine.md index 8b5eddacf..c7b5b80d0 100644 --- a/_authors/elaine.md +++ b/_authors/elaine.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: elainekamlley twitter: elainekamlley -team: Outreach project: - 18f.gsa.gov - 18F Blog diff --git a/_authors/emaland.md b/_authors/emaland.md index 4e4eb90f5..0da55fc7f 100644 --- a/_authors/emaland.md +++ b/_authors/emaland.md @@ -7,7 +7,6 @@ last_name: Maland name: emaland role: state: -team: twitter: redirect_from: "/team/emaland/" published: false diff --git a/_authors/emileigh.md b/_authors/emileigh.md index 6444771bd..2d5be3a54 100644 --- a/_authors/emileigh.md +++ b/_authors/emileigh.md @@ -5,7 +5,6 @@ full_name: Emileigh Barnes name: emileigh github: emileighoutlaw twitter: emileighoutlaw -team: Design role: Content Designer city: Washington state: D.C. diff --git a/_authors/eric.md b/_authors/eric.md index 12d26a2a1..d40987242 100644 --- a/_authors/eric.md +++ b/_authors/eric.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/eric/" published: true --- diff --git a/_authors/erica.md b/_authors/erica.md index ae4d52b41..c5b49a9a9 100644 --- a/_authors/erica.md +++ b/_authors/erica.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Design redirect_from: "/team/erica/" alumni: true published: true diff --git a/_authors/ericronne.md b/_authors/ericronne.md index f0511233e..5660bf380 100644 --- a/_authors/ericronne.md +++ b/_authors/ericronne.md @@ -8,7 +8,6 @@ city: Chicago state: IL github: twitter: -team: redirect_from: "/team/ericronne/" published: false --- diff --git a/_authors/estherchang.md b/_authors/estherchang.md index df2e3a8d9..403cc7449 100644 --- a/_authors/estherchang.md +++ b/_authors/estherchang.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Talent redirect_from: "/team/estherchang/" published: false --- diff --git a/_authors/estherkim.md b/_authors/estherkim.md index eae71c10d..9d0104942 100644 --- a/_authors/estherkim.md +++ b/_authors/estherkim.md @@ -7,7 +7,6 @@ last_name: Kim name: estherkim role: state: -team: twitter: redirect_from: "/team/estherkim/" published: false diff --git a/_authors/ethan.md b/_authors/ethan.md index 9c9065740..7a0fe26c9 100644 --- a/_authors/ethan.md +++ b/_authors/ethan.md @@ -4,7 +4,6 @@ full_name: Ethan Heppner first_name: Ethan last_name: Heppner role: Operations Specialist -team: Operations city: Chicago state: IL redirect_from: "/team/ethan/" diff --git a/_authors/fureigh.md b/_authors/fureigh.md index 454da617c..e97b00a91 100644 --- a/_authors/fureigh.md +++ b/_authors/fureigh.md @@ -7,7 +7,6 @@ last_name: Fureigh name: fureigh role: state: -team: twitter: redirect_from: "/team/fureigh/" published: false diff --git a/_authors/gail.md b/_authors/gail.md index e8b5465f4..2a1f8e315 100644 --- a/_authors/gail.md +++ b/_authors/gail.md @@ -8,7 +8,6 @@ state: IL role: User Experience Designer github: twitter: -team: Design redirect_from: "/team/gail/" published: false --- diff --git a/_authors/garren.md b/_authors/garren.md index 9f3e5c899..b6c7501c6 100644 --- a/_authors/garren.md +++ b/_authors/garren.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: 18F redirect_from: "/team/garren/" alumni: true published: true diff --git a/_authors/grace-hopper.md b/_authors/grace-hopper.md index e5d163c74..8b339c25a 100644 --- a/_authors/grace-hopper.md +++ b/_authors/grace-hopper.md @@ -6,7 +6,6 @@ name: grace-hopper role: Developer city: Washington state: DC -team: Delivery april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/gramirez.md b/_authors/gramirez.md index a689c0095..615b36d19 100644 --- a/_authors/gramirez.md +++ b/_authors/gramirez.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/gramirez/" alumni: true published: true diff --git a/_authors/gray.md b/_authors/gray.md index 302d086da..799e56180 100644 --- a/_authors/gray.md +++ b/_authors/gray.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery project: - Analytics Guild - api.data.gov diff --git a/_authors/greg.md b/_authors/greg.md index 9dd1eca2d..69e9c503e 100644 --- a/_authors/greg.md +++ b/_authors/greg.md @@ -8,7 +8,6 @@ state: role: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/gsa-blog-team.md b/_authors/gsa-blog-team.md index c970cea0f..56b7f0661 100644 --- a/_authors/gsa-blog-team.md +++ b/_authors/gsa-blog-team.md @@ -3,7 +3,6 @@ name: gsa-blog-team first_name: GSA Blog Team last_name: full_name: GSA Blog Team -team: GSA role: city: state: diff --git a/_authors/gwynnekostin.md b/_authors/gwynnekostin.md index ae6342b61..b99aae6e6 100644 --- a/_authors/gwynnekostin.md +++ b/_authors/gwynnekostin.md @@ -7,7 +7,6 @@ github: last_name: Kostin role: state: -team: twitter: guest: true url: https://www.digitalgov.gov/author/gkostin/ diff --git a/_authors/hillary.md b/_authors/hillary.md index edf2c6a76..a27dd9a26 100644 --- a/_authors/hillary.md +++ b/_authors/hillary.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: quepol twitter: hillary -team: 18F redirect_from: "/team/hillary/" published: true --- diff --git a/_authors/holly.md b/_authors/holly.md index 1be3d1d97..7a84d099b 100644 --- a/_authors/holly.md +++ b/_authors/holly.md @@ -8,7 +8,6 @@ state: CA role: Director of Engineering github: hollyallen twitter: -team: Delivery redirect_from: "/team/holly/" published: false --- diff --git a/_authors/jackie.md b/_authors/jackie.md index 22df8319f..2c7f864fd 100644 --- a/_authors/jackie.md +++ b/_authors/jackie.md @@ -7,7 +7,6 @@ last_name: Kazil name: jackie role: state: -team: twitter: redirect_from: alumni: true diff --git a/_authors/jackiexu.md b/_authors/jackiexu.md index 3813a8e00..93c7e8dad 100644 --- a/_authors/jackiexu.md +++ b/_authors/jackiexu.md @@ -7,7 +7,6 @@ last_name: Xu name: jackiexu role: state: -team: twitter: redirect_from: "/team/jackiexu/" published: false diff --git a/_authors/jacobharris.md b/_authors/jacobharris.md index 02489ebd5..4a2caf1fb 100644 --- a/_authors/jacobharris.md +++ b/_authors/jacobharris.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: harrisj twitter: harrisj -team: Delivery redirect_from: "/team/jacobharris/" published: true --- diff --git a/_authors/james-seppi.md b/_authors/james-seppi.md index fe141294e..6e60db45e 100644 --- a/_authors/james-seppi.md +++ b/_authors/james-seppi.md @@ -8,7 +8,6 @@ city: Austin state: Texas github: twitter: -team: Engineering redirect_from: "/team/james-seppi/" published: false --- diff --git a/_authors/jameshupp.md b/_authors/jameshupp.md index 28e1f4924..7e665f6d5 100644 --- a/_authors/jameshupp.md +++ b/_authors/jameshupp.md @@ -4,7 +4,6 @@ full_name: James Hupp first_name: James last_name: Hupp role: -team: city: New York state: NY redirect_from: "/team/jameshupp/" diff --git a/_authors/jamesscott.md b/_authors/jamesscott.md index a81b3273d..0ed40322c 100644 --- a/_authors/jamesscott.md +++ b/_authors/jamesscott.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/jamesscott/" published: false --- diff --git a/_authors/jamie.md b/_authors/jamie.md index 2ff7480c2..41d722307 100644 --- a/_authors/jamie.md +++ b/_authors/jamie.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: jamiealbrecht twitter: jmealbrecht -team: Talent redirect_from: "/team/jamie/" published: true --- diff --git a/_authors/jayhuie.md b/_authors/jayhuie.md index 7e3a2c20a..248a15cb8 100644 --- a/_authors/jayhuie.md +++ b/_authors/jayhuie.md @@ -7,7 +7,6 @@ last_name: Huie name: jayhuie role: state: DC -team: Consulting twitter: redirect_from: "/team/jayhuie/" published: false diff --git a/_authors/jeffwoodworth.md b/_authors/jeffwoodworth.md index 9d857aee4..2244a59b2 100644 --- a/_authors/jeffwoodworth.md +++ b/_authors/jeffwoodworth.md @@ -2,12 +2,11 @@ name: jeffwoodworth city: first_name: Jeff +last_name: Woodworth full_name: Jeff Woodworth github: -last_name: role: state: -team: twitter: guest: true redirect_from: diff --git a/_authors/jen.md b/_authors/jen.md index d8b5dd82a..4eb4c6909 100644 --- a/_authors/jen.md +++ b/_authors/jen.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/jen/" published: true --- diff --git a/_authors/jennmoran.md b/_authors/jennmoran.md index 052a4927f..9beed7b4e 100644 --- a/_authors/jennmoran.md +++ b/_authors/jennmoran.md @@ -7,7 +7,6 @@ last_name: Moran name: jennmoran role: state: DC -team: Talent twitter: redirect_from: "/team/jennmoran/" published: false diff --git a/_authors/jentress.md b/_authors/jentress.md index b86926b91..96080fa3e 100644 --- a/_authors/jentress.md +++ b/_authors/jentress.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Talent redirect_from: "/team/jentress/" published: false --- diff --git a/_authors/jeremiak.md b/_authors/jeremiak.md index 83bc4c46a..ee8fe8d61 100644 --- a/_authors/jeremiak.md +++ b/_authors/jeremiak.md @@ -8,7 +8,6 @@ city: New York state: NY github: jeremiak twitter: jeremiak -team: Delivery redirect_from: "/team/jeremiak/" published: true --- diff --git a/_authors/jeremy.md b/_authors/jeremy.md index 34a15051f..51dc1b8dc 100644 --- a/_authors/jeremy.md +++ b/_authors/jeremy.md @@ -8,7 +8,6 @@ city: New York City state: NY github: twitter: -team: Design redirect_from: "/team/jeremy/" published: true --- diff --git a/_authors/jessedondero.md b/_authors/jessedondero.md index 7a6e9c047..bc6fd67f3 100644 --- a/_authors/jessedondero.md +++ b/_authors/jessedondero.md @@ -7,7 +7,6 @@ last_name: Dondero name: jessedondero role: state: -team: twitter: redirect_from: "/team/jessedondero/" published: false diff --git a/_authors/jessie-posilkin.md b/_authors/jessie-posilkin.md index 6739026c0..5e956bb0e 100644 --- a/_authors/jessie-posilkin.md +++ b/_authors/jessie-posilkin.md @@ -7,7 +7,6 @@ last_name: Posilkin name: jessie-posilkin role: state: District of Columbia -team: twitter: redirect_from: "/team/jessie-posilkin/" published: false diff --git a/_authors/jessie.md b/_authors/jessie.md index cdd003ec4..d7e25407b 100644 --- a/_authors/jessie.md +++ b/_authors/jessie.md @@ -7,7 +7,6 @@ last_name: Young name: jessie role: Developer state: California -team: Delivery twitter: redirect_from: "/team/jessie/" published: true diff --git a/_authors/jez-humble.md b/_authors/jez-humble.md index 1e35035b0..3420e8d56 100644 --- a/_authors/jez-humble.md +++ b/_authors/jez-humble.md @@ -7,7 +7,6 @@ last_name: Humble name: jez-humble role: Deputy Director of Infrastructure state: California -team: twitter: redirect_from: "/team/jez-humble/" published: true diff --git a/_authors/jfinch.md b/_authors/jfinch.md index 79bfebfdd..118aa9c8e 100644 --- a/_authors/jfinch.md +++ b/_authors/jfinch.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Consulting redirect_from: "/team/jfinch/" published: true --- diff --git a/_authors/jhunter.md b/_authors/jhunter.md index ff0ea4897..a821b5af8 100644 --- a/_authors/jhunter.md +++ b/_authors/jhunter.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: jeanninehunter twitter: -team: Design project: - Content Lead - USCIS diff --git a/_authors/joe.md b/_authors/joe.md index 01382041e..70ae0bf9c 100644 --- a/_authors/joe.md +++ b/_authors/joe.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/joel-minton.md b/_authors/joel-minton.md index 65e505a9a..7b968c8a0 100644 --- a/_authors/joel-minton.md +++ b/_authors/joel-minton.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: published: true --- diff --git a/_authors/john-donmoyer.md b/_authors/john-donmoyer.md index 02e69e09c..c6c98b026 100644 --- a/_authors/john-donmoyer.md +++ b/_authors/john-donmoyer.md @@ -7,7 +7,6 @@ last_name: Donmoyer name: john-donmoyer role: User Experience Designer state: IL -team: Design twitter: redirect_from: "/team/john-donmoyer/" published: false diff --git a/_authors/jonathanrubin.md b/_authors/jonathanrubin.md index fb8fa0fb6..eb252c3ba 100644 --- a/_authors/jonathanrubin.md +++ b/_authors/jonathanrubin.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: project: redirect_from: published: true diff --git a/_authors/josh.md b/_authors/josh.md index 6847f6e07..6f51f5a2b 100644 --- a/_authors/josh.md +++ b/_authors/josh.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/josh/" published: false --- diff --git a/_authors/joshbailes.md b/_authors/joshbailes.md index 8cf31e74b..1a1f2647c 100644 --- a/_authors/joshbailes.md +++ b/_authors/joshbailes.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Legal redirect_from: "/team/joshbailes/" published: false --- diff --git a/_authors/joshcarp.md b/_authors/joshcarp.md index fc7a2d7cd..68d909493 100644 --- a/_authors/joshcarp.md +++ b/_authors/joshcarp.md @@ -8,7 +8,6 @@ city: Charlottesville state: VA github: twitter: -team: Delivery redirect_from: "/team/joshcarp/" published: false --- diff --git a/_authors/jtag.md b/_authors/jtag.md index 2e1398488..237ce54ad 100644 --- a/_authors/jtag.md +++ b/_authors/jtag.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Consulting redirect_from: "/team/jtag/" published: true --- diff --git a/_authors/jthibault.md b/_authors/jthibault.md index 6b02ac595..1d7b4537d 100644 --- a/_authors/jthibault.md +++ b/_authors/jthibault.md @@ -8,7 +8,6 @@ city: New York City state: NY github: jenniferthibault twitter: jlthibault -team: Design redirect_from: "/team/jthibault/" published: true --- diff --git a/_authors/jtindel.md b/_authors/jtindel.md index 48ed99679..7509c7450 100644 --- a/_authors/jtindel.md +++ b/_authors/jtindel.md @@ -7,7 +7,6 @@ github: last_name: Tindel role: state: -team: twitter: guest: true redirect_from: diff --git a/_authors/julia.md b/_authors/julia.md index 918d3d83e..b6e3ca7ba 100644 --- a/_authors/julia.md +++ b/_authors/julia.md @@ -8,7 +8,6 @@ city: Durham state: NC github: juliaelman twitter: juliaelman -team: Design redirect_from: "/team/julia/" published: true --- diff --git a/_authors/juliawinn.md b/_authors/juliawinn.md index 5a261689f..eaecc7650 100644 --- a/_authors/juliawinn.md +++ b/_authors/juliawinn.md @@ -7,7 +7,6 @@ last_name: Winn name: juliawinn role: state: D.C. -team: twitter: redirect_from: "/team/julia-winn" published: true diff --git a/_authors/justin-herman.md b/_authors/justin-herman.md index 4259f83b0..b8313490d 100644 --- a/_authors/justin-herman.md +++ b/_authors/justin-herman.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: published: true --- diff --git a/_authors/justin.md b/_authors/justin.md index 1b883b1bf..cf53af659 100644 --- a/_authors/justin.md +++ b/_authors/justin.md @@ -8,7 +8,6 @@ city: Seattle state: WA github: twitter: -team: Delivery redirect_from: "/team/justin/" published: false --- diff --git a/_authors/kaitlin.md b/_authors/kaitlin.md index eab732bb1..5a05dc49f 100644 --- a/_authors/kaitlin.md +++ b/_authors/kaitlin.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: kaitlin twitter: kaitlinbdevine -team: Delivery redirect_from: "/team/kaitlin/" published: true --- diff --git a/_authors/kane.md b/_authors/kane.md index cff441e20..1388f433d 100644 --- a/_authors/kane.md +++ b/_authors/kane.md @@ -7,7 +7,6 @@ last_name: Baccigalupi name: kane role: state: CA -team: twitter: redirect_from: "/team/kane/" published: true diff --git a/_authors/kara.md b/_authors/kara.md index b5fd3ccfd..03922ea83 100644 --- a/_authors/kara.md +++ b/_authors/kara.md @@ -8,7 +8,6 @@ city: San Diego state: CA github: twitter: -team: 18F redirect_from: "/team/kara/" published: true --- diff --git a/_authors/kate.md b/_authors/kate.md index e6c7ac6ed..012b06d63 100644 --- a/_authors/kate.md +++ b/_authors/kate.md @@ -8,7 +8,6 @@ city: Portland state: OR github: twitter: -team: Design redirect_from: "/team/kate/" published: true --- diff --git a/_authors/kathrynconnolly.md b/_authors/kathrynconnolly.md index 6fe153a46..f3c707770 100644 --- a/_authors/kathrynconnolly.md +++ b/_authors/kathrynconnolly.md @@ -5,7 +5,6 @@ last_name: Connolly full_name: Kathryn Connolly city: Washington state: D.C. -team: Operations role: Team Operations redirect_from: "/team/kathrynconnolly/" published: false diff --git a/_authors/kedelman.md b/_authors/kedelman.md index f7551ed23..dd5bc230e 100644 --- a/_authors/kedelman.md +++ b/_authors/kedelman.md @@ -8,7 +8,6 @@ state: DC role: Acquisition Management Consultant github: twitter: -team: Consulting redirect_from: "/team/kedelman/" published: true --- diff --git a/_authors/kimberdowsett.md b/_authors/kimberdowsett.md index 347cbc8a7..57d9d3e92 100644 --- a/_authors/kimberdowsett.md +++ b/_authors/kimberdowsett.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Infrastructure Engineering redirect_from: "/team/kimberdowsett/" published: true --- diff --git a/_authors/kinlane.md b/_authors/kinlane.md index 4c88b8cf3..762e9ea94 100644 --- a/_authors/kinlane.md +++ b/_authors/kinlane.md @@ -7,7 +7,6 @@ last_name: Lane name: kinlane role: state: -team: twitter: redirect_from: alumni: true diff --git a/_authors/kris-rowley.md b/_authors/kris-rowley.md index f0657145a..502330c94 100644 --- a/_authors/kris-rowley.md +++ b/_authors/kris-rowley.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: guest: true redirect_from: published: true diff --git a/_authors/kristy-singletary.md b/_authors/kristy-singletary.md index 04a4f49ed..ba8f9724f 100644 --- a/_authors/kristy-singletary.md +++ b/_authors/kristy-singletary.md @@ -4,7 +4,6 @@ first_name: Kristy last_name: Singletary full_name: Kristy Singletary role: -team: city: state: guest: true diff --git a/_authors/krutivora.md b/_authors/krutivora.md index accd3260b..033ccb11d 100644 --- a/_authors/krutivora.md +++ b/_authors/krutivora.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: General Services Administration redirect_from: "/team/krutivora/" published: false --- diff --git a/_authors/lane-becker.md b/_authors/lane-becker.md index 103352b71..d9febf9ff 100644 --- a/_authors/lane-becker.md +++ b/_authors/lane-becker.md @@ -7,7 +7,6 @@ last_name: Becker name: lane-becker role: state: -team: Strategy twitter: redirect_from: "/team/lane-becker/" published: false diff --git a/_authors/larry-bafundo.md b/_authors/larry-bafundo.md index 7e2eb82e7..cf6f0ef67 100644 --- a/_authors/larry-bafundo.md +++ b/_authors/larry-bafundo.md @@ -7,7 +7,6 @@ last_name: Bafundo name: larry-bafundo role: Project Manager state: CA -team: Delivery twitter: redirect_from: "/team/larry-bafundo/" published: false diff --git a/_authors/laura-gerhardt.md b/_authors/laura-gerhardt.md index 9734d42e0..4f5abec54 100644 --- a/_authors/laura-gerhardt.md +++ b/_authors/laura-gerhardt.md @@ -7,7 +7,6 @@ last_name: Gerhardt name: laura-gerhardt role: state: DC -team: twitter: redirect_from: "/team/laura-gerhardt/" published: false diff --git a/_authors/leah.md b/_authors/leah.md index 2302b2e14..318f778ff 100644 --- a/_authors/leah.md +++ b/_authors/leah.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: leahbannon twitter: leahbannon -team: Delivery redirect_from: "/team/leah/" published: true --- diff --git a/_authors/leahg.md b/_authors/leahg.md index 5494218c7..ff29f34ce 100644 --- a/_authors/leahg.md +++ b/_authors/leahg.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Operations redirect_from: "/team/leahg/" published: false --- diff --git a/_authors/lenny-bogdonoff.md b/_authors/lenny-bogdonoff.md index 7753eafe8..5bc197317 100644 --- a/_authors/lenny-bogdonoff.md +++ b/_authors/lenny-bogdonoff.md @@ -7,7 +7,6 @@ last_name: Bogdonoff name: lenny-bogdonoff role: General Developer state: NY -team: twitter: redirect_from: "/team/lenny-bogdonoff/" published: false diff --git a/_authors/lindsay.md b/_authors/lindsay.md index e13fa734b..936764b74 100644 --- a/_authors/lindsay.md +++ b/_authors/lindsay.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/lindsay/" published: true --- diff --git a/_authors/lisagelobter.md b/_authors/lisagelobter.md index 2ed54bdbf..e12374f46 100644 --- a/_authors/lisagelobter.md +++ b/_authors/lisagelobter.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: guest: true redirect_from: published: true diff --git a/_authors/majma.md b/_authors/majma.md index db1f59bd3..3f606b89c 100644 --- a/_authors/majma.md +++ b/_authors/majma.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/manger.md b/_authors/manger.md index 64104e5b2..385f59261 100644 --- a/_authors/manger.md +++ b/_authors/manger.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Design redirect_from: "/team/manger/" published: true --- diff --git a/_authors/marco.md b/_authors/marco.md index 054b62a27..7019ecd9f 100644 --- a/_authors/marco.md +++ b/_authors/marco.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Design proejct: - Front End Guild redirect_from: "/team/marco/" diff --git a/_authors/marinafox.md b/_authors/marinafox.md index d6b1f5855..b4bbe7eac 100644 --- a/_authors/marinafox.md +++ b/_authors/marinafox.md @@ -7,7 +7,6 @@ github: last_name: Fox role: state: -team: twitter: guest: true url: https://www.digitalgov.gov/author/mfox/ diff --git a/_authors/mark.md b/_authors/mark.md index 5fbf53f0a..97b80a171 100644 --- a/_authors/mark.md +++ b/_authors/mark.md @@ -7,7 +7,6 @@ last_name: Nejbauer name: mark role: state: -team: twitter: redirect_from: "/team/mark/" published: false diff --git a/_authors/matt.md b/_authors/matt.md index 38cbf8172..721ea5cf9 100644 --- a/_authors/matt.md +++ b/_authors/matt.md @@ -7,7 +7,6 @@ last_name: Spencer name: matt role: state: D.C. -team: twitter: redirect_from: "/team/matt/" published: false diff --git a/_authors/mattchessen.md b/_authors/mattchessen.md index fe4e0665a..5b2f7b4ad 100644 --- a/_authors/mattchessen.md +++ b/_authors/mattchessen.md @@ -7,7 +7,6 @@ last_name: Chessen name: mattchessen role: state: -team: twitter: guest: true redirect_from: diff --git a/_authors/maya.md b/_authors/maya.md index 120d957f9..fe290249f 100644 --- a/_authors/maya.md +++ b/_authors/maya.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Design redirect_from: "/team/maya/" published: true --- diff --git a/_authors/mbland.md b/_authors/mbland.md index 41ad99059..2c9b26d5c 100644 --- a/_authors/mbland.md +++ b/_authors/mbland.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/mchopson.md b/_authors/mchopson.md index 7c74880fe..785b8924f 100644 --- a/_authors/mchopson.md +++ b/_authors/mchopson.md @@ -7,7 +7,6 @@ last_name: Hopson name: mchopson role: state: D.C. -team: twitter: redirect_from: "/team/mark-hopson" published: true diff --git a/_authors/meghana.md b/_authors/meghana.md index 56e7ee5fa..6d467acfb 100644 --- a/_authors/meghana.md +++ b/_authors/meghana.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Design redirect_from: "/team/meghana/" published: true --- diff --git a/_authors/melody.md b/_authors/melody.md index 329132b57..4c014bb78 100644 --- a/_authors/melody.md +++ b/_authors/melody.md @@ -8,7 +8,6 @@ city: Chapel Hill state: NC github: melodykramer twitter: mkramer -team: Outreach project: - 18f.gsa.gov - 18F Blog diff --git a/_authors/memiwhitehead.md b/_authors/memiwhitehead.md index 28721455c..59e6d5378 100644 --- a/_authors/memiwhitehead.md +++ b/_authors/memiwhitehead.md @@ -4,7 +4,6 @@ last_name: Whitehead full_name: Memi Whitehead name: memiwhitehead role: -team: city: state: guest: true diff --git a/_authors/mheadd.md b/_authors/mheadd.md index 4733a3587..5f0ca90b0 100644 --- a/_authors/mheadd.md +++ b/_authors/mheadd.md @@ -8,7 +8,6 @@ city: Syracuse state: New York github: mheadd twitter: mheadd -team: Acquisitions published: true --- diff --git a/_authors/mhz.md b/_authors/mhz.md index ffafbfe3b..5d12bd051 100644 --- a/_authors/mhz.md +++ b/_authors/mhz.md @@ -8,7 +8,6 @@ city: Tucson state: AZ github: meiqimichelle twitter: meiqimichelle -team: Design redirect_from: "/team/mhz/" published: true --- diff --git a/_authors/micahsaul.md b/_authors/micahsaul.md index 9f41634ed..dd8635a0f 100644 --- a/_authors/micahsaul.md +++ b/_authors/micahsaul.md @@ -8,7 +8,6 @@ city: Portland state: OR github: twitter: -team: Delivery redirect_from: "/team/micahsaul/" published: false --- diff --git a/_authors/michael-balint.md b/_authors/michael-balint.md index 54be1dba4..0ae532bec 100644 --- a/_authors/michael-balint.md +++ b/_authors/michael-balint.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: redirect_from: "/team/michael-balint/" published: false --- diff --git a/_authors/michael-cata.md b/_authors/michael-cata.md index 3fd6e6207..d2b0ffc7a 100644 --- a/_authors/michael-cata.md +++ b/_authors/michael-cata.md @@ -8,7 +8,6 @@ city: New York state: NY github: twitter: -team: 18F redirect_from: "/team/michael-cata/" published: false --- diff --git a/_authors/michael-torres.md b/_authors/michael-torres.md index f0277997d..be3c8e14f 100644 --- a/_authors/michael-torres.md +++ b/_authors/michael-torres.md @@ -7,7 +7,6 @@ last_name: Torres name: michael-torres role: state: CA -team: Product twitter: redirect_from: "/team/michael-torres/" published: true diff --git a/_authors/michael-walker.md b/_authors/michael-walker.md index f569dfd8f..baa74a604 100644 --- a/_authors/michael-walker.md +++ b/_authors/michael-walker.md @@ -7,7 +7,6 @@ last_name: Walker name: michael-walker role: Practical Dev state: MS -team: AcqStack twitter: redirect_from: "/team/michael-walker/" published: true diff --git a/_authors/michelle-chronister.md b/_authors/michelle-chronister.md index f8c322218..5154a466a 100644 --- a/_authors/michelle-chronister.md +++ b/_authors/michelle-chronister.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: alumni: true redirect_from: published: true diff --git a/_authors/mike-hsu.md b/_authors/mike-hsu.md index cf75c254c..0e1faf34d 100644 --- a/_authors/mike-hsu.md +++ b/_authors/mike-hsu.md @@ -4,7 +4,6 @@ last_name: Hsu full_name: Mike Hsu name: mike-hsu role: Product manager -team: Delivery city: Washington state: D.C. redirect_from: "/team/mike-hsu/" diff --git a/_authors/mike-wilkening.md b/_authors/mike-wilkening.md index 52953cf30..b212724c6 100644 --- a/_authors/mike-wilkening.md +++ b/_authors/mike-wilkening.md @@ -8,6 +8,5 @@ published: true role: city: state: -team: --- diff --git a/_authors/mollieruskin.md b/_authors/mollieruskin.md index 40654c97c..f2bd6a5a1 100644 --- a/_authors/mollieruskin.md +++ b/_authors/mollieruskin.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: published: true --- diff --git a/_authors/moncef.md b/_authors/moncef.md index 8dcf1db7e..c39b84809 100644 --- a/_authors/moncef.md +++ b/_authors/moncef.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/moncef/" published: false --- diff --git a/_authors/mossadeq-zia.md b/_authors/mossadeq-zia.md index 2d17ad2ae..733eec9c2 100644 --- a/_authors/mossadeq-zia.md +++ b/_authors/mossadeq-zia.md @@ -7,7 +7,6 @@ last_name: Zia name: mossadeq-zia role: DevOps Engineer state: DC -team: Infrastructure twitter: redirect_from: "/team/mossadeq-zia/" published: true diff --git a/_authors/nick.md b/_authors/nick.md index c3613b70c..557c48cce 100644 --- a/_authors/nick.md +++ b/_authors/nick.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery project: - Accessibility Guild redirect_from: "/team/nick/" diff --git a/_authors/nicole-fenton.md b/_authors/nicole-fenton.md index 6afd0c404..fa84f1be9 100644 --- a/_authors/nicole-fenton.md +++ b/_authors/nicole-fenton.md @@ -7,7 +7,6 @@ last_name: Fenton name: nicole-fenton role: Content Designer state: New York -team: design twitter: nicoleslaw redirect_from: "/team/nicole-fenton/" published: true diff --git a/_authors/noah.md b/_authors/noah.md index cb4c1712a..ca0104717 100644 --- a/_authors/noah.md +++ b/_authors/noah.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: https://github.com/noahkunin twitter: https://twitter.com/noahkunin -team: DevOps redirect_from: "/team/noah/" published: true --- diff --git a/_authors/nolson.md b/_authors/nolson.md index 72c8b3c8c..3cdfee9dd 100644 --- a/_authors/nolson.md +++ b/_authors/nolson.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Presidential Innovation Fellowship redirect_from: "/team/nolson/" published: false --- diff --git a/_authors/ozzy.md b/_authors/ozzy.md index dc6107002..36248c785 100644 --- a/_authors/ozzy.md +++ b/_authors/ozzy.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/phaedra.md b/_authors/phaedra.md index d6e47dd07..f1d3bdf48 100644 --- a/_authors/phaedra.md +++ b/_authors/phaedra.md @@ -7,7 +7,6 @@ last_name: Chrousos name: phaedra role: state: -team: twitter: redirect_from: "/team/phaedra/" published: false diff --git a/_authors/philip-reid.md b/_authors/philip-reid.md index fda03f26e..d0bf3fe92 100644 --- a/_authors/philip-reid.md +++ b/_authors/philip-reid.md @@ -6,7 +6,6 @@ name: philip-reid role: Engineer city: Washington state: DC -team: Delivery april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/phoebe-espiritu.md b/_authors/phoebe-espiritu.md index 579d06094..26177508a 100644 --- a/_authors/phoebe-espiritu.md +++ b/_authors/phoebe-espiritu.md @@ -7,7 +7,6 @@ last_name: Phoebe name: phoebe-espiritu role: state: -team: twitter: redirect_from: "/team/phoebe-espiritu/" published: true diff --git a/_authors/pia.md b/_authors/pia.md index 618f22fb2..06ab86ff9 100644 --- a/_authors/pia.md +++ b/_authors/pia.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Outreach redirect_from: "/team/pia/" published: false --- diff --git a/_authors/pkarman.md b/_authors/pkarman.md index 82de37717..f6dc74b2c 100644 --- a/_authors/pkarman.md +++ b/_authors/pkarman.md @@ -7,7 +7,6 @@ last_name: Karman name: pkarman role: state: -team: twitter: redirect_from: "/team/pkarman/" published: true diff --git a/_authors/porta.md b/_authors/porta.md index d5069675f..e35c73407 100644 --- a/_authors/porta.md +++ b/_authors/porta.md @@ -7,7 +7,6 @@ last_name: Antiporta name: porta role: Product Lead state: IL -team: Product twitter: redirect_from: "/team/porta-antiporta" published: true diff --git a/_authors/puja.md b/_authors/puja.md index f4113f97c..3aac0d67c 100644 --- a/_authors/puja.md +++ b/_authors/puja.md @@ -7,7 +7,6 @@ last_name: Balachander name: puja role: Program Manager state: D.C. -team: Presidential Innovation Fellowship twitter: redirect_from: "/team/puja/" published: false diff --git a/_authors/randy-hart.md b/_authors/randy-hart.md index c47c5a077..c533379bb 100644 --- a/_authors/randy-hart.md +++ b/_authors/randy-hart.md @@ -7,7 +7,6 @@ last_name: Hart name: randy-hart role: Procurement Specialist state: DC -team: Consulting twitter: redirect_from: "/team/randy-hart/" published: false diff --git a/_authors/raphy.md b/_authors/raphy.md index 4e7d37789..0f90a7960 100644 --- a/_authors/raphy.md +++ b/_authors/raphy.md @@ -8,7 +8,6 @@ city: Chicago state: IL github: twitter: -team: Delivery redirect_from: "/team/raphy/" published: false --- diff --git a/_authors/rebeccapiazza.md b/_authors/rebeccapiazza.md index b39e95542..39bec266f 100644 --- a/_authors/rebeccapiazza.md +++ b/_authors/rebeccapiazza.md @@ -8,7 +8,6 @@ state: D.C. role: Product Manager github: twitter: -team: Delivery redirect_from: "/team/rebeccapiazza/" published: true --- diff --git a/_authors/ric.md b/_authors/ric.md index cfafcf0da..7b5a6bf44 100644 --- a/_authors/ric.md +++ b/_authors/ric.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: 18F redirect_from: "/team/ric/" published: false --- diff --git a/_authors/robert.md b/_authors/robert.md index 46433141a..9fec9ab3d 100644 --- a/_authors/robert.md +++ b/_authors/robert.md @@ -7,7 +7,6 @@ last_name: Read name: robert role: state: -team: twitter: redirect_from: alumni: true diff --git a/_authors/robin-carnahan.md b/_authors/robin-carnahan.md index 55ff13e0f..d31b1a38f 100644 --- a/_authors/robin-carnahan.md +++ b/_authors/robin-carnahan.md @@ -7,7 +7,6 @@ last_name: Carnahan name: robin-carnahan role: state: -team: twitter: redirect_from: "/team/robin-carnahan/" published: true diff --git a/_authors/robin-thottungal.md b/_authors/robin-thottungal.md index da07b3a2e..25bd2bf31 100644 --- a/_authors/robin-thottungal.md +++ b/_authors/robin-thottungal.md @@ -7,7 +7,6 @@ last_name: Thottungal name: robin-thottungal role: state: -team: twitter: guest: true redirect_from: diff --git a/_authors/roger-ruiz.md b/_authors/roger-ruiz.md index fea49de78..788d14e72 100644 --- a/_authors/roger-ruiz.md +++ b/_authors/roger-ruiz.md @@ -8,7 +8,6 @@ city: Richmond state: VA github: twitter: -team: Delivery redirect_from: "/team/roger-ruiz/" published: false --- diff --git a/_authors/romke.md b/_authors/romke.md index 8180dc75c..64fc267ad 100644 --- a/_authors/romke.md +++ b/_authors/romke.md @@ -7,7 +7,6 @@ last_name: De Haan name: romke role: state: -team: twitter: redirect_from: "/team/romke/" published: false diff --git a/_authors/russ.md b/_authors/russ.md index 5049ab43a..8424caedf 100644 --- a/_authors/russ.md +++ b/_authors/russ.md @@ -7,7 +7,6 @@ last_name: Unger name: russ role: state: -team: twitter: redirect_from: "/team/romke" published: true diff --git a/_authors/ryan-sibley.md b/_authors/ryan-sibley.md index 9a6e96fa6..7b5047acf 100644 --- a/_authors/ryan-sibley.md +++ b/_authors/ryan-sibley.md @@ -7,7 +7,6 @@ last_name: Sibley name: ryan-sibley role: Content Designer state: DC -team: Design twitter: redirect_from: "/team/ryan-sibley/" published: true diff --git a/_authors/ryan.md b/_authors/ryan.md index 63a78d218..82afab0e8 100644 --- a/_authors/ryan.md +++ b/_authors/ryan.md @@ -7,7 +7,6 @@ last_name: Thurwell name: ryan role: state: -team: twitter: redirect_from: "/team/ryan/" published: true diff --git a/_authors/sally-ride.md b/_authors/sally-ride.md index 8b4850677..f3ec9fc9c 100644 --- a/_authors/sally-ride.md +++ b/_authors/sally-ride.md @@ -6,7 +6,6 @@ name: sally-ride role: Deputy Director of Infrastructure city: San Diego state: CA -team: Infrastructure april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/sam-eagle.md b/_authors/sam-eagle.md index 1cffac1e4..e260163b0 100644 --- a/_authors/sam-eagle.md +++ b/_authors/sam-eagle.md @@ -6,7 +6,6 @@ name: sam-eagle role: Press city: Washington state: DC -team: Outreach april-fools: 2016 redirect_to: "/april-fools/2016/" joke: | diff --git a/_authors/sarah.md b/_authors/sarah.md index 013bf3527..680e474b8 100644 --- a/_authors/sarah.md +++ b/_authors/sarah.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/sarahcrane.md b/_authors/sarahcrane.md index 63afdb952..51eeefeba 100644 --- a/_authors/sarahcrane.md +++ b/_authors/sarahcrane.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: published: true --- diff --git a/_authors/sasha.md b/_authors/sasha.md index 004978b09..d08b022b8 100644 --- a/_authors/sasha.md +++ b/_authors/sasha.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Delivery redirect_from: "/team/sasha/" published: false --- diff --git a/_authors/sean.md b/_authors/sean.md index 72243f913..676b681bc 100644 --- a/_authors/sean.md +++ b/_authors/sean.md @@ -8,7 +8,6 @@ city: state: github: twitter: -team: redirect_from: alumni: true published: true diff --git a/_authors/shashank.md b/_authors/shashank.md index abb2c804b..12c5ec1d7 100644 --- a/_authors/shashank.md +++ b/_authors/shashank.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Consulting project: redirect_from: - "/team/khandelwal/" diff --git a/_authors/shawn.md b/_authors/shawn.md index 1a254cea3..c6a3e9165 100644 --- a/_authors/shawn.md +++ b/_authors/shawn.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Design redirect_from: "/team/shawn/" published: true --- diff --git a/_authors/shawnique.md b/_authors/shawnique.md index 1ac5a566f..8a4730af3 100644 --- a/_authors/shawnique.md +++ b/_authors/shawnique.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Talent redirect_from: "/team/shawnique/" published: false --- diff --git a/_authors/smita.md b/_authors/smita.md index c312265bf..1ca5f4746 100644 --- a/_authors/smita.md +++ b/_authors/smita.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Presidential Innovation Fellowship redirect_from: "/team/smita/" published: false --- diff --git a/_authors/stephanierivera.md b/_authors/stephanierivera.md index c48568225..77710ad30 100644 --- a/_authors/stephanierivera.md +++ b/_authors/stephanierivera.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Strategy project: - 18F Intake redirect_from: "/team/stephanierivera/" diff --git a/_authors/steven-harms.md b/_authors/steven-harms.md index abdc4304a..b10ed1755 100644 --- a/_authors/steven-harms.md +++ b/_authors/steven-harms.md @@ -7,7 +7,6 @@ last_name: Harms name: steven-harms role: state: -team: twitter: redirect_from: "/team/steven-harms/" published: false diff --git a/_authors/steven-reilly.md b/_authors/steven-reilly.md index 31051bb95..14d1da76c 100644 --- a/_authors/steven-reilly.md +++ b/_authors/steven-reilly.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Acquisitions redirect_from: "/team/steven-reilly/" published: true --- diff --git a/_authors/stuart-drown.md b/_authors/stuart-drown.md index 42a6a1cbe..5fbb083c7 100644 --- a/_authors/stuart-drown.md +++ b/_authors/stuart-drown.md @@ -8,6 +8,5 @@ published: true role: city: state: -team: --- diff --git a/_authors/tadhg.md b/_authors/tadhg.md index f7ea46457..1d6c09f0c 100644 --- a/_authors/tadhg.md +++ b/_authors/tadhg.md @@ -7,7 +7,6 @@ last_name: O'Higgins name: tadhg role: state: -team: twitter: redirect_from: "/team/tadhg/" published: true diff --git a/_authors/tgrandison.md b/_authors/tgrandison.md index 80737c067..54f476ee9 100644 --- a/_authors/tgrandison.md +++ b/_authors/tgrandison.md @@ -7,7 +7,6 @@ github: last_name: Grandison role: state: -team: twitter: redirect_from: published: true diff --git a/_authors/theresa.md b/_authors/theresa.md index 149bc438a..95e5d9935 100644 --- a/_authors/theresa.md +++ b/_authors/theresa.md @@ -8,7 +8,6 @@ city: Berkeley state: CA github: theresaanna twitter: theresaanna -team: Delivery project: - CALC redirect_from: "/team/theresa/" diff --git a/_authors/timlowden.md b/_authors/timlowden.md index b8f4bc9cc..d704aa422 100644 --- a/_authors/timlowden.md +++ b/_authors/timlowden.md @@ -6,7 +6,6 @@ name: timlowden city: state: role: -team: redirect_from: published: true --- diff --git a/_authors/timothy-jones.md b/_authors/timothy-jones.md index 79fdc9490..c9356bf43 100644 --- a/_authors/timothy-jones.md +++ b/_authors/timothy-jones.md @@ -6,7 +6,6 @@ name: timothy-jones city: Washington state: D.C. role: Digital transformation lead -team: 18F Consulting redirect_from: "/team/timothy-jones/" published: false --- diff --git a/_authors/unpublished_author.md b/_authors/unpublished_author.md new file mode 100644 index 000000000..9829f366b --- /dev/null +++ b/_authors/unpublished_author.md @@ -0,0 +1,13 @@ +--- +name: unpublished-author +first_name: unpublished +last_name: author +full_name: Unpublished Author +role: Testing +city: +state: +github: 18F +twitter: 18F +published: false +--- + diff --git a/_authors/valdiviezo.md b/_authors/valdiviezo.md index 2d7e08f19..325eb6e14 100644 --- a/_authors/valdiviezo.md +++ b/_authors/valdiviezo.md @@ -7,7 +7,6 @@ last_name: Valdiviezo name: valdiviezo role: state: -team: twitter: redirect_from: "/team/valdiviezo/" published: false diff --git a/_authors/vdavez.md b/_authors/vdavez.md index e3e53abcf..1ae2dae4c 100644 --- a/_authors/vdavez.md +++ b/_authors/vdavez.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: vdavez twitter: vdavez -team: Acquisition redirect_from: "/team/vdavez/" published: true --- diff --git a/_authors/victor-udoewa.md b/_authors/victor-udoewa.md index 0a46ccd35..7c80490ff 100644 --- a/_authors/victor-udoewa.md +++ b/_authors/victor-udoewa.md @@ -7,7 +7,6 @@ last_name: Udoewa name: victor-udoewa role: state: D.C. -team: Consulting twitter: redirect_from: "/team/victor-udoewa/" published: true diff --git a/_authors/victor.md b/_authors/victor.md index fd3e2a64d..1a67b03a5 100644 --- a/_authors/victor.md +++ b/_authors/victor.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Design redirect_from: "/team/victor/" published: true --- diff --git a/_authors/vraj-mohan.md b/_authors/vraj-mohan.md index 4544b5160..2619d7a56 100644 --- a/_authors/vraj-mohan.md +++ b/_authors/vraj-mohan.md @@ -8,7 +8,6 @@ city: Philadelphia state: PA github: twitter: -team: 18F redirect_from: "/team/vraj-mohan/" published: false --- diff --git a/_authors/will.md b/_authors/will.md index 5f95d7b8a..a6eab5d2d 100644 --- a/_authors/will.md +++ b/_authors/will.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: wslack twitter: wslack -team: Products and Platforms project: - Federalist redirect_from: "/team/will/" diff --git a/_authors/willsullivan.md b/_authors/willsullivan.md index e1b1e5b3a..30da0b1d6 100644 --- a/_authors/willsullivan.md +++ b/_authors/willsullivan.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/willsullivan/" published: true --- diff --git a/_authors/yoz.md b/_authors/yoz.md index 3c36414dc..a1aa9cad3 100644 --- a/_authors/yoz.md +++ b/_authors/yoz.md @@ -8,7 +8,6 @@ city: San Francisco state: CA github: twitter: -team: Delivery project: - Project Review redirect_from: "/team/yoz/" diff --git a/_authors/yuda.md b/_authors/yuda.md index 83d1d4ee5..d9de5fd99 100644 --- a/_authors/yuda.md +++ b/_authors/yuda.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Delivery redirect_from: "/team/yuda/" published: true --- diff --git a/_authors/zaccohn.md b/_authors/zaccohn.md index f01b4bc5d..32ebfc04c 100644 --- a/_authors/zaccohn.md +++ b/_authors/zaccohn.md @@ -8,7 +8,6 @@ city: Washington state: D.C. github: twitter: -team: Consulting redirect_from: "/team/zaccohn/" published: true --- diff --git a/_config-blog.yml b/_config-blog.yml index ccc39748e..7bc84c058 100644 --- a/_config-blog.yml +++ b/_config-blog.yml @@ -26,6 +26,7 @@ exclude: - sitemap.xml - system-security-plan.yml - vendor +- pages/our-work.html - _posts/2014-03-12-coming-soon.md - _posts/2014-03-19-hello-world-we-are-18f.md - _posts/2014-03-21-29-minutes.md @@ -334,3 +335,15 @@ exclude: - _posts/2016-10-14-iterative-workplace-design-denver-federal-center.md - _posts/2016-10-24-embracing-opportunities-to-improve-and-innovate.md - _posts/2016-10-25-three-small-steps-you-can-take-to-reboot-agile-in-your-organization.md +- _posts/2016-07-22-building-empathy-with-stakeholder-interviews-part-2-conversation.md +- _posts/2016-10-26-writing-for-web-easy-writing-for-users-not.md +- _posts/2016-10-28-california-takes-new-approach-procurement.md +- _posts/2016-11-04-code-gov-the-next-milestone-federal-open-source-code.md +- _posts/2016-11-14-modular-procurement-state-local-government.md +- _posts/2016-11-17-leadership-innovation-california-child-welfare-services.md +- _posts/2016-11-22-a-vulnerability-disclosure-policy-for-the-technology-transformation-service.md +- _posts/2016-11-25-what-18f-is-thankful-for-this-thanksgiving.md +- _posts/2016-11-30-curate-best-thinking-available.md +- _posts/2016-12-02-presidential-innovation-fellows-now-accepting-applications-spring-2017.md +- _posts/2016-12-12-connecting-culture-change-at-18F-and-PBS.md +- _posts/2016-12-13-lowering-risk-of-experimentation-open-source-code.md diff --git a/_config-dev.yml b/_config-dev.yml index b35ce5c5a..261716b67 100644 --- a/_config-dev.yml +++ b/_config-dev.yml @@ -20,3 +20,4 @@ exclude: - serve - sitemap.xml - system-security-plan.yml +- pages/our-work.html diff --git a/_config.yml b/_config.yml index f88a9f36d..d852e48c5 100644 --- a/_config.yml +++ b/_config.yml @@ -12,9 +12,6 @@ feature_image: /assets/img/feature-background.jpg tag_dir: tags github_repo: https://github.com/18F/18f.gsa.gov/blob/master -# app version number -version: v1.1.0 - analytics: google: code: 'UA-48605964-1' # Change this to your GSA analytics code @@ -107,7 +104,10 @@ exclude: - LICENSE.md - PULL_REQUEST_TEMPLATE.md - ISSUE_TEMPLATE.md - - 'Accessibility Scanning Using Pa11y-ci.md' + - bin + - pages/our-work.html + - tests/**/* + - tests/schema/tags.yml # jekyll plugins gems: diff --git a/_data/navigation.yml b/_data/navigation.yml index 725918c25..ec90638e0 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -6,6 +6,14 @@ assigned: in_menu: false in_drawer: false in_footer: false + - + text: Our work + href: pages/our-work.md + permalink: /our-work/ + in_menu: false + in_drawer: false + in_footer: false + children: - text: What we deliver href: pages/what-we-deliver.md diff --git a/_hire/index.md b/_hire/index.md index d7c0f4aca..7171682d4 100644 --- a/_hire/index.md +++ b/_hire/index.md @@ -1,24 +1,14 @@ --- title: Hire 18F permalink: /hire/ -image: /assets/img/page-feature/hire-us.jpg +layout: default-intro lead: Let’s work together to design services that empower your team, better serve the public, and tackle the big problems facing your agency. --- We can work with you to explore and define a variety of problems, and then we can help you build or buy a solution. -Because of our limited resources, 18F is not able to take on every -project that agencies propose. We select our projects through a -qualification and evaluation process led by our Agency Partnerships -Team. If you and 18F decide that we’re the right fit for a project and -we have the necessary time and resources, we’ll work with you to draft -the necessary documents to begin our partnership. You can read more -about how we work with other agencies in our [Partnership -Playbook](https://pages.18f.gov/partnership-playbook/). +Because of our limited resources, 18F is not able to take on every project that agencies propose. We select our projects through a qualification and evaluation process led by our Agency Partnerships Team. If you and 18F decide that we’re the right fit for a project and we have the necessary time and resources, we’ll work with you to draft the necessary documents to begin our partnership. You can read more about how we work with other agencies in our [Partnership Playbook](https://pages.18f.gov/partnership-playbook/). -18F is a cost-recoverable office, which means that we do not receive -appropriated funds from Congress and must charge our partner agencies to -cover our costs. Funding is set up through [Interagency -Agreements](https://pages.18f.gov/iaa-forms/). +18F is a cost-recoverable office, which means that we do not receive appropriated funds from Congress and must charge our partner agencies to cover our costs. Funding is set up through [Interagency Agreements](https://pages.18f.gov/iaa-forms/). Do you have a project in mind? Let us know: [inquiries18F@gsa.gov](mailto:inquiries18F@gsa.gov) diff --git a/_includes/card-project.html b/_includes/card-project.html new file mode 100644 index 000000000..befd02fe9 --- /dev/null +++ b/_includes/card-project.html @@ -0,0 +1,12 @@ + +{% assign project = site | find_collection: 'projects' | where: 'slug', include.project | first %} + +{% include card.html + image_src=project.image + image_alt=project.image_accessibility + agency=project.agency + tagline=project.subtitle + description=project.excerpt + link=project.permalink + columns=3 +%} diff --git a/_includes/card.html b/_includes/card.html index c9c067770..f9d9eccf7 100644 --- a/_includes/card.html +++ b/_includes/card.html @@ -1,13 +1,27 @@ {% assign card_link = include.link | prepend: site.baseurl %} -
+{% assign columns = include.columns | default: 3 %} + +{% if columns == 2 %} + {% assign wds_grid_class = 'usa-width-one-half' %} +{% else %} + {% assign wds_grid_class = 'usa-width-one-third' %} +{% endif %} + +{% assign project_type = include.project_type | default: 'none' %} + +
- {{ include.image_alt }} +
-

{{ include.title }}

+

{{ include.agency }}

+

{{ include.tagline }}

{{ include.description }}

- Learn more + + Read more + {% include svg/icons/arrow-right.svg %} +
diff --git a/_includes/details-code.html b/_includes/details-code.html index 3900b17f3..25cf9d109 100644 --- a/_includes/details-code.html +++ b/_includes/details-code.html @@ -1,6 +1,6 @@ {% capture code %} ```{{ include.lang | default: 'text' }} -{{ include.content | markdownify }} +{{ include.content }} ``` {% endcapture %} @@ -8,6 +8,6 @@
{{ include.text }} - {{ code }} + {{ code | markdownify }}
diff --git a/_includes/feature-image.html b/_includes/feature-image.html index 8713c54d0..f3a19789f 100644 --- a/_includes/feature-image.html +++ b/_includes/feature-image.html @@ -1,5 +1,8 @@ -{% if page.image %} +{% assign include_image = include.image | default: page.image %} +{% assign include_image_alt = include.image | default: page.image_alt | default: "" %} + +{% if include_image %} {% unless page.hero == false %} -
+ {% endunless %} {% endif %} diff --git a/_includes/javascript.html b/_includes/javascript.html index c08b19cb7..a2fba653e 100644 --- a/_includes/javascript.html +++ b/_includes/javascript.html @@ -2,6 +2,8 @@ + + + + + icon for closing tab + + + + diff --git a/_includes/svg/icons/arrow-left.svg b/_includes/svg/icons/arrow-left.svg new file mode 100644 index 000000000..8c6c0fc19 --- /dev/null +++ b/_includes/svg/icons/arrow-left.svg @@ -0,0 +1,40 @@ + + + + + Arrow left + Icon image of an arrow pointing to the left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/_includes/svg/icons/arrow-right.svg b/_includes/svg/icons/arrow-right.svg new file mode 100644 index 000000000..8fef8c5f3 --- /dev/null +++ b/_includes/svg/icons/arrow-right.svg @@ -0,0 +1,5 @@ + + Arrow right + Icon image of an arrow pointing to the right + + diff --git a/_includes/svg/icons/folderwithclock.svg b/_includes/svg/icons/folderwithclock.svg new file mode 100644 index 000000000..5cd846051 --- /dev/null +++ b/_includes/svg/icons/folderwithclock.svg @@ -0,0 +1,20 @@ + + + + Folder with clock icon + Icon image of a folder with a clock in front of it + + + + + + + + + + + + + + + diff --git a/_includes/svg/icons/gavel.svg b/_includes/svg/icons/gavel.svg new file mode 100644 index 000000000..ac30cc67e --- /dev/null +++ b/_includes/svg/icons/gavel.svg @@ -0,0 +1,17 @@ + + + + Gavel icon + Icon image of a gavel + + + + + + + + + + + + diff --git a/_includes/svg/icons/monitor.svg b/_includes/svg/icons/monitor.svg new file mode 100644 index 000000000..3269454d2 --- /dev/null +++ b/_includes/svg/icons/monitor.svg @@ -0,0 +1,26 @@ + + + + Monitor icon + Icon image of a monitor + + + + + + + + + + + + + + + + + + + + + diff --git a/_includes/tag-results.html b/_includes/tag-results.html index 6672b0229..b42567f2c 100644 --- a/_includes/tag-results.html +++ b/_includes/tag-results.html @@ -23,7 +23,10 @@

{% endunless %} {{ post.excerpt }}

- Continue reading + + Continue reading + {% include svg/icons/arrow-right.svg %} +

{% unless include.limit_metadata %}