Skip to content

Commit

Permalink
Merge/latest master (bloom-housing#1987)
Browse files Browse the repository at this point in the history
* Dev - Listing Pagination, Filtering and LM Updates (bloom-housing#1814)

* 1573/remove dependencies from listings group

* changelog

* Flagged set perms (bloom-housing#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 (bloom-housing#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 <dominik@airnauts.com>
Co-authored-by: seanmalbert <smabert@gmail.com>

* 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 <lint-action@samuelmeuli.com>
Co-authored-by: seanmalbert <smabert@gmail.com>

* 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 (bloom-housing#1767)

* Update unit status labels

* Update changelog

Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>

* 1751/character limit (bloom-housing#1766)

* Update character limit to 600

* Update changelog

Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>

* 1760/add none label if applicationDueDate does not exist (bloom-housing#1764)

* Add none label if applicationDueDate does not exist

* Update changelog

Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>

* Fix code style issues with Prettier

* 1711/403 page (bloom-housing#1763)

* Add 403 page

* Update changelog

* Make buttonLink prop as optional

* Make button title as optional

* Remove hero button

Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>

* 1758/update select width (bloom-housing#1765)

* Update cell width

* Update changelog

* Update columns

* Update select right padding

Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>

* relocate formatIncome

* changelog

* Adds Jurisdiction to listings, users, translations (replaces countyCode) (bloom-housing#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 (bloom-housing#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 <dominik@airnauts.com>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

* Fix code style issues with Prettier

* Add application types to the listing form (bloom-housing#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 <smabert@gmail.com>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

* 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 (bloom-housing#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 (bloom-housing#1792)

* update master with latest (bloom-housing#1727)

* 1545/lat-long draggable map (#1577)

* 1616/user roles (bloom-housing#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 <afarr@google.com>
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 <smabert@gmail.com>

* Contribute Feature/Ensure Progress Bar is screen reader friendly (bloom-housing#1674)

* Add unit size filter to backend (bloom-housing#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 <lint-action@samuelmeuli.com>

* fix missing bedrooms build error

Co-authored-by: Lint Action <lint-action@samuelmeuli.com>

* 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 <lint-action@samuelmeuli.com>
Co-authored-by: seanmalbert <smabert@gmail.com>

* Restructure units summary table (bloom-housing#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 <smabert@gmail.com>

* Contribute/Create listing updated UI component (bloom-housing#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 <lint-action@samuelmeuli.com>

* 1629/fcfs with date (bloom-housing#1680)

* 1629/fcfs with date

* changelog

* 1611/what to expect editable in listings management (bloom-housing#1681)

* 1611/what to expect editable

* fixup unit test

* changelog

* Make actions an optional prop and hide the footer when not present. (bloom-housing#1690)

* Make features section more robust (bloom-housing#1688)

* Fixes whatToExpect UI Component failing test (bloom-housing#1692)

* force quit redis connection on app close

* updates for redis config

* adds enableShutdownHooks to main app

* Update archer-listing.ts

* Add migration (bloom-housing#1689)

Co-authored-by: seanmalbert <smabert@gmail.com>

* Fix code style issues with Prettier

* adds SRO to num_bedroom case

* 872/allow for unit sets to have multiple ami charts (bloom-housing#1678)

* Updates cache clear to use reset, instead of maintaining cache keys (bloom-housing#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 (bloom-housing#1699)

* testing build issues

* testing build issues pt 2

* Updates translations to check for values before sending to service

Co-authored-by: seanmalbert <smabert@gmail.com>

* 1656/lottery type without explicit date (bloom-housing#1682)

* Add two lines to the LeasingAgent UI component to display information about the listing management company (bloom-housing#1677)

* Fix code style issues with Prettier

* 1402/multiple statuses under image card (bloom-housing#1700)

Co-authored-by: Anthony Kong <anthony.kong@sfgov.org>

* fix application routing (bloom-housing#1715)

* fix-applications-url

* changelog

* 1691/hmi translations (bloom-housing#1707)

* update bha-csv (bloom-housing#1726)

* Fix code style issues with Prettier

Co-authored-by: Sean Albert <smabert@gmail.com>
Co-authored-by: Abbie Farr <afarr@google.com>
Co-authored-by: Abbie Farr <83078310+abbiefarr@users.noreply.github.com>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: Jared White <jared@jaredwhite.com>
Co-authored-by: pfeeny5 <82653098+pfeeny5@users.noreply.github.com>
Co-authored-by: Austin Valeske <avaleske@users.noreply.github.com>
Co-authored-by: Marcin Jędras <mjjedras@gmail.com>
Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com>
Co-authored-by: Anders Schneider <anderseschneider@gmail.com>
Co-authored-by: Anthony Kong <anthony.kong@sfgov.org>

* Flagged set perms (bloom-housing#1754) (bloom-housing#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 <smabert@gmail.com>
Co-authored-by: Abbie Farr <afarr@google.com>
Co-authored-by: Abbie Farr <83078310+abbiefarr@users.noreply.github.com>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: Jared White <jared@jaredwhite.com>
Co-authored-by: pfeeny5 <82653098+pfeeny5@users.noreply.github.com>
Co-authored-by: Austin Valeske <avaleske@users.noreply.github.com>
Co-authored-by: Marcin Jędras <mjjedras@gmail.com>
Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com>
Co-authored-by: Anders Schneider <anderseschneider@gmail.com>
Co-authored-by: Anthony Kong <anthony.kong@sfgov.org>
Co-authored-by: Jesse Arnold <jessearnold@Jesses-MacBook-Pro.local>

* 1429/application type fixes (bloom-housing#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 (bloom-housing#1809)

* Fix pagination limit

* Update changelog

Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>

* listing slug check for property

Co-authored-by: Emily Jablonski <emily.jablonski@exygy.com>
Co-authored-by: dominikx96 <dominikx96@gmail.com>
Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>
Co-authored-by: Emily Jablonski <65367387+emilyjablonski@users.noreply.github.com>
Co-authored-by: Michał Plebański <michalp@airnauts.com>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: Jared White <jared@jaredwhite.com>
Co-authored-by: Jesse James Arnold <jesse.james@exygy.com>
Co-authored-by: Abbie Farr <afarr@google.com>
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 <avaleske@users.noreply.github.com>
Co-authored-by: Marcin Jędras <mjjedras@gmail.com>
Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com>
Co-authored-by: Anders Schneider <anderseschneider@gmail.com>
Co-authored-by: Anthony Kong <anthony.kong@sfgov.org>
Co-authored-by: Jesse Arnold <jessearnold@Jesses-MacBook-Pro.local>

* 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 (bloom-housing#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 (bloom-housing#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 (bloom-housing#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 <emily.jablonski@exygy.com>
Co-authored-by: dominikx96 <dominikx96@gmail.com>
Co-authored-by: Dominik Barcikowski <dominik@airnauts.com>
Co-authored-by: Emily Jablonski <65367387+emilyjablonski@users.noreply.github.com>
Co-authored-by: Michał Plebański <michalp@airnauts.com>
Co-authored-by: Lint Action <lint-action@samuelmeuli.com>
Co-authored-by: Jared White <jared@jaredwhite.com>
Co-authored-by: Jesse James Arnold <jesse.james@exygy.com>
Co-authored-by: Abbie Farr <afarr@google.com>
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 <avaleske@users.noreply.github.com>
Co-authored-by: Marcin Jędras <mjjedras@gmail.com>
Co-authored-by: Will Lin <4317058+willrlin@users.noreply.github.com>
Co-authored-by: Anders Schneider <anderseschneider@gmail.com>
Co-authored-by: Anthony Kong <anthony.kong@sfgov.org>
Co-authored-by: Jesse Arnold <jessearnold@Jesses-MacBook-Pro.local>
  • Loading branch information
18 people committed Oct 13, 2021
1 parent 57b5a41 commit 9074635
Show file tree
Hide file tree
Showing 16 changed files with 53 additions and 49 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion backend/core/package.json
Original file line number Diff line number Diff line change
@@ -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 <marcin.jedras@exygy.com>",
"private": false,
Expand Down
1 change: 1 addition & 0 deletions backend/core/src/applications/applications.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion backend/core/src/auth/authz_policy.csv
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions backend/core/test/jurisdictions/jurisdictions.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand Down
28 changes: 0 additions & 28 deletions backend/core/types/src/backend-swagger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3849,9 +3849,6 @@ export interface UserFilterParams {
/** */
$comparison: EnumUserFilterParamsComparison

/** */
$include_nulls?: boolean

/** */
isPartner?: boolean
}
Expand Down Expand Up @@ -3968,9 +3965,6 @@ export interface ListingFilterParams {
/** */
$comparison: EnumListingFilterParamsComparison

/** */
$include_nulls?: boolean

/** */
name?: string

Expand All @@ -3988,21 +3982,6 @@ export interface ListingFilterParams {

/** */
leasingAgents?: string

/** */
availability?: EnumListingFilterParamsAvailability

/** */
seniorHousing?: boolean

/** */
minRent?: number

/** */
maxRent?: number

/** */
minAmiPercentage?: number
}

export interface UnitAccessibilityPriorityType {
Expand Down Expand Up @@ -5912,27 +5891,20 @@ export enum EnumUserFilterParamsComparison {
"<>" = "<>",
"IN" = "IN",
">=" = ">=",
"<=" = "<=",
"NA" = "NA",
}
export enum EnumListingFilterParamsComparison {
"=" = "=",
"<>" = "<>",
"IN" = "IN",
">=" = ">=",
"<=" = "<=",
"NA" = "NA",
}
export enum EnumListingFilterParamsStatus {
"active" = "active",
"pending" = "pending",
"closed" = "closed",
}
export enum EnumListingFilterParamsAvailability {
"hasAvailability" = "hasAvailability",
"noAvailability" = "noAvailability",
"waitlist" = "waitlist",
}
export enum OrderByFieldsEnum {
"mostRecentlyUpdated" = "mostRecentlyUpdated",
"applicationDates" = "applicationDates",
Expand Down
39 changes: 38 additions & 1 deletion docs/DeployServicesHeroku.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion sites/partners/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sites/public/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion sites/public/pages/applications/review/terms.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ const ApplicationTerms = () => {

{apiError && (
<AlertBox type="alert" inverted onClose={() => setApiError(false)}>
{t("errors.rateLimitExceeded")}
{t("errors.alert.badRequest")}
</AlertBox>
)}

Expand Down
5 changes: 2 additions & 3 deletions sites/public/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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
}

Expand Down
1 change: 1 addition & 0 deletions sites/public/pages/listing/[id]/[slug].tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from "react"
import qs from "qs"
import Head from "next/head"
import axios from "axios"
Expand Down
2 changes: 1 addition & 1 deletion ui-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ui-components/src/locales/general.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 9074635

Please sign in to comment.