Skip to content

Commit

Permalink
Merge branch 'release-1.0.45'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed Mar 8, 2021
2 parents 892bf78 + 15b015b commit badb692
Show file tree
Hide file tree
Showing 11 changed files with 99 additions and 216 deletions.
22 changes: 11 additions & 11 deletions client/package-lock.json

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

2 changes: 1 addition & 1 deletion client/package.json
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.44",
"version": "1.0.45",
"author": "Hack for LA",
"license": "GPL-2.0",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Admin/AccountAutocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function AccountAutocomplete({
<>
{accounts ? (
<Autocomplete
value={accounts.find((acct) => acct.id === accountId)}
value={accounts.find((acct) => acct.id === accountId) || null}
onChange={handleChange}
options={accounts}
getOptionLabel={(option) =>
Expand Down
5 changes: 4 additions & 1 deletion client/src/components/Layout/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ const useStyles = makeStyles((theme) => ({
fontWeight: "bold",
fontSize: "14px",
lineHeight: "1.2",
textAlign: "left",
textAlign: "center",
flexGrow: 1,
flexShrink: 1,
fontFamily: `Helvetica, Arial, "Lucida Grande", sans- serif`,
[theme.breakpoints.up("sm")]: {
display: "none",
Expand All @@ -75,6 +77,7 @@ const useStyles = makeStyles((theme) => ({
lineHeight: "1.5",
flexBasis: "1em",
textAlign: "right",
flexGrow: 1,
fontFamily: `"HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans- serif`,
},
}));
Expand Down
75 changes: 15 additions & 60 deletions client/src/components/StaticPagesHI/About.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,71 +157,26 @@ const About = () => {
/>
<h2>Our Mission</h2>
<p>
Access to enough food should be a basic right. Unfortunately, this
is not the reality for millions of people in Hawaii. Food insecurity
is inconsistent with access to cheap and nutritious food.
<a href={"https://alohaharvest.org/"}>Aloha Harvest</a> is the largest food rescue nonprofit in the state
of Hawaiʻi. Seven days a week, free of
charge and free of liability, we rescue quality excess food from donors (ex: wholesale distributors,
grocery stores, restaurants, hotels) and redistribute it to recipient agencies feeding the hungry
(ex: homeless shelters, social services, food pantries).
</p>
<p>(TBD)</p>
<p>
Food pantries in the area are experiencing unprecedented demand. The
demand for food assistance has almost doubled since the beginning of
2020. To compound matters, it is the hard work of volunteers that
keeps pantries and meal programs open. The number of volunteers
available to distribute food has diminished.
We have been doing this work for over 21 years and represent the largest and most successful collaboration
between businesses and nonprofits in the state.
<a href="https://drive.google.com/file/d/1-sdszGH_y2MLd-yTDVa0ESalyY_zCDKH/view">Last year</a>, we
worked with 370 food donors and 273 recipient agencies to redistribute over 2.7 million pounds of good
food that would have otherwise been wasted!
</p>
<p>
The primary goal of Food Oasis is to provide up-to-date information
to Hawaiians. We built a directory that connects anyone with
hundreds of free food resources. Food Oasis presents reliable
information on a user-friendly platform. This will reduce stress and
uncertainty for food seekers. It will also demonstrate to our
community the growing need of food donations on the islands.
</p>
<p>
Food Oasis is creating a directory of updated food resources. There
are countless groups helping to feed hungry Hawaiians. But it’s
difficult for those in need to find them because there’s no one
source of updated info. We’re working to change that.
This work is essential because even while 1 in 5 people in Hawaiʻi rely on food pantries for assistance,
about 237,000 tons of good food is wasted annually. Here's a
<a href="https://www.youtube.com/watch?v=p9kNYCUtg8E&feature=youtu.be">short</a> video that explains
more of our process, impact, and future potential.
</p>
</div>
<section className={classes.team}>
<img
alt="Our Team"
src={iconSpacer}
className={classes.icon}
height="40"
/>
<h2>Our Team</h2>
<p>
Food Oasis started in 2015 under{" "}
<a href="//hackforla.org" target="_blank" rel="noopener noreferrer">
Hack for LA
</a>
, a brigade under the non-profit{" "}
<a
href="//codeforamerica.org"
target="_blank"
rel="noopener noreferrer"
>
Code for America
</a>
. The goal was to create a site of free and subsidized food
resources. The team gave the project to a nonprofit to manage its
day-to-day operations. The upkeep turned out to be much more work
than any single nonprofit could handle.
</p>

<p>
Our web-based solution is sparking collaboration, community
building, and team building. The result of this community-building
gives the food seeker updated information to find the free food
resources they need.
</p>
<p>
We are 100% volunteer-run project. We look forward to sharing our
updated directory with Hawaii.
</p>
</section>
<section className={classes.contact}>
<img
alt="Contact Us"
Expand All @@ -241,7 +196,7 @@ const About = () => {
<p>
Please contact us
<br />
<a href="mailto:[email protected]">[email protected]</a>
<a href="https://alohaharvest.org/">Aloha Harvest</a>
</p>
</section>
<section className={classes.partners}>
Expand Down
75 changes: 10 additions & 65 deletions client/src/components/StaticPagesHI/Donate.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,77 +160,22 @@ const Donate = () => {
className={classes.icon}
height="40"
/>
<h2>Why Donate?</h2>
<h2>How to Donate?</h2>
<p>
We’ve done so much already as a 100% volunteer-run organization—but
we need your help to finish what we set out to do. The admin,
development, and marketing costs to expand our directory are
extensive. We have a directory of over 1,300 organizations to
update. Your tax-deductible donation would help us offset some of
those costs.
As a 501(c)(3), we rely completely on the generosity of our funders, ranging from national grants to
individual donations by community members.
</p>
<br/>
<p>
Please make donations to our parent organization (Code for America)
At the Code for America donation page you will see a text box:
&quot;What inspired you to donate today&quot;? Please write
&quot;Food Oasis and Code for Hawaii&quot; in that box. Your
donation will get earmarked for Food Oasis Hawaii
To donate online, visit <a href="http://alohaharvest.org/donate">http://alohaharvest.org/donate</a>.
</p>
<a
href="//www.codeforamerica.org/donate"
target="_blank"
rel="noopener noreferrer"
className={classes.btnOutline}
>
Donate
</a>
</section>
<div className={classes.volunteerSection}>
<img
alt="Volunteer"
src={iconSpacer}
className={classes.icon}
height="40"
/>
<h2>Volunteer</h2>
<br/>
<p>
We’re run 100% by remote volunteers who do critical work by updating
our food directory weekly. The work you do impact those who don’t
have enough to eat. Your help to update our directory makes it
easier for anyone to get in touch with groups that fit their needs.
To donate via check, please make your donation out to: <br/>
Aloha Harvest <br/>
3599 Wai`alae Ave., Suite 23 <br/>
Honolulu, HI 96816<br/>
</p>
<a
href="//laworks.com/opportunity/a0C3l00000iCS6GEAW"
target="_blank"
rel="noopener noreferrer"
className={classes.btnWhite}
>
Become a Volunteer
</a>
</div>
<section className={classes.cards}>
<aside className={classes.signup}>
<h3>Get monthly updates on what we&apos;`re doing</h3>
<a
href="//foodoasis.us18.list-manage.com/subscribe?u=40d31892cbbe01312937f7de6&id=42235bb7ce"
target="_blank"
rel="noopener noreferrer"
className={classes.btnWhite}
>
Signup
</a>
</aside>
<aside className={classes.volunteer}>
<h3>Want to give your time instead?</h3>
<a
href="//laworks.com/opportunity/a0C3l00000iCS6GEAW"
target="_blank"
rel="noopener noreferrer"
className={classes.btnWhite}
>
Volunteer
</a>
</aside>
</section>
<Footer />
</div>
Expand Down
25 changes: 2 additions & 23 deletions client/src/components/StaticPagesHI/Faq.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,30 +173,9 @@ const About = () => {
/>
<h2>For Volunteers</h2>
<dl className={classes.dl}>
<dt>How can I sign up to volunteer?</dt>
<dt>Interested in donating excess food, volunteering, or anything else?</dt>
<dd>
<a
href="//laworks.com/opportunity/a0C3l00000iCS6GEAW"
target="_blank"
rel="noopener noreferrer"
>
Attend a training session
</a>{" "}
to get an assignment, or reach out to{" "}
<a href="mailto:[email protected]">[email protected]</a>.
</dd>
<dt>When can I volunteer?</dt>
<dd>
Anytime. After you attend a training session, you can update the
details whenever you have time. That may mean calling in the
mornings or researching online in the evenings.
</dd>
<dt>How do I set up an account to start my assignment?</dt>
<dd>
<a href="/register">Enter your info here</a>, and look out for a
confirmation email from{" "}
<a href="mailto:[email protected]">[email protected]</a>.
Follow the instructions on the email.
Visit our website at alohaharvest.org.
</dd>
</dl>
</section>
Expand Down
Loading

0 comments on commit badb692

Please sign in to comment.