Skip to content

Commit

Permalink
get back in line with 18f site and uswds 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
stvnrlly committed Aug 24, 2020
1 parent 443fbc7 commit 2d200a3
Show file tree
Hide file tree
Showing 2,022 changed files with 99,034 additions and 18,914 deletions.
16 changes: 8 additions & 8 deletions .about.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# .about.yml project metadata
#
# Short name that acts as the project identifier (required)
name: 18f-portfolios-site
name: 18f-site

# Full proper name of the project (required)
full_name: "portfolios.18f.gsa.gov"
full_name: "18f.gsa.gov"

# The type of content in the repo
# values: app, docs, policy
Expand All @@ -28,7 +28,7 @@ status: active

# Description of the project
description: |
The portfolios microsite for 18F.
The official website of 18F.
# Should be 'true' if the project has a continuous build (required)
# values: true, false
Expand Down Expand Up @@ -78,9 +78,9 @@ stack:
# name: Name of the license from the Software Package Data Exchange (SPDX): https://spdx.org/licenses/
# url: URL for the text of the license
licenses:
18f-portfolios-site:
18f-site:
name: CC0-1.0
url: https://github.com/18F/portfolios/blob/staging/LICENSE.md
url: https://github.com/18F/18f.gsa.gov/blob/staging/LICENSE.md

# Blogs or websites associated with project development
#blog:
Expand All @@ -91,9 +91,9 @@ licenses:
# - url: URL for the link
# text: Anchor text for the link
links:
- url: https://portfolios.18f.gsa.gov/
text: The portfolios microsite for 18F
- url: https://18f.gsa.gov/
text: The official website of 18F

# Email addresses of points-of-contact
contact:
- elizabeth.ayer@gsa.gov
- gregory.boone@gsa.gov
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_layouts/**/*
_includes/**/*
pages
10 changes: 6 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@ ruby '~>2.6.3'

gem 'accesslint-ci', '0.2.8'
gem 'html-proofer', '~> 3.6.0'
gem 'jekyll', '~> 3.6.3'
gem 'jekyll', '~> 3.9'
gem 'jemoji', '>= 0.11.1'
gem 'kramdown-parser-gfm'
gem 'parallel'

group :jekyll_plugins do
gem 'jekyll-archives', git: 'https://github.com/jekyll/jekyll-archives.git', ref: '112c508'
gem 'jekyll-feed'
gem 'jekyll_frontmatter_tests', '~> 0.1.0'
gem 'jekyll-paginate'
gem 'jekyll-redirect-from'
gem 'jekyll-seo-tag'
gem 'jekyll-sitemap'
gem 'jekyll_frontmatter_tests', '~> 0.1.0'
gem 'jekyll_pages_api'
gem 'jekyll_pages_api_search', '~> 0.4.5'
gem 'jekyll_oembed'
Expand All @@ -25,8 +26,9 @@ group :development do
gem 'capybara', '>= 3.29.0'
gem 'chromedriver-helper', '>= 2.1.1'
gem 'colorize'
gem 'pry', '~> 0.10.4'
gem 'rack-jekyll', '>= 0.5.0'
gem 'pry'
gem 'rack', '>=2.1.4'
gem 'rack-jekyll', git: 'https://github.com/adaoraul/rack-jekyll', ref: 'a997bd0'
gem 'rb-readline'
gem 'rspec'
gem 'selenium-webdriver', '>= 3.1.0'
Expand Down
83 changes: 50 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
GIT
remote: https://github.com/adaoraul/rack-jekyll
revision: a997bd0c384fa377cda3b9ebeb462f91cd8dfd03
ref: a997bd0
specs:
rack-jekyll (0.5.0)
jekyll (>= 1.3)
listen (>= 1.3)
rack (>= 1.5)

