Skip to content

Commit

Permalink
Merge pull request #327 from Rebuild-Black-Business/revert-324-sugges…
Browse files Browse the repository at this point in the history
…tionBox

Revert "Suggestion box"
  • Loading branch information
magnificode authored Aug 27, 2020
2 parents 022aaea + 198917e commit d91c39c
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 220 deletions.
4 changes: 2 additions & 2 deletions .env.EXAMPLE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# for local dev, you’ll need an Airtable API key get access to the Airtable
# for local dev, you’ll need an Airtable API key get access to the Airtable
# we’re using here. To get access to the base, click this invite link:
# https://bit.ly/3gSMniS
#
Expand All @@ -15,4 +15,4 @@ GATSBY_AIRTABLE_BASE_ID=appkenjGlBB01wr3i
# The GATSBY_RBB_API_KEY is stored in a note in the 1pass vault for this project.
# Make sure you're using the appropriate key for the environment you're testing (production, staging, local dev)
# Note: if you're testing locally, you should PROBABLY be looking at .env.development instead of here!
GATSBY_RBB_API_KEY=12345
GATSBY_RBB_API_KEY=12345
2 changes: 1 addition & 1 deletion .env.development.EXAMPLE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# copy/paste this file, and rename it to `.env.devlopment` (remove .EXAMPLE) - these are picked up by gatsby during local dev
# copy/paste this file, and rename it to `.env.devlopment` (remove .EXAMPLE) - these are picked up by gatsby during local dev

GATSBY_SEARCH_API_ENDPOINT=''

Expand Down
6 changes: 5 additions & 1 deletion src/components/Feeds/AllyFeed.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,11 @@ const AllyFeed = props => {
) : (
<NoResultsCard type="allies" />
)}
<ModalForm isOpen={isOpen} onClose={onClose} />
<ModalForm
isOpen={isOpen}
title="Sign up to be an Ally"
onClose={onClose}
/>
</Box>
</>
);
Expand Down
4 changes: 0 additions & 4 deletions src/components/Forms/AllySignUpForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,6 @@ const AllySignUpForm = () => {
}
}}
>
<Text fontSize="xl" textAlign="center">
Sign up to be an Ally
</Text>

{/* renders when form is submitted with validation errors */}
{validationMessage && <Text>{validationMessage}</Text>}

Expand Down
3 changes: 0 additions & 3 deletions src/components/Forms/BusinessSignUpForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ const BusinessSignUpForm = ({ isFundraiser = false }) => {
}
}}
>
<Text fontSize="xl" textAlign="center">
Register your business
</Text>
{/* renders when form is submitted with validation errors */}
{validationMessage && <Text>{validationMessage}</Text>}

Expand Down
196 changes: 0 additions & 196 deletions src/components/Forms/SuggestionBox.js

This file was deleted.

14 changes: 3 additions & 11 deletions src/components/about/ContactCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import React from 'react';
import Image from '../../components/Image.js';
import { VOLUNTEER_URL } from '../../constants/about';
import BusinessSignUpForm from '../Forms/BusinessSignUpForm.js';
import SuggestionBox from '../Forms/SuggestionBox.js';

const CardContent = ({ title, blurb, publicId, alt, transforms = {} }) => {
const theme = useTheme();
Expand Down Expand Up @@ -78,13 +77,13 @@ const CardImage = ({ publicId, transforms, alt }) => {
};

const ModalForm = ({ isOpen, onClose, title }) => (
<Modal isOpen={isOpen} onClose={onClose} closeOnOverlayClick={false}>
<Modal isOpen={isOpen} onClose={onClose}>
<ModalOverlay />
<ModalContent>
<ModalHeader>{title}</ModalHeader>
<ModalCloseButton />
<ModalBody>
<SuggestionBox />
<BusinessSignUpForm />
</ModalBody>
</ModalContent>
</Modal>
Expand All @@ -98,7 +97,6 @@ const ModalCard = ({
blurb,
margin,
transforms = {},
suggestions,
}) => {
const { onOpen, isOpen, onClose } = useDisclosure();
const focusRef = React.useRef();
Expand All @@ -122,12 +120,7 @@ const ModalCard = ({
transforms={transforms}
/>
</Flex>
<ModalForm
isOpen={isOpen}
title={modalTitle}
onClose={onClose}
suggestions={suggestions}
/>
<ModalForm isOpen={isOpen} title={modalTitle} onClose={onClose} />
</>
);
};
Expand Down Expand Up @@ -198,7 +191,6 @@ const ContactCard = ({
modalTitle,
email,
transforms = {},
suggestions,
}) => {
const cardStyle = {
hover: {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ export default function About() {
>
<ContactCard
modalCard
title="Suggestions"
blurb="How can we improve?"
title="Business Owners"
publicId="assets/contact-left"
alt="business shop window"
transforms={{ width: 800, height: 450, crop: 'crop' }}
blurb="Add your business to our list"
/>
<ErrorBoundary>
<StaticQuery
Expand Down

0 comments on commit d91c39c

Please sign in to comment.