Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi-issue PR #367

Merged
merged 56 commits into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2a7fa52
initial addition of files from miles repo
riatzukiza Jan 14, 2022
6bec2de
Add deployment scripts
riatzukiza Jan 14, 2022
76342ac
update references to close.svg
riatzukiza Jan 19, 2022
5b76309
move deployment
riatzukiza Jan 19, 2022
63aa88e
Update some links
riatzukiza Jan 20, 2022
f30a4ef
Update scripts/deploy-live-comms.sh
riatzukiza Jan 20, 2022
d1b99e7
Apply suggestions from code review
riatzukiza Jan 20, 2022
d2ecbc5
update links referencing index
riatzukiza Jan 20, 2022
5823f7d
Updates content, tweaks css for paragraph text
reitermb Jan 20, 2022
b1158e4
Merge branch 'raft-tdp-main' into feat/1545-add-site-files
jorgegonzalez Jan 21, 2022
0a1e08a
Remove a lot of files
riatzukiza Jan 21, 2022
ad135d9
Merge branch 'feat/1545-add-site-files' into feat/1545-migrate-live-c…
riatzukiza Jan 24, 2022
c6e9cb2
Update documentation
riatzukiza Jan 24, 2022
ffde074
use old non minified css file
riatzukiza Jan 24, 2022
1b69a6a
Bump eslint from 7.32.0 to 8.7.0 in /tdrs-frontend
dependabot[bot] Jan 25, 2022
395e802
fix: add missing eslint dep
jorgegonzalez Jan 25, 2022
cfbd8c7
Merge branch 'raft-tdp-main' into dependabot/npm_and_yarn/tdrs-fronte…
jorgegonzalez Jan 25, 2022
a205a8e
Merge pull request #1551 from raft-tech/dependabot/npm_and_yarn/tdrs-…
jorgegonzalez Jan 25, 2022
9044fee
Migrates remaining imgur links, adds alt text, adds research synthesi…
reitermb Jan 25, 2022
f9b9e5d
Remove TTS related 'contributing' markdown, add background and review…
reitermb Jan 26, 2022
acdbd6b
Update live-comms/August-2021-Update.html
riatzukiza Jan 26, 2022
82994cc
Update live-comms/August-2021-Update.html
riatzukiza Jan 26, 2022
7763c7f
Update live-comms/June-2021-Update.html
riatzukiza Jan 26, 2022
d61cc19
Update live-comms/June-2021-Update.html
riatzukiza Jan 26, 2022
9fcc235
Update live-comms/June-2021-Update.html
riatzukiza Jan 26, 2022
6472e9b
Bump node-sass from 6.0.1 to 7.0.1 in /tdrs-frontend
dependabot[bot] Jan 27, 2022
4cd2ed0
Fixed font-related 404s, fixed broken nav link items
reitermb Jan 27, 2022
d7bcfd4
chore: replace node-sass with sass
jorgegonzalez Jan 28, 2022
afe5758
Merge branch 'raft-tdp-main' into feat/1545-add-site-files
jorgegonzalez Jan 28, 2022
c2d0f12
Merge pull request #1555 from raft-tech/feat/1545-add-site-files
jorgegonzalez Jan 28, 2022
fce4aa5
Merge branch 'raft-tdp-main' into feat/1545-migrate-live-comms-site
jorgegonzalez Jan 28, 2022
10feb51
Bump pa11y-ci from 2.4.2 to 3.0.1 in /tdrs-frontend
dependabot[bot] Jan 28, 2022
631fc8c
Merge branch 'raft-tdp-main' into dependabot/npm_and_yarn/tdrs-fronte…
jorgegonzalez Jan 28, 2022
f8d6eb9
Update docker file for chrome error in pa11y
riatzukiza Jan 28, 2022
a64e166
update node orb
riatzukiza Jan 28, 2022
6d45cc0
Fix mobile nav label inconsistency
reitermb Jan 28, 2022
94b3f6d
Merge pull request #1578 from raft-tech/dependabot/npm_and_yarn/tdrs-…
jorgegonzalez Jan 28, 2022
db13349
Use sudo
riatzukiza Jan 28, 2022
b2255b4
Merge remote-tracking branch 'origin/raft-tdp-main' into dependabot/n…
riatzukiza Jan 28, 2022
dc4d27e
Merge branch 'raft-tdp-main' into feat/1545-migrate-live-comms-site
jorgegonzalez Jan 28, 2022
b710d25
Revert "Update docker file for chrome error in pa11y"
riatzukiza Jan 28, 2022
f821b6d
Revert "update node orb"
riatzukiza Jan 28, 2022
b6d4d29
Merge pull request #1573 from raft-tech/dependabot/npm_and_yarn/tdrs-…
jorgegonzalez Jan 28, 2022
3a13dc1
Bump concurrently from 6.5.1 to 7.0.0 in /tdrs-frontend
dependabot[bot] Jan 28, 2022
2d26229
Merge pull request #1581 from raft-tech/dependabot/npm_and_yarn/tdrs-…
jorgegonzalez Jan 28, 2022
166d8e9
Merge branch 'raft-tdp-main' into feat/1545-migrate-live-comms-site
jorgegonzalez Jan 28, 2022
bd7c621
Merge pull request #1548 from raft-tech/feat/1545-migrate-live-comms-…
jorgegonzalez Jan 28, 2022
e8272b9
Deploy script should be executable
riatzukiza Jan 28, 2022
2b80fbb
Merge pull request #1586 from raft-tech/hotfix/deploy-live-comms-perm…
jorgegonzalez Jan 28, 2022
357316b
Add new job for live comms deploy
riatzukiza Jan 28, 2022
94505a2
Add parameters
riatzukiza Jan 28, 2022
e1c417a
Merge branch 'raft-tdp-main' into hotfix/live-comms-job
jorgegonzalez Jan 28, 2022
f164aef
Merge pull request #1587 from raft-tech/hotfix/live-comms-job
jorgegonzalez Jan 28, 2022
2bd73c4
add pre steps
riatzukiza Jan 28, 2022
a105ada
Merge branch 'raft-tdp-main' into hotfix/live-comms-job
jorgegonzalez Jan 28, 2022
832b066
Merge pull request #1588 from raft-tech/hotfix/live-comms-job
jorgegonzalez Jan 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ commands:
- run:
name: Install Node.JS
command: |
sudo apt-get update
sudo apt-get install -y libgbm-dev
source /opt/circleci/.nvm/nvm.sh
nvm install v16.13
nvm alias default v16.13
Expand Down Expand Up @@ -496,6 +498,35 @@ jobs:
cf-space: tanf-staging
cf-username: CF_USERNAME_STAGING

