Skip to content
This repository has been archived by the owner on Aug 15, 2024. It is now read-only.

VOTE-1039 nvrf review link #991

Merged
merged 32 commits into from
Jun 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2e30264
VOTE-246 Integrate nvrf app into static site
rayestrada Nov 28, 2023
07f5920
test update
rayestrada Nov 28, 2023
fd7d3bf
Update script to copy nvrf data
rayestrada Nov 28, 2023
621efcb
move nvrf pdf file
rayestrada Nov 28, 2023
3566c12
VOTE-246 refactor the loading of css
rayestrada Nov 29, 2023
1192beb
style improvements
rayestrada Nov 29, 2023
eac81ae
Merge remote-tracking branch 'origin/staging' into feature/VOTE-246-n…
rayestrada Dec 5, 2023
fd59513
VOTE-564: add nvrf hero logo and hide search (#956)
mlloydbixal Dec 18, 2023
0c11ba1
VOTE-594: fix broken nvrf styling (#958)
mlloydbixal Dec 18, 2023
be2dc36
Merge remote-tracking branch 'origin/staging' into feature/VOTE-246-n…
rayestrada Jan 2, 2024
7d04d60
Update NVRF app to v0.2.0
rayestrada Jan 2, 2024
2b0b0ce
Recreate package-lock and update nvrf assets to use query hash
rayestrada Jan 2, 2024
603eeec
Update NVRF app to v0.3.0
rayestrada Jan 2, 2024
6f9b5db
VOTE-689 styling revisions
rayestrada Jan 12, 2024
437144f
VOTE-610: create nvrf privacy policy page (#962)
mlloydbixal Jan 13, 2024
acf0e4e
Update to NVRF app v0.4.0
rayestrada Jan 17, 2024
e9963fc
Merge remote-tracking branch 'origin/staging' into nvrf-integration
rayestrada Jan 17, 2024
e59d09c
Adding url overrides for nvrf pages
rayestrada Jan 17, 2024
c267cd8
VOTE-724 critical revisions and upgrade to NVRF app v0.4.1
rayestrada Jan 18, 2024
7d8a83c
Enable login form requirement
rayestrada Jan 18, 2024
488b9bb
update NVRF to v0.4.2
rayestrada Jan 20, 2024
61b9cdf
Update to NVRF app v0.5.0
rayestrada Jan 31, 2024
b80b97c
Update to USWDS 3.7.1
rayestrada Jan 31, 2024
b548d56
update NVRF to v0.6.0
rayestrada Feb 15, 2024
c4aff35
Merge remote-tracking branch 'origin/staging' into nvrf-integration
rayestrada Mar 6, 2024
461d4e4
update NVRF to v0.7.1
rayestrada Mar 6, 2024
8ac413e
VOTE-1039 create new NVRF link for review
rayestrada Apr 19, 2024
007b908
Merge remote-tracking branch 'origin/staging' into feature/VOTE-1039-…
rayestrada Apr 19, 2024
7edaa86
Merge remote-tracking branch 'origin/staging' into feature/VOTE-1039-…
rayestrada May 8, 2024
0bb689e
update NVRF to v0.11.0
rayestrada May 8, 2024
a598a9a
update NVRF to v0.12.0
rayestrada May 22, 2024
1d73988
update NVRF to v0.13.0
rayestrada Jun 20, 2024
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,16 @@ npm-debug.log
assets/**/*demo.html

# Assets generated by build pipeline
static/assets/*
static/**/*

# The compiled Hugo site
public/

# The generated language content and layouts directories
content/registrar
layouts/registrar
content/*/*/data
content/*/*/files

tmp/

Expand Down
Binary file added assets/img/NVRF_hero_lockup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
63 changes: 30 additions & 33 deletions assets/styles/component/alert.scss
Original file line number Diff line number Diff line change
@@ -1,46 +1,43 @@
@use 'uswds-core' as *;
@use '../mixins' as *;

.usa-alert {
padding: 0;
margin-top: 0;
border-left: 0.5rem solid #00bde3;
}
.sitewide-alert, .page-alert {
.usa-alert {
padding: 0;
margin-top: 0;
border-left: 0.5rem solid #00bde3;
}

[dir="rtl"] .usa-alert {
border-right: 0.5rem solid #00bde3;
border-left: 0;
}
[dir="rtl"] .usa-alert {
border-right: 0.5rem solid #00bde3;
border-left: 0;
}

.usa-alert--info:before {
display: none;
}
.usa-alert--info:before {
display: none;
}

.usa-alert--info {
background-image: unset;
background-color: #e7f6f8;
border: 0;
}
.usa-alert--info {
background-image: unset;
background-color: #e7f6f8;
border: 0;
}

[dir="rtl"] .usa-alert--info {
.grid-container {
background-position: calc(100% - 1rem) 1rem;
[dir="rtl"] .usa-alert--info {
.grid-container {
background-position: calc(100% - 1rem) 1rem;

@include at-media('tablet') {
background-position: calc(100% - 1rem) 0.3rem;
@include at-media('tablet') {
background-position: calc(100% - 1rem) 0.3rem;
}
}
}
}

.usa-alert--info .usa-alert__body {
padding-left: 2.5rem;

&:before {
left: -0.5rem;
}
}
.usa-alert--info .usa-alert__body {
padding-left: 2.5rem;

.usa-alert__text:only-child {
margin-bottom: 0.5rem;
padding: 0.75rem 0 0.25rem;
&:before {
left: -0.5rem;
}
}
}
8 changes: 8 additions & 0 deletions assets/styles/component/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
margin-top: 1rem;
margin-bottom: 3rem;
}

&.usa-button--outline,
&.usa-button--outline:hover,
&.usa-button--outline:focus {
background-color: transparent;
color: $color-blue-dark;
box-shadow: inset 0 0 0 2px $color-blue-dark;
}
}

.usa-button:hover,
Expand Down
4 changes: 4 additions & 0 deletions assets/styles/component/hero.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@
}
}

.nvrf-hero {
padding: 20px 0;
}

.align-bottom {
display: flex;
flex-direction: column;
Expand Down
9 changes: 9 additions & 0 deletions assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ $theme-show-notifications: false,
@forward "usa-prose";
@forward "usa-intro";
@forward "usa-language-selector";
@forward "usa-layout-grid";

// NVRF dependencies --------------- //
@forward "usa-card";
@forward "usa-step-indicator";
@forward "usa-icon-list";
@forward "uswds-fonts";
@forward "uswds-helpers";
@forward "uswds-utilities";

@forward 'component/language-switcher';
@forward 'component/identifier';
Expand Down
78 changes: 78 additions & 0 deletions assets/styles/nvrf.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
.nvrf-app-container {
.usa-button {
line-height: 1.2;
}

@media only screen and (max-width: 639px) {
.mobile-width {
width: 100%;
max-width: 480px;
}
}

.grid-container-tablet {
max-width: 720px;
}

hr,
.usa-prose > hr {
border: 0;
border-top: 1px solid #adadad;
margin: 2rem 0;
}

.usa-form .usa-input {
max-width: 480px;
}

h2.margin-0 {
margin: 0;
}

.edit-btn .usa-button.usa-button--unstyled {
background-color: transparent;
color: #005ea2;
}

fieldset + .usa-hint {
margin-top: 0.5rem;
}

.error-container {
border-left: 3px solid #b50909;
padding-left: 15px;

.error-text {
display: block;
}
}

.error-text {
color: #b50909;
font-size: 1rem;
margin-top: 0.5rem;
display: none;
}

.usa-step-indicator__header {
@media (min-width: 640px) {
position: absolute;
text-indent: -9000px;
overflow: hidden;
}
}

.usa-alert__text {
> *:first-child {
margin-top: 0;
}
> *:last-child {
margin-bottom: 0;
}
}
}

#touchpoints-form-embed .fba-modal-dialog {
margin: 0;
}

7 changes: 1 addition & 6 deletions assets/styles/pages/state-page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
margin-bottom: 60px;
margin-top: 40px;

a {
a:not(.usa-button) {
color: $color-blue-dark;
}

Expand All @@ -18,9 +18,4 @@
margin-bottom: 0.5em;
margin-top: 30px;
}

p {
margin-bottom: 1em;
margin-top: 0;
}
}
8 changes: 8 additions & 0 deletions content/en/national-voter-registration-form-review/nvrf.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
+++
title = "NVRF"
meta_title = "NVRF"
type = "nvrf"
meta_description = "Vote.gov is a United States government website that provides trusted voting information and can help you find voter registration rules for your state."
url = "/national-voter-registration-form-review"
hide_touchpoints = "true"
+++
39 changes: 39 additions & 0 deletions content/en/national-voter-registration-form-review/privacy.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
+++
title = "Privacy Policy"
meta_title = "National Voter Registration Form Privacy Policy"
meta_description = "Vote.gov is a United States government website that provides trusted voting information and can help you find voter registration rules for your state."
translationKey = "privacy"
url = "/national-voter-registration-form-review/privacy"
hide_back_link = "true"
hide_touchpoints = "true"
+++

<div class="usa-prose">
<h2>Policy and Privacy Notice</h2>
Last Updated December 2023

<h3>Vote.gov does not collect your personal information.</h3>
<p>Vote.gov offers a web-based form filler tool with improved accessibility features to help eligible voters fill out the mail-in registration form. Unlike many other web-based registration tools, vote.gov does not store any user-provided information. </p>
<p>Vote.gov built the registration form filler tool in partnership with the <a href="https://eac.gov">Election Assistance Commission (EAC)</a>, and all information requested from you in the registration form comes directly from the EAC. When states provide updates to the EAC, those updates will be reflected in the registration form filler tool on vote.gov.</p>

<h3>Vote.gov does not have a federal database of voters.</h3>
<p>The federal government does not have a federal database of voters. If you are using the registration form filler tool on vote.gov to make changes to your information, you are reporting a change directly to your state. Your information is not being saved or updated in a federal database. </p>

<h3>Your information is stored on your device, not on vote.gov.</h3>
<p>When you complete the registration form on vote.gov, your web browser renders a PDF that you can save on your device (whether a computer, phone, or tablet). Your information is not being stored on federal government servers. Closing your web browser will clear your information. If you close the web browser before completing the registration form, you will have to start over filling out the form. </p>

<h3>Vote.gov does not use cookies. </h3>
<p>Vote.gov uses standard Google Analytics tracking, which tracks anonymous data such as clicks and time spent on pages. We do not track personally identifiable information (PII) or IP addresses.</p>

<h3>If you’re using a public machine (such as a library computer), we recommend that you do the following to keep your information safe:</h3>
<ul>
<li>Delete the generated PDF with your information if you downloaded it on the public machine, then empty the trash on this device.</li>
<li>Close the vote.gov page and web browser after you’ve completed the form. Since the webpage does not automatically time out, your information will remain on the page until you refresh or close the page.</li>
</ul>

<h3>If you have questions or concerns</h3>
<p>If you have questions about the registration form filler tool on vote.gov, please contact: <a href="mailto:vote@gsa.gov">vote@gsa.gov</a>.</p>


<h3>If you have questions or concerns about the information being requested by your state, please contact your state or local election office. </h3>
</div>
2 changes: 1 addition & 1 deletion gulp/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ exports.buildWebsite = buildWebsite;
exports.watch = watch;
exports.website= website;

var build = gulp.series(cleanAll, printPackageInfo, gulp.parallel('styles', 'scripts', 'images', 'fonts'), 'data');
var build = gulp.series(cleanAll, printPackageInfo, gulp.parallel('styles', 'scripts', 'images', 'fonts', 'nvrf'), 'data');
var buildWebsite = gulp.series (build, buildWebsite);
var website = gulp.series (build, website);

Expand Down
40 changes: 40 additions & 0 deletions gulp/nvrf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
var gulp = require('gulp');
var log = require('fancy-log');
var colors = require('ansi-colors');

var destPagePath = 'national-voter-registration-form-review';

gulp.task('nvrf-assets', function () {
var stream = gulp.src([
'./node_modules/vote-gov-nvrf-app/dist/assets/index.js'
]);

return stream.pipe(gulp.dest('./static/assets/nvrf'));

});

gulp.task('nvrf-files', function () {
var stream = gulp.src([
'./node_modules/vote-gov-nvrf-app/dist/files/*'
]);

return stream.pipe(gulp.dest(`./content/en/${destPagePath}/files`));

});

gulp.task('nvrf-data', function () {
var stream = gulp.src([
'./node_modules/vote-gov-nvrf-app/dist/data/**/*'
]);

return stream.pipe(gulp.dest(function(file) {
var path = file.path;
var base = file.base + '/';
var lang = path.replace(base, '').split('/')[0];

return `./content/${lang}/${destPagePath}/data`;
}));

});

gulp.task('nvrf', gulp.series('nvrf-assets', 'nvrf-files', 'nvrf-data'));
2 changes: 1 addition & 1 deletion gulp/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gulp.task('styles', gulp.series('scss-lint', function () {
log(colors.cyan('styles'), 'Compiling Sass assets');

var scssStream = scss({includePaths: ["node_modules/@uswds/uswds/packages"]});
var stream = gulp.src('./assets/styles/main.scss');
var stream = gulp.src(['./assets/styles/main.scss', './assets/styles/nvrf.scss']);

if (process.env.NODE_ENV === 'production') {
log(colors.cyan('styles'), 'Compressing styles');
Expand Down
1 change: 1 addition & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require('./gulp/styles');
require('./gulp/scripts');
require('./gulp/images');
require('./gulp/fonts');
require('./gulp/nvrf');
require('./gulp/data');
var build = require('./gulp/build');
var gulp = require('gulp');
Expand Down
2 changes: 2 additions & 0 deletions layouts/_default/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ <h1 class="main-heading" data-test="main-header">{{ .Title }}</h1>
{{ .Content }}
</section>

{{ if ne .Params.hide_back_link "true" }}
<p class="arrow-text"><a href="{{ .Site.Home.RelPermalink }}" title="Vote.gov" data-test="back-button"><span class="arrow direction"></span>{{ .Site.Params.go_back }}</a></p>
{{ end }}

</div>
</div>
Expand Down
36 changes: 36 additions & 0 deletions layouts/nvrf/single.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{{ $translation := ( index $.Site.Data.translations .Site.Language.Lang ) }}
{{ $queryNum := substr (md5 now.Unix) 0 9 }}

{{ partial "head.html" . }}

<body class="page-basic">
<link rel="stylesheet" href="{{ .Site.BaseURL }}/assets/styles/nvrf.css?v={{ $queryNum }}">

{{ partial "header.html" . }}
<main id="main-content">
<div class="bg-blue" id="skip-target">
<div class="grid-container">
<div class="tablet:grid-col-6 nvrf-hero">
<a href="{{ .Site.Home.RelPermalink }}" aria-label="Vote.gov">
<img width="150" height="59" src="{{ .Site.BaseURL }}/assets/img/NVRF_hero_lockup.png"
alt="{{ $translation.footer.vote_logo_alt_text }}" aria-label="Vote.gov"/>
</a>
</div>
</div>
</div>
<div class="grid-container">
<section class="voter-info">
{{ .Content }}
<div class="nvrf-app-container" id="root"></div>
</section>
</div>
</main>
{{ partial "footer.html" . }}

{{ partial "analytics.html" . }}
{{ partial "scripts.html" . }}
<script type="module" crossorigin src="{{ .Site.BaseURL }}/assets/nvrf/index.js?v={{ $queryNum }}"></script>

</body>

</html>
Loading
Loading