GIT
remote: https://github.com/jekyll/jekyll-archives.git
revision: 112c508031acf3cf1d9024b005f99b2752133769
Expand All @@ -21,7 +31,7 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
archive-zip (0.12.0)
io-like (~> 0.3.0)
capybara (3.32.2)
capybara (3.33.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
Expand All @@ -39,17 +49,21 @@ GEM
colorator (1.1.0)
colored (1.2)
colorize (0.8.1)
concurrent-ruby (1.1.6)
diff-lcs (1.3)
concurrent-ruby (1.1.7)
diff-lcs (1.4.4)
docile (1.1.5)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
ffi (1.13.1)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.13.0)
html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
html-proofer (3.6.0)
Expand All @@ -65,32 +79,35 @@ GEM
http-accept (1.7.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (1.8.3)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
io-like (0.3.1)
jekyll (3.6.3)
jekyll (3.9.0)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.14)
jekyll-watch (~> 2.0)
kramdown (>= 1.17, < 3)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 3)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-feed (0.11.0)
jekyll (~> 3.3)
jekyll-feed (0.15.0)
jekyll (>= 3.7, < 5.0)
jekyll-paginate (1.1.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.6.1)
jekyll (>= 3.3, < 5.0)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-watch (1.5.1)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
jekyll_frontmatter_tests (0.1.0)
jekyll (>= 2.0, < 4.0)
Expand All @@ -107,36 +124,34 @@ GEM
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
json (2.3.0)
kramdown (1.17.0)
json (2.3.1)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
method_source (0.8.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.1)
netrc (0.11.0)
nokogiri (1.10.9)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
parallel (1.19.1)
parallel (1.19.2)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.5)
rack (1.6.13)
rack-jekyll (0.5.0)
jekyll (>= 1.3)
listen (>= 1.3)
rack (~> 1.5)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rb-fsevent (0.10.4)
Expand All @@ -149,7 +164,8 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rouge (2.2.1)
rexml (3.2.4)
rouge (3.22.0)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
Expand Down Expand Up @@ -179,7 +195,6 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
thor (0.20.3)
thread_safe (0.3.6)
typhoeus (0.8.0)
Expand All @@ -203,7 +218,7 @@ DEPENDENCIES
codeclimate-test-reporter (~> 1.0.0)
colorize
html-proofer (~> 3.6.0)
jekyll (~> 3.6.3)
jekyll (~> 3.9)
jekyll-archives!
jekyll-feed
jekyll-paginate
Expand All @@ -215,9 +230,11 @@ DEPENDENCIES
jekyll_pages_api
jekyll_pages_api_search (~> 0.4.5)
jemoji (>= 0.11.1)
kramdown-parser-gfm
parallel
pry (~> 0.10.4)
rack-jekyll (>= 0.5.0)
pry
rack (>= 2.1.4)
rack-jekyll!
rb-readline
rspec
selenium-webdriver (>= 3.1.0)
Expand Down
22 changes: 22 additions & 0 deletions GemfileFederalist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
source 'https://rubygems.org'

ruby '~>2.6.3'

gem 'accesslint-ci', '0.2.8'
gem 'html-proofer', '~> 3.6.0'
gem 'jekyll', '~> 3.9'
gem 'jemoji', '>= 0.11.1'
gem 'kramdown-parser-gfm'
gem 'parallel'