deploy-live-comms:
parameters:
cf-org:
default: CF_ORG
type: env_var_name
cf-space:
default: tanf-dev
type: string
cf-password:
type: env_var_name
default: CF_PASSWORD_DEV
cf-username:
type: env_var_name
default: CF_USERNAME_DEV
executor: docker-executor
working_directory: ~/tdp-deploy
steps:
- checkout
- sudo-check
- cf-check
- login-cloud-dot-gov:
cf-password: <<parameters.cf-password>>
cf-org: <<parameters.cf-org>>
cf-space: <<parameters.cf-space>>
cf-username: <<parameters.cf-username>>
- run:
name: Deploy Live Comms Site
command: ./scripts/deploy-live-comms.sh rolling tdp-live-comms

deploy-prod:
executor: docker-executor
working_directory: ~/tdp-deploy
Expand Down Expand Up @@ -564,6 +595,11 @@ workflows:
staging-deployment:
unless: << pipeline.parameters.run_dev_deployment >>
jobs:
- deploy-live-comms:
filters:
branches:
only:
- raft-tdp-main
- deploy-infrastructure-staging:
filters:
branches:
Expand Down
129 changes: 129 additions & 0 deletions live-comms/August-2021-Update.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>TANF Data Portal Project Updates - August 2021</title>
<link rel="stylesheet" href="css/uswds.css" />
<link rel="icon" type="image/x-icon" href="img/favicons/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="js/uswds.min.js"></script>
</head>
<body>

<a class="usa-skipnav" href="/index.html">Skip to main content</a>




<section class="usa-banner" aria-label="This page is maintained by the Design team at Raft LLC for the purposes of the TANF Data Portal project.">
<div class="usa-accordion">
<header class="usa-banner__header">
<div class="usa-banner__inner">
<div class="grid-col-auto">
</div>
<div class="grid-col-fill tablet:grid-col-auto">
<p class="usa-banner__header-text">This page is maintained by the Design team at Raft LLC for the purposes of the TANF Data Portal project.</p>
</div>

</div>
</header>
</section>







</div>
</div>
</nav>
</header>




<main id="main-content">


