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

README formatting #24

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

README formatting #24

wants to merge 35 commits into from

Conversation

wildmolasses
Copy link

No description provided.

Adusei added 30 commits October 6, 2017 07:27
@Adusei
add 'to do list' using docker-compose, flask, mongo
286e2e1
@Adusei
move app py files into api directory
916b82c
@Adusei
trying two react native boilerplates
ab8d17e
@Adusei
combine two approaches in hello-world react app
f84df36
@Adusei
rm 2 old react apps
38fdf26
@Adusei
add two apps, one native, one web add hot loading on web
3eec7b5
@Adusei
adding some actions / reducers
68fbbc9
@Adusei
put the node process in docker compose
5bb2106
@Adusei
get spongemap.html in app.js
fcec321
@Adusei
split python template file into components
824dc9d
@Adusei
render a leaflet map
3639a0f
@Adusei
after wresting with axios cors errors, use jsonp package
050dea0
@Adusei
trying different leaflet approaches
d086a1e
@Adusei
cleanup, add back the pure leaflet implementation
b227920
@Adusei
cleanup
1277225
@Adusei
working on installing carto
f8817e9
@Adusei
working on the AI import
66fcec7
@Adusei
use create viz as opposed to leaflet directly
4dc8769
@Adusei
clean up cartowrapper to use just carto, not leaflet
5a32d1e
@Adusei
add boostrap for better layout
6a39fed
@Adusei
cleanup
d85d257
@Adusei
add hide button for info panel
9da4565
@Adusei
cleanup, remove div i dont need
37a9d8e
@Adusei
cleanup indentation
6bf28b7
@Adusei
add first unit test, mock AI call for faster development/debugging
f4ae582
@Adusei
working through ai api
0bd4425
@Adusei
replace get-or create with a DoesNotExist exception
857ad5c
@Adusei
set up api..
9beb397
@Adusei
use redux to hide info panel
33d0ef1
@Adusei
using redux constructs to manipulate state
174eba2
@jamescw
Copy link
Contributor

jamescw commented Mar 19, 2018

Hi @emazurek thank you for your contribution!

I am just trying to see which commits are yours vs what @Adusei has done, did you base of his branch?

Cheers, James

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

@Adusei Adusei

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wildmolasses @jamescw @Adusei