Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev to master #77

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

Dev to master #77

wants to merge 36 commits into from

Conversation

mayahp
Copy link
Collaborator

@mayahp mayahp commented Aug 7, 2020

One last push!

mayahp added 30 commits July 30, 2020 16:58
@mayahp
added event filter component
bc9762b
@mayahp
added updateReduxState function
48194c1
@mayahp
add dependencies
da86ddb
@mayahp
added checkbox change function
6b1b211
@mayahp
remove filter code from mapviewpage
640d9a4
@mayahp
added map view side panel component
cedec9e
@mayahp
fixed event filter component
2db0411
@mayahp
map toggles when there are events
2795ace
@mayahp
mapviewpage cleanup
0c36748
@mayahp
cleaned entire mapviewpage
e7b5f99
@mayahp
small style fixes
8930f91
@mayahp
cleaned up time filtering
a53afad
@mayahp
quick fix
6c7c763
@mayahp
small style fixes
f2c2a98
@mayahp
abstracted code in mapview
cafa286
@mayahp
moved side panel code to different component
9cf928b
@mayahp
navbar navigation fixes
309e73a
@mayahp
cleanup navbar
577589d
@mayahp
style cleanup ConfirmDelete.js
c0f013b
@mayahp
profile page cleanup + make profile module
7f39860
@mayahp
created UserEvents component
019830d
@mayahp
removed useless constructors
cf0df51
@mayahp
created profile event card component
8506d36
@mayahp
removed unused imports
b076630
@mayahp
conclude merge
eadd0b5
@mayahp
finish merging final changes
003aee4
@mayahp
fix event panel bug and change create event into a page
3694cb9
@mayahp
style changes to CreateEventPage
fd9e256
@mayahp
move update event page to pages
b54ba8b
@mayahp
integrated Searchbar.js with welcome page
946b383
Jkim-Hack
Jkim-Hack approved these changes Aug 7, 2020
View reviewed changes
Copy link
Contributor

@Jkim-Hack Jkim-Hack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing job everybody! Great way to end it off!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmicomyiza tmicomyiza tmicomyiza approved these changes

@Jkim-Hack Jkim-Hack Jkim-Hack approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mayahp @Jkim-Hack @tmicomyiza