<div class="usa-overlay"></div>
<header class="usa-header usa-header--basic">
<div class="usa-nav-container">
<div class="usa-navbar">
<div class="usa-logo" id="basic-logo">
<em class="usa-logo__text">
<a href="./index.html" title="TDP Project Updates">
TANF Data Portal Project Updates
</a>
</em>
</div>
<button class="usa-menu-btn">Menu</button>
</div>
<nav aria-label="Primary navigation" class="usa-nav">
<button class="usa-nav__close">
<img src="./img/close.svg" role="img" alt="Close" />
</button>
<ul class="usa-nav__primary usa-accordion">
<li class="usa-nav__primary-item">
<a href="./index.html" class="usa-nav__link">
<span>January 2022</span>
</a>
</li>
<li class="usa-nav__primary-item">
<a href="August-2021-Update.html" class="usa-current" aria-current="page">
<span>August 2021</span>
</a>
</li>
<li class="usa-nav__primary-item">
<a href="June-2021-Update.html" class="usa-nav__link">
<span>June 2021</span>
</a>
</li>
</ul>


</nav>
</div>
</header>

<div class="usa-section">
<div class="grid-container">
<div class="grid-row grid-gap">
<div class="usa-layout-docs__sidenav desktop:grid-col-3">
<nav aria-label="Secondary navigation">
<ul class="usa-sidenav">
<li class="usa-sidenav__item">
<a href="./index.html">January 2022</a>
</li>
<li class="usa-sidenav__item">
<a href="August-2021-Update.html" class="usa-current" aria-current="page">August 2021</a>
</li>
<li class="usa-sidenav__item">
<a href="June-2021-Update.html">June 2021</a>
</li>
</ul>
</nav>
</div>

<main
class="usa-layout-docs__main desktop:grid-col-9 usa-prose usa-layout-docs"
id="main-content"
>
<h1>Project Update - August 16th, 2021</h1>

<p class="usa-intro">
Project updates prior to January 2022 were made in a PDF format. You can download the PDF from our August 16th update below.
</p>

<a href="https://github.com/reitermb/TANF-Data-Portal-Updates/files/7831522/TDRS.Project.Update.Aug.16.2021.pdf" class="usa-button"><span style="color: white;">Download PDF</span></a>





</main>
</div>
</div>
</div>
129 changes: 129 additions & 0 deletions live-comms/June-2021-Update.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>TANF Data Portal Project Updates - June 2021</title>
<link rel="stylesheet" href="css/uswds.css" />
<link rel="icon" type="image/x-icon" href="img/favicons/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="js/uswds.min.js"></script>
</head>
<body>

<a class="usa-skipnav" href="#main-content">Skip to main content</a>




<section class="usa-banner" aria-label="This page is maintained by the Design team at Raft LLC for the purposes of the TANF Data Portal project.">
<div class="usa-accordion">
<header class="usa-banner__header">
<div class="usa-banner__inner">
<div class="grid-col-auto">
</div>
<div class="grid-col-fill tablet:grid-col-auto">
<p class="usa-banner__header-text">This page is maintained by the Design team at Raft LLC for the purposes of the TANF Data Portal project.</p>
</div>

</div>
</header>
</section>







</div>
</div>
</nav>
</header>




<main id="main-content">


<div class="usa-overlay"></div>
<header class="usa-header usa-header--basic">
<div class="usa-nav-container">
<div class="usa-navbar">
<div class="usa-logo" id="basic-logo">
<em class="usa-logo__text">
<a href="./index.html" title="TDP Project Updates">
TANF Data Portal Project Updates
</a>
</em>
</div>
<button class="usa-menu-btn">Menu</button>
</div>
<nav aria-label="Primary navigation" class="usa-nav">
<button class="usa-nav__close">
<img src="./img/close.svg" role="img" alt="Close" />
</button>
<ul class="usa-nav__primary usa-accordion">
<li class="usa-nav__primary-item">
<a href="./index.html" class="usa-nav__link">
<span>January 2022</span>
</a>
</li>
<li class="usa-nav__primary-item">
<a href="August-2021-Update.html" class="usa-nav__link">
<span>August 2021</span>
</a>
</li>
<li class="usa-nav__primary-item">
<a href="June-2021-Update.html" class="usa-current" aria-current="page">
<span>June 2021</span>
</a>
</li>
</ul>


</nav>
</div>
</header>

<div class="usa-section">
<div class="grid-container">
<div class="grid-row grid-gap">
<div class="usa-layout-docs__sidenav desktop:grid-col-3">
<nav aria-label="Secondary navigation">
<ul class="usa-sidenav">
<li class="usa-sidenav__item">
<a href="./index.html">January 2022</a>
</li>
<li class="usa-sidenav__item">
<a href="August-2021-Update.html">August 2021</a>
</li>
<li class="usa-sidenav__item">
<a href="June-2021-Update.html" class="usa-current" aria-current="page">June 2021</a>
</li>
</ul>
</nav>
</div>

