Skip to content

Commit

Permalink
Merge latest master (#1370)
Browse files Browse the repository at this point in the history
* Remove /auth/register endpoint (#140)

* late-breaking phone number fix for Jones (#156)

* Add monarch listing (#131)

* catch up ala site to upstream before Monarch launch (#158)

* fix requested QA changes for Monarch (#157)

* Fix QA request changes
* fix quotes and ordinal on preferences
* add listing-specific rentalAssistance text
* update office hours for C19

* update rentalAssistance text for Monarch (#159)

* apply conditional fix for requiredDocuments from upstream (#163)

* Fix deposit for Monarch listing (#161)

* Fix deposit for Monarch listing
* Update leasing agent address

* change monarch pref ordinals to numeric format (#164)

* extend Skylyne deadline to 1 Nov per request (#165)

* Re-create Re-create SMC Brunswick Listing (#168)

* Initial Logan listing (#169)

* Update ala feedback link (#170)

* Another round of Logan listing QA (#173)

* Another round of QA fixes for Logan (#175)

* adjust Logan lat/lng for map display (#177)

* Update Logan leasing agent number (#179)

* fix 2 decimal points for deposit min/max on Logan

* Extend skylyne again (#182)

* update Skylyne deadline to 12/1
* add triton-test listing from core so automated tests can use it

* Fixes for Netlify build

* Update from main repo + Alameda

* Update SJ subrepo

* SMC subrepo update

* Update missing changes for Alameda repo

* Fix env jsonpaths for templates

* Move SMC and SJ listings to backend core

* Update application methods for SJ and SMC listings

* Move SMC and SJ listings to backend core

* Update listings to the new shema

* Remove missing route from SJ

* Remove additional resources reference from SJ

* Hide links to sign in

* Add So Hay listing

* Update So Hay occupancy

* SqFeet fix for So Hay

* Add events to So Hay

* Update So Hay due date

* Fixes for Brunswick listing

* 2021 changes for Brunswick

* Adds cost not included to Brunswick

* Another round of fixes for Brunswick

* Update SoHay, add ami chart

* So Hay updates with download links

* Late January So-Hay update

* Copy public-ala over to public

* Remove ami_charts

* Increase JS heap

* Add a mandatory GET listings county query param

* Remove housing counselors from next.config.js

* Fix HousingCounselors.tsx export

* Fix translations

* Add housing counselors page

* Apply heroku JS VM best practices for container memory size optimization

* Increase server request/response timeout

* Increase max_old_space_size

* Optimize next.js /listings queries

* Revert "Add a mandatory GET listings county query param"

This reverts commit 9547714.

* Add missing jsonpath package

* Add Alameda Specific Translation to 0.3 Alameda

* Fix PageHeader changes

* Fix counselors build

* Fix counselors noneFound logic

* Fix counselors build

* Align Alameda changes with prod

* So Hay updates, add events and hide counselors

* Update listing_data/so-hay.json

* update general.json with text View Additional Housing Opportunities and Resources

* removed the second sentence from Nav text

* Make hero centered

* Remove duplicate get assistance link

* Update the Alameda string to not include log-in text

* Skip some validations for SoHay listing

* Fix So Hay preference format

* Improve presentation of the Additional Resources page

* Fix class names

* Translations for City of Hayward preferences

* Update Do You Work In sections

* Add link for more mission corridor information

* Add the translation to the override file and remove from ui-components

* Changed Displaced to Displacee

* Final round of updates for So Hay with main repo merge

* Update lottery translation

* Update lottery translation

* Fix lottery translations

* Fix SoHay CSVFormattingType in json seed

* Switch off the houshold size validation for SoHay

* Updated 211 translations

* Hotfix CSV encoder

* Clean up aside block styling and add missing mobile blocks (#1140)

* Clean up aside block styling and add missing mobile blocks

* Remove tinting from Open Housts section

* Add mercy listing (#259)

* Initial Mercy listing setup

* Updates for Mercy listing

* Add city center listing (#260)

* Initial City Center listing setup

* Updates for City Center listing

* Nova Listing v1

* Updated Nova listing

* Rename file

* json updates

* linting issues

* Enable sign in (#267)

* Bump ssri from 6.0.1 to 6.0.2 (#1194)

* feature: support rent as percent income (#1195)

* Enable sign in and account creation

* Add translations for referral application

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Emily Jablonski <[email protected]>

* QA updates for City Center (#268)

* Mercy QA updates (#269)

* Updates for Mercy listing (#262)

* add aurora listing

* Enable sign in on application (#273)

* Updates for Mercy and City Center (#276)

* Update CSV formatter for city_center, mercy and nova

* Aurora Listing Updates

* Updated translations (#261)

* Updated translations

* Reduced changes to just override county-specific translations

* Updated translation strings

* Removed missionCorridor preference translation overrides

* Added preference titles

Co-authored-by: dominikx96 <[email protected]>

* Update paper application links for City Center and Mercy (#281)

* Update paper application links for City Center and Mercy

* Update City Center link

* Merge changes 05.11 (#280)

* Add description for pulling newest changes from core repository

* Updated translations to support listing countyCode

* Updated translations

* removed extra comma

* Removed extra comma

* translation file fix

* Removed unused properties

* Replaced text

* Removed extra comma

* update nova qa pt 2

* Updated translations

* Listings links update (#295)

* Update paper application links for City Center and Mercy

* Update City Center link

* Update paper application links for City Center and Mercy

* Update City Center link

* Updates for mercy and city center

* Display City Center waitlist (#297)

* Final qa to city center (#298)

* Final City Center QA (#300)

* coliseum listing

* coliseum json issues

* nova updates

* aurora qa

* update ami chart

* updates MetaTags source

* updates translation overrides and _app.tsx to add them in for "en" as well

* BACKEND_API_BASE is being used from toml instead of netlify env setting

* update coliseum pt 3

* coliseum updates pt 5

* coliseum updates pt 6

* coliseum updates pt 7

* coliseum updates pt 8

* removes BACKEND_API_BASE from partners netlify.toml

* coliseum 8

* string overrides

* coliseum updates pt 9

* coliseum updates pt 10

* coliseum updates pt 11

* coliseum updates pt 12

* Upstream merge (#321)

* Removes BACKEND_API_BASE from partners netlify.toml (#1273)

* updates pull request template

* removes BACKEND_API_BASE from netlify.toml

* Add icon support to standard variants of Button component (#1268)

* Refactor icon placement in Button component

* Update tests and icon placement styles for Button component

* Add Icon Button PR to Changelog

* Detect proper inline sizing for button

* Remove explicit fill color from back arrow icon

* fix: preference select text issues (#1270)

* feat: new checkbox behavior (#1272)

* Bump class-transformer and apply ClassSerializerInterceptor globally (#1265)

* Bump class-transformer and apply ClassSerializerInterceptor globally

* Switch back to nestjs/[email protected]

* Regenerate backend-swagger.ts client

* Update changelog

* Add missing typing to @Transforms

* Fix linter

* Define generic type for authorizeUserAction

* Add a migration fixing extraData serialization problems for applications.preferences

Co-authored-by: Bart <[email protected]>

* Ensure Netlify builds always do a full rebuild and deploy (#1279)

* Fix/preference extradata (#1282)

* Save an empty array if there is no extraData

* Fixed broken test

* Updated changelog

* Fix all spec

Co-authored-by: dominikx96 <[email protected]>

* Remove legacy tests sites/public/cypress/integration/pages/applications_new.ts

* un-comment out income verification

* add back in household validation

* add back in live-alone validation

* validation typo

* comment out validations and the tests w feature flag todo

* remove incorrect disclaimer URL check

Co-authored-by: Sean Albert <[email protected]>
Co-authored-by: Jared White <[email protected]>
Co-authored-by: Emily Jablonski <[email protected]>
Co-authored-by: Bart <[email protected]>
Co-authored-by: dominikx96 <[email protected]>
Co-authored-by: dominikx96 <[email protected]>
Co-authored-by: Emily Jablonski <[email protected]>

* coliseum updates pt 13

* add office hours update

* application links

* coliseum updates pt 14

* coliseum updates pt 15

* Mercy QA updates (#315)

* Mercy QA updates

* Updates for Mercy

* Upstream merge (#328)

* Add OHA formatter (#1292)

* Add OHA formatter

* Update changelog

* Change coliseum CSVFormattingType to ohaFormat

* Fixes for Mercy (#329)

* Merge upstream (#330)

* Add OHA formatter (#1292)

* Add OHA formatter

* Update changelog

* Remove displaced tenant preferences from ohaFormat CSV formatter (#1293)

* Add hopwa preference (#1295)

* Add hopwa preference

* Update changelog

* Update changelog (#1296)

* Fixed search param (#1301)

* Fixed search param

* Updated changelog

* Cleanup

Co-authored-by: dominikx96 <[email protected]>

* Bump ws from 7.3.1 to 7.4.6 (#1291)

* Replace toPrecision with toFixed (#1304)

Co-authored-by: dominikx96 <[email protected]>
Co-authored-by: dominikx96 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marcin Jędras <[email protected]>

* mercy updates

* mercy updates pt 2

* mercy updates pt 2

* removes production GTM key from netlify config

* mercy updates pt 3

* Draft Skyline (#331)

Co-authored-by: Ben Kutler <[email protected]>
Co-authored-by: Marcin Jędras <[email protected]>
Co-authored-by: Netra Patil <[email protected]>
Co-authored-by: Jared White <[email protected]>
Co-authored-by: Emily Jablonski <[email protected]>
Co-authored-by: Netra Badami <[email protected]>
Co-authored-by: Emily Jablonski <[email protected]>
Co-authored-by: dominikx96 <[email protected]>
Co-authored-by: dominikx96 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sean Albert <[email protected]>
Co-authored-by: Bart <[email protected]>
  • Loading branch information
13 people authored Jun 15, 2021
1 parent 4506971 commit 845f2e6
Show file tree
Hide file tree
Showing 101 changed files with 50,648 additions and 521 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file. The format
- Added "ohaFormat" to CSV exporter (includes OHA and HOPWA preferences) ([#1292](https://github.com/bloom-housing/bloom/pull/1292)) (Michał Plebański)
- `/assets` endpoints (create and createPresignedUploadMetadata)
- "noEmailConfirmation" query param to `POST /users` endpoint
- POST `/users` endpoint response from StatusDTO to UserBasicDto (Michał Plebański)

- Changed:

Expand All @@ -49,8 +50,11 @@ All notable changes to this project will be documented in this file. The format
- Fix repetition of select text on preferences ([#1270](https://github.com/bloom-housing/bloom/pull/1270)) (Emily Jablonski)
- Fix aplication submission and broken test ([#1270](https://github.com/bloom-housing/bloom/pull/1282)) (Dominik Barcikowski)
- Fix broken application search in Partners ([#1301](https://github.com/bloom-housing/bloom/pull/1301)) (Dominik Barcikowski)
<<<<<<< HEAD
=======
- Fix multiple unit rows in summaries, sorting issues ([#1306](https://github.com/bloom-housing/bloom/pull/1306)) (Emily Jablonski)
- Fix partners application submission ([#1340](https://github.com/bloom-housing/bloom/pull/1340)) (Dominik Barcikowski)
> > > > > > > upstream/master
- Changed:

Expand Down
10 changes: 6 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Contributing to Bloom
# Contributing to HousingBayArea and Bloom

Contributions to the core Bloom applications and services are welcomed. To help us meet the project's goals around quality and maintainability, we ask that all contributors read, understand, and agree to these guidelines.
Contributions to this Bay Area local site, as well as the core Bloom applications and services are welcomed. To help us meet the project's goals around quality and maintainability, we ask that all contributors read, understand, and agree to these guidelines.

It's important to know that this project is a local fork of the [core Bloom framework](https://github.com/bloom-housing/bloom).
If you're planning to contribute, make sure to think through if it's a Bay Area-specific set of code, in which case it should be submitted here, or if it's a general improvement to the framework that would benefit all users and should be submitted to the core upstream project.

## Reporting an Issue

We use GitHub issues to track both bugs and feature ideas, and encourage all developers working with Bloom to file issues for consideration.

Please note that implementation-specific issues with individual Bloom sites should be tracked in the repositories for those sites. Our issue tracker is for issues with the core software and reference implementations only.
This site tracks implementation-specific issues about the Bay Area sites for Alameda County, San Mateo County, and the City of San Jose only.

## Pull Requests

Expand All @@ -27,4 +30,3 @@ Bloom uses the Circle CI system to automatically run tests on any pull requests.
We use the ESlint linting system and the automatic code formatter Prettier (which the linter also enforces). **All** pull requests must pass linting to be accepted, so they don't create fix work for future contributors. If you're not using an IDE that integrates with these tools, please run eslint + prettier from the cli on all added or changed code before you submit a pull request.

As much as we'll try to keep current, the linting rules can become out of date, and in this case you should file an issue with the adjustments you're looking for. We'll be looking for a resulting PR with a minimum of two commits - one to adjust the rules or tooling, and another that updates the codebase to match. If the latter changes are complex, please discuss in advance and break up the work into reasonably reviewable commits.

20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,23 @@ We are using [lerna](https://lerna.js.org/) as a package versioning tool. It hel
## Contributing

Contributions to the core Bloom applications and services are welcomed. To help us meet the project's goals around quality and maintainability, we ask that all contributors read, understand, and agree to these guidelines.

## Pulling changes from core repository

Add a new remote origin:

```
git remote add upstream https://github.com/bloom-housing/bloom.git
```

Fetch newest indices from it:

```
git fetch upstream
```

Merge remote into your local branch:

```
git merge upstream/master
``
Loading

0 comments on commit 845f2e6

Please sign in to comment.