Skip to content

Develop #1

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
Merged
Isams01 merged 228 commits into from
Mar 12, 2021
Merged

Develop #1

Isams01 merged 228 commits into from
Mar 12, 2021

Conversation

@angel-sinn
Copy link
Collaborator

@angel-sinn angel-sinn commented Mar 12, 2021

Functional App

Isams01 and others added 30 commits March 6, 2021 20:14
@Isams01
add jquery
00c4a15
@Isams01
add maps route
b39ad74
@Isams01
add maps route
d62e6b4
@Isams01
add request library
bc49354
@Isams01
make get request to google maps api
95ac078
@Isams01
fix typo
f557851
@Isams01
help me
fb330ea
@JoshuaRully
add schema tables
4a50254
@JoshuaRully
add image property in users schema
591df37
@Isams01
map renders
7e3b93a
@Isams01
remove unecessary ajax
c93fc7a
@JoshuaRully
Merge branch 'develop' of github.com:Isams01/mappi into develop
7cb1296
@JoshuaRully
fix typo in pins.sql table creation
f8cbe22
@Isams01
use ejs template only
b09e5e6
@Isams01
get started on routes
016eead
@JoshuaRully
Merge branch 'develop' of github.com:Isams01/mappi into schema
8d7d8f1
@Isams01
delete index.html
5f768c0
@JoshuaRully
Merge branch 'develop' of github.com:Isams01/mappi into schema
67fb41c
@angel-sinn
Added partial ejs folder and _header.ejs file
f90d058
@angel-sinn
Added styling for _header.ejs and index.ejs file
8594348
@angel-sinn
Included _header.ejs
88035b9
@JoshuaRully
add basic structure for addition of routes
4d974b5
@JoshuaRully
revised basic routes structure slightly ~ still uncertain of specific…
615462e 
… routes
@angel-sinn
Added dummy object for user
ef2bc5d
@angel-sinn
Updated styling on map
a4cd8a2
@angel-sinn
Updated map div
8b2ca6a
@angel-sinn
Added users.ejs file
a1fbb01
@JoshuaRully
add test seed for pins
cade991
@JoshuaRully
add basic structure for addition of routes
155be68
@JoshuaRully
revised basic routes structure slightly ~ still uncertain of specific…
e155f51 
… routes
JoshuaRully and others added 29 commits March 11, 2021 19:02
@JoshuaRully
demo quality seed data changes
be2f56e
@angel-sinn
Updated styling for delete button in infowindow
6f2d59b
@angel-sinn
Updated function to auto close infowindow when another pin is clicked…
5569e2b 
…, and updated default values for infowindow
@JoshuaRully
hardcode zoom for testing
4a7ddd3
@Isams01
update map location in db and locally
337b54a
@Isams01
change form. to div.
fba5327
@Isams01
send mapdata in ajax to map put request
0b3b244
@Isams01
save map location
0690cb0
@Isams01
Send 200 after query complete
da312cd
@Isams01
fav mappi button adds to favourites and disables after click
b19c305
@angel-sinn
Added type animation to homepage p
6835d9c
@JoshuaRully
Merge branch 'develop' of github.com:Isams01/mappi into refactor/seeds
199fefc
@JoshuaRully
incoming merge change
5eaf4c2
@angel-sinn
Updated button styling and animation text on homepage
30ccc7d
@angel-sinn
Merge branch 'develop' of github.com:Isams01/mappi into features/ejs_…
7d3a1b0 
…views
@angel-sinn
Updated yeahh to yeah
7b0719c
@angel-sinn
Updated homepage animation keyframes
56db097
@JoshuaRully
map2 and pins done
2685eba
@JoshuaRully
map3 favourite map from other user done
e2aaa63
@JoshuaRully
map4 collaborated map from user done
712a48b
@angel-sinn
Added icons to corresponding categories
5cb4bb2
@angel-sinn
Updated styling for icons
4752c17
@angel-sinn
Merge branch 'develop' of github.com:Isams01/mappi into features/ejs_…
38bc9b3 
…views
@angel-sinn
Updated category labeling convention to match db to show icons
2a95d62
@angel-sinn
Updated title in <head> to display correct title of each page on browser
1da8131
@angel-sinn
Made div boxes in homepage wider
db49c9f
@angel-sinn
Updated seed data to feature contributed_maps
f7120a3
@angel-sinn
Fixed bug in delete button
474b94b
@angel-sinn
Updated styling for delete button
d91e3f8
@Isams01 Isams01 merged commit 773fe46 into master Mar 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@angel-sinn @Isams01 @JoshuaRully