Commits

Commit history

1. Commits on Apr 27, 2021

   • final commit for now with all updated comments. we rocked it

     amgjurich

     committed
     abbef49View commit details

     Copy full SHA for abbef49

     View code at this pointBrowse repository at this point
2. Commits on Apr 26, 2021

   • styling up to presentation time

     

     allanmaclean

     committed
     13cf257View commit details

     Copy full SHA for 13cf257

     View code at this pointBrowse repository at this point

   • fixed merge conflicts

     

     allanmaclean

     committed
     ee2dc79View commit details

     Copy full SHA for ee2dc79

     View code at this pointBrowse repository at this point

   • started styling

     

     allanmaclean

     committed
     fbd69baView commit details

     Copy full SHA for fbd69ba

     View code at this pointBrowse repository at this point

   • just pulled in amy changes and everything merged well. it updated the profile page by grabbing info

     amgjurich

     committed
     9492f4dView commit details

     Copy full SHA for 9492f4d

     View code at this pointBrowse repository at this point

   • committing so i can pull down amy code

     amgjurich

     committed
     e593d01View commit details

     Copy full SHA for e593d01

     View code at this pointBrowse repository at this point

   • resolving merge conflict

     designal46

     committed
     22fba73View commit details

     Copy full SHA for 22fba73

     View code at this pointBrowse repository at this point

   • completed profile page logicand query calls

     designal46

     committed
     eadadefView commit details

     Copy full SHA for eadadef

     View code at this pointBrowse repository at this point

   • 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
     156eff0View commit details

     Copy full SHA for 156eff0

     View code at this pointBrowse repository at this point

   • fixed autocomplete merge issues'

     

     allanmaclean

     committed
     beb1b4aView commit details

     Copy full SHA for beb1b4a

     View code at this pointBrowse repository at this point

   • removed mammoth console log of airport data

     

     allanmaclean

     committed
     f16747dView commit details

     Copy full SHA for f16747d

     View code at this pointBrowse repository at this point

   • tweaked autocomplete with full airport name and country. Had to tweak onSubmit in MainContainer.jsx as a result

     

     allanmaclean

     committed
     1891e0dView commit details

     Copy full SHA for 1891e0d

     View code at this pointBrowse repository at this point

   • completed loop to update the flight info in the database and merged latest main successfully

     amgjurich

     committed
     d6f651bView commit details

     Copy full SHA for d6f651b

     View code at this pointBrowse repository at this point

   • just updated code so that flights are being sent to the database

     amgjurich

     committed
     340b9adView commit details

     Copy full SHA for 340b9ad

     View code at this pointBrowse repository at this point

   • autocomplete complete

     

     allanmaclean

     committed
     1ba4004View commit details

     Copy full SHA for 1ba4004

     View code at this pointBrowse repository at this point

   • committing to create a pull request so everyone has the lastest info for making a difference

     amgjurich

     committed
     184ad5eView commit details

     Copy full SHA for 184ad5e

     View code at this pointBrowse repository at this point

   • added profile page components. working on backend db queries

     amgjurich

     committed
     d60324dView commit details

     Copy full SHA for d60324d

     View code at this pointBrowse repository at this point
3. Commits on Apr 25, 2021

   • updated comments for the mathematical logic for the carbon offsets

     amgjurich

     committed
     1d92a3aView commit details

     Copy full SHA for 1d92a3a

     View code at this pointBrowse repository at this point

   • added the code for the offset actions

     amgjurich

     committed
     db405f8View commit details

     Copy full SHA for db405f8

     View code at this pointBrowse repository at this point

   • trying to checkout to main so that I can see how amys code works without my merge

     amgjurich

     committed
     61559a6View commit details

     Copy full SHA for 61559a6

     View code at this pointBrowse repository at this point
4. Commits on Apr 24, 2021

   • merged amys latest pr merge. line 26 of flightInterface needed a props added into it so I added that, as well. all logic is working correctly. not seeing the updated info on the screen amy added?

     amgjurich

     committed
     391e8f2View commit details

     Copy full SHA for 391e8f2

     View code at this pointBrowse repository at this point

   • configured the server portion to work with the components. took much too long.

     amgjurich

     committed
     4085ef8View commit details

     Copy full SHA for 4085ef8

     View code at this pointBrowse repository at this point

   • merged latest main into branch

     designal46

     committed
     8e82059View commit details

     Copy full SHA for 8e82059

     View code at this pointBrowse repository at this point

   • Merge branch 'main' into mainStates

     designal46

     committed
     79117f1View commit details

     Copy full SHA for 79117f1

     View code at this pointBrowse repository at this point

   • added flight states to MainContainer which is passed to flightoutput diplay; also added logic to support round trip flights

     designal46

     committed
     eacb322View commit details

     Copy full SHA for eacb322

     View code at this pointBrowse repository at this point

   • Merge branch 'main' into passport

     

     allanmaclean

     committed
     68b3a6cView commit details

     Copy full SHA for 68b3a6c

     View code at this pointBrowse repository at this point

   • just created the login page with components and the routes

     amgjurich

     committed
     0b281b0View commit details

     Copy full SHA for 0b281b0

     View code at this pointBrowse repository at this point

   • oAuth complete but not linked to index.html (see login.html and server.js)

     

     allanmaclean

     committed
     3d544f4View commit details

     Copy full SHA for 3d544f4

     View code at this pointBrowse repository at this point

   • fixed file reference for MainContainer

     designal46

     committed
     f19c81bView commit details

     Copy full SHA for f19c81b

     View code at this pointBrowse repository at this point

   • added files for all the components

     amgjurich

     committed
     119e319View commit details

     Copy full SHA for 119e319

     View code at this pointBrowse repository at this point

   • passport set up but not working

     

     allanmaclean

     committed
     dc92f93View commit details

     Copy full SHA for dc92f93

     View code at this pointBrowse repository at this point

   • Set up API query call and basic display for flight search

     designal46

     committed
     8c4e4e9View commit details

     Copy full SHA for 8c4e4e9

     View code at this pointBrowse repository at this point
5. Commits on Apr 23, 2021

   • commiting boilerplate files

     designal46

     committed
     5dc02e0View commit details

     Copy full SHA for 5dc02e0

     View code at this pointBrowse repository at this point
6. Loading