Code

Feedback#1

Code

Open

github-classroom[bot] wants to merge 140 commits intofeedback6859-sp21/final-project-police-brutality:feedbackfrom main6859-sp21/final-project-police-brutality:mainCopy head branch name to clipboard

+371,712-1

Commits

Commits on Apr 27, 2021

• Setting up GitHub Classroom Feedback

  github-classroom[bot]

  authored
  04bcaa4

Commits on Apr 28, 2021

• created react app

  itstabya

  committed
  041d318

Commits on May 1, 2021

• working with index.html, deleted mapbox scrollytelling, kept react project

  itstabya

  committed
  55bd4b7

Commits on May 2, 2021

• added react version

  itstabya

  committed
  1bb1fd4

• deleted react

  itstabya

  committed
  bf4b8fe

• cleaned up

  jodihuang10

  committed
  2836671

• restructure

  jodihuang10

  committed
  f4e88e5

• added geojson

  itstabya

  committed
  2f5ae91

• data incompleteness section

  jodihuang10

  committed
  4bd0bd7

• data incompleteness section

  jodihuang10

  committed
  f9bc4ae

• Add more datas

  allanaz

  committed
  5227a25

• added circle marks

  itstabya

  committed
  659603f

• fixed merge conflict with jodi 20 br

  itstabya

  committed
  2596657

• changed data source to github links

  itstabya

  committed
  2df6046

• added markers for beginning famous names

  itstabya

  committed
  bc81704

• added more chapters for mvp, centered features

  itstabya

  committed
  549f20a

• start something from allan

  allanaz

  committed
  2d77013

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  allanaz

  committed
  5e9a804

• incorporated simple d3 visualization

  jodihuang10

  committed
  f8c783d

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  jodihuang10

  committed
  9dfa410

• incorporated simple d3 visualization

  jodihuang10

  committed
  e7d7b1b

• fixed empty names

  jodihuang10

  committed
  2c8e5ae

Commits on May 3, 2021

• work on use of force participation data

  allanaz

  committed
  eea7513

• dark map

  itstabya

  committed
  2ea08bd

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  a7bc616

• working on a map

  allanaz

  committed
  f431ff3

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  allanaz

  committed
  fa2a9f9

• change txt to json

  allanaz

  committed
  a9382d2

• removed incorrect coordinates

  jodihuang10

  committed
  d7342b7

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  jodihuang10

  committed
  115e2ac

• removed incorrect coordinates

  jodihuang10

  committed
  34a3f88

• formatted csv

  jodihuang10

  committed
  0a03449

• attempted circle chart

  itstabya

  committed
  9bd7f89

• merge connflict

  itstabya

  committed
  382126e

• converted to geojson for total departments

  itstabya

  committed
  34ca2fa

• added pie chart

  jodihuang10

  committed
  5e95d5d

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  jodihuang10

  committed
  1df5abb

• make map work

  allanaz

  committed
  0c981d9

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  allanaz

  committed
  bb62a9d

• Add map to the scroll map

  allanaz

  committed
  7ea9029

• Add title and description to the use of force map

  allanaz

  committed
  3166acd

• added visualization pie chart

  itstabya

  committed
  b52ac9b

• adjustment for mvp

  itstabya

  committed
  22cbede

Commits on May 12, 2021

• renamed map scroll

  itstabya

  committed
  293d573

• added state geometries

  jodihuang10

  committed
  180ab36

• total departments geojson test

  jodihuang10

  committed
  01ddd86

Commits on May 16, 2021

• trying to add legend to circle chart

  itstabya

  committed
  ae471f3

• merge conflict

  itstabya

  committed
  486a76c

• added choropleth at relevant area

  itstabya

  committed
  bd6a682

• testing total departments geojson

  jodihuang10

  committed
  f3b8302

• testing total departments geojson

  jodihuang10

  committed
  469ee04

• testing total departments geojson

  jodihuang10

  committed
  d83878a

• testing total departments geojson

  jodihuang10

  committed
  e087cea

• testing total departments geojson

  jodihuang10

  committed
  c1d8bce

• basic code for animations

  itstabya

  committed
  a590b6a

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  79315e3

• moved choropleth to back

  jodihuang10

  committed
  1e764ec

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  jodihuang10

  committed
  4f9fa09

• formatted animations

  jodihuang10

  committed
  4274406

• cleaned code

  jodihuang10

  committed
  d50b976

• updated tooltips

  itstabya

  committed
  db04214

• merge conflict

  itstabya

  committed
  0ad1f1a

• fixed merge conflict error with map js

  itstabya

  committed
  304db1f

Commits on May 17, 2021

• added color to the map for marginalized communities

  itstabya

  committed
  a50ff78

• legislation graph and beginnings of dod loan program

  allanaz

  committed
  08325cd

