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

Fixed issues with nearby algorithm #23

Merged
merged 50 commits into from
May 27, 2024
Merged

Fixed issues with nearby algorithm #23

merged 50 commits into from
May 27, 2024

Commits on May 5, 2024

  1. Added basic cards for available ride requests.

    @shristigupta1408
    shristigupta1408 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    bfdfd1a View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. fixed routing issue

    @Mohamad11Dab
    Mohamad11Dab committed May 8, 2024
    Configuration menu
    Copy the full SHA
    af71474 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge remote-tracking branch 'origin/postgis' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    aa0f6f7 View commit details
    Browse the repository at this point in the history

  2. Added mat ui icons and added approve decline buttons to card.

    @shristigupta1408
    shristigupta1408 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    5e23bbc View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. reimplement trips page

    Ferdi Sungkar authored and Ferdi Sungkar committed May 10, 2024
    Configuration menu
    Copy the full SHA
    62c5eff View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. Merging dev Merge remote-tracking branch 'origin/dev' into frontend-S… 

    …hristi
    @shristigupta1408
    shristigupta1408 committed May 11, 2024
    Configuration menu
    Copy the full SHA
    d6b9dad View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Merge remote-tracking branch 'origin/dev' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 12, 2024
    Configuration menu
    Copy the full SHA
    ac8bfec View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/trip_request_frontend' into fron… 

    …tend-Shristi
    @shristigupta1408
    shristigupta1408 committed May 12, 2024
    Configuration menu
    Copy the full SHA
    acdfd0f View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge remote-tracking branch 'origin/dev' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    f28d04f View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge remote-tracking branch 'origin/postgis' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 16, 2024
    Configuration menu
    Copy the full SHA
    26f3683 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge remote-tracking branch 'origin/dev' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    d93f0c0 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2024

  1. Merge remote-tracking branch 'origin/trip_request_frontend' into fron… 

    …tend-Shristi
    @shristigupta1408
    shristigupta1408 committed May 18, 2024
    Configuration menu
    Copy the full SHA
    6e48331 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2024

  1. Added pending requests endpoint to frontend and integrated for now.

    @shristigupta1408
    shristigupta1408 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    0939ea0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    ca7005b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/trip_request_frontend' into fron… 

    …tend-Shristi
    @shristigupta1408
    shristigupta1408 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    1ad8e18 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/postgis' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    24fefda View commit details
    Browse the repository at this point in the history

  5. Populating available ride request cards with the nearby trip request … 

    …details.
    @shristigupta1408
    shristigupta1408 committed May 20, 2024
    Configuration menu
    Copy the full SHA
    61af745 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge remote-tracking branch 'origin/postgis' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5e53b2d View commit details
    Browse the repository at this point in the history

  2. Integrated approve request endpoint and changed the endpoint to retur… 

    …n json errors.
    @shristigupta1408
    shristigupta1408 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c2f8278 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. merge with dev

    @ferdisungkar
    ferdisungkar committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b0e89b4 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. merging with dev

    @ferdisungkar
    ferdisungkar committed May 24, 2024
    Configuration menu
    Copy the full SHA
    6426b88 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of https://github.com/CSSE6400/P01-RidingShare int… 

    …o frontend-ferdi
    @ferdisungkar
    ferdisungkar committed May 24, 2024
    Configuration menu
    Copy the full SHA
    34cce4d View commit details
    Browse the repository at this point in the history

  3. implement api to trips

    @ferdisungkar
    ferdisungkar committed May 24, 2024
    Configuration menu
    Copy the full SHA
    acc5cee View commit details
    Browse the repository at this point in the history

  4. implement api to trips

    @ferdisungkar
    ferdisungkar committed May 24, 2024
    Configuration menu
    Copy the full SHA
    2d1873f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' of https://github.com/CSSE6400/P01-RidingShare in… 

    …to frontend-ferdi
    @ferdisungkar
    ferdisungkar committed May 24, 2024
    Configuration menu
    Copy the full SHA
    5797d84 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/dev' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    f51e50d View commit details
    Browse the repository at this point in the history

  7. implement trip details

    @ferdisungkar
    ferdisungkar committed May 24, 2024
    Configuration menu
    Copy the full SHA
    eb2ae15 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. Merge remote-tracking branch 'origin/frontend-ferdi' into frontend-Sh… 

    …risti
    @shristigupta1408
    shristigupta1408 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    13097b7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    9f19574 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/postgis' into frontend-Shristi

    @shristigupta1408
    shristigupta1408 committed May 25, 2024
    Configuration menu
    Copy the full SHA
    88a120f View commit details
    Browse the repository at this point in the history

  4. made few changes in the map and added sqlmap testing

    @Mohamad11Dab
    Mohamad11Dab committed May 25, 2024
    Configuration menu
    Copy the full SHA
    3c8e501 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. made a github workflow

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    7dbe318 View commit details
    Browse the repository at this point in the history

  2. setup tests

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    720bd5a View commit details
    Browse the repository at this point in the history

  3. fixed worfklow

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    e672168 View commit details
    Browse the repository at this point in the history

  4. added new test cases

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    122e89d View commit details
    Browse the repository at this point in the history

  5. merged dev into my branch

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    f749c06 View commit details
    Browse the repository at this point in the history

  6. Fixed styling and endpoint error.

    @shristigupta1408
    shristigupta1408 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    b488e54 View commit details
    Browse the repository at this point in the history

  7. Fixed spelling mistake.

    @shristigupta1408
    shristigupta1408 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    2068701 View commit details
    Browse the repository at this point in the history

  8. Added privateroute to rides page.

    @shristigupta1408
    shristigupta1408 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    9fadea9 View commit details
    Browse the repository at this point in the history

  9. added script for testing

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    4617957 View commit details
    Browse the repository at this point in the history

  10. removed unused import

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    1c447f8 View commit details
    Browse the repository at this point in the history

  11. Added more tests

    @Mohamad11Dab
    Mohamad11Dab committed May 26, 2024
    Configuration menu
    Copy the full SHA
    541ff76 View commit details
    Browse the repository at this point in the history

  12. Fixed time such that passengers with suitable starting time period ca… 

    …n only be suggested
    @BaileyS03
    BaileyS03 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    e843239 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. added consideration of end point to suggestions

    @BaileyS03
    BaileyS03 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    56160f5 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/dev' into frontend-Shristi

    @Mohamad11Dab
    Mohamad11Dab committed May 27, 2024
    Configuration menu
    Copy the full SHA
    f653a0f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #20 from CSSE6400/frontend-Shristi 

    Available Ride Requests Page + styling fixes + Ferdi's initial changes + some of the changes in postgis
    @Mohamad11Dab
    Mohamad11Dab authored May 27, 2024
    Configuration menu
    Copy the full SHA
    f89118f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/dev' into test_setup

    @Mohamad11Dab
    Mohamad11Dab committed May 27, 2024
    Configuration menu
    Copy the full SHA
    03ee141 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/dev' into test_setup

    @Mohamad11Dab
    Mohamad11Dab committed May 27, 2024
    Configuration menu
    Copy the full SHA
    ca26220 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #21 from CSSE6400/test_setup 

    Test setup
    @Mohamad11Dab
    Mohamad11Dab authored May 27, 2024
    Configuration menu
    Copy the full SHA
    b6e22c0 View commit details
    Browse the repository at this point in the history

  7. merged dev into branch

    @Mohamad11Dab
    Mohamad11Dab committed May 27, 2024
    Configuration menu
    Copy the full SHA
    677bfa0 View commit details
    Browse the repository at this point in the history