Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions project-app/components/Forms/StartClean.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const StartCleanForm = () => {
.max(10, "Must be 10 characters or less")
.required("Required"),*/
cleanName: Yup.string()
.max(20, "Must be 20 characters or less")
.max(50, "Must be 50 characters or less")
.required("Required"),
location: Yup.string()
.max(50, "Must be 50 characters or less")
Expand All @@ -92,9 +92,9 @@ const StartCleanForm = () => {
.max(8, "Must be 8 characters or less")
.required("Required"),
host: Yup.string()
.max(15, "Must be 15 characters or less")
.max(25, "Must be 25 characters or less")
.required("Required"),
notes: Yup.string().max(50, "Must be 50 characters or less"),
notes: Yup.string().max(75, "Must be 75 characters or less"),

latitude: Yup.number(),
longitude: Yup.number(),
Expand Down Expand Up @@ -122,7 +122,7 @@ const StartCleanForm = () => {
htmlFor="cleanName"
className="pb-2 text-white text-lg font-medium"
>
Your Clean-up Name
Your clean-up name
</label>
<Field
placeholder="e.g. Brighton Pier clean-up"
Expand Down Expand Up @@ -227,6 +227,7 @@ const StartCleanForm = () => {
</label>
<Field
as="textarea"
placeholder="e.g. muddy terrain, wear wellies!"
name="notes"
type="text"
className="w-full h-20 p-2.5 mb-1 bg-gray-50 border-2 rounded-lg shadow-inner text-black text-base focus:ring-[#FF9505]"
Expand Down
6 changes: 3 additions & 3 deletions project-app/components/Landing/Landing.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ const LandingBanner = () => {
</h1>
<hr className="flex items-center sm:w-[55rem] h-0.5 bg-[#004e5491] mb-[2rem]"></hr>
<div className="flex items-center w-[20rem] sm:w-[35rem] text-[15px] sm:text-[20px] text-[#004F54]">
<p>Project Clean-Up is a place where you can join others to make a difference to our
environment by creating or joining litter clean-ups. They can
be done anywhere from beaches to rivers and even national parks to your
<p>Project Clean-Up is a place where you can join others to improve the
environment by creating or joining litter clean-ups. They can
be done anywherefrom beaches, rivers, and even national parks, to your
very own neighbourhood!</p>
</div>
<div className="flex flex-col md:flex-row items-center justify-center md:space-x-[3em] space-y-[2rem] mt-[2rem] md:space-y-[0]">
Expand Down
13 changes: 3 additions & 10 deletions project-app/components/NavGetInvolved/NavGetInvolved.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,9 @@ const NavGetInvolved = () => {
</Link>
</div>

<div className="flex items-center justify-center text-[#FF9505] text-[18px] text-center font-medium">
<p>
If you would like to join a clean-up in your area, click{" "}
<strong>"Join A Clean"</strong>, and sign up by joining an existing
clean on the map. Start a clean-up in your area by clicking the{" "}
<strong>"Start A Clean"</strong> button. If you have hosted an
event, make sure to log the results of your hard work via the{" "}
<strong>"Log A Clean"</strong> button to update the project with how
many bags were collected and how many people took part.
</p>
<div className="flex items-center justify-center text-[#FF9505] text-[18px] text-center font-medium">
<p>If you would like to join a clean-up in your area, click <strong>"Join a Clean"</strong>, and sign up with an existing clean on the map. Start a clean-up in your area by clicking the <strong>"Start a Clean"</strong> button. If you have hosted an event, make sure to log the results of your hard work via the <strong>"Log a Clean"</strong> button to update the project with how many bags were collected and how many people took part.</p>
</div>
</div>
</div>
</div>
Expand Down
17 changes: 7 additions & 10 deletions project-app/components/OurMission/OurMission.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ const OurMission = () => {
return (
<div id="mission" className={Style.missionContainer}>
<div className={Style.textContainer}>
<h2 className="text-lg sm:text-xl md:text-4xl text-[#004F54] font-bold">What is Project Cleanup?</h2>
<h2 className="text-lg sm:text-xl md:text-4xl text-[#004F54] font-bold">What is Project Clean-Up?</h2>

<p className={Style.missionParagraph}>
Project Clean-Up allows you to start your own clean-up or join an
Project Clean-Up enables you to start your own litter clean-up, or join an
existing one. All you have to do is go to the {" "}
<a href="#map" className="text-[#FF9505] underline font-medium">
map
</a>
{" "}and search for a clean-up in any area you're interested in. If
one is available, simply click the map marker, read the details, then
go ahead and join that cleanup. If there aren't any, you could{" "}
go ahead and join that clean-up. If there aren't any, you could{" "}
<a
href="/start-a-clean"
className="text-[#FF9505] underline font-medium"
Expand All @@ -30,13 +30,10 @@ const OurMission = () => {
<p className={Style.missionParagraph}>
Get some friends together, make a family day of it, take your pupils
out for an educational excursion, or even take your corporate team for
an authentic team-building day out.
</p>
<p className={Style.missionParagraph}>
Whichever you choose, you will be making a positive impact on the
environment. There are so many benefits when getting involved with a
cleanup; not only are you making a massive difference to the planet,
you are also immersing yourself in the great outdoors, keeping active,
an authentic team building experience. Whatever you choose, you will make a positive impact on the
environment. There are many benefits from getting involved with a
clean-up; not only are you making a massive difference to the planet,
you are immersing yourself in the great outdoors, keeping active,
and meeting new people—all at the same time.
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion project-app/components/Stats/Stats.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default function Stats() {
<StatCard
key={Math.random() * 500}
number={totalCleans}
text="Cleanups Started"
text="Clean-Ups Started"
image="/icon-abacus.svg"
/>
<StatCard
Expand Down
4 changes: 2 additions & 2 deletions project-app/components/Weather/WeatherForecast.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const WeatherForecast = ({ weatherObject }) => {
</p>
</div>
{/* CARD 3 */}
<div className="flex flex-row sm:flex-col rounded border-4 border-[#579094] shadow-lg mt-4 mb-4 w-54 p-1 sm:p-4 ml-2 mr-2 sm:ml-4 justify-evenly items-center text-xl font-bold">
<div className="flex flex-row sm:flex-col rounded border-4 border-[#579094] shadow-lg mt-4 mb-4 w-54 p-1 sm:p-4 ml-2 mr-2 sm:ml-4 justify-evenly items-center text-xl font-bold">
<div className="flex flex-col">
<p className="text-white">
{datConvertor(weatherObject?.list[24].dt)}
Expand All @@ -121,7 +121,7 @@ const WeatherForecast = ({ weatherObject }) => {
</p>
</div>
{/* CARD 4 */}
<div className="flex flex-row sm:flex-col rounded border-[#579094] border-4 shadow-lg mt-4 mb-4 w-54 p-1 sm:p-4 ml-2 mr-2 sm:ml-4 justify-evenly items-center text-xl font-bold">
<div className="flex flex-row sm:flex-col rounded border-[#579094] border-4 shadow-lg mt-4 mb-4 w-54 p-1 sm:p-4 ml-2 mr-2 sm:ml-4 justify-evenly items-center text-xl font-bold">
<div className="flex flex-col">
<p className="text-white">
{datConvertor(weatherObject?.list[32].dt)}
Expand Down
2 changes: 1 addition & 1 deletion project-app/components/Weather/WeatherReqs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const WeatherReqs = () => {
return (
<>
<button
className="bg-[#004F54] text-white font-bold uppercase text-[10px] md:text-xs py-0.5 px-2 sm:p1 sm:mt-0 rounded shadow hover:shadow-lg ease-linear transition-all duration-75"
className="bg-[#004F54] text-white font-bold uppercase text-[10px] md:text-xs py:0.5 sm:py-1 px-2 sm:p1 rounded shadow hover:shadow-lg ease-linear transition-all duration-75"
type="button"
onClick={() => setShowModal(true)}
>
Expand Down
2 changes: 1 addition & 1 deletion project-app/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default function Home() {
<div className=" ml-1 mr-1 mt-4 mb-16">
<a id="map" className="flex invisible pb-[50px]"></a>
<h2 className="text-lg sm:text-xl md:text-4xl text-[#004F54] font-bold ml-6">
Join a Clean-up
Join a Clean-Up
</h2>
<h3 className="ml-4 sm:ml-6 mb-2 text-sm sm:text-lg rounded-md text-[#ffffff] bg-[#FF9505] w-11/12 sm:w-[30rem] p-1 text-center">
Find a marker and click to reveal clean-up details
Expand Down
6 changes: 3 additions & 3 deletions project-app/pages/log-a-clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ export default function LogClean() {
</Head>
<NavbarLogClean />

<h3 className="pt-32 text-5xl text-center text-[#004F54]">Log A Clean</h3>
<h3 className="pt-32 text-5xl text-center text-[#004F54]">Log a Clean</h3>
<div className="flex flex-col h-full justify-center">
<div className="flex justify-center ">
<h3 className=" mb-0 text-sm sm:text-lg rounded-md text-[#ffffff] bg-[#FF9505] w-11/12 sm:w-[32rem] p-1 text-center">
Log your clean and check our stats to see your contribution!
<h3 className=" mb-0 text-sm sm:text-lg rounded-md text-[#ffffff] bg-[#FF9505] w-11/12 sm:w-[34rem] p-1 text-center">
Log your clean, then our stats will update with your contribution!
</h3>
</div>

Expand Down
8 changes: 4 additions & 4 deletions project-app/pages/start-a-clean.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ export default function startClean() {
<div className="h-full bg-[#E6E5E4] ">
<NavbarStartClean />
<h2 className="pt-32 pb-8 text-5xl text-center text-[#004F54]">
Start A Clean
Start a Clean
</h2>
<h3 className="ml-4 sm:ml-6 mb-0 text-sm sm:text-lg rounded-md text-[#ffffff] bg-[#FF9505] w-11/12 sm:w-[39rem] p-1 text-center">
<strong>IMPORTANT:</strong> Drag the marker to your cleanup location &
then fill in form
<h3 className="ml-4 sm:ml-6 mb-0 text-sm sm:text-lg rounded-md text-[#ffffff] bg-[#FF9505] w-11/12 sm:w-[33rem] p-1 text-center">
Drag the marker to your clean-up location,
then fill in the form
</h3>

<div className="flex flex-col sm:flex-row ">
Expand Down