diff --git a/sites/partners/pages/application/[id]/index.tsx b/sites/partners/pages/application/[id]/index.tsx index 569e79824a..078d1047c5 100644 --- a/sites/partners/pages/application/[id]/index.tsx +++ b/sites/partners/pages/application/[id]/index.tsx @@ -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 diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalDetails.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalDetails.tsx index 1bbf94eb46..7504b14d92 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalDetails.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalDetails.tsx @@ -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) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalEligibility.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalEligibility.tsx index 56bc19e7ce..fa4138630e 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalEligibility.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalEligibility.tsx @@ -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) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalFees.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalFees.tsx index d2457ba10e..5b7c34b94d 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalFees.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailAdditionalFees.tsx @@ -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) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationAddress.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationAddress.tsx index 7b96141f23..4d6917dbdb 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationAddress.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationAddress.tsx @@ -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) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationDates.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationDates.tsx index 40de538382..662a33c98c 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationDates.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailApplicationDates.tsx @@ -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) @@ -16,16 +16,12 @@ const DetailApplicationDates = () => { - {listing.applicationDueDate - ? moment(new Date(listing?.applicationDueDate)).utc().format("MM/DD/YYYY") - : t("t.none")} + {getDetailFieldDate(listing.applicationDueDate)} - {listing.applicationDueTime - ? moment(new Date(listing?.applicationDueTime)).format("hh:mm:ss A") - : t("t.none")} + {getDetailFieldTime(listing.applicationDueTime)} diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailBuildingFeatures.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailBuildingFeatures.tsx index 4db008dbc9..986471342e 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailBuildingFeatures.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailBuildingFeatures.tsx @@ -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) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailLeasingAgent.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailLeasingAgent.tsx index 136f7b3432..50a91c7a53 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailLeasingAgent.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailLeasingAgent.tsx @@ -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) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailListingData.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailListingData.tsx index 0c94619a11..14cc2e9c46 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailListingData.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailListingData.tsx @@ -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) @@ -12,11 +13,19 @@ const DetailListingData = () => { - {listing.createdAt} + + {getDetailFieldDate(listing.createdAt)} +
+ {getDetailFieldTime(listing.createdAt)} +
- {listing.updatedAt} + + {getDetailFieldDate(listing.updatedAt)} +
+ {getDetailFieldTime(listing.updatedAt)} +
) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/DetailListingIntro.tsx b/sites/partners/src/listings/PaperListingDetails/sections/DetailListingIntro.tsx index 1c2e771b57..116760fdab 100644 --- a/sites/partners/src/listings/PaperListingDetails/sections/DetailListingIntro.tsx +++ b/sites/partners/src/listings/PaperListingDetails/sections/DetailListingIntro.tsx @@ -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) diff --git a/sites/partners/src/listings/PaperListingDetails/sections/helpers.ts b/sites/partners/src/listings/PaperListingDetails/sections/helpers.ts new file mode 100644 index 0000000000..ad4b3f4472 --- /dev/null +++ b/sites/partners/src/listings/PaperListingDetails/sections/helpers.ts @@ -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") +} diff --git a/sites/public/src/ListingView.tsx b/sites/public/src/ListingView.tsx index d44382a5fc..2ab2f42190 100644 --- a/sites/public/src/ListingView.tsx +++ b/sites/public/src/ListingView.tsx @@ -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 (
@@ -372,19 +369,17 @@ export const ListingView = (props: ListingProps) => { - {showMap && ( - -
- -
-
- )} + +
+ +
+
{(listing.requiredDocuments || listing.programRules || listing.specialNotes) && (