Skip to content

Commit

Permalink
Add parent-info-intro (#83)
Browse files Browse the repository at this point in the history
- Add person icon

Co-authored-by: Chibuisi Enyia <[email protected]>
  • Loading branch information
cy-by and enyia21 authored Feb 27, 2024
1 parent 82bf4e6 commit b4b4d4a
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 18 deletions.
7 changes: 4 additions & 3 deletions src/main/resources/flows-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ flow:
onboarding-language-pref:
beforeDisplayAction: SetLanguagePreferences
nextScreens:
- name: children-info-intro
- name: parent-info-intro

parent-info-intro:
nextScreens:
- name: parent-info-basic-1
# - name: parent-info-basic-1
- name: children-info-intro
parent-info-basic-1:
nextScreens:
- name: parent-info-basic-2
Expand Down Expand Up @@ -256,4 +257,4 @@ subflows:
reviewScreen: children-add
deleteConfirmationScreen: children-delete
landmarks:
firstScreen: onboarding-getting-started
firstScreen: onboarding-getting-started
8 changes: 7 additions & 1 deletion src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,13 @@ onboarding-language-pref.language-to-read-help-text=We will use this language wh
onboarding-language-pref.language-to-speak-label=What language do you prefer to speak?
onboarding-language-pref.language-to-speak-help-text=We will do our best to connect you with someone who speaks your language for any in-person or phone interactions.
#
#parent-info-intro
parent-info-intro.title=Parent and Guardian Information
parent-info-intro.step=Step 1 of 5
parent-info-intro.box.header=We'll ask about
parent-info-intro.box.one=Your basic Information
parent-info-intro.box.two=Your partner's information
parent-info-intro.box.three=Other adult dependents
#
#parent-info-basic-1
#parent-info-basic-2
#parent-info-service
Expand Down
12 changes: 12 additions & 0 deletions src/main/resources/templates/fragments/gcc-icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,18 @@ <h1>Icons</h1>
</svg>
</td>
</tr>
<tr>
<td>person</td>
<td>
<svg th:fragment="person" width="101" height="75" viewBox="0 0 101 75" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M78.0323 64.0161C71.9547 69.0396 63.7557 69.5292 55.973 70.8791C48.031 72.2566 39.9632 74.7579 32.3906 71.9325C24.3233 68.9224 17.2202 62.9052 13.6252 55.0783C10.1027 47.4091 11.6522 38.6751 13.3286 30.4309C14.9321 22.5451 17.0872 14.4229 22.9985 8.98227C28.7887 3.65303 36.9612 2.37867 44.7946 1.47002C52.341 0.59466 60.0031 0.703132 66.9234 3.88711C74.0542 7.16795 79.8467 12.6848 83.8504 19.4393C88.0582 26.5382 91.0384 34.6172 89.9737 42.7747C88.8944 51.0446 84.4478 58.7131 78.0323 64.0161Z" fill="#769BF3"/>
<path d="M56.5496 32.0783H43.4501C40.7168 32.0783 38.5 34.247 38.5 36.9209V60H61.5V36.9209C61.5 34.247 59.2829 32.0783 56.5496 32.0783Z" fill="white"/>
<path d="M49.9998 32.0783C54.8207 32.0783 58.729 28.2552 58.729 23.5392C58.729 18.8231 54.8207 15 49.9998 15C45.179 15 41.271 18.8231 41.271 23.5392C41.271 28.2552 45.179 32.0783 49.9998 32.0783Z" fill="white"/>
<path d="M56.5496 32.0783H43.4501C40.7168 32.0783 38.5 34.247 38.5 36.9209V60H61.5V36.9209C61.5 34.247 59.2829 32.0783 56.5496 32.0783Z" stroke="#121111" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
<path d="M49.9998 32.0783C54.8207 32.0783 58.729 28.2552 58.729 23.5392C58.729 18.8231 54.8207 15 49.9998 15C45.179 15 41.271 18.8231 41.271 23.5392C41.271 28.2552 45.179 32.0783 49.9998 32.0783Z" stroke="#121111" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
</td>
</tr>
</tbody>
</table>
</article>
34 changes: 21 additions & 13 deletions src/main/resources/templates/gcc/parent-info-intro.html
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
<!DOCTYPE html>
<html th:lang="${#locale.language}" xmlns:th="http://www.thymeleaf.org">
<head th:replace="~{fragments/head :: head(title='TEMPLATE')}"></head>
<head th:replace="~{fragments/head :: head(title=#{parent-info-intro.title})}"></head>
<body>
<div class="page-wrapper">
<div th:replace="~{fragments/toolbar :: toolbar}"></div>
<section class="slab">
<div class="grid">
<div th:replace="~{fragments/goBack :: goBackLink}"></div>
<main id="content" role="main" class="form-card spacing-above-35">
<th:block th:replace="~{fragments/cardHeader :: cardHeader(header=#{placeholder}, subtext=#{placeholder})}"/>
<th:block th:replace="~{fragments/form :: form(action=${formAction}, content=~{::formContent})}">
<th:block th:ref="formContent">
<div class="form-card__content">
<!-- Put inputs here -->
</div>
<div class="form-card__footer">
<th:block th:replace="~{fragments/inputs/submitButton :: submitButton(text=#{general.inputs.continue})}"/>
</div>
</th:block>
</th:block>
<div class="text--centered">
<th:block th:replace="~{fragments/gcc-icons :: person}"></th:block>
<p class="text--grey-dark" th:text="#{parent-info-intro.step}"></p>
<th:block
th:replace="~{fragments/cardHeader :: cardHeader(header=#{parent-info-intro.title})}"/>
</div>
<div class="form-card__content">
<div class="boxed-content">
<p class="text--centered"><strong th:text="#{parent-info-intro.box.header}"></strong></p>
<ol class="list--numbered">
<li th:text="#{parent-info-intro.box.one}"></li>
<li th:text="#{parent-info-intro.box.two}"></li>
<li th:text="#{parent-info-intro.box.three}"></li>
</ol>
</div>
</div>
<div class="form-card__footer text--centered">
<th:block th:replace="~{fragments/continueButton :: continue}"/>
</div>
</main>
</div>
</section>
</div>
<th:block th:replace="~{fragments/footer :: footer}"/>
</body>
</html>
</html>
6 changes: 5 additions & 1 deletion src/test/java/org/ilgcc/app/journeys/GccFlowJourneyTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ void fullGccFlow() {
testPage.selectFromDropdown("languageSpeak", "Español");
testPage.clickContinue();

// parent-info-intro
assertThat(testPage.getTitle()).isEqualTo("Parent and Guardian Information");
testPage.clickContinue();

//children-info-intro
assertThat(testPage.getTitle()).isEqualTo("Your Children");
testPage.clickContinue();
Expand Down Expand Up @@ -139,4 +143,4 @@ void fullGccFlow() {
assertThat(testPage.getElementText("weeklySchedule-monday-label")).isEqualTo("Monday");
testPage.clickContinue();
}
}
}

0 comments on commit b4b4d4a

Please sign in to comment.