Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
332 commits
Select commit Hold shift + click to select a range
47568e3
image is now displaying in line with our mission text
EdMark11 Aug 1, 2022
1fc32d2
finished our mission
amiragucher Aug 1, 2022
abb45ec
Background colour changed
amiragucher Aug 1, 2022
b6fa5d2
Merge pull request #19 from SchoolOfCode/Carousel-Component
amiragucher Aug 1, 2022
0611915
Merge branch 'development' into our-mission
amiragucher Aug 1, 2022
959bf6c
Merge pull request #21 from SchoolOfCode/our-mission
amiragucher Aug 1, 2022
03f7d99
Merge branch 'development' into main-page-css
amiragucher Aug 1, 2022
517ea99
sample form added in log a clean which doesnt work
srai98i Aug 1, 2022
9394d17
Merge pull request #22 from SchoolOfCode/main-page-css
amiragucher Aug 1, 2022
c7712b2
Weather setCity un-commented
amiragucher Aug 1, 2022
020574f
Merge pull request #23 from SchoolOfCode/development
amiragucher Aug 1, 2022
9d070a2
changed map sizing and worked on responsiveness for weather widget
BlakeLawrence Aug 1, 2022
5b66015
fixed map scroll issue - added more responsiveness to map and weather…
BlakeLawrence Aug 1, 2022
4db4a23
changed map height
BlakeLawrence Aug 1, 2022
5347e49
branch created, positioning buttons/making them bigger
amiragucher Aug 1, 2022
e2e399d
Buttons are now in the center of the page
amiragucher Aug 1, 2022
bf5f29a
Nav-bar size changed, placeholder logo added, stats in progress
amiragucher Aug 1, 2022
a14b352
Css styling finished home page complete
amiragucher Aug 1, 2022
0ac4d3d
sorted out weather search bar responsiveness and weather tips button …
BlakeLawrence Aug 2, 2022
c75ae21
sorted out weather forecast card responsivenes - from samsung galaxy …
BlakeLawrence Aug 2, 2022
98ef9ea
fixed button sizing for weather tips
BlakeLawrence Aug 2, 2022
a1eb124
fixed map pop up responsiveness
BlakeLawrence Aug 2, 2022
0953561
button change
BlakeLawrence Aug 2, 2022
87ed021
map height changed
BlakeLawrence Aug 2, 2022
7efa2a6
Merge pull request #24 from SchoolOfCode/weather/map-styling
BlakeLawrence Aug 2, 2022
54692de
Merge pull request #25 from SchoolOfCode/home-css
amiragucher Aug 2, 2022
cf5bfc3
Merge pull request #26 from SchoolOfCode/development
amiragucher Aug 2, 2022
88bff4f
log clean form made
srai98i Aug 2, 2022
bb94d37
added new page, map and form files and logic for the start a clean se…
BlakeLawrence Aug 2, 2022
c29a158
map tweaking
BlakeLawrence Aug 2, 2022
5b71c03
map tweaking
BlakeLawrence Aug 2, 2022
291affd
afdded package json for gesture handling
BlakeLawrence Aug 2, 2022
447b12b
fixed bugs: map overlapping Navbar and model, mobile view side menu n…
EdMark11 Aug 2, 2022
b35ced8
added an invisible anchor above map so that when join a cleanup butto…
EdMark11 Aug 2, 2022
ec24d98
adjusted drop down menu href to take user to map rather than new page
EdMark11 Aug 2, 2022
826395a
Basic form functionality complete, useContext implemented to pass map…
SurfingElectron Aug 2, 2022
1649b29
Merge pull request #27 from SchoolOfCode/forms
SurfingElectron Aug 2, 2022
a067884
Merge pull request #28 from SchoolOfCode/debugging-map
EdMark11 Aug 2, 2022
7152e8d
Merge pull request #29 from SchoolOfCode/development
jena-84 Aug 2, 2022
b168e1a
fixed weather card spacing issues
BlakeLawrence Aug 2, 2022
90bf7ce
further weather style tweaks
BlakeLawrence Aug 2, 2022
0dc6a86
fixed modal responsiveness and changed weather card opoacity, also re…
BlakeLawrence Aug 3, 2022
78d7242
Merge pull request #30 from SchoolOfCode/weather-styling
BlakeLawrence Aug 3, 2022
002ea26
changed form validation
BlakeLawrence Aug 3, 2022
cdfe6ce
log a clean
jenan-84 Aug 3, 2022
d2ede9e
Merge pull request #31 from SchoolOfCode/branch-for-style
jena-84 Aug 3, 2022
8d7225d
Join a clean form created, modal added to form but needs changing
amiragucher Aug 3, 2022
b8c6a6e
navbar start started
srai98i Aug 3, 2022
390d247
Merge pull request #32 from SchoolOfCode/forms
EdMark11 Aug 3, 2022
4de95bd
refactoring navbar in navbar start
srai98i Aug 3, 2022
d068070
added a form inside of the join clean pop-up
EdMark11 Aug 3, 2022
94a1b2c
added navbar for each page, all routing working 100% now
BlakeLawrence Aug 3, 2022
9596a6a
Model displaying, close and join button functioning, submit button co…
amiragucher Aug 3, 2022
44fcd98
added margin right for new navbars
BlakeLawrence Aug 3, 2022
92dade3
Tailwind added to the fonts in the modal
amiragucher Aug 3, 2022
c3e8cf7
added module to start a clean and removed most contents, back to home…
srai98i Aug 3, 2022
cc56a30
Title is now# response
amiragucher Aug 3, 2022
8e5edb4
added modal to log clean page and added log button to landing page
BlakeLawrence Aug 3, 2022
22c429b
worked on the responsiveness of components
EdMark11 Aug 3, 2022
161b4fd
Merge pull request #33 from SchoolOfCode/navbar_routing
srai98i Aug 3, 2022
f6d29af
Merge branch 'development' into main-css
EdMark11 Aug 3, 2022
b84352c
Merge pull request #34 from SchoolOfCode/main-css
EdMark11 Aug 3, 2022
a01f314
removed join a clean-up page that wasnt being used
EdMark11 Aug 3, 2022
17bf512
Merge pull request #36 from SchoolOfCode/development
EdMark11 Aug 3, 2022
389ed37
Created custom 404 page.
SurfingElectron Aug 3, 2022
2c38bcb
Removed redundant divs and Tailwind CSS
SurfingElectron Aug 3, 2022
e48a44d
Getting started on the documentation.
SurfingElectron Aug 3, 2022
8f2e7ec
Minor formatting tweak to tech stack.
SurfingElectron Aug 3, 2022
58dedc4
created new map branch off development and fixed draggable marker - d…
BlakeLawrence Aug 4, 2022
51b8029
worked on formik start clean orm
BlakeLawrence Aug 4, 2022
0db428a
furtehr form tweaks
BlakeLawrence Aug 4, 2022
23861e8
emma fixed map form issues with spread operator
BlakeLawrence Aug 4, 2022
5fb7648
Merge pull request #37 from SchoolOfCode/map-FINAL
BlakeLawrence Aug 4, 2022
041707d
Form background colour changed
amiragucher Aug 4, 2022
940546c
Tidying the imports at the top of NavBars, importing useUser from auth0
SurfingElectron Aug 4, 2022
10a7674
Lost the wrapper on the _app somewhere in the merging, added it back in.
SurfingElectron Aug 4, 2022
cf477f6
Added page protection to log-a-clean and start-a-clean pages
SurfingElectron Aug 4, 2022
7f2321a
Added loginlogout to NavbarHome
SurfingElectron Aug 4, 2022
6cc89df
added the our mission text
BlakeLawrence Aug 5, 2022
4fa94f5
Merge pull request #40 from SchoolOfCode/our-mission
amiragucher Aug 5, 2022
3072ca5
Merge pull request #41 from SchoolOfCode/css-start-form
amiragucher Aug 5, 2022
2b3ad2e
Merge pull request #38 from SchoolOfCode/404-page
amiragucher Aug 5, 2022
a35531f
Merge pull request #42 from SchoolOfCode/auth0-merge-fixes
amiragucher Aug 5, 2022
1878a13
Merge pull request #43 from SchoolOfCode/documentation
amiragucher Aug 5, 2022
1f4dc8f
Merge pull request #44 from SchoolOfCode/development
amiragucher Aug 5, 2022
61bc301
installed auth0 package
srai98i Aug 5, 2022
93a31d7
Merge pull request #45 from SchoolOfCode/development
amiragucher Aug 5, 2022
fcdc8a8
map testing routes branch created
BlakeLawrence Aug 5, 2022
b8543a3
fetch request to display a cleanup on the map done
EdMark11 Aug 5, 2022
d1fe83f
Added map for data
amiragucher Aug 5, 2022
45660bc
Merge pull request #46 from SchoolOfCode/testing-routes
BlakeLawrence Aug 5, 2022
ee37b8d
Merge pull request #47 from SchoolOfCode/development
BlakeLawrence Aug 5, 2022
06eb822
changed map zoom and added comments to map
BlakeLawrence Aug 5, 2022
a35698f
changed url
BlakeLawrence Aug 5, 2022
edf8726
changed url
BlakeLawrence Aug 5, 2022
c7d7dff
changed url
BlakeLawrence Aug 5, 2022
2b2f53c
added key to map children
BlakeLawrence Aug 5, 2022
1616d9c
Merge branch 'main' into development
BlakeLawrence Aug 5, 2022
0a5dad8
Merge pull request #48 from SchoolOfCode/development
BlakeLawrence Aug 5, 2022
38206d6
resolved conflicts
BlakeLawrence Aug 5, 2022
807ca2a
Merge pull request #49 from SchoolOfCode/main
srai98i Aug 5, 2022
996d4bf
added text for weather section
BlakeLawrence Aug 6, 2022
e5be22e
added better description to weather tips section - possibly solved z-…
BlakeLawrence Aug 6, 2022
ac46525
fixed our mission responsiveness
BlakeLawrence Aug 6, 2022
41a3a14
re-sized weather tips button
BlakeLawrence Aug 6, 2022
cb56217
changed italic to standard in weather tips
BlakeLawrence Aug 6, 2022
fa300ef
changed map positioning
BlakeLawrence Aug 6, 2022
735ee08
fixed weather sizing
BlakeLawrence Aug 6, 2022
79e2301
fixed map responsiveness and layout adjustment
BlakeLawrence Aug 6, 2022
8f341c7
adjusted join clean form spacing
BlakeLawrence Aug 6, 2022
2ebdc61
changed map height from 60vh to 70vh
BlakeLawrence Aug 7, 2022
268a67e
updated check wethae text
BlakeLawrence Aug 7, 2022
6ef1deb
added margin bottom to join button
BlakeLawrence Aug 7, 2022
cea39f0
made footer responsive and tweaked sizings
BlakeLawrence Aug 7, 2022
a681498
tweaked footer for large screens
BlakeLawrence Aug 7, 2022
21ae5f4
styled start clean form for mobile phone
BlakeLawrence Aug 8, 2022
7f5ad4d
started styling start clean form for full screen
BlakeLawrence Aug 8, 2022
be6d146
Merge pull request #51 from SchoolOfCode/weather-text
BlakeLawrence Aug 8, 2022
41a9324
Merge pull request #52 from SchoolOfCode/form-styling
BlakeLawrence Aug 8, 2022
f56cc7b
fixing auth0 error
srai98i Aug 8, 2022
9a988e9
css for start a clean form added
amiragucher Aug 8, 2022
3073488
post request for join form works successfully
EdMark11 Aug 8, 2022
258c252
button need positioning, flex working for the map and text box
amiragucher Aug 8, 2022
8f78d9a
Button is displaying in the center, start a clean form css complete
amiragucher Aug 8, 2022
112ef9e
Button size fixed
amiragucher Aug 8, 2022
a5d902a
Merge pull request #53 from SchoolOfCode/form-posts
amiragucher Aug 8, 2022
b38dd46
Merge pull request #54 from SchoolOfCode/form-css
amiragucher Aug 8, 2022
bc92a0b
added login status to other navbars
srai98i Aug 8, 2022
6ca583c
fixed bug
BlakeLawrence Aug 8, 2022
4485610
Css positioning need to be changed so that it is in the center in pho…
amiragucher Aug 8, 2022
5bfef68
log clean form is now posting data to db
EdMark11 Aug 8, 2022
e4df7d5
form logic front end complete
EdMark11 Aug 8, 2022
89e96ac
Merge pull request #55 from SchoolOfCode/auth0-error
jena-84 Aug 8, 2022
c0c68fc
Merge pull request #56 from SchoolOfCode/form-css-again
amiragucher Aug 8, 2022
c06ce92
Merge branch 'development' into formLogic-frontend
EdMark11 Aug 8, 2022
409089f
Merge pull request #57 from SchoolOfCode/formLogic-frontend
EdMark11 Aug 8, 2022
75043b6
Merge pull request #58 from SchoolOfCode/development
amiragucher Aug 8, 2022
1021fe7
Removed dark mode, redundant CSS and a lot of the individual padding/…
SurfingElectron Aug 8, 2022
65c7f4b
Flexed the boxes; form is now centered in its div, corrected some typ…
SurfingElectron Aug 8, 2022
0acfd47
Adjusted button so not so reliant on padding & margins, styled error …
SurfingElectron Aug 8, 2022
de3fe62
Tweaked modal - removed conflicting padding and margins from various …
SurfingElectron Aug 8, 2022
9486ac6
Moved the modal setState from onClick into handleSubmit so only appea…
SurfingElectron Aug 8, 2022
22524c4
Adjusted padding and size of form container.
SurfingElectron Aug 8, 2022
3ea306b
Carousel images changed, and made bigger to fit the screen
amiragucher Aug 8, 2022
d527975
changed main buttons y-spacing for mobiles, changed stats text size f…
BlakeLawrence Aug 9, 2022
23f364d
mobile sizing (our mission text, map and weather explanations,todays …
BlakeLawrence Aug 9, 2022
c638f68
added text for stats card
BlakeLawrence Aug 9, 2022
e83cac7
added text styling to stats
BlakeLawrence Aug 9, 2022
6fccc98
tidied up stats console logs
BlakeLawrence Aug 9, 2022
81f75e9
changed stats heading font weight
BlakeLawrence Aug 9, 2022
41d59d9
removed search bar from startClean map as we werent meant to have thi…
BlakeLawrence Aug 9, 2022
5c24dc2
removed un-necessary imports from startClean map
BlakeLawrence Aug 9, 2022
dfa6dbc
removed start clean form changes
BlakeLawrence Aug 9, 2022
9138d8d
removed map form comments
BlakeLawrence Aug 9, 2022
051bdc5
Merge pull request #59 from SchoolOfCode/carousel-component-test
amiragucher Aug 9, 2022
0013472
Merge pull request #60 from SchoolOfCode/styling-tweaks
BlakeLawrence Aug 9, 2022
d09fd14
Merge pull request #61 from SchoolOfCode/css-form-experiments
SurfingElectron Aug 9, 2022
aa8b5f5
removed title for stats and uncommented city stats
BlakeLawrence Aug 9, 2022
711bae9
Merge branch 'development' of https://github.com/SchoolOfCode/environ…
BlakeLawrence Aug 9, 2022
4590d5f
Merge pull request #62 from SchoolOfCode/development
srai98i Aug 9, 2022
0587e35
Change form and page for log-a-clean, now matching start-a-clean styl…
SurfingElectron Aug 9, 2022
e7f2d18
Adding fixed to footer to try to make it stick to bottom of page.
SurfingElectron Aug 9, 2022
97de1a5
added front end documentation to existing readme
BlakeLawrence Aug 9, 2022
903cf07
Styling for log-a-clean finished instructions need to be made responsive
amiragucher Aug 9, 2022
3fc7095
Start a clean title changed
amiragucher Aug 9, 2022
e47ffba
fixed bug where weather app crashed the site if city name was spelled…
EdMark11 Aug 9, 2022
cbfc2ea
added an alert for submitting a join request
EdMark11 Aug 9, 2022
576b579
Reverted some changes causing spacing/footer issues, added background…
SurfingElectron Aug 9, 2022
136b86b
Merge pull request #63 from SchoolOfCode/form-styling
SurfingElectron Aug 9, 2022
904a23b
Merge pull request #64 from SchoolOfCode/frontend-documentation
BlakeLawrence Aug 9, 2022
a87f1b3
Merge pull request #65 from SchoolOfCode/fixing-weather-bugs
EdMark11 Aug 9, 2022
4e31467
Merge pull request #66 from SchoolOfCode/development
amiragucher Aug 9, 2022
fcfbd2f
Used flexbox and h-screen to nudge footer to bottom.
SurfingElectron Aug 9, 2022
d65e091
Playing with footer CSS
SurfingElectron Aug 9, 2022
c9fbb34
Centered the text on the footer, made the gaps between the social ico…
SurfingElectron Aug 9, 2022
40e0a88
Delete .env.production
srai98i Aug 9, 2022
7d31ed9
Installed cypress and have a simple test running
EdMark11 Aug 10, 2022
cfd4f36
adding new tests to cypress
EdMark11 Aug 10, 2022
d63ec8f
Added app logo to footer.
SurfingElectron Aug 10, 2022
f152082
Logo added to all navbars, css landing page updated text made responsive
amiragucher Aug 10, 2022
db55f50
added some extra tests to cypress, including testing the tips modal
EdMark11 Aug 10, 2022
52ad4a2
sorting auth0 credentials
srai98i Aug 10, 2022
308a66b
new untracked .env.production file
srai98i Aug 10, 2022
f5cf93c
Merging changes
EdMark11 Aug 10, 2022
76ecdee
Merge pull request #67 from SchoolOfCode/development
srai98i Aug 10, 2022
0f35d59
added a test that checks for our test section
EdMark11 Aug 10, 2022
06419c8
removed the production env file
EdMark11 Aug 10, 2022
1defccc
Weather display changed, our mission display changed
amiragucher Aug 10, 2022
004eb17
sorted out map marker validation and time fields format
BlakeLawrence Aug 10, 2022
4a6c82e
Added row of nav buttons below mission statement, resized main nav bar.
SurfingElectron Aug 10, 2022
5912ce9
sorted out map wording
BlakeLawrence Aug 10, 2022
70e0d79
Merge pull request #68 from SchoolOfCode/map-coordinates
BlakeLawrence Aug 10, 2022
f91f065
Merge branch 'development' into footer-tinkering
amiragucher Aug 10, 2022
a225794
Merge pull request #70 from SchoolOfCode/footer-tinkering
amiragucher Aug 10, 2022
c7d4d54
Merge pull request #72 from SchoolOfCode/log-a-clean-experiments
BlakeLawrence Aug 10, 2022
68f4c52
sorted out aesthetic niggles
BlakeLawrence Aug 11, 2022
402c71a
Merge pull request #73 from SchoolOfCode/aboutUs-blurb
BlakeLawrence Aug 11, 2022
e4a8f44
Merge pull request #74 from SchoolOfCode/cypress-testing
EdMark11 Aug 11, 2022
adfc3a1
Merge pull request #75 from SchoolOfCode/development
amiragucher Aug 11, 2022
d91150f
changed next image spelling
BlakeLawrence Aug 11, 2022
99198b7
removed old readme
BlakeLawrence Aug 11, 2022
95329c2
Merge pull request #76 from SchoolOfCode/development
BlakeLawrence Aug 11, 2022
6e2852b
put post request in if statement
srai98i Aug 11, 2022
0305afb
Fixed images in figma to fit. New images added to the carousel
amiragucher Aug 11, 2022
4f5587b
Edited the front page to match the new wireframe, removed dark mode o…
SurfingElectron Aug 11, 2022
a5da117
Fixed Navbar text (from cleanup to Clean-up) and changed user.nicknam…
SurfingElectron Aug 11, 2022
6e2751b
Changed join clean submit button to match other form stylings.
SurfingElectron Aug 11, 2022
e288dda
Merge pull request #77 from SchoolOfCode/carousel-images
amiragucher Aug 11, 2022
150e3b8
Cypress now is able to log in through auth0, and added some simple te…
EdMark11 Aug 11, 2022
8bcd686
uncomented codes and removes lines 19-20
jenan-84 Aug 11, 2022
6ff660b
Log a clean alert added. Log a clean form text added styling almost c…
amiragucher Aug 11, 2022
96541ad
Added tests for log a clean may need to refactor some based on stylin…
EdMark11 Aug 11, 2022
1bffa79
Removed duplicate CSS in WeatherForecast, added <head> tags to remain…
SurfingElectron Aug 11, 2022
bf1e26b
sorted form closing for join clean
BlakeLawrence Aug 11, 2022
20d6571
changed alert message
BlakeLawrence Aug 11, 2022
b9e7f54
Added a test that fills in start a clean form and interacts with the map
EdMark11 Aug 11, 2022
40f8c86
Merge pull request #78 from SchoolOfCode/start-form-submit-bug
srai98i Aug 11, 2022
8b5b607
Merge pull request #79 from SchoolOfCode/close-map-popup
srai98i Aug 11, 2022
2271f61
Merge pull request #80 from SchoolOfCode/testing-on-cypress
EdMark11 Aug 11, 2022
ac62a07
Merge pull request #81 from SchoolOfCode/main-page-adjustments
amiragucher Aug 11, 2022
81ef979
Merge pull request #82 from SchoolOfCode/development
SurfingElectron Aug 11, 2022
a5ee59f
Editing pass over text, updated start-a-clean validation to 50 charac…
SurfingElectron Aug 11, 2022
e8b8e32
Styled the dropdown menu!
SurfingElectron Aug 11, 2022
c4cc355
swapped order of fields on log clean form - put volunteers before amo…
BlakeLawrence Aug 12, 2022
8b50abe
made bag estimation comment on log clean form 1 size smaller
BlakeLawrence Aug 12, 2022
4c0d218
repush
BlakeLawrence Aug 12, 2022
a0af996
added custom alert
srai98i Aug 12, 2022
be4d58e
added new success message for join clean form
BlakeLawrence Aug 12, 2022
1bd4747
added new error for start clean map
BlakeLawrence Aug 12, 2022
1070720
Merge pull request #83 from SchoolOfCode/joinModal-BL
srai98i Aug 12, 2022
6c46aea
Merge branch 'development' into editing-pass-website-text
SurfingElectron Aug 12, 2022
40bd47c
Merge pull request #84 from SchoolOfCode/editing-pass-website-text
SurfingElectron Aug 12, 2022
a883dba
Merge pull request #85 from SchoolOfCode/dropdown-styling
SurfingElectron Aug 12, 2022
be40f7e
sorted error in navGetInvolved
BlakeLawrence Aug 12, 2022
585e137
Create README.md
SurfingElectron Aug 12, 2022
5ac8c6b
Delete el-potential-update
SurfingElectron Aug 12, 2022
9e579f6
removed setCity comment
BlakeLawrence Aug 12, 2022
b38e9f5
Merge branch 'main' of https://github.com/SchoolOfCode/environment_va…
BlakeLawrence Aug 12, 2022
d5f8090
Merge branch 'main' into development
jena-84 Aug 12, 2022
dc582c7
Merge pull request #86 from SchoolOfCode/development
jena-84 Aug 12, 2022
c348456
changed statcard for cleanup spelling and added extra info in modal f…
srai98i Aug 14, 2022
7d02d8a
Merge pull request #87 from SchoolOfCode/minor-tweaks-sim
srai98i Aug 15, 2022
0f75d63
Merge pull request #88 from SchoolOfCode/development
srai98i Aug 15, 2022
612a5f3
Update README.md
amiragucher Sep 15, 2022
a85c3ff
Update README.md
amiragucher Sep 15, 2022
d565965
db url changed
BlakeLawrence Dec 6, 2022
5a65bed
Merge branch 'main' of https://github.com/SchoolOfCode/environment_va…
BlakeLawrence Dec 6, 2022
54dc56e
addde comment
BlakeLawrence Dec 7, 2022
68c15f8
got database working by updating heroku and changing environment vari…
BlakeLawrence Feb 27, 2023
1ac0d01
url test for reploy
BlakeLawrence Feb 28, 2023
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
129 changes: 127 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,127 @@
[![Open in Visual Studio Code](https://classroom.github.com/assets/open-in-vscode-c66648af7eb3fe8bc4f294546bfd86ef473780cde1dea487d3c4ff354943c9ae.svg)](https://classroom.github.com/online_ide?assignment_repo_id=8143537&assignment_repo_type=AssignmentRepo)
# final-project_front-end
![Project Clean-Up](https://user-images.githubusercontent.com/98705391/184337846-b06b80b3-98d3-40b4-912b-dc429ad54f72.png)
# Welcome To Project Clean-up
This is the repository for the front end of Project Clean-up, an app created as a final project in the [School of Code's](https://www.schoolofcode.co.uk/) Bootcamp 12 (25 April - 16 August 2022). If you'd like to see the back-end, please check out the [git repository](https://github.com/SchoolOfCode/environment_variables_backend).

Deployed on vercel: https://projectcleanup.netlify.app/

![Earth, map, and map marker emojis](https://user-images.githubusercontent.com/98705391/184339535-2eb89ee6-2c6b-4376-baf3-2f5c4720e582.png)

### 🤔 **The Problem**
Pollution and litter is a growing environmental crisis. Animals can choke on or ingest litter, suffocate in plastic bags, get entangled in elastics and plastics, or suffer injuries from discarded glass, metals and hooks. It can also present a danger to plant life, with flammable materials presenting a fire hazard, leak contaminants which can damage plants and inhibit their growth, or reduce light availability and moisture.

### 🧠 **Our Solution**
Our aim is to help protect the wildlife and beauty of our green spaces by reducing litter and so the hazards it presents. Project Clean-Up is a full-stack app which enables people to join and create litter clean-up events in their communities—or further afield, if that's what takes their fancy!

### 🛠️ **How It Works**
All of the clean-up events are stored in a database. The front-end makes requests to the database to display clean-up statistics, and populate the front page map with all events. Users can choose to join an event without registering, or register using Auth0 to start their own event⁠—which is then posted to the database and so visible on the front page map. After an event, the host can log their clean and submit the number of volunteers in attendance, and the amount of litter collected, which is then reflected in the statistics displayed on the page. A weather widget is included, along with advice for various weather conditions, so that users can ensure they are adequately prepared for the Great British weather on the day of their clean-up!


## Authors (aka, the Environment Variables)
**Click our names to view our GitHub Profiles**

- [Emma Gill](https://github.com/SurfingElectron)

- [Amira Gucher-Blackman](https://github.com/amiragucher)

- [Blake Lawrence](https://github.com/BlakeLawrence)

- [Edgaras Markunas](https://github.com/EdMark11)

- [Simran Rai](https://github.com/srai98i)

- [Jena Zubaydi](https://github.com/jena-84)


## App Features
The app offers a number of features to achieve its goal of helping users join and create litter clean-up events:
- 🗺️ **Interactive maps**, so users can locate existing clean-ups, or select a location to start their own;

- ⛅ **A weather widget**, to allow users to check the weather for an upcoming event and prepare accordingly;

- 📱 **Responsive design**, so the app can be used just as easily on mobile devices as it is on computers;

- 💽 **A custom database**, which stores all clean-up events, and responds to HTTP requests via our [back-end](https://github.com/SchoolOfCode/environment_variables_backend);

- 🔒 **User authentication**, to minimise spam, irrelevant or malicious postings, and to facilitate future features.


## Screenshots
|Landing Page| Forms |
|--|--|
| ![Landing page screenshot](https://user-images.githubusercontent.com/64714474/184341409-0a635d8c-ba79-4a27-8ddb-d54dde55dcdb.png) | ![Log a Clean screenshot](https://user-images.githubusercontent.com/64714474/184341488-e399b883-98eb-48e6-9f53-fffadf3fa6c4.png) |
| ![Map screenshot](https://user-images.githubusercontent.com/64714474/184341540-24922844-2518-420f-a5fc-4443f44924c5.png) | ![Start a Clean screenshot](https://user-images.githubusercontent.com/64714474/184341654-116dba21-7ba4-4cf1-9958-c5e324e6c390.png) |



## APIs
- [Leaflet](https://react-leaflet.js.org/) for the interative maps
- [Open Weather map](https://openweathermap.org/api) for the weather widget


## Installation 💻
**Clone the front-end and back-end repositories to your computer:**

```bash
https://github.com/SchoolOfCode/environment_variables_frontend
https://github.com/SchoolOfCode/environment_variables_backend

```

**Install the dependancies for both with the following command:**
```bash
npm install
```

To run this project, you will need to add the following environment variables to your front-end .env file:

`NEXT_PUBLIC_WEATHER_KEY= <place your api key from open weather map here>`

`NEXT_PUBLIC_DATABASE_URL= <place your api key from Heroku here>`

You will also need to add your Auth0 applications keys to your development and/or deployment environments. Please refer to the [Auth0](https://auth0.com/docs) docs for further details on how to do this.


## Tech stack
### Front-end
![Javascript mini-banner](https://camo.githubusercontent.com/93c855ae825c1757f3426f05a05f4949d3b786c5b22d0edb53143a9e8f8499f6/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4a6176615363726970742d3332333333303f7374796c653d666f722d7468652d6261646765266c6f676f3d6a617661736372697074266c6f676f436f6c6f723d463744463145)
![React mini-banner](https://camo.githubusercontent.com/268ac512e333b69600eb9773a8f80b7a251f4d6149642a50a551d4798183d621/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f52656163742d3230323332413f7374796c653d666f722d7468652d6261646765266c6f676f3d7265616374266c6f676f436f6c6f723d363144414642)
![Next.js mini-banner](https://camo.githubusercontent.com/b7395b00d152dc8f19cec61f582369bd580e31b8ed93d34646ec43aa675baa7c/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4e6578742d626c61636b3f7374796c653d666f722d7468652d6261646765266c6f676f3d6e6578742e6a73266c6f676f436f6c6f723d7768697465)
![CSS mini-banner](https://camo.githubusercontent.com/3a0f693cfa032ea4404e8e02d485599bd0d192282b921026e89d271aaa3d7565/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f435353332d3135373242363f7374796c653d666f722d7468652d6261646765266c6f676f3d63737333266c6f676f436f6c6f723d7768697465)
![Tailwind mini-banner](https://i.im.ge/2022/08/11/FGEabT.image-58.png)
![Formik mini-banner](https://i.im.ge/2022/08/11/FGCNkf.Group-18.png)
![Auth0 mini-banner](https://i.im.ge/2022/08/11/FGy2mS.Group-16.png)
![Figma mini-banner](https://camo.githubusercontent.com/4a1038affbb2653ec140936555b3714ddc322526be8567b489e8423a795dea18/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4669676d612d4632344531453f7374796c653d666f722d7468652d6261646765266c6f676f3d6669676d61266c6f676f436f6c6f723d7768697465)
![Netlify mini-banner](https://camo.githubusercontent.com/92dde1e7c42c013a5fce4dfeee0843f06710bfd38a610885e33a273c7eca0d22/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4e65746c6966792d3030433742373f7374796c653d666f722d7468652d6261646765266c6f676f3d6e65746c696679266c6f676f436f6c6f723d7768697465)

### Testing
![Cypress mini-banner](https://camo.githubusercontent.com/a2cc7362377d69d8ad5147e49f7b269cab69f00509828ce2d583b9dde9130499/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f2d637970726573732d2532334535453545353f7374796c653d666f722d7468652d6261646765266c6f676f3d63797072657373266c6f676f436f6c6f723d303538613565)
![Jest mini-banner](https://camo.githubusercontent.com/5ec7b7ed343219da6b2213349bacdc389803950b5298464b35e76f7ab6ccf27d/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4a6573742d4332313332353f7374796c653d666f722d7468652d6261646765266c6f676f3d6a657374266c6f676f436f6c6f723d7768697465)


## Colour Reference
![Colour reference banner](https://i.im.ge/2022/08/11/FGY0w1.Group-19-1.png) We chose colours which would reflect the goals and theme of our app, using [coolers](https://coolors.co/) to help generate colour palettes. Blues and greens are strongly associated with the environment, and we chose a dark green so we would have a high contrast against a light background for accessibility and ease of use.

|Background Colour |Primary Colour|Accent Colour|
|--|--|--|
| #E6E5E4 ![Background colour example](https://i.im.ge/2022/08/11/FGxQ6a.Rectangle-196.png) | #004F54 ![Primary colour example](https://i.im.ge/2022/08/11/FG3lk1.Rectangle-195.png) | #FF9505 ![Accent colour example](https://i.im.ge/2022/08/11/FG3F9m.Rectangle-194.png)
<br>
<br>

## Challenges and how we overcame them
There were numerous challenges on this project, mostly because we are a team of junior developers grappling with new technologies. In general, we used our skills at navigating documentation and parsing error messages

**Next.js and Leaflet**
- Using Next.js and Leaflet together was a challenge because




## What we took from this experience
Our goal for this project was to work together well as a team, learn as much as we could, and at the end of it, present a functional and attractive app. We enabled this by deciding on a team manifesto at the very start, which included important topics like how we wanted to approach discussions, make decisions, and resolve conflicts. This




Furthermore, working in an Agile environment and taking on an iterative approach to our project through user feedback and revision was an invaluable experience for us and will surely put us all in good stead for when we take on our first positions as developers.

Given more time, there are alot more features and functionality we would implement, but we worked hard at all times and we are very pleased with the end-result.
6 changes: 6 additions & 0 deletions node_modules/.package-lock.json

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

6 changes: 6 additions & 0 deletions project-app/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"extends": ["next/babel","next/core-web-vitals"]

}


39 changes: 39 additions & 0 deletions project-app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js
.env.local
# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem
.babelrc

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# local env files
.env*.local

.env
.env.production

# vercel
.vercel

# cypress
cypress.env.json
51 changes: 51 additions & 0 deletions project-app/components/Footer/Footer.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import Image from "next/image";
import {
AiFillFacebook,
AiFillInstagram,
AiOutlineTwitter,
} from "react-icons/ai";

export default function Footer() {
return (
<footer className="flex justify-between items-center w-full h-[6rem] px-1 sm:px-4 bg-[#004F54]">
{/* Logo */}
<div className="flex flex-row h-auto w-1/4 sm:w-56">
<div className="h-12 w-12 sm:h-16 sm:w-16 relative">
<Image
src="/logo-app.png"
alt="Project Clean-up logo"
layout="fill"
objectFit="cover"
/>
</div>
</div>
{/* Built by and copyright */}
<div className="mt-3 sm:mt-6 text-center">
<span className="text-white text-xs sm:text-sm">
Built by the Environment Variables
</span>
<p className="text-[.5rem] sm:text-xs text-gray-50">
Copyright &copy;2022
</p>
</div>
{/* Social Icons*/}
<div className="flex flex-row h-auto w-1/4 sm:w-56 justify-end">
<div className="item w-6 h-6 sm:w-10 sm:h-8 sm:m2">
<a href="https://www.facebook.com" target="blank">
<AiFillFacebook className="h-6 w-6 sm:h-8 sm:w-8 rounded-md mr-4 text-gray-50" />
</a>
</div>
<div className="item w-6 h-6 sm:w-10 sm:h-8">
<a href="https://www.instagram.com" target="blank">
<AiFillInstagram className="h-6 w-6 sm:h-8 sm:w-8 rounded-md mr-4 text-gray-50" />
</a>
</div>
<div className="item w-6 h-6 sm:w-10 sm:h-8">
<a href="https://www.twitter.com" target="blank">
<AiOutlineTwitter className="h-6 w-6 sm:h-8 sm:w-8 mr-2 rounded-md text-gray-50" />
</a>
</div>
</div>
</footer>
);
}
131 changes: 131 additions & 0 deletions project-app/components/Forms/JoinClean.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
import React from "react";
import { Formik, Field, Form, ErrorMessage } from "formik";
import * as Yup from "yup";
import { ToastContainer, toast } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";

export const JoinCleanForm = ({ showModal, setShowModal }) => {
const url = process.env.NEXT_PUBLIC_DATABASE_URL;

const handleSubmit = async function (values) {
const response = await fetch(`${url}/joinclean`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
name: values.name,
comments: values.comments,
}),
});
const data = await response.json();
function successToast() {
toast(
`Thanks for joining a cleanup! \n
Be there 15 mins prior on the day for the host's briefing`,
{
position: toast.POSITION.TOP_CENTER,
autoClose: false,
style: {
background: "#239c13",
color: "white",
width: "370px",
fontSize: "16px",
fontWeight: "bold",
paddingRight: "0.5em",
},
}
);
}
successToast();
setShowModal(false);
};

return (
<Formik
initialValues={{
name: "",
comments: "",
}}
validationSchema={Yup.object({
name: Yup.string()
.max(30, "Must be 30 characters or less")
.required("Required"),
comments: Yup.string()
.max(50, "Must be 50 characters or less")
.required("Required"),
})}
onSubmit={handleSubmit}
>
<Form>
<label
htmlFor="name"
className="font-bold block text-sm text-gray-900 "
>
Name
</label>
<Field
className="mb-[5px] shadow-sm bg-gray-50 text-gray-900 text-sm rounded-lg border border-[#004F54] focus:ring-[#FF9505] focus:border-[#FF9505] block w-full p-2.5 "
name="name"
type="text"
/>
<ErrorMessage
name="name"
component="div"
className="text-[#FF9505] italic font-medium"
/>

<label
htmlFor="comments"
className="font-bold block text-sm text-gray-900 "
>
Comments
</label>
<Field
name="comments"
type="text"
className="mb-[5px] shadow-sm bg-gray-50 text-gray-900 text-sm rounded-lg border border-[#004F54] focus:ring-[#FF9505] focus:border-[#FF9505] block w-full p-2.5 "
/>
<ErrorMessage
name="comments"
component="div"
className="text-[#FF9505] italic font-medium"
/>

<button
type="submit"
className="text-white bg-[#FF9505] hover:bg-orange-700 px-1 py-1 font-medium rounded-lg text-sm w-14 mt-2 text-center"
>
Submit
</button>
</Form>
</Formik>
);
};

export const JoinCleanModal = () => {
const [showModal, setShowModal] = React.useState(false);

return (
<>
<button
className="bg-[#004F54] ml-0 mb-4 md:ml-0 text-white font-medium text-xs md:text-sm px-1 py-1 mt-2 sm:mt-2 rounded hover:bg-[#004F54]/90 outline-none
focus:outline-none mr-1 ease-linear transition-all duration-100 w-12"
type="button"
onClick={() => {
if (showModal == false) {
setShowModal(true);
} else if (showModal == true) {
setShowModal(false);
}
}}
>
{showModal ? "Close" : "Join"}
</button>

{showModal ? (
<>
<JoinCleanForm setShowModal={setShowModal} showModal={showModal} />
</>
) : null}
</>
);
};
Loading