• complete merge?

  allanaz

  committed
  dde7176

• babsic implmentation of bbutton instead of radio

  itstabya

  committed
  14957d5

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  ed8a49f

• add bar chart

  allanaz

  committed
  990c83d

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  allanaz

  committed
  4981261

• basic styling to get an idea

  itstabya

  committed
  cabf009

• merge conflict

  itstabya

  committed
  eb4e542

• process 1033 data

  allanaz

  committed
  2d1a512

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  allanaz

  committed
  23de6a0

• process data into shape for stack, and extract cumulative numbers for visualization

  allanaz

  committed
  d18a880

• restructuring for narrative flow

  itstabya

  committed
  55d2e40

• Add militarization graph

  allanaz

  committed
  9971fa3

• fix merge conflicts in map and d3_vis

  allanaz

  committed
  39fb41b

• something didnt save

  allanaz

  committed
  1aef633

• trying to structure rows and oclumns

  itstabya

  committed
  7e5bf65

• adding MPV data for csv

  itstabya

  committed
  ed34273

Commits on May 18, 2021

• fix year display on zoom in of militarization plot

  allanaz

  committed
  9da6a1d

• attempting heatmap

  itstabya

  committed
  5ad213e

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  6cdc79e

• the calendar heat maps work

  allanaz

  committed
  1a4f2d7

• clean up calendar and show the numbers on the label

  allanaz

  committed
  67cc8a5

• styilng around world issue

  itstabya

  committed
  69b9b2a

• merge

  itstabya

  committed
  6c0ce1c

• map hover info

  jodihuang10

  committed
  bac7670

• merge

  jodihuang10

  committed
  2f328b1

• persisting red dots

  jodihuang10

  committed
  629b08c

• first draft of militarization explanation

  allanaz

  committed
  df98a37

• fix merge conflict

  allanaz

  committed
  4fee3dd

Commits on May 19, 2021

• try new colors, clean up some of the styling/organization

  allanaz

  committed
  e8414d6

• updated adam toledo

  itstabya

  committed
  1c3355a

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  1a27526

• added breonna taylor

  itstabya

  committed
  edc5575

• two pie charts instead of 1

  itstabya

  committed
  e3bc678

• add text to legislation section

  allanaz

  committed
  d7b9ca9

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  allanaz

  committed
  b73912a

• new orientation for pie

  itstabya

  committed
  dfbc174

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  b3fe450

• added coloring

  itstabya

  committed
  dc7d4c4

• font pairing

  itstabya

  committed
  4e1ded6

• adam toledo humianization as well as title sldie

  itstabya

  committed
  ae8b1fd

• basic css formatting

  jodihuang10

  committed
  ce44183

• wild merge

  jodihuang10

  committed
  fbfedb1

• removed red dots from missing data

  jodihuang10

  committed
  1fa244f

• css changes + testing on different screens

  jodihuang10

  committed
  d8a69b0

• map changes

  jodihuang10

  committed
  e1b8be8

• formatting changes

  jodihuang10

  committed
  85391e4

• started readme

  itstabya

  committed
  80260ac

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  462296b

• formatting changes

  jodihuang10

  committed
  84bbfa1

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  jodihuang10

  committed
  9ac9d7b

• change map for first section

  jodihuang10

  committed
  10a7e07

• heading margins

  itstabya

  committed
  eccd180

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  3e1c3a2

• formatting changes

  jodihuang10

  committed
  58bf2f7

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  jodihuang10

  committed
  e2d3f59

• fixed image

  jodihuang10

  committed
  c8659c2

• conclusion nstuff

  itstabya

  committed
  8e6f9a7

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  6f5a6c1

• added resources

  jodihuang10

  committed
  0c4c4dc

• added resources

  jodihuang10

  committed
  b76eb8e

• added summary image

  jodihuang10

  committed
  8a14e94

• summary image on readme test

  jodihuang10

  committed
  6eda019

• readme test

  jodihuang10

  committed
  f3aed46

• readme abstract

  jodihuang10

  committed
  8d8d352

• readme addition for project process

  itstabya

  committed
  123ced8

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  0628a1a

• added more resources

  itstabya

  committed
  c0d1a80

Commits on May 20, 2021

• minor visualization fixes

  jodihuang10

  committed
  f686370

• final edits to language in last two sections

  allanaz

  committed
  86060ff

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  allanaz

  committed
  1be1ded

• minor edits that seem to need to be committed

  itstabya

  committed
  70ab68e

• Merge branch 'main' of https://github.com/6859-sp21/final-project-police-brutality into main

  itstabya

  committed
  6f55ea4

• add final apper

  itstabya

  committed
  3157e3e

• changed small wording

  itstabya

  committed
  ed27b7a

• moved paper to final folder

  itstabya

  committed
  c87876a