group :jekyll_plugins do
gem 'jekyll-archives', git: 'https://github.com/jekyll/jekyll-archives.git', ref: '112c508'
gem 'jekyll-feed'
gem 'jekyll-paginate'
gem 'jekyll-redirect-from'
gem 'jekyll-seo-tag'
gem 'jekyll-sitemap'
gem 'jekyll_pages_api'
gem 'jekyll_pages_api_search', '~> 0.4.5'
gem 'jekyll_oembed'
end
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ This repository houses the 18F website. We use the [U.S. Web Design System](http

A detailed history of the past work that went into developing this redesign can be found at [18F/beta.18f.gov](https://github.com/18F/beta.18f.gov).

## Installation
## Installation and Deployment

__*Note:*__ _The Federalist platform does not support the use of a predefined `SHOME` environment variable which impacts the installation of the site's testing dependency [`pry`](https://github.com/pry/pry) (See the [issue](https://github.com/pry/pry/issues/2139)). In order to build the Federalist deployment and keep the tests working in CI, a Federalist specific gemfile ([`GemfileFederalist`](./GemfileFederalist)) was created to exclude the testing and development groups during install. The Federalist script in the `package.json` is run during the build time a creates a bundler config to install the `GemfileFederalist` dependencies and not the default `Gemfile`. Any updates to the production builds `Gemfile` should be included in the `GemfileFederalist` until a better fix is in place for the `pry` dependency or the Federalist platform._

Run each of the following steps to get the site up and running.

Expand Down
84 changes: 84 additions & 0 deletions _about/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
---
title: About
permalink: /about/
layout: primary
lead: We help other government agencies build, buy, and share technology products.
banner_cta: true
subnav_items:
- text: Our mission
permalink: /about/#our-mission
- text: Our team
permalink: /about/#our-team
- text: History and funding
permalink: /about/#history-and-funding
- text: For press
permalink: /about/#for-press
---

18F is an office of federal employees within the [General Services Administration](https://www.gsa.gov/) (GSA) that collaborates with other agencies to fix technical problems, build products, and improve how government serves the public through technology. 18F is part of the Technology Transformation Services, which is within the Federal Acquisition Service.

-----

## Our mission

We envision a country whose government consistently offers digital services that instill pride and trust, meet user needs, are secure, and are delivered quickly and at reasonable cost.

We develop partnerships with agencies to help them deliver exceptional digital experiences that address their strategic initiatives. Through our work together, we also aim to strengthen government technology practices in ways that last beyond our formal partnerships. We effect change by practicing user-centered development, testing to validate hypotheses, shipping often, and deploying products in the open.

-----

## Our team

We are a team of about 120 designers, software engineers, strategists, and product managers — all federal employees. We have offices in DC, San Francisco, Chicago, and New York, as well as team members working remotely from all over the country.

Want to get to know our team a little better? These blog posts feature the voices of people from across 18F:

- [We asked 100 of our coworkers why they joined 18F]({{ site.baseurl }}/2016/03/21/we-asked-100-of-our-coworkers-why-did-you-join-18f/)
- [We asked over 100 of our coworkers: What was your path to 18F?]({{ site.baseurl }}/2016/03/22/what-was-your-path-to-18f/)
- [We asked over 100 of our coworkers what they've loved working on?]({{ site.baseurl }}/2016/03/23/what-have-you-loved-working-on/)
- [We asked everyone at 18F to reflect on the most meaningful project they worked on this year]({{ site.baseurl }}/2015/12/23/looking-back-2015-our-own-words/)

We've also published [profiles of individuals]({{ site.baseurl }}/tags/staff-profiles/), if you want to learn more about our day-to-day work.

-----

## History and funding

In March 2014, a group of [Presidential Innovation Fellows](https://presidentialinnovationfellows.gov/) started 18F to extend their efforts to improve and modernize government technology.

In 2016, 18F became part of the [Technology Transformation Services](https://www.gsa.gov/tts) (TTS), which also includes the Presidential Innovation Fellows program, the Office of Acquisitions, the [Office of Products and Programs](https://www.gsa.gov/portal/content/124174), and the [IT Modernization Centers of Excellence](https://coe.gsa.gov/).

In 2017, TTS became part of GSA's existing [Federal Acquisition Service](https://www.gsa.gov/about-us/organization/federal-acquisition-service).

**What does 18F mean?**

Our name is short for the address of the GSA building where we're headquartered in Washington, DC: 1800 F Street.

### Funding and agreements

We are cost-recoverable, which means we don't receive appropriated funds from Congress and must charge partner agencies for our work. There are two authorities we use to recover costs:

- Acquisition Services Fund (ASF) reimbursement authority: for work related to acquisitions
- [Economy Act (PDF)](http://www.gc.noaa.gov/documents/mou-economyact.pdf) reimbursement authority: for projects that cannot use ASF reimbursement authority

We use [Interagency Agreements](https://www.gsa.gov/cdnstatic/Treasury_Form_7600a_Comm.pdf) (IAAs) to set up the terms of our projects, and bill partners through [Intra-Governmental Payment and Collection](https://www.fiscal.treasury.gov/fsservices/gov/acctg/ipac/ipac_home.htm) (IPAC) on a monthly basis.

-----

## For press

For all press inquiries, please email [[email protected]](mailto:[email protected]?Subject=18F%20Media%20Query) with the topic you’d like to talk about and your deadline.

The GSA Office of Strategic Communications handles all press questions and can connect you with the proper people at 18F and the Technology Transformation Services. See the [GSA newsroom](https://www.gsa.gov/portal/category/26627) for news releases and official resources.

If you’re writing a story about 18F, feel free to use any of the images below.

**Organizational logos:**
- [18F (SVG)]({{ site.baseurl }}/assets/img/logos/18f-logo.svg)
- [GSA (JPG)]({{ site.baseurl }}/assets/img/logos/gsa-logo-dark.jpg)

**Product logos:**
- [cloud.gov (SVG)]({{ site.baseurl }}/assets/img/logos/cloud-gov-logo.svg)
- [login.gov (SVG)]({{ site.baseurl }}/assets/img/logos/login-gov-logo.svg)

[Photograph of GSA's DC headquarters (2.5 MB PNG)]({{ site.baseurl }}/assets/img/GSA-HQ-F-Street-exterior.png)
9 changes: 9 additions & 0 deletions _authors/18F.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: 18F
first_name: 18F
last_name:
full_name: 18F
redirect_from: "/team/18F/"
published: true
---

Loading

0 comments on commit 2d200a3

Please sign in to comment.