Skip to content

Commit

Permalink
Merge branch 'release-1.0.78'
Browse files Browse the repository at this point in the history
  • Loading branch information
@entrotech
entrotech committed Feb 7, 2024
2 parents 2c4cd06 + 6af4b94 commit 52d9187
Show file tree
Hide file tree
Showing 12 changed files with 9,590 additions and 11,295 deletions.
21 changes: 10 additions & 11 deletions client/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions client/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "foodoasis-client",
"description": "React Client for Food Oasis",
"version": "1.0.77",
"version": "1.0.78",
"author": "Hack for LA",
"license": "GPL-2.0",
"private": true,
Expand All @@ -11,7 +11,7 @@
"build": "craco build",
"test": "craco test",
"eject": "react-scripts eject",
"format": "prettier --write \"**/*.{js,jsx}\"",
"format": "prettier --write \"**/*.{js,jsx,ts,tsx}\"",
"lint": "eslint -c .eslintrc.json --ignore-path .eslintignore \"**/*.{js,jsx}\"",
"lint:fix": "eslint -c .eslintrc.json --ignore-path .eslintignore --fix \"**/*.{js,jsx}\""
},
Expand All @@ -25,7 +25,7 @@
"@mui/material": "^5.11.1",
"@mui/x-data-grid": "^5.17.20",
"@mui/x-date-pickers": "^6.8.0",
"axios": "^1.6.0",
"axios": "^1.6.7",
"dayjs": "^1.11.7",
"debounce-fn": "^5.0.0",
"formik": "^2.2.9",
Expand All @@ -39,6 +39,7 @@
"react-router-dom": "^6.10.0",
"react-scripts": "^5.0.1",
"react-virtuoso": "^4.1.0",
"typescript": "^4.9.5",
"yup": "^0.32.8"
},
"browserslist": {
Expand All @@ -59,13 +60,13 @@
"devDependencies": {
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"prettier": "^2.4.1",
"typescript": "^4.9.5"
"prettier": "^2.4.1"
},
"overrides": {
"react-scripts": {
"nth-check": "^2.1.1",
"postcss": "^8.4.33"
"postcss": "^8.4.33",
"serialize-javascript": "6.0.2"
}
}
}
6 changes: 3 additions & 3 deletions client/src/components/FoodSeeker/SearchResults/ResultsFilters/ResultsFilters.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@ const ResultsFilters = ({
backgroundColor: theme.palette.common.white,
"&:hover": {
backgroundColor: theme.palette.common.white,
}
})}
},
})}
>
<LocationSearching
sx={(theme) => ({
fontSize: "1.25rem",
backgroundColor: theme.palette.common.white,
color: theme.palette.common.black
color: theme.palette.common.black,
})}
/>
</Button>
Expand Down
191 changes: 12 additions & 179 deletions client/src/components/StaticPages/Donate.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import {
import donationStep1 from "images/donationStep1.png";
import donationStep2 from "images/donationStep2.png";
import donationStep3 from "images/donationStep3.png";
import donationStep4 from "images/donationStep4.png";
import donationStep5 from "images/donationStep5.png";
import donationStep6 from "images/donationStep6.png";
import donationStep7 from "images/donationStep7.png";
// import donationStep4 from "images/donationStep4.png";
// import donationStep5 from "images/donationStep5.png";
// import donationStep6 from "images/donationStep6.png";
// import donationStep7 from "images/donationStep7.png";
import logo from "images/foodoasis.svg";
import { useState, useEffect } from "react";
import * as analytics from "../../services/analytics";
Expand Down Expand Up @@ -136,11 +136,10 @@ const DonationDialog = ({ showDonationDialog, setShowDonationDialog }) => {
/>
<Grid item>
<Typography align="center">
Please make donations to our parent organization (Code for
America)
Hack for LA takes donations through Civic Tech Structure.
</Typography>
<Typography align="center" color="error" variant="h6">
This is a 7-step process.
This is a 3-step process.
</Typography>
</Grid>
<Grid item>
Expand Down Expand Up @@ -232,7 +231,9 @@ const DonationDialog = ({ showDonationDialog, setShowDonationDialog }) => {
</Avatar>
</Grid>
<Grid item xs zeroMinWidth>
<Typography>Check the box right below.</Typography>
<Typography>
In the "Project" field enter <em>"Food Oasis"</em>.
</Typography>
<CardMedia
component="img"
sx={{
Expand Down Expand Up @@ -273,8 +274,8 @@ const DonationDialog = ({ showDonationDialog, setShowDonationDialog }) => {
</Grid>
<Grid item xs zeroMinWidth>
<Typography>
Under "Person to notify" and "Honoree Name" write{" "}
<em>"Food Oasis"</em>.
Fill out the remaining payment information and click{" "}
<em>Donate</em>.
</Typography>
<CardMedia
component="img"
Expand All @@ -288,174 +289,6 @@ const DonationDialog = ({ showDonationDialog, setShowDonationDialog }) => {
</Grid>
</Grid>
</Paper>
<Paper
xs={{
maxWidth: "400px",
padding: { xs: "16px", md: "24px" },
margin: { xs: "16px auto", md: "24px auto" },
}}
>
<Grid
sx={{
padding: "5px 16px",
}}
container
wrap="nowrap"
spacing={2}
>
<Grid item>
<Avatar
sx={{
backgroundColor: "#ef624f",
width: { xs: "24px", md: "56px" },
height: { xs: "24px", md: "56px" },
}}
>
4
</Avatar>
</Grid>
<Grid item xs zeroMinWidth>
<Typography>
Under "Recipient Email" write{" "}
<em>"foodoasis+donations@hackforla.org"</em>.
</Typography>
<CardMedia
component="img"
sx={{
width: "90%",
height: "auto",
}}
src={donationStep4}
alt="logo"
/>
</Grid>
</Grid>
</Paper>
<Paper
xs={{
maxWidth: "400px",
padding: { xs: "16px", md: "24px" },
margin: { xs: "16px auto", md: "24px auto" },
}}
>
<Grid
sx={{
padding: "5px 16px",
}}
container
wrap="nowrap"
spacing={2}
>
<Grid item>
<Avatar
sx={{
backgroundColor: "#ef624f",
width: { xs: "24px", md: "56px" },
height: { xs: "24px", md: "56px" },
}}
>
5
</Avatar>
</Grid>
<Grid item xs zeroMinWidth>
<Typography>
Choose the brigade <em>"Hack for LA"</em> in the dropdown.
</Typography>
<CardMedia
component="img"
sx={{
width: "90%",
height: "auto",
}}
src={donationStep5}
alt="logo"
/>
</Grid>
</Grid>
</Paper>
<Paper
xs={{
maxWidth: "400px",
padding: { xs: "16px", md: "24px" },
margin: { xs: "16px auto", md: "24px auto" },
}}
>
<Grid
sx={{
padding: "5px 16px",
}}
container
wrap="nowrap"
spacing={2}
>
<Grid item>
<Avatar
sx={{
backgroundColor: "#ef624f",
width: { xs: "24px", md: "56px" },
height: { xs: "24px", md: "56px" },
}}
>
6
</Avatar>
</Grid>
<Grid item xs zeroMinWidth>
<Typography>Click next.</Typography>
<CardMedia
component="img"
sx={{
width: "90%",
height: "auto",
}}
src={donationStep6}
alt="logo"
/>
</Grid>
</Grid>
</Paper>
<Paper
xs={{
maxWidth: "400px",
padding: { xs: "16px", md: "24px" },
margin: { xs: "16px auto", md: "24px auto" },
}}
>
<Grid
sx={{
padding: "5px 16px",
}}
container
wrap="nowrap"
spacing={2}
>
<Grid item>
<Avatar
sx={{
backgroundColor: "#ef624f",
width: { xs: "24px", md: "56px" },
height: { xs: "24px", md: "56px" },
}}
>
7
</Avatar>
</Grid>
<Grid item xs zeroMinWidth>
<Typography>
Under "What inspired you to donate today?" write{" "}
<em>"Food Oasis"</em>.
</Typography>
<CardMedia
component="img"
sx={{
width: "90%",
height: "auto",
}}
src={donationStep7}
alt="logo"
/>
</Grid>
</Grid>
</Paper>
</Container>
<Grid
sx={{
Expand All @@ -480,7 +313,7 @@ const DonationDialog = ({ showDonationDialog, setShowDonationDialog }) => {
textTransform: "uppercase",
}}
variant="contained"
href="//www.codeforamerica.org/donate"
href="//donate.stripe.com/bIY9Cpcg8dihfIc5kl"
target="_blank"
rel="noopener noreferrer"
component="a"
Expand Down
Binary file modified client/src/images/donationStep1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/images/donationStep2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified client/src/images/donationStep3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 52d9187

Please sign in to comment.