<main
class="usa-layout-docs__main desktop:grid-col-9 usa-prose usa-layout-docs"
id="main-content"
>
<h1>Project Update - June 15th, 2021</h1>

<p class="usa-intro">
Project updates prior to January 2022 were made in a PDF format. You can download the PDF from our June 15th update below.
</p>

<a href="https://github.com/reitermb/TANF-Data-Portal-Updates/files/7831672/TDRS_STT.Comms.1.pdf" class="usa-button"><span style="color: white;">Download PDF</span></a>





</main>
</div>
</div>
</div>
59 changes: 59 additions & 0 deletions live-comms/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
## A few parts of this project are not in the public domain

### Files licensed under the SIL Open Font License, Version 1.1

The Source Sans Pro font files in `src/fonts/source-sans-pro` are a [customized subset](https://github.com/miguelsousa/source-sans-pro-subset) of [Source Sans Pro](https://github.com/adobe-fonts/source-sans-pro) owned by Adobe Systems Incorporated, licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web), and copyright 2010, 2012, 2014 [Adobe Systems Incorporated], with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States or other countries.

The Merriweather font files in `src/fonts/merriweather` are the version 2.001 files from [GitHub](https://github.com/EbenSorkin/Merriweather/releases/tag/v2.001) subsetted into Latin and with additional formats generated with [Transfonter](https://transfonter.org/), licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web), and copyright [Sorkin Type Co](www.sorkintype.com) with Reserved Font Name 'Merriweather'.

The Public Sans font files in `src/fonts/public-sans` are licensed under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web). Public Sans is a modification of Libre Franklin, copyright [Impallari Type](www.impallari.com).

The files in `src/img` are from [Font Awesome](http://fontawesome.io/) by Dave Gandy under the [SIL Open Font License, Version 1.1](https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL_web).

### Files licensed under the Apache 2.0 License

The Roboto Mono font files in `src/fonts/roboto-mono` are licensed under the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0).

### Files licensed under the MIT license

The files in `src/stylesheets/lib` are from:

- [Normalize.css](https://github.com/necolas/normalize.css), copyright Nicolas Gallagher and Jonathan Neal, under the [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).

#### Full license text for the MIT licensed files:

```
The MIT License (MIT)
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
```

## The rest of this project is in the worldwide public domain

As a work of the United States government, this project is in the public domain within the United States.

Additionally, we waive copyright and related rights in the work worldwide through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).

### CC0 1.0 Universal Summary

This is a human-readable summary of the [Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode).

#### No Copyright

The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.

You can copy, modify, distribute and perform the work, even for commercial purposes, all without asking permission.

#### Other Information

In no way are the patent or trademark rights of any person affected by CC0, nor are the rights that other persons may have in the work or in how the work is used, such as publicity or privacy rights.

Unless expressly stated otherwise, the person who associated a work with this deed makes no warranties about the work, and disclaims liability for all uses of the work, to the fullest extent permitted by applicable law. When using or citing the work, you should not imply endorsement by the author or the affirmer.

### Contributions to this project

As stated in [CONTRIBUTING](CONTRIBUTING.md), all contributions to this project will be released under the CC0 dedication. By submitting a pull request, you are agreeing to comply with this waiver of copyright interest.
22 changes: 22 additions & 0 deletions live-comms/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Design environment for web hosted live comms

The live comms website was created for use as a tool to communicate project updates and research findings to the broader OFA team and to grantees. It is also aimed at improving the accessibility of these updates from that of the prior PDF format. The structure of the live comms site is aimed at being simple to extend and maintain via simple HTML/CSS skills so as to allow the current design team or other non-developer team members to easily update it without requiring additional development time to be spent on non-feature work.

## How is this hosted?

It is a static website using the static file buildpack provided by cloud foundry on cloud.gov

## Deployment process

### Automated

When ever any PR is approved and merged into raft-tdp-main, any changes that were made to this static site will be deployed
to https://tdp-live-comms.app.cloud.gov/

## Review process

While the live comms site is stored in the TANF-app repo, it is not a part of the TDP application. Given that and the nature of updates involving simple HTML modifications/additions, the review process for updates to live comms should be made via the [review process](https://github.com/HHS/TANF-app/blob/main/docs/How-We-Work/our-workflow.md) for design tickets rather than dev tickets involving:

- Content review by the government product owner and tech lead
- Accessibility review by the government accessibility reviewer

Binary file added live-comms/Slide 16_9 - 1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added live-comms/Staticfile
Empty file.
Binary file added live-comms/TDRS Project Update Aug 16 2021.pdf
Binary file not shown.
Loading