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": {