Repository navigation

Commits

Commits on Apr 27, 2021
- Merge pull request #18 from amgjurich/feature
  allanmaclean
  authored
  6da1976
- final commit for now with all updated comments. we rocked it
  amgjurich
  committed
  abbef49
Commits on Apr 26, 2021
- Merge pull request #17 from allanmaclean/styling
  ozi-oztrk
  authored
  ce5e1ea
- styling up to presentation time
  allanmaclean
  committed
  13cf257
- fixed merge conflicts
  allanmaclean
  committed
  ee2dc79
- started styling
  allanmaclean
  committed
  fbd69ba
- just pulled in amy changes and everything merged well. it updated the profile page by grabbing info
  amgjurich
  committed
  9492f4d
- Merge pull request #16 from designal46/profileLogic
  amgjurich
  authored
  06b2593
- Merge branch 'main' into feature
  amgjurich
  committed
  3a928ba
- committing so i can pull down amy code
  amgjurich
  committed
  e593d01
- resolving merge conflict
  designal46
  committed
  22fba73
- completed profile page logicand query calls
  designal46
  committed
  eadadef
- Merge pull request #15 from amgjurich/feature
  allanmaclean
  authored
  c0bb00a
- all elements working on latest merge. updated one line of alan logic for the airport autocomplete. added in code so that users will not be entered multiple times in the users database.
  amgjurich
  committed
  156eff0
- Merge branch 'main' into feature
  amgjurich
  committed
  4cbaf14
- just updated profile login so that multiple of the same user are not added to users db
  amgjurich
  committed
  4fe24eb
- Merge pull request #14 from allanmaclean/autocomplete
  allanmaclean
  authored
  64b9571
- fixed autocomplete merge issues'
  allanmaclean
  committed
  beb1b4a
- removed mammoth console log of airport data
  allanmaclean
  committed
  f16747d
- tweaked autocomplete with full airport name and country. Had to tweak onSubmit in MainContainer.jsx as a result
  allanmaclean
  committed
  1891e0d
- Merge pull request #13 from amgjurich/feature
  designal46
  authored
  d6ac778
- completed loop to update the flight info in the database and merged latest main successfully
  amgjurich
  committed
  d6f651b
- just updated code so that flights are being sent to the database
  amgjurich
  committed
  340b9ad
- Merge pull request #12 from allanmaclean/autocomplete
  ozi-oztrk
  authored
  95b66a2
- resolved merge conflicts
  allanmaclean
  committed
  5dd13a5
- autocomplete complete
  allanmaclean
  committed
  1ba4004
- Merge pull request #11 from amgjurich/feature
  designal46
  authored
  6fbb12f
- just updated code to add user profile info to users table in database
  amgjurich
  committed
  1cdf266
- fixed merged conflicts
  allanmaclean
  committed
  6c87a77
- autocomplete wip
  allanmaclean
  committed
  8570428
- Merge pull request #10 from amgjurich/feature
  amgjurich
  authored
  18234fb
- committing to create a pull request so everyone has the lastest info for making a difference
  amgjurich
  committed
  184ad5e
- added profile page components. working on backend db queries
  amgjurich
  committed
  d60324d
Commits on Apr 25, 2021
- updated comments for the mathematical logic for the carbon offsets
  amgjurich
  committed
  1d92a3a
- added the code for the offset actions
  amgjurich
  committed
  db405f8

Branch selector

User selector

Datepicker

Commit history

Commits on Apr 27, 2021

Commits on Apr 26, 2021

Commits on Apr 25, 2021