From 90746359085323e3668f96545d38e6e4e0102f74 Mon Sep 17 00:00:00 2001 From: Sean Albert Date: Wed, 13 Oct 2021 14:21:49 -0700 Subject: [PATCH] Merge/latest master (#1987) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Dev - Listing Pagination, Filtering and LM Updates (#1814) * 1573/remove dependencies from listings group * changelog * Flagged set perms (#1754) * force quit redis connection on app close * updates for redis config * adds enableShutdownHooks to main app * Update archer-listing.ts * Updates cache clear to use cacheManager reset, so we don't have to maintain keys * Update units-transformations.ts * Update CHANGELOG.md * allows for not needing google api keys * Update listings.controller.ts * Update listings.e2e-spec.ts * updates permssions for flagged sets so partner role can access * 1651/users table (#1679) * Add navigation item * Create users page * Fix undefined * Basic list users method setup * Generate client * Create users table * Update role column * backend-swagger updates * adds auth check to user list * adds pagination to user list * joins listings id, name onto user list * Update backend-swagger.ts * Update backend-swagger - need to rebase before merging * Update listings column * Join role to the user * sets backend-swagger to upstream * Update backend-swagger.ts * Update backend-swagger.ts * Update changelog * Update changelog * Remove todo comment * fixes issues with backend-swagger by updating DTOs * updates view to be optional * final? fixes for backend-swagger * removes roles from create and update user * fixing flaky tests * makes unitSummary optional and fixes more tests Co-authored-by: Dominik Barcikowski Co-authored-by: seanmalbert * Remove AmiChart object from UnitDto (#1575) * Remove AmiChart object from UnitDto Add AmiChartOverrides to listing service * Rename ListingAmiChartOverride to UnitAmiChartOverride and move override entity relation to Unit * Add AmiChart overriding logic tests * Fix ListingsService.retrieve view queryparam typing (incorrect autogeneration from @Query("key") * Fix autogenerated type changes in frontend sites * Fix UserRoleDto typing * Add /user tests for updating roles property * Fix ui-components tests * Update CHANGELOG.md * Fix code style issues with Prettier * updates DetailsUnitDrawer to fetch and use ami chart by id * updates ui-component tests * removes ApiQuery for view since it's now covered with ListingsRetrieveQueryParams Co-authored-by: Lint Action Co-authored-by: seanmalbert * 1721/remove business logic from HouseholdSizeField * changelog * add guards around min and max * fix cypress test * 1716/remove business logic from HousingCounselor * changelog * cleanup * fixup unit tests * 1574/remove dependencies from ListingsList * changelog * 1762/unit availability (#1767) * Update unit status labels * Update changelog Co-authored-by: Dominik Barcikowski * 1751/character limit (#1766) * Update character limit to 600 * Update changelog Co-authored-by: Dominik Barcikowski * 1760/add none label if applicationDueDate does not exist (#1764) * Add none label if applicationDueDate does not exist * Update changelog Co-authored-by: Dominik Barcikowski * Fix code style issues with Prettier * 1711/403 page (#1763) * Add 403 page * Update changelog * Make buttonLink prop as optional * Make button title as optional * Remove hero button Co-authored-by: Dominik Barcikowski * 1758/update select width (#1765) * Update cell width * Update changelog * Update columns * Update select right padding Co-authored-by: Dominik Barcikowski * relocate formatIncome * changelog * Adds Jurisdiction to listings, users, translations (replaces countyCode) (#1776) * force quit redis connection on app close * updates for redis config * adds enableShutdownHooks to main app * Update archer-listing.ts * Updates cache clear to use cacheManager reset, so we don't have to maintain keys * Update units-transformations.ts * Update CHANGELOG.md * allows for not needing google api keys * Update listings.controller.ts * Update listings.e2e-spec.ts * adds jurisdiction relations * cleanup after testing * adds jurisdiction selection to listings form * updates backend tests * updates to ui-components * testing cypress tests * renamed JuriWrap to JurisdictionWrapper * addresses feedback from review * Adds changelog entry * 1687/listing pagination issues (#1782) * Refactor addFilters to allow an array of filters to be passed as input param * Update CHANGELOG.md * Fix addFilters typing * Fix listing.spec.ts tests * Generate client * Update backend-swagger.ts * Add qs package * Update axios requests for public * Update client * Add listings pagination * Fix code style issues with Prettier * Update listings requests * Fix code style issues with Prettier * Add qs serializer * Fix code style issues with Prettier * Update listings fetch hook * Change validator to string * Update leasingAgents value Co-authored-by: Dominik Barcikowski Co-authored-by: Lint Action * Fix code style issues with Prettier * Add application types to the listing form (#1703) * First round of adding Application Types form * Finish building out Application Types form * fix comments * WIP of adding application types to listing detail * Regenerated backend swagger * Fix bug in Dto * Swagger again! * More details on the listing detail * Use proper schema in UI components * updates migration script to migrate application methods to paper applications * Fix code style issues with Prettier * updates swagger * adds boolean fields to listings to make application methods easier * Fix code style issues with Prettier * pulls application method logic into own section and simplifies * cleanup unused fields * ensures commonDigitalApplication is set after digitalApplication change * Fix code style issues with Prettier * phone field updates to handle render and "as" cases * Fix code style issues with Prettier * rename old ApplicationTypes and rename v2 * cleans up translation warnings and adds fixes from Detroit #528 Co-authored-by: seanmalbert Co-authored-by: Lint Action * updates adds-application-method-referral-type * updates adds-application-method-referral-type-2 * updates adds-application-method-referral-type-3 * updates adds-application-method-referral-type-4 * updates adds-application-method-referral-type-5 * Fix code style issues with Prettier * Dev - fixes ApplicationType dependency issue (#1800) * force quit redis connection on app close * updates for redis config * adds enableShutdownHooks to main app * Update archer-listing.ts * Updates cache clear to use cacheManager reset, so we don't have to maintain keys * Update units-transformations.ts * Update CHANGELOG.md * allows for not needing google api keys * Update listings.controller.ts * Update listings.e2e-spec.ts * fix commonDigitalApplication dependency in ApplicationTypes * Adding email templates (#1792) * update master with latest (#1727) * 1545/lat-long draggable map (#1577) * 1616/user roles (#1673) from 1628 * User roles for partners * generate migration * update client * update seeds and policy * migrate partners from leasing agent table * change enum name * Remove anonymous role * Update authz.service.ts * fix application view * update changelog * fix backend tests * add test * fix ui tests Co-authored-by: Abbie Farr Co-authored-by: Abbie Farr <83078310+abbiefarr@users.noreply.github.com> * Fix code style issues with Prettier * 1587/Updates Listing Columns and Perms so Leasing Agents can Edit (#1627) * updates for cache revalidation on the frontend * fixes listing bug issue * Updates partner listings columns * updates policy and user perms * skips tests until #1616 is implemented * updates to work with new user roles * remove origin from listing service list args * test update * Fix code style issues with Prettier * Split Listing form up into two main tabs (#1644) * Add tabs to the listing form * Fix button positions and ensure tabs always render * Add #1644 to Changelog * fixes warning for ArrowForward props Co-authored-by: seanmalbert * Contribute Feature/Ensure Progress Bar is screen reader friendly (#1674) * Add unit size filter to backend (#1660) * Add unit size filter to backend (#368) * initial thoughts * initial bedrooms filter (untested) * Fix code style issues with Prettier * fix typo in 'studio' * remove custom filter handling, switch to bedrooms field on unit table * add additional check for invalid comparisons, outside the filter handler * use unit_type table for bedrooms, add field to unit_type table, remove toLowerCase() from filter name comparisons to allow camelCase filter names * Fix code style issues with Prettier * add bedrooms filter to frontend comparison map * fix comparison type for frontend map * fix test and migration indentation * update changelog * regenerate swagger * fix tests * try to fix more ui tests * try to fix more ui tests * add comment for custom filter handling Co-authored-by: Lint Action * fix missing bedrooms build error Co-authored-by: Lint Action * 1431/google translate (#1590) * Initial google translate listing * Translations for arrays * Disable caching for GET listing endpoint * Final tweaks to google translate * Update change log for google translations * Fix code style issues with Prettier * Update CHANGELOG.md * Minor cleanup for Google Translate * Initial google translate listing * Translations for arrays * Disable caching for GET listing endpoint * Final tweaks to google translate * Update change log for google translations * Fix code style issues with Prettier * Update CHANGELOG.md * Minor cleanup for Google Translate * Google translate refactoring * Fix listings service spec * adds custom cache interceptor for language * updates custom cache interceptor * Add missing Headers import for listings controller Co-authored-by: Lint Action Co-authored-by: seanmalbert * Restructure units summary table (#1670) * Add UnitsSummary to Listing * remove listing service changes * redo migration * monthlyRent as number * fix lint errors * Fix code style issues with Prettier * Hardcode the number of items in listings.e2e-spec.ts. (#1643) Using the length of the array from seed.ts was causing flakiness if the bloom database was not set up in the testing environment. Co-authored-by: seanmalbert * Contribute/Create listing updated UI component (#1676) * 1621/Listing Views (#1626) * set fallback to true for getStaticPaths so new paths can be added * adds revalidate to staticProps * updates for cache revalidation on the frontend * trigger cleanup * fixes listing bug issue * adds additional checks for unit type and priority * new line * Fix code style issues with Prettier * adds listing view * adds other views * adds unitsAvailable to select * updates to pass view as query param for list and by id * removes comment * Update CHANGELOG.md * updates view test * rename spec and remove log * removes another log * updates partner-role migration * updates partner-role migration * adds --runInBand --detectOpenHandles to backend test * adds view param to applications e2e spec test that fetches listings * updates default view to full and fixes housing-counselors bug * view test update Co-authored-by: Lint Action * 1629/fcfs with date (#1680) * 1629/fcfs with date * changelog * 1611/what to expect editable in listings management (#1681) * 1611/what to expect editable * fixup unit test * changelog * Make actions an optional prop and hide the footer when not present. (#1690) * Make features section more robust (#1688) * Fixes whatToExpect UI Component failing test (#1692) * force quit redis connection on app close * updates for redis config * adds enableShutdownHooks to main app * Update archer-listing.ts * Add migration (#1689) Co-authored-by: seanmalbert * Fix code style issues with Prettier * adds SRO to num_bedroom case * 872/allow for unit sets to have multiple ami charts (#1678) * Updates cache clear to use reset, instead of maintaining cache keys (#1698) * force quit redis connection on app close * updates for redis config * adds enableShutdownHooks to main app * Update archer-listing.ts * Updates cache clear to use cacheManager reset, so we don't have to maintain keys * Update units-transformations.ts * Update CHANGELOG.md * allows for not needing google api keys * Update listings.controller.ts * Update listings.e2e-spec.ts * testing build issues (#1699) * testing build issues * testing build issues pt 2 * Updates translations to check for values before sending to service Co-authored-by: seanmalbert * 1656/lottery type without explicit date (#1682) * Add two lines to the LeasingAgent UI component to display information about the listing management company (#1677) * Fix code style issues with Prettier * 1402/multiple statuses under image card (#1700) Co-authored-by: Anthony Kong * fix application routing (#1715) * fix-applications-url * changelog * 1691/hmi translations (#1707) * update bha-csv (#1726) * Fix code style issues with Prettier Co-authored-by: Sean Albert Co-authored-by: Abbie Farr Co-authored-by: Abbie Farr <83078310+abbiefarr@users.noreply.github.com> Co-authored-by: Lint Action Co-authored-by: Jared White Co-authored-by: pfeeny5 <82653098+pfeeny5@users.noreply.github.com> Co-authored-by: Austin Valeske Co-authored-by: Marcin Jędras Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com> Co-authored-by: Anders Schneider Co-authored-by: Anthony Kong * Flagged set perms (#1754) (#1756) * force quit redis connection on app close * updates for redis config * adds enableShutdownHooks to main app * Update archer-listing.ts * Updates cache clear to use cacheManager reset, so we don't have to maintain keys * Update units-transformations.ts * Update CHANGELOG.md * allows for not needing google api keys * Update listings.controller.ts * Update listings.e2e-spec.ts * updates permssions for flagged sets so partner role can access * fixes/updates listing form unit and ami chart checks * Adding email templates * moves logo * Fix code style issues with Prettier * Update inlined.html Co-authored-by: Emily Jablonski <65367387+emilyjablonski@users.noreply.github.com> Co-authored-by: Sean Albert Co-authored-by: Abbie Farr Co-authored-by: Abbie Farr <83078310+abbiefarr@users.noreply.github.com> Co-authored-by: Lint Action Co-authored-by: Jared White Co-authored-by: pfeeny5 <82653098+pfeeny5@users.noreply.github.com> Co-authored-by: Austin Valeske Co-authored-by: Marcin Jędras Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com> Co-authored-by: Anders Schneider Co-authored-by: Anthony Kong Co-authored-by: Jesse Arnold * 1429/application type fixes (#1806) * force quit redis connection on app close * updates for redis config * adds enableShutdownHooks to main app * Update archer-listing.ts * Updates cache clear to use cacheManager reset, so we don't have to maintain keys * Update units-transformations.ts * Update CHANGELOG.md * allows for not needing google api keys * Update listings.controller.ts * Update listings.e2e-spec.ts * fix commonDigitalApplication dependency in ApplicationTypes * fixes render issues with application types * updates phone field control type * update for toggling with nested watched field * phonefield * 1721/remove business logic from HouseholdMemberForm * changelog * changelog typo * deleting member fix * pr feedback * Reset page to 1 on limit change (#1809) * Fix pagination limit * Update changelog Co-authored-by: Dominik Barcikowski * listing slug check for property Co-authored-by: Emily Jablonski Co-authored-by: dominikx96 Co-authored-by: Dominik Barcikowski Co-authored-by: Emily Jablonski <65367387+emilyjablonski@users.noreply.github.com> Co-authored-by: Michał Plebański Co-authored-by: Lint Action Co-authored-by: Jared White Co-authored-by: Jesse James Arnold Co-authored-by: Abbie Farr Co-authored-by: Abbie Farr <83078310+abbiefarr@users.noreply.github.com> Co-authored-by: pfeeny5 <82653098+pfeeny5@users.noreply.github.com> Co-authored-by: Austin Valeske Co-authored-by: Marcin Jędras Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com> Co-authored-by: Anders Schneider Co-authored-by: Anthony Kong Co-authored-by: Jesse Arnold * updates asset auth policy * fixes JurisdictionWrapper to work when only one jurisdiction * version bump to 2.0.0-pre-tailwind * adds log to backend application _create and updates submit alert error * Cherry pick release with Application types fixes, notification URL and getStaticProps cleanup (#1904) * application types, staticproptypes and notification url * updates from listingview * backend-swagger * fix lint issues * fix ApplicationSection test * fix ApplicationSection story * adds notifications qa from 1860 (#1907) * adds notifications qa from 1860 * adds next start to netlify command * Update netlify.toml * Update homepage.scss * feat(backend): Add tokenMissing logging to reveal user id that is failing (#1945) * Update DeployServicesHeroku.md * chore: resolves merge conflicts from frontend * Fix code style issues with Prettier * fix: adds totalFlagged and removes maxLength 600 instances * fix: removes dup unitStatusOptions from UnitForm Co-authored-by: Emily Jablonski Co-authored-by: dominikx96 Co-authored-by: Dominik Barcikowski Co-authored-by: Emily Jablonski <65367387+emilyjablonski@users.noreply.github.com> Co-authored-by: Michał Plebański Co-authored-by: Lint Action Co-authored-by: Jared White Co-authored-by: Jesse James Arnold Co-authored-by: Abbie Farr Co-authored-by: Abbie Farr <83078310+abbiefarr@users.noreply.github.com> Co-authored-by: pfeeny5 <82653098+pfeeny5@users.noreply.github.com> Co-authored-by: Austin Valeske Co-authored-by: Marcin Jędras Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com> Co-authored-by: Anders Schneider Co-authored-by: Anthony Kong Co-authored-by: Jesse Arnold --- CHANGELOG.md | 2 + backend/core/package.json | 2 +- .../src/applications/applications.service.ts | 1 + backend/core/src/auth/authz_policy.csv | 2 +- .../jurisdictions/jurisdictions.e2e-spec.ts | 8 ---- backend/core/types/src/backend-swagger.ts | 28 ------------- docs/DeployServicesHeroku.md | 39 ++++++++++++++++++- lerna.json | 2 +- package.json | 2 +- sites/partners/package.json | 2 +- sites/public/package.json | 2 +- .../pages/applications/review/terms.tsx | 2 +- sites/public/pages/index.tsx | 5 +-- sites/public/pages/listing/[id]/[slug].tsx | 1 + ui-components/package.json | 2 +- ui-components/src/locales/general.json | 2 +- 16 files changed, 53 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a376e53ff..070165c4fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file. The format ## Unreleased +## v2.0.0-pre-tailwind 09/16/2021 + ## Frontend - Added: diff --git a/backend/core/package.json b/backend/core/package.json index 50d66219fb..e8be9f30c4 100644 --- a/backend/core/package.json +++ b/backend/core/package.json @@ -1,6 +1,6 @@ { "name": "@bloom-housing/backend-core", - "version": "1.0.5", + "version": "2.0.0-pre-tailwind", "description": "Listings service reference implementation for the Bloom affordable housing system", "author": "Marcin Jedras ", "private": false, diff --git a/backend/core/src/applications/applications.service.ts b/backend/core/src/applications/applications.service.ts index e112360ca5..0b797136b9 100644 --- a/backend/core/src/applications/applications.service.ts +++ b/backend/core/src/applications/applications.service.ts @@ -255,6 +255,7 @@ export class ApplicationsService { { retries: 6, minTimeout: 200 } ) } catch (e) { + console.log("Create application error = ", e) // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore if (e instanceof QueryFailedError && e.code === "40001") { diff --git a/backend/core/src/auth/authz_policy.csv b/backend/core/src/auth/authz_policy.csv index e4b03d1c56..2d4a5e7134 100644 --- a/backend/core/src/auth/authz_policy.csv +++ b/backend/core/src/auth/authz_policy.csv @@ -12,7 +12,7 @@ p, admin, asset, true, .* p, partner, asset, true, .* p, admin, preference, true, .* -p, partner, preference, true, read +p, partner, preference, true, .* p, admin, applicationMethod, true, .* p, partner, applicationMethod, true, read diff --git a/backend/core/test/jurisdictions/jurisdictions.e2e-spec.ts b/backend/core/test/jurisdictions/jurisdictions.e2e-spec.ts index 35935d694e..916c5e59f4 100644 --- a/backend/core/test/jurisdictions/jurisdictions.e2e-spec.ts +++ b/backend/core/test/jurisdictions/jurisdictions.e2e-spec.ts @@ -63,14 +63,6 @@ describe("Jurisdictions", () => { expect(getById.body.name).toBe("test") }) - afterEach(() => { - jest.clearAllMocks() - }) - - afterAll(async () => { - await app.close() - }) - it(`should create and return a new jurisdiction by name`, async () => { const res = await supertest(app.getHttpServer()) .post(`/jurisdictions`) diff --git a/backend/core/types/src/backend-swagger.ts b/backend/core/types/src/backend-swagger.ts index d2f73e43a1..07a6a5e56c 100644 --- a/backend/core/types/src/backend-swagger.ts +++ b/backend/core/types/src/backend-swagger.ts @@ -3849,9 +3849,6 @@ export interface UserFilterParams { /** */ $comparison: EnumUserFilterParamsComparison - /** */ - $include_nulls?: boolean - /** */ isPartner?: boolean } @@ -3968,9 +3965,6 @@ export interface ListingFilterParams { /** */ $comparison: EnumListingFilterParamsComparison - /** */ - $include_nulls?: boolean - /** */ name?: string @@ -3988,21 +3982,6 @@ export interface ListingFilterParams { /** */ leasingAgents?: string - - /** */ - availability?: EnumListingFilterParamsAvailability - - /** */ - seniorHousing?: boolean - - /** */ - minRent?: number - - /** */ - maxRent?: number - - /** */ - minAmiPercentage?: number } export interface UnitAccessibilityPriorityType { @@ -5912,7 +5891,6 @@ export enum EnumUserFilterParamsComparison { "<>" = "<>", "IN" = "IN", ">=" = ">=", - "<=" = "<=", "NA" = "NA", } export enum EnumListingFilterParamsComparison { @@ -5920,7 +5898,6 @@ export enum EnumListingFilterParamsComparison { "<>" = "<>", "IN" = "IN", ">=" = ">=", - "<=" = "<=", "NA" = "NA", } export enum EnumListingFilterParamsStatus { @@ -5928,11 +5905,6 @@ export enum EnumListingFilterParamsStatus { "pending" = "pending", "closed" = "closed", } -export enum EnumListingFilterParamsAvailability { - "hasAvailability" = "hasAvailability", - "noAvailability" = "noAvailability", - "waitlist" = "waitlist", -} export enum OrderByFieldsEnum { "mostRecentlyUpdated" = "mostRecentlyUpdated", "applicationDates" = "applicationDates", diff --git a/docs/DeployServicesHeroku.md b/docs/DeployServicesHeroku.md index 0cf5b31f83..7023bf97ae 100644 --- a/docs/DeployServicesHeroku.md +++ b/docs/DeployServicesHeroku.md @@ -2,10 +2,47 @@ Bloom is designed to use a set of independently run services that provide the data and business logic processing needed by the front-end apps. While the Bloom architecture accomodates services built and operated in a variety of environments, the reference implementation includes services that can be easily run within the [Heroku PaaS environment](https://www.heroku.com/). -## Monorepo Buildpack +## Resources + +- [Heroku Postgres](https://www.heroku.com/postgres) +- [Heroku Redis](https://www.heroku.com/redis) + +## Heroku Buildpacks + +### Monorepo Buildpack Since the Bloom repository uses a monorepo layout, all Heroku services must use the [monorepo buildpack](https://elements.heroku.com/buildpacks/lstoll/heroku-buildpack-monorepo). +### Node.js Buildpack + +Bloom's backend runs on Node.js and Heroku must be setup with [Heroku Buildpack for Node.js](https://elements.heroku.com/buildpacks/heroku/heroku-buildpack-nodejs). + ## Procfile +release: yarn herokusetup + +web: yarn start + ## Environment Variables + +APP_BASE=backend/core + +APP_SECRET='YOUR-LONG-SECRET-KEY' + +CLOUDINARY_SECRET= + +CLOUDINARY_KEY= + +DATABASE_URL= + +EMAIL_API_KEY='SENDGRID-API-KEY' + +EMAIL_FROM_ADDRESS= + +PARTNERS_BASE_URL='PARTNER-PORTAL-URL' + +REDIS_TLS_URL= + +REDIS_URL= + +REDIS_USE_TLS=1 diff --git a/lerna.json b/lerna.json index 4b1c280a2d..02eda9f521 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "packages": ["sites/public", "sites/partners", "backend/core", "shared-helpers", "ui-components"], - "version": "1.0.5", + "version": "2.0.0-pre-tailwind", "npmClient": "yarn", "useWorkspaces": true } diff --git a/package.json b/package.json index 75a22e1ab2..90628abb84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bloom-housing", - "version": "1.0.5", + "version": "2.0.0-pre-tailwind", "description": "Bloom is a system to manage processes for affordable housing", "workspaces": { "packages": [ diff --git a/sites/partners/package.json b/sites/partners/package.json index 79844ec54f..dd807359f5 100644 --- a/sites/partners/package.json +++ b/sites/partners/package.json @@ -1,6 +1,6 @@ { "name": "@bloom-housing/partners", - "version": "1.0.5", + "version": "2.0.0-pre-tailwind", "description": "Partners app reference implementation for the Bloom affordable housing system", "main": "index.js", "license": "Apache-2.0", diff --git a/sites/public/package.json b/sites/public/package.json index a4b120e871..3dad491364 100644 --- a/sites/public/package.json +++ b/sites/public/package.json @@ -1,6 +1,6 @@ { "name": "@bloom-housing/public", - "version": "1.0.5", + "version": "2.0.0-pre-tailwind", "description": "Public web app reference implementation for the Bloom affordable housing system", "main": "index.js", "license": "Apache-2.0", diff --git a/sites/public/pages/applications/review/terms.tsx b/sites/public/pages/applications/review/terms.tsx index 2847e55ae9..bff3a1ab63 100644 --- a/sites/public/pages/applications/review/terms.tsx +++ b/sites/public/pages/applications/review/terms.tsx @@ -91,7 +91,7 @@ const ApplicationTerms = () => { {apiError && ( setApiError(false)}> - {t("errors.rateLimitExceeded")} + {t("errors.alert.badRequest")} )} diff --git a/sites/public/pages/index.tsx b/sites/public/pages/index.tsx index a8c3d5b240..1374db0b3f 100644 --- a/sites/public/pages/index.tsx +++ b/sites/public/pages/index.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react" import Head from "next/head" -import { Jurisdiction, Listing } from "@bloom-housing/backend-core/types" +import { Jurisdiction } from "@bloom-housing/backend-core/types" import { AlertBox, LinkButton, @@ -10,13 +10,12 @@ import { ActionBlock, Icon, } from "@bloom-housing/ui-components" -import Layout from "../layouts/application" import axios from "axios" +import Layout from "../layouts/application" import { ConfirmationModal } from "../src/ConfirmationModal" import { MetaTags } from "../src/MetaTags" interface IndexProps { - listings: Listing[] jurisdiction: Jurisdiction } diff --git a/sites/public/pages/listing/[id]/[slug].tsx b/sites/public/pages/listing/[id]/[slug].tsx index df9e38ef17..408764a1c7 100644 --- a/sites/public/pages/listing/[id]/[slug].tsx +++ b/sites/public/pages/listing/[id]/[slug].tsx @@ -1,3 +1,4 @@ +import React from "react" import qs from "qs" import Head from "next/head" import axios from "axios" diff --git a/ui-components/package.json b/ui-components/package.json index 89e304eb52..f4b6cf03d6 100644 --- a/ui-components/package.json +++ b/ui-components/package.json @@ -64,7 +64,7 @@ "webpack": "^4.44.2" }, "dependencies": { - "@bloom-housing/backend-core": "^1.0.5", + "@bloom-housing/backend-core": "2.0.0-pre-tailwind", "@mapbox/mapbox-sdk": "^0.13.0", "@types/body-scroll-lock": "^2.6.1", "@types/jwt-decode": "^2.2.1", diff --git a/ui-components/src/locales/general.json b/ui-components/src/locales/general.json index 831b202f52..909685f374 100644 --- a/ui-components/src/locales/general.json +++ b/ui-components/src/locales/general.json @@ -665,7 +665,7 @@ }, "errors": { "alert": { - "badRequest": "Oops! Looks like something went wrong. Please try again. \n\nContact your housing department if you're still experiencing issues.", + "badRequest": "Looks like something went wrong. Please try again. \n\nContact your housing department if you're still experiencing issues.", "timeoutPleaseTryAgain": "Oops! Looks like something went wrong. Please try again." }, "notFound": {