diff --git a/shared-helpers/package.json b/shared-helpers/package.json index 161c6640eb..a7e8c7ac44 100644 --- a/shared-helpers/package.json +++ b/shared-helpers/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@bloom-housing/ui-components": "12.4.0", - "@bloom-housing/ui-seeds": "1.17.0", + "@bloom-housing/ui-seeds": "1.18.1", "@heroicons/react": "^2.1.1", "axios-cookiejar-support": "4.0.6", "tough-cookie": "4.1.3" diff --git a/shared-helpers/src/locales/es.json b/shared-helpers/src/locales/es.json index de3a47e101..34c8369a30 100644 --- a/shared-helpers/src/locales/es.json +++ b/shared-helpers/src/locales/es.json @@ -549,7 +549,11 @@ "errors.timeError": "Por favor, ingrese una hora válida", "errors.zipCodeError": "Por favor ingrese un código postal", "footer.contact": "Contacto", - "footer.copyright": "Demonstration Jurisdiction © 2021 • Todos los derechos reservados.", + "footer.content.applicationQuestions": "Si tiene preguntas sobre el listado y la solicitud, comuníquese con el agente de arrendamiento que aparece en el listado.", + "footer.content.partnership": "en asociación con", + "footer.content.programQuestions": "Para consultas generales sobre el programa, puede llamar al MOHD al 123-456-7890.", + "footer.content.projectOf": "Bloomington Housing Portal es un proyecto de la", + "footer.copyright": "© Ciudad y condado de Bloomington", "footer.disclaimer": "Exención de responsabilidades", "footer.forGeneralQuestions": "Si requiere información general sobre el programa, nos puede llamar al 000-000-0000.", "footer.giveFeedback": "Proporcione sus comentarios", diff --git a/shared-helpers/src/locales/general.json b/shared-helpers/src/locales/general.json index 2e0d957b7f..e52ae007ed 100644 --- a/shared-helpers/src/locales/general.json +++ b/shared-helpers/src/locales/general.json @@ -540,7 +540,11 @@ "errors.timeError": "Please enter a valid time", "errors.zipCodeError": "Please enter a zip code", "footer.contact": "Contact", - "footer.copyright": "Demonstration Jurisdiction © 2021 • All Rights Reserved", + "footer.content.applicationQuestions": "For listing and application questions, please contact the Leasing Agent displayed on the listing.", + "footer.content.partnership": "in partnership with", + "footer.content.programQuestions": "For general program inquiries, you may call MOHD at 123-456-7890.", + "footer.content.projectOf": "Bloomington Housing Portal is a project of the", + "footer.copyright": "© City & County of Bloomington", "footer.disclaimer": "Disclaimer", "footer.forGeneralQuestions": "For general program inquiries, you may call us at 000-000-0000.", "footer.giveFeedback": "Give Feedback", @@ -774,7 +778,7 @@ "pageDescription.listing": "Apply for affordable housing at %{listingName} in %{regionName}, built in partnership with Exygy.", "pageDescription.welcome": "Search and apply for affordable housing on %{regionName}'s Housing Portal", "pageTitle.additionalResources": "More Housing Opportunities", - "pageTitle.disclaimer": "Endorsement Disclaimers", + "pageTitle.disclaimer": "Disclaimer", "pageTitle.getAssistance": "Get Assistance", "pageTitle.housingCounselors": "Housing Counselors", "pageTitle.privacy": "Privacy Policy", @@ -785,8 +789,7 @@ "progressNav.completed": "completed", "progressNav.notCompleted": "not completed", "progressNav.srHeading": "Progress", - "region.name": "Local Region", - "states.AK": "Alaska", + "region.name": "Bloomington", "states.AL": "Alabama", "states.AR": "Arkansas", "states.AZ": "Arizona", diff --git a/shared-helpers/src/locales/tl.json b/shared-helpers/src/locales/tl.json index 0d5b1b948e..7f7f6858d1 100644 --- a/shared-helpers/src/locales/tl.json +++ b/shared-helpers/src/locales/tl.json @@ -549,7 +549,11 @@ "errors.timeError": "Pakilagay ang tamang oras", "errors.zipCodeError": "Pakilagay ang zipcode", "footer.contact": "Contact", - "footer.copyright": "Demonstration Jurisdiction © 2021 • Ang Lahat ng Karapatan ay Nakalaan", + "footer.content.applicationQuestions": "Para sa listahan at mga tanong sa aplikasyon, mangyaring makipag-ugnayan sa Leasing Agent na ipinapakita sa listahan.", + "footer.content.partnership": "sa pakikipagtulungan sa", + "footer.content.programQuestions": "Para sa mga pangkalahatang katanungan sa programa, maaari kang tumawag sa MOHD sa 123-456-7890.", + "footer.content.projectOf": "Ang Bloomington Housing Portal ay isang proyekto ng", + "footer.copyright": "© Lungsod at County ng Bloomington", "footer.disclaimer": "Pagtatatuwa", "footer.forGeneralQuestions": "Para sa pangkalahatang katanungan ukol sa programa, maaari mo kaming tawagan sa 000-000-0000.", "footer.giveFeedback": "Magbigay ng Feedback", diff --git a/shared-helpers/src/locales/vi.json b/shared-helpers/src/locales/vi.json index 25a9d964d4..6f1f45cdc8 100644 --- a/shared-helpers/src/locales/vi.json +++ b/shared-helpers/src/locales/vi.json @@ -549,7 +549,11 @@ "errors.timeError": "Vui lòng nhập thời gian hợp lệ", "errors.zipCodeError": "Vui lòng nhập số zipcode", "footer.contact": "Liên hệ", - "footer.copyright": "Quyền tài phán biểu tình © 2021 • Bảo lưu mọi quyền", + "footer.content.applicationQuestions": "Đối với các câu hỏi về danh sách và đơn đăng ký, vui lòng liên hệ với Đại lý cho thuê được hiển thị trên danh sách.", + "footer.content.partnership": "hợp tác với", + "footer.content.programQuestions": "FNếu có thắc mắc chung về chương trình, bạn có thể gọi MOHD theo số 123-456-7890.", + "footer.content.projectOf": "Cổng thông tin nhà ở Bloomington là một dự án của", + "footer.copyright": "© Thành phố & Quận Bloomington", "footer.disclaimer": "Tuyên bố miễn trừ trách nhiệm", "footer.forGeneralQuestions": "Đối với các yêu cầu chung về chương trình, bạn có thể gọi cho chúng tôi theo số 000-000-0000.", "footer.giveFeedback": "Đưa ra Phản hồi", diff --git a/shared-helpers/src/locales/zh.json b/shared-helpers/src/locales/zh.json index 82c8eede6d..d49bbd9f52 100644 --- a/shared-helpers/src/locales/zh.json +++ b/shared-helpers/src/locales/zh.json @@ -549,7 +549,11 @@ "errors.timeError": "請輸入有效的時間", "errors.zipCodeError": "請輸入郵遞區號", "footer.contact": "聯絡方式", - "footer.copyright": "Demonstration Jurisdiction © 2021 • 版權所有", + "footer.content.applicationQuestions": "對於清單和申請問題，請聯絡清單中顯示的租賃代理。", + "footer.content.partnership": "與 合作", + "footer.content.programQuestions": "對於一般計劃查詢，您可以致電 MOHD：123-456-7890。", + "footer.content.projectOf": "布魯明頓住房門戶網站是", + "footer.copyright": "© 布魯明頓市和縣", "footer.disclaimer": "免責聲明", "footer.forGeneralQuestions": "若為一般計劃查詢，可以致電 000-000-0000 聯絡我們。", "footer.giveFeedback": "提供回饋意見", diff --git a/sites/partners/package.json b/sites/partners/package.json index dbf0fbd24a..ecf56b13c9 100644 --- a/sites/partners/package.json +++ b/sites/partners/package.json @@ -31,7 +31,7 @@ "dependencies": { "@bloom-housing/shared-helpers": "^7.7.1", "@bloom-housing/ui-components": "12.4.0", - "@bloom-housing/ui-seeds": "1.17.0", + "@bloom-housing/ui-seeds": "1.18.1", "@heroicons/react": "^2.1.1", "@mapbox/mapbox-sdk": "^0.13.0", "ag-grid-community": "^26.0.0", diff --git a/sites/partners/src/components/listings/helpers.tsx b/sites/partners/src/components/listings/helpers.tsx index 0cd8e3e83a..bf18765a40 100644 --- a/sites/partners/src/components/listings/helpers.tsx +++ b/sites/partners/src/components/listings/helpers.tsx @@ -26,7 +26,7 @@ export const getListingStatusTag = (listingStatus: ListingsStatusEnum) => { return ( diff --git a/sites/public/package.json b/sites/public/package.json index 9482e3fdf0..6ef6c9adc2 100644 --- a/sites/public/package.json +++ b/sites/public/package.json @@ -31,7 +31,7 @@ "dependencies": { "@bloom-housing/shared-helpers": "^7.7.1", "@bloom-housing/ui-components": "12.4.0", - "@bloom-housing/ui-seeds": "1.17.0", + "@bloom-housing/ui-seeds": "1.18.1", "@heroicons/react": "^2.1.1", "@mapbox/mapbox-sdk": "^0.13.0", "@sentry/nextjs": "^7.61.0", diff --git a/sites/public/public/images/default-housing-logo.svg b/sites/public/public/images/default-housing-logo.svg new file mode 100644 index 0000000000..4bb263e960 --- /dev/null +++ b/sites/public/public/images/default-housing-logo.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sites/public/src/components/shared/CustomSiteFooter.module.scss b/sites/public/src/components/shared/CustomSiteFooter.module.scss new file mode 100644 index 0000000000..1b5d9d51ad --- /dev/null +++ b/sites/public/src/components/shared/CustomSiteFooter.module.scss @@ -0,0 +1,116 @@ +.footer-container { + color: var(--seeds-color-on-inverse-muted); + width: 100%; + background-color: var(--seeds-bg-color-inverse); + text-align: left; + display: flex; + flex-direction: column; + + a { + color: var(--seeds-color-on-inverse); + } +} + +.footer-content-container { + padding-inline: var(--seeds-s6); + padding-block: var(--seeds-s12); + @media (--md-down) { + padding-inline: var(--seeds-s6); + padding-block: var(--seeds-s8); + } + width: 100%; +} + +.footer { + padding-inline: 0; + text-align: left; + display: flex; + justify-content: space-between; + flex-direction: column; + align-items: flex-start; + margin: auto; + max-width: var(--seeds-screen-lg); +} + +.icon-container { + display: flex; + flex-direction: row; + align-items: center; + flex-wrap: wrap; + + .jurisdiction-icon { + width: var(--seeds-s24); + height: var(--seeds-s24); + display: inline-block; + margin-right: var(--seeds-s3); + margin-bottom: var(--seeds-s8); + img { + width: 100%; + height: 100%; + } + } +} + +.copyright-content-container { + background-color: var(--seeds-bg-color-inverse-dark); +} + +.copyright { + flex-direction: row; + justify-content: space-between; + background-color: var(--seeds-bg-color-inverse-dark); + align-items: flex-start; + color: var(--seeds-color-on-inverse-muted); + img { + margin-left: var(--seeds-s4); + } + + @media (--md-down) { + flex-direction: column; + align-items: flex-start; + justify-content: start; + img { + margin-top: var(--seeds-s4); + margin-left: 0; + } + } +} + +.text-container { + display: flex; + flex-direction: column; + margin-bottom: var(--seeds-s4); +} + +.text-container:last-of-type { + margin-bottom: 0; +} + +.copyright-text { + min-width: var(--seeds-s72); +} + +.links { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: flex-end; + margin-bottom: calc(-1 * var(--seeds-s2)); + a { + color: var(--seeds-color-on-inverse-muted); + margin-left: var(--seeds-s6); + margin-bottom: var(--seeds-s2); + } + @media (--md-down) { + margin-bottom: 0; + flex-direction: column; + margin-top: var(--seeds-s8); + a { + margin-left: 0; + margin-bottom: var(--seeds-s5); + } + a:last-of-type { + margin-bottom: 0; + } + } +} diff --git a/sites/public/src/components/shared/CustomSiteFooter.tsx b/sites/public/src/components/shared/CustomSiteFooter.tsx new file mode 100644 index 0000000000..abe89162b5 --- /dev/null +++ b/sites/public/src/components/shared/CustomSiteFooter.tsx @@ -0,0 +1,48 @@ +import React from "react" +import Link from "next/link" +import { t } from "@bloom-housing/ui-components" +import styles from "./CustomSiteFooter.module.scss" + +const CustomSiteFooter = () => { + return ( + + ) +} + +export default CustomSiteFooter diff --git a/sites/public/src/layouts/application.tsx b/sites/public/src/layouts/application.tsx index b3c918734f..9b33fb16e3 100644 --- a/sites/public/src/layouts/application.tsx +++ b/sites/public/src/layouts/application.tsx @@ -1,19 +1,12 @@ import React, { useContext } from "react" import dayjs from "dayjs" import { useRouter } from "next/router" -import Link from "next/link" import Head from "next/head" import { Message, Toast } from "@bloom-housing/ui-seeds" -import { - SiteHeader, - SiteFooter, - FooterNav, - FooterSection, - MenuLink, - t, -} from "@bloom-housing/ui-components" -import { AuthContext, ExygyFooter, MessageContext } from "@bloom-housing/shared-helpers" +import { SiteHeader, MenuLink, t } from "@bloom-housing/ui-components" +import { AuthContext, MessageContext } from "@bloom-housing/shared-helpers" import styles from "./application.module.scss" +import CustomSiteFooter from "../components/shared/CustomSiteFooter" const Layout = (props) => { const { profile, signOut } = useContext(AuthContext) @@ -132,15 +125,7 @@ const Layout = (props) => { - - - {t("pageTitle.privacy")} - {t("pageTitle.disclaimer")} - - - - - + ) } diff --git a/yarn.lock b/yarn.lock index 9acb6f1791..36c6f3b2bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2021,10 +2021,10 @@ tailwindcss-rtl "^0.9.0" typesafe-actions "^5.1.0" -"@bloom-housing/ui-seeds@1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@bloom-housing/ui-seeds/-/ui-seeds-1.17.0.tgz#b5a9cb2c0ffb83d8fe37919fa7e0775a796836b0" - integrity sha512-LoYWq5I02lzU3VRDiMnvAezdhjBIj1dN8mazMWotHv9RoZaO1J37nmM2zX5UiMv7604I+j1BMZOmjN6sSMyUIA== +"@bloom-housing/ui-seeds@1.18.1": + version "1.18.1" + resolved "https://registry.yarnpkg.com/@bloom-housing/ui-seeds/-/ui-seeds-1.18.1.tgz#9e3d56478d3e78364ed7ba848ffc5658ae237c98" + integrity sha512-no/0kfPquMSb76u7Lfo32BeltB+bZ5si0RH8lhn2nL9js1LhuT/yFlDotGNvGwAAqP6iDcfqjfbWrTM4f+KGrA== dependencies: "@fortawesome/fontawesome-svg-core" "^6.3.0" "@fortawesome/react-fontawesome" "^0.2.0"