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

Amethyst - Elaine W. #91

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

Amethyst - Elaine W. #91

wants to merge 35 commits into from

Commits on Apr 3, 2023

  1. Completed tests for Wave 1, starting on Wave 2

    @ewatki
    ewatki committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    8242e15 View commit details
    Browse the repository at this point in the history

  2. just worked through the first wave to see if i understood things corr… 

    …ectly
    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    5c13edb View commit details
    Browse the repository at this point in the history

  3. added get_by_id and swap_items functions

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    8651f7e View commit details
    Browse the repository at this point in the history

  4. Began Wave 2 (item.py) with one more test left

    @ewatki
    ewatki committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    1e5d65e View commit details
    Browse the repository at this point in the history

  5. Updated Vendor init function to make wave 1 tests pass

    @ewatki
    ewatki committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    4098a72 View commit details
    Browse the repository at this point in the history

  6. moved the functions swap_items and get_by_id to item.py

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    080eb55 View commit details
    Browse the repository at this point in the history

  7. added functions

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    577fde7 View commit details
    Browse the repository at this point in the history

  8. see previous comments

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    f9ce09b View commit details
    Browse the repository at this point in the history

  9. commenting out decorators

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    8875543 View commit details
    Browse the repository at this point in the history

  10. commenting out decorators

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    dce0043 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'main' of https://github.com/ewatki/swap-meet

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    23a2bd2 View commit details
    Browse the repository at this point in the history

  12. Wave 1 and 2 merge conflicts resolved, now up to date

    @ewatki
    ewatki committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    6adacec View commit details
    Browse the repository at this point in the history

  13. Wave 1 and 2 merge conflicts resolved, now up to date

    @ewatki
    ewatki committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    479bf94 View commit details
    Browse the repository at this point in the history

  14. removed vs code bits

    @Rainacam12
    Rainacam12 committed Apr 3, 2023
    Configuration menu
    Copy the full SHA
    77606bb View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2023

  1. passed all of wave two tests

    @Rainacam12
    Rainacam12 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    16e0e9d View commit details
    Browse the repository at this point in the history

  2. passed wave 2 and 3 and added asserts to test_wave_03

    @Rainacam12
    Rainacam12 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    b93d0b6 View commit details
    Browse the repository at this point in the history

  3. Pulling recent changes

    @ewatki
    ewatki committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    1a98140 View commit details
    Browse the repository at this point in the history

  4. added assertion to test wave 3

    @Rainacam12
    Rainacam12 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    09dc990 View commit details
    Browse the repository at this point in the history

  5. Pulling recent changes

    @ewatki
    ewatki committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    bc69842 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/ewatki/swap-meet

    @ewatki
    ewatki committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    6484f5f View commit details
    Browse the repository at this point in the history

  7. passed all of wave four, added swap_first_item

    @Rainacam12
    Rainacam12 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    8772550 View commit details
    Browse the repository at this point in the history

  8. Attempting to pull changes

    @ewatki
    ewatki committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    7948aeb View commit details
    Browse the repository at this point in the history

  9. Completed Wave 5 tests

    @ewatki
    ewatki committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    fd7d1f1 View commit details
    Browse the repository at this point in the history

  10. added get_best_by_category function

    @Rainacam12
    Rainacam12 committed Apr 4, 2023
    Configuration menu
    Copy the full SHA
    73f6d95 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2023

  1. Completed test and function for get_by_category()

    @ewatki
    ewatki committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    f32bec5 View commit details
    Browse the repository at this point in the history

  2. Completed test and function for get_by_category()

    @ewatki
    ewatki committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    4e4c019 View commit details
    Browse the repository at this point in the history

  3. Worked on swap_best_by_category and its tests. Three tests left need … 

    …asserts
    @ewatki
    ewatki committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    9627f8c View commit details
    Browse the repository at this point in the history

  4. just need to pass last two assertions for wave_06

    @Rainacam12
    Rainacam12 committed Apr 5, 2023
    Configuration menu
    Copy the full SHA
    11640fd View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2023

  1. typo fix

    @Rainacam12
    Rainacam12 committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    06b2952 View commit details
    Browse the repository at this point in the history

  2. Reset to original code before super()

    @ewatki
    ewatki committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    cdee5af View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of https://github.com/ewatki/swap-meet 

    "
    @ewatki
    ewatki committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    dfb822b View commit details
    Browse the repository at this point in the history

  4. added super()

    @ewatki
    ewatki committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    e1a2bf5 View commit details
    Browse the repository at this point in the history

  5. removed comments

    @Rainacam12
    Rainacam12 committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    5a2efe1 View commit details
    Browse the repository at this point in the history

  6. Finished last function and remaining tests

    @ewatki
    ewatki committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    42309ca View commit details
    Browse the repository at this point in the history

  7. shortened comments

    @ewatki
    ewatki committed Apr 6, 2023
    Configuration menu
    Copy the full SHA
    94d3df1 View commit details
    Browse the repository at this point in the history