Skip to content

Commit

Permalink
pr feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
emilyjablonski committed Jul 7, 2021
1 parent bdaad12 commit a9a22ed
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 36 deletions.
4 changes: 0 additions & 4 deletions sites/partners/pages/application/[id]/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ import { DetailsHouseholdIncome } from "../../../src/applications/PaperApplicati
import { DetailsTerms } from "../../../src/applications/PaperApplicationDetails/sections/DetailsTerms"
import { Aside } from "../../../src/applications/Aside"

export const getDetailFieldString = (listingString: string) => {
return listingString && listingString !== "" ? listingString : t("t.none")
}

export default function ApplicationsList() {
const router = useRouter()
const applicationId = router.query.id as string
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { getDetailFieldString } from "../../../../pages/application/[id]/index"
import { getDetailFieldString } from "./helpers"

const DetailAdditionalDetails = () => {
const listing = useContext(ListingContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { getDetailFieldString } from "../../../../pages/application/[id]/index"
import { getDetailFieldString } from "./helpers"

const DetailAdditionalEligibility = () => {
const listing = useContext(ListingContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { getDetailFieldString } from "../../../../pages/application/[id]/index"
import { getDetailFieldString } from "./helpers"

const DetailAdditionalFees = () => {
const listing = useContext(ListingContext)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { ListingApplicationAddressType } from "@bloom-housing/backend-core/types"
import { getDetailFieldString } from "../../../../pages/application/[id]/index"
import { getDetailFieldString } from "./helpers"

const DetailApplicationAddress = () => {
const listing = useContext(ListingContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import moment from "moment"
import { getDetailFieldDate, getDetailFieldTime } from "./helpers"

const DetailApplicationDates = () => {
const listing = useContext(ListingContext)
Expand All @@ -16,16 +16,12 @@ const DetailApplicationDates = () => {
<GridSection columns={3}>
<GridCell>
<ViewItem label={t("listings.applicationDeadline")}>
{listing.applicationDueDate
? moment(new Date(listing?.applicationDueDate)).utc().format("MM/DD/YYYY")
: t("t.none")}
{getDetailFieldDate(listing.applicationDueDate)}
</ViewItem>
</GridCell>
<GridCell>
<ViewItem label={t("listings.applicationDueTime")}>
{listing.applicationDueTime
? moment(new Date(listing?.applicationDueTime)).format("hh:mm:ss A")
: t("t.none")}
{getDetailFieldTime(listing.applicationDueTime)}
</ViewItem>
</GridCell>
</GridSection>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { getDetailFieldString } from "../../../../pages/application/[id]/index"
import { getDetailFieldString } from "./helpers"

const DetailBuildingFeatures = () => {
const listing = useContext(ListingContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { getDetailFieldString } from "../../../../pages/application/[id]/index"
import { getDetailFieldString } from "./helpers"

const DetailLeasingAgent = () => {
const listing = useContext(ListingContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { getDetailFieldDate, getDetailFieldTime } from "./helpers"

const DetailListingData = () => {
const listing = useContext(ListingContext)
Expand All @@ -12,11 +13,19 @@ const DetailListingData = () => {
</GridCell>

<GridCell>
<ViewItem label={t("listings.details.createdDate")}>{listing.createdAt}</ViewItem>
<ViewItem label={t("listings.details.createdDate")}>
{getDetailFieldDate(listing.createdAt)}
<br />
{getDetailFieldTime(listing.createdAt)}
</ViewItem>
</GridCell>

<GridCell>
<ViewItem label={t("listings.details.updatedDate")}>{listing.updatedAt}</ViewItem>
<ViewItem label={t("listings.details.updatedDate")}>
{getDetailFieldDate(listing.updatedAt)}
<br />
{getDetailFieldTime(listing.updatedAt)}
</ViewItem>
</GridCell>
</GridSection>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useContext } from "react"
import { t, GridSection, ViewItem, GridCell } from "@bloom-housing/ui-components"
import { ListingContext } from "../../ListingContext"
import { getDetailFieldString } from "../../../../pages/application/[id]/index"
import { getDetailFieldString } from "./helpers"

const DetailListingIntro = () => {
const listing = useContext(ListingContext)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { t } from "@bloom-housing/ui-components"
import moment from "moment"

export const getDetailFieldString = (listingString: string) => {
return listingString && listingString !== "" ? listingString : t("t.none")
}

export const getDetailFieldDate = (listingDate: Date) => {
return listingDate ? moment(new Date(listingDate)).utc().format("MM/DD/YYYY") : t("t.none")
}

export const getDetailFieldTime = (listingTime: Date) => {
return listingTime ? moment(new Date(listingTime)).format("hh:mm:ss A") : t("t.none")
}
27 changes: 11 additions & 16 deletions sites/public/src/ListingView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ export const ListingView = (props: ListingProps) => {
!listing.applicationPickUpAddressType &&
listing.applicationMethods?.length === 0

const showMap =
listing.buildingAddress.latitude !== null && listing.buildingAddress.longitude !== null

return (
<article className="flex flex-wrap relative max-w-5xl m-auto">
<header className="image-card--leader">
Expand Down Expand Up @@ -372,19 +369,17 @@ export const ListingView = (props: ListingProps) => {
</div>
</ListingDetailItem>

{showMap && (
<ListingDetailItem
imageAlt={t("listings.neighborhoodBuildings")}
imageSrc="/images/listing-neighborhood.svg"
title={t("listings.sections.neighborhoodTitle")}
subtitle={t("listings.sections.neighborhoodSubtitle")}
desktopClass="bg-primary-lighter"
>
<div className="listing-detail-panel">
<ListingMap address={listing.buildingAddress} listing={listing} />
</div>
</ListingDetailItem>
)}
<ListingDetailItem
imageAlt={t("listings.neighborhoodBuildings")}
imageSrc="/images/listing-neighborhood.svg"
title={t("listings.sections.neighborhoodTitle")}
subtitle={t("listings.sections.neighborhoodSubtitle")}
desktopClass="bg-primary-lighter"
>
<div className="listing-detail-panel">
<ListingMap address={listing.buildingAddress} listing={listing} />
</div>
</ListingDetailItem>

{(listing.requiredDocuments || listing.programRules || listing.specialNotes) && (
<ListingDetailItem
Expand Down

0 comments on commit a9a22ed

Please sign in to comment.