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

Convert to md theme #5

Merged
merged 2 commits into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions src/main/resources/application-demo.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/resources/application-staging.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,9 @@
spring:
thymeleaf:
cache: true
datasource:
url: jdbc:postgresql://host.docker.internal:5432/mdbenefits
flyway:
placeholders:
uuid_function: "gen_random_uuid"
user_file_doc_type_default_label: ${form-flow.uploads.default-doc-type-label:#{null}}
session:
jdbc:
initialize-schema: always
management:
endpoints:
enabled-by-default: false
form-flow:
disabled-flows: ~
uploads:
max-file-size: '5'
default-doc-type-label: "NotSet"
8 changes: 5 additions & 3 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ form-flow:
lock-after-submitted:
- flow: mdBenefitsFlow
redirect: confirmation
disabled-flows:
- flow: mdBenefitsFlow
staticRedirectPage: /
disabled-flows: ~
pdf:
path: 'src/main/resources/pdfs/'
map-file: pdf-map.yaml
Expand Down Expand Up @@ -41,6 +39,10 @@ form-flow:
smarty_auth_token: ${SMARTY_AUTH_TOKEN}
smarty_url: "https://us-street.api.smartystreets.com/street-address"
spring:
flyway:
placeholders:
uuid_function: "gen_random_uuid"
user_file_doc_type_default_label: ${form-flow.uploads.default-doc-type-label:#{null}}
profiles:
group:
test:
Expand Down
23 changes: 7 additions & 16 deletions src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,16 @@ language-preferences.english=English
language-preferences.spanish=Espa\u00F1ol
language-preferences.vietnamese=Ti\u1EBFng Vi\u1EC7t

index.title=Louisiana Digital Assister
index.header=Apply for food benefits easily online.
index.louisiana-partner=Official State of Louisiana partner.
index.upload-description=Apply for SNAP benefits in about 20 minutes or less.
index.title=Maryland Benefits Application
index.header=Welcome to the <em> new </em> Maryland Benefits application experience.
index.description=We're working to make applying for benefits easier. Thanks for your patience while we build the new site. You can still apply on the original site using the link below.
index.upload-documents-primary=Apply Now <i class="button__icon icon-arrow_forward"></i>
index.recommended-documents=Recommended documents:
index.website-description=This website is an authorized application assistance tool by the State of Louisiana.
index.upload-documents-primary.link=/flow/mdBenefitsFlow/parish?lang=en
index.safe-and-secure=Safe and secure
index.upload-documents-second=Aplique ya<i class="button__icon icon-arrow_forward"></i>
index.upload-documents-second.link=/flow/mdBenefitsFlow/parish?lang=es
index.upload-documents-third=\u0110\u0103ng k\u00FD ngay<i class="button__icon icon-arrow_forward"></i>
index.upload-documents-third.link=/flow/mdBenefitsFlow/parish?lang=vi
index.apply-for-snap=Apply for SNAP
index.apply-for-snap.paragraph=<b>SNAP</b> (Supplemental Nutrition Assistance Program) helps you and your family get the food they need. You'll get an EBT card that you can use like a debit card to buy groceries at most stores and farmer's markets.
index.assistance-question=Looking for assistance with other programs?
index.assistance-subheader=Visit <a target="_blank" rel="noreferrer noopener" href="https://sspweb.ie.dcfs.la.gov"/>LA CAF\u00C9</a> for more information.</p>

footer.this-benefits-application-is=The document uploader is a service built by Code for America in partnership with Louisiana's Department of Children and Family Services, on behalf of the people of Louisiana.
index.apply-on-mdthink=Apply for benefits on <a target="_blank" rel="noreferrer noopener" href="https://mymdthink.maryland.gov/home/#/"/>MDTHINK</a>.</p>

footer.this-benefits-application-is=This benefits application is a service built by Code for America in partnership with the state of Maryland, on behalf of the people of Maryland.
footer.faq=Frequently Asked Questions (FAQ)
footer.privacy=Privacy Policy
privacy.title=Privacy Policy
privacy.sub-title=BenefitsLouisiana is a service created by Code for America Labs, Inc. ("Code for America," "we," "us,", "our") to:
Expand Down
5 changes: 1 addition & 4 deletions src/main/resources/static/assets/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* This file is provided for addition of custom CSS styles */

:root {
--primary: #00284D;
--primary: #000000;
--light: #F5F5F5;
--primary-light: #C0CEDB;
--dark-grey: #121111;
Expand Down Expand Up @@ -464,6 +464,3 @@ button.button.button--secondary{
.main-footer {
position: static;
}



Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 0 additions & 24 deletions src/main/resources/templates/fragments/footer.html

This file was deleted.

10 changes: 4 additions & 6 deletions src/main/resources/templates/fragments/toolbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

<a class="logo" href="/">
<picture>
<source srcset="/assets/images/dcfs-logo-white.webp" type="image/webp">
<source srcset="/assets/images/dcfs-logo-white.png" type="image/png">
<img src="/assets/images/dcfs-logo-white.png" alt="DCFS logo" class="max-width-logo"/>
<!-- TODO: Other picture sources, fix alt below -->
<source srcset="/assets/images/md-gov.png" type="image/png">
<img src="/assets/images/md-gov.png" alt="Maryland.gov logo" class="max-width-logo"/>
</picture>
</a>
<script>
Expand All @@ -30,9 +30,7 @@

});
</script>
<div th:replace="~{fragments/localeSelect :: localeSelect}"></div>
<th:block th:replace="~{fragments/localeSelect :: translate_noscript}"></th:block>
</div>
</div>
</header>
<th:block th:replace="~{fragments/demoBanner :: demoBanner(demoText=#{demo.banner-text}, demoProfile=${@environment.getProperty('demo')})}"/>
</th:block>
73 changes: 4 additions & 69 deletions src/main/resources/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,16 @@
<section class="slab slab--white">
<div class="grid">
<div class="grid__item width-one-half">
<!-- TODO: How are icons overridden?-->
<th:block th:replace="~{fragments/icons :: nextSteps}"></th:block>
<h1 class="spacing-below-15 spacing-above-0" th:utext="#{index.header}"></h1>
<p class="spacing-below-15" th:utext="#{index.upload-description}"></p>
<p class="text--help spacing-below-25">
<small th:text="#{index.louisiana-partner}"></small>
</p>
<p class="spacing-below-15" th:utext="#{index.description}"></p>
<a id="upload_docs_1" th:href="#{index.upload-documents-primary.link}"
th:utext="#{index.upload-documents-primary}"
th:rel="keep-params"
class="button button--primary spacing-below-10"><i
class="button__icon icon-arrow_forward"></i></a>
<p class="text--help spacing-below-25">
<small>
<i class="icon-lock_outline"></i>
<span th:text="#{index.safe-and-secure}"></span>
</small>
</p>

<div class="display-inline-grid">
<a id="upload_docs_2" th:href="#{index.upload-documents-second.link}"
th:utext="#{index.upload-documents-second}"
th:rel="keep-params"
class="button button--small spacing-below-15 button--other"></a>
<a id="upload_docs_3" th:href="#{index.upload-documents-third.link}"
th:utext="#{index.upload-documents-third}"
th:rel="keep-params"
class="button button--small button--other"></a>
</div>
<p th:utext="#{index.apply-on-mdthink}"></p>
</div>
<div class="grid__item width-one-half">
<picture>
Expand All @@ -47,54 +30,6 @@ <h1 class="spacing-below-15 spacing-above-0" th:utext="#{index.header}"></h1>
</div>
</div>
</section>

<section class="slab slab--la-blue">
<div class="grid">
<div class="grid__item width-one-half">
<div class="seal">
<picture>
<source srcset="/assets/images/Seal_of_Louisiana.webp" type="image/webp"
width="100px">
<source srcset="/assets/images/Seal_of_Louisiana.png" type="image/png" width="100px">
<img src="/assets/images/Seal_of_Louisiana.png"
alt="Louisiana State Seal"
class="border-right"
style="width: 100px;">
</picture>
</div>
<div class="logo">
<picture>
<source srcset="/assets/images/dcfs-logo-bg.webp" type="image/webp" width="160px">
<source srcset="/assets/images/dcfs-logo-bg.png" type="image/png" width="160px">
<img src="/assets/images/dcfs-logo-bg.png"
alt="DCFS Logo"
style="width: 160px;">
</picture>
</div>
</div>
<div class="grid__item width-one-half">
<p class="spacing-above-25 text--centered" th:text="#{index.website-description}"></p>
</div>
</div>
</section>

<section class="slab slab--yellow spacing-below-0">
<h2 class="spacing-above-5 spacing-below-35"
th:text="#{index.apply-for-snap}"></h2>

<div class="spacing-above-35">
<p th:utext="#{index.apply-for-snap.paragraph}"></p>
</div>


</section>
<section class="slab slab--white">
<h2 class="spacing-above-5 spacing-below-35"
th:text="#{index.assistance-question}"></h2>
<div class="spacing-above-35">
<p th:utext="#{index.assistance-subheader}"></p>
</div>
</section>
</main>
</div>
<th:block th:replace="~{fragments/footer :: footer}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,6 @@ void raceEthnicityFlow() {
loadHouseHoldData("Person", "Two", "12", "12", "2016");
loadHouseHoldData("Person", "Three", "12", "12", "2017");

testPage.clickElementById("translate-button");
testPage.clickLink("Tiếng Việt");

testPage.navigateToFlowScreen("mdBenefitsFlow/ethnicitySelection");
// the titles don't seem to render correctly in test
// assertThat(testPage.getTitle()).isEqualTo("L\u1ef1a ch\u1ecdn dân t\u1ed9c");
Expand All @@ -255,11 +252,10 @@ void raceEthnicityFlow() {
.filter(ei -> ei.getAttribute("value").equals("Hispanic or Latino"))
.forEach(ei -> {
ei.click();
// make sure found them, even with the site language being in Vietnamese
assertThat(ei.isSelected()).isTrue();
});

testPage.clickContinue(Locale.forLanguageTag("vi"));
testPage.clickContinue();
testPage.goBack();

//assertThat(testPage.getTitle()).isEqualTo("L\u1ef1a ch\u1ecdn dân t\u1ed9c");
Expand All @@ -270,7 +266,7 @@ void raceEthnicityFlow() {
assertThat(element.getAttribute("value")).isEqualTo("Hispanic or Latino");
});

testPage.clickContinue(Locale.forLanguageTag("vi"));
testPage.clickContinue();
//assertThat(testPage.getTitle()).isEqualTo("L\u1ef1a ch\u1ecdn ch\u1ee7ng t\u1ed9c");

// set for the applicant
Expand All @@ -292,7 +288,7 @@ void raceEthnicityFlow() {
assertThat(ri.isSelected()).isTrue();
});

testPage.clickContinue(Locale.forLanguageTag("vi"));
testPage.clickContinue();
testPage.goBack();

//assertThat(testPage.getTitle()).isEqualTo("L\u1ef1a ch\u1ecdn ch\u1ee7ng t\u1ed9c");
Expand All @@ -310,9 +306,6 @@ void raceEthnicityFlow() {
assertThat(value).isNotEqualTo("American Indian");
});

// change the language back
testPage.clickElementById("translate-button");
testPage.clickLink("English");
assertThat(testPage.getTitle()).isEqualTo("Race Selection");
}

Expand All @@ -326,20 +319,7 @@ void docUploadSkipTest() {

@Test
void fullDigitalAssisterFlow() {
// Landing screen (language toggled)
assertThat(testPage.getTitle()).isEqualTo("Louisiana Digital Assister");
testPage.clickElementById("translate-button");
String languages = testPage.getElementText("menu2");
assertThat(languages).contains("Español");
assertThat(languages).contains("English");
assertThat(languages).contains("Tiếng Việt");
testPage.clickLink("Español");
assertThat(testPage.getElementText("translate-button")).contains("Traducir");
testPage.clickElementById("translate-button");
testPage.clickLink("Tiếng Việt");
assertThat(testPage.getElementText("translate-button")).contains("Phiên dịch");
testPage.clickElementById("translate-button");
testPage.clickLink("English");
assertThat(testPage.getTitle()).isEqualTo("Maryland Benefits Application");

testPage.clickButton("Apply Now");

Expand Down
Loading