Code

Map Filter#22

Code

Open

atan9611 wants to merge 35 commits intomainlablueprint/skid-row-arts-alliance:mainfrom map-filterlablueprint/skid-row-arts-alliance:map-filterCopy head branch name to clipboard

+1,091-9,416

Commits

Commits on Mar 1, 2023

• map filter

  atan9611

  committed
  a599bd9

  Copy full SHA for a599bd9

Commits on Mar 9, 2023

• map filter

  atan9611

  committed
  b00242d

  Copy full SHA for b00242d

Commits on Apr 6, 2023

• separate screen basic functionality of map filter

  atan9611

  committed
  43fc4f7

  Copy full SHA for 43fc4f7

• removed unnecessary comments

  atan9611

  committed
  214fb94

  Copy full SHA for 214fb94

Commits on Apr 13, 2023

• basic styling of map filter

  atan9611

  committed
  1668403

  Copy full SHA for 1668403

Commits on Apr 20, 2023

• pulled from main and resolved conflicts

  atan9611

  committed
  609fe0c

  Copy full SHA for 609fe0c

• more merge changes

  atan9611

  committed
  be02af3

  Copy full SHA for be02af3

• moved filter button to map and started stack screen

  atan9611

  committed
  566c861

  Copy full SHA for 566c861

Commits on Apr 26, 2023

• shortened filter code, added filter button on map, working on rendering the filtered map cards on map screen

  atan9611

  committed
  f7de7e9

  Copy full SHA for f7de7e9

Commits on May 10, 2023

• moved map filter to map screen, created temporary categories and database arrays

  atan9611

  committed
  af5f50c

  Copy full SHA for af5f50c

Commits on May 11, 2023

• moved map filter to map screen so that events and resources render

  atan9611

  committed
  b806efc

  Copy full SHA for b806efc

Commits on May 17, 2023

• made button styling responsive

  

  Angela Tan

  authored and

  Angela Tan

  committed
  4136b52

  Copy full SHA for 4136b52

Commits on May 18, 2023

• map filter styling

  

  Angela Tan

  authored and

  Angela Tan

  committed
  62b77c7

  Copy full SHA for 62b77c7

• fixed linting bugs

  

  Angela Tan

  authored and

  Angela Tan

  committed
  c851047

  Copy full SHA for c851047

Commits on May 21, 2023

• Remove map filter from nav bar

  

  Angela Tan

  authored and

  Angela Tan

  committed
  bd7f92a

  Copy full SHA for bd7f92a

• finish merge

  

  Angela Tan

  authored and

  Angela Tan

  committed
  7a3d95c

  Copy full SHA for 7a3d95c

• finish merge app nav

  

  Angela Tan

  authored and

  Angela Tan

  committed
  e836531

  Copy full SHA for e836531

• added import

  siddharthnandy

  committed
  e6eeb1f

  Copy full SHA for e6eeb1f

• Merge branch 'main' into map-filter

  zhangjuliet

  authored
  b0f2929

  Copy full SHA for b0f2929

• Fix art filtering navigation bug

  zhangjuliet

  committed
  219c271

  Copy full SHA for 219c271

Commits on May 22, 2023

• Move map filter button into header

  zhangjuliet

  committed
  23f2f64

  Copy full SHA for 23f2f64

Commits on May 25, 2023

• package lock json

  

  Angela Tan

  authored and

  Angela Tan

  committed
  8192d8f

  Copy full SHA for 8192d8f

• fixed css issue

  

  Angela Tan

  authored and

  Angela Tan

  committed
  f304108

  Copy full SHA for f304108

• app navigator

  

  Angela Tan

  authored and

  Angela Tan

  committed
  fd83be4

  Copy full SHA for fd83be4

• added filter button to tab and cleaned filter code

  

  Angela Tan

  committed
  10ecad2

  Copy full SHA for 10ecad2

Commits on May 31, 2023

• Merge branch 'main' into map-filter

  zhangjuliet

  committed
  3d0003d

  Copy full SHA for 3d0003d

• Fix merge conflict

  zhangjuliet

  committed
  49fa880

  Copy full SHA for 49fa880

• Merge branch 'main' of https://github.com/lablueprint/skid-row-arts-alliance into map-filter

  zhangjuliet

  committed
  d63a3ce

  Copy full SHA for d63a3ce

• Update aws-sdk in package-lock.json

  zhangjuliet

  committed
  a89b039

  Copy full SHA for a89b039

• Delete .gitignore

  zhangjuliet

  authored
  38c4a2a

  Copy full SHA for 38c4a2a

• Delete modules.xml

  zhangjuliet

  authored
  53fdc82

  Copy full SHA for 53fdc82

• Delete skid-row-arts-alliance.iml

  zhangjuliet

  authored
  88f29ce

  Copy full SHA for 88f29ce

• Delete vcs.xml

  zhangjuliet

  authored
  6e9c7d0

  Copy full SHA for 6e9c7d0

Commits on Jun 1, 2023

• styling of map-filter done

  

  Angela Tan

  committed
  ff294b5

  Copy full SHA for ff294b5

Commits on Jun 7, 2023

• changed eventCategories to an array of strings instead of array of objects, cleaned up reptitive code from PR comments

  

  Angela Tan

  committed
  3322c7c

  Copy full SHA for 3322c7c