From 575d26add9fd9d8ff5ced28b696f6cb12dadb67c Mon Sep 17 00:00:00 2001 From: Charlie Harris Date: Fri, 3 Jun 2022 17:11:52 -0500 Subject: [PATCH] Damn --- .tool-versions | 1 + package-lock.json | 37 +++++++++++++++++++++++++++++++++---- src/components/Contact.js | 13 ++++++++----- src/templates/contact-us.js | 4 ++-- 4 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..6d9bf1f --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +nodejs 8.17.0 diff --git a/package-lock.json b/package-lock.json index bce198b..6fa1a0b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1094,7 +1094,6 @@ "fast-glob": "^2.2.2", "fb-watchman": "^2.0.0", "fbjs": "^1.0.0", - "immutable": "~3.7.6", "nullthrows": "^1.1.0", "relay-runtime": "2.0.0", "signedsource": "^1.0.0", @@ -1260,11 +1259,41 @@ "@types/node": "*" } }, + "@types/google-maps": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/@types/google-maps/-/google-maps-3.2.3.tgz", + "integrity": "sha512-+GR/7sMvo2bENS26H4t2QqoCqE4FE5qhsG8aaDM9mJAlsorkLyaFdTQra8VkmS1RNE09fx9c1kac+GKG0RtA2A==", + "dev": true, + "requires": { + "@types/google.maps": "*" + } + }, + "@types/google.maps": { + "version": "3.49.2", + "resolved": "https://registry.npmjs.org/@types/google.maps/-/google.maps-3.49.2.tgz", + "integrity": "sha512-ZO1qWciukqED9qcUNW7OaPXWnTlT+tO3WcYkmudZyQW2BqD7TlMFRrdqSCoqfwKhERCwBA5A/YZt/g5A3BqgLQ==", + "dev": true + }, + "@types/googlemaps": { + "version": "3.43.3", + "resolved": "https://registry.npmjs.org/@types/googlemaps/-/googlemaps-3.43.3.tgz", + "integrity": "sha512-ZWNoz/O8MPEpiajvj7QiqCY8tTLFNqNZ/a+s+zTV58wFVNAvvqV4bdGfnsjTb5Cs4V6wEsLrX8XRhmnyYJ2Tdg==", + "dev": true + }, "@types/history": { "version": "4.7.2", "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.2.tgz", "integrity": "sha512-ui3WwXmjTaY73fOQ3/m3nnajU/Orhi6cEu5rzX+BrAAJxa3eITXZ5ch9suPqtM03OWhAHhPSyBGCN4UKoxO20Q==" }, + "@types/markerclustererplus": { + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/@types/markerclustererplus/-/markerclustererplus-2.1.33.tgz", + "integrity": "sha512-ZDxsLUp8BmK9MVZZeQVDDzVrEXgRL0021AQcfXqfreFhdfZ9+PS0P6o4nZBvoIVYTmGSBemdCdI6mL6hf9yWvg==", + "dev": true, + "requires": { + "@types/google-maps": "*" + } + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -9589,9 +9618,9 @@ "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" }, "immutable": { - "version": "3.7.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", - "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" + "version": "3.8.2", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz", + "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==" }, "import-cwd": { "version": "2.1.0", diff --git a/src/components/Contact.js b/src/components/Contact.js index a776036..69f3cb0 100644 --- a/src/components/Contact.js +++ b/src/components/Contact.js @@ -4,12 +4,11 @@ import React from 'react' import ContactMap from './SingleLocationMap' const ContactBox = props => { - console.log('ADDREESS HERE', props) return (
ECOcentrix Consultants, LLC
-
2612 Delmar Blvd
+
{props.address.street1}
{props.address.street2 && (
{props.address.street2}
)} @@ -73,9 +72,13 @@ export const ContactBoxQuery = () => ( } } `} - render={data => ( - - )} + render={data => { + const { node } = data.allMarkdownRemark.edges.find( + edge => edge.node.frontmatter.address !== null + ) + console.log({ node }) + return + }} /> ) diff --git a/src/templates/contact-us.js b/src/templates/contact-us.js index b892278..f8e1627 100644 --- a/src/templates/contact-us.js +++ b/src/templates/contact-us.js @@ -11,7 +11,7 @@ export const ContactPageTemplate = ({ title, content, contentComponent }) => { return (
-
+

{title}

@@ -72,7 +72,7 @@ export const ContactPageTemplate = ({ title, content, contentComponent }) => {