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

Sprint 2 #39

Merged
merged 55 commits into from
May 4, 2023
Merged

Sprint 2 #39

merged 55 commits into from
May 4, 2023

Commits on Apr 15, 2023

  1. Initial ODMs

    @Hissah-CMU
    Hissah-CMU committed Apr 15, 2023
    Configuration menu
    Copy the full SHA
    02c95ff View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. 1. Added home screen. 

    2. Added signup screen.
3. Added survey screen.
    @shashankshk
    shashankshk committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    65b0417 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Update .gitignore and initial api spec

    @dzellmer
    dzellmer committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    dacc929 View commit details
    Browse the repository at this point in the history

  2. Update server dependencies and revise user model

    @dzellmer
    dzellmer committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    d24080e View commit details
    Browse the repository at this point in the history

  3. Simplified model naming; restructured survey and response

    @dzellmer
    dzellmer committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    c6037f5 View commit details
    Browse the repository at this point in the history

  4. Model naming and export updates

    @dzellmer
    dzellmer committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    2abbee0 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #31 from CMU-17-356/odm 

    Odm
    @dzellmer
    dzellmer authored Apr 17, 2023
    Configuration menu
    Copy the full SHA
    89e0629 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Merge branch 'Backend-ODM' of https://github.com/CMU-17-356/cmu-17-35… 

    …6-final-project-s23-stylelabz into api_spec
    @dzellmer
    dzellmer committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    4123c65 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Login Flow

    @nathanmaher41
    nathanmaher41 committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    f669e44 View commit details
    Browse the repository at this point in the history

  2. - Added userPreference model 

    - Added unit test
- Modified clothing model
    @Hissah-CMU
    Hissah-CMU committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    16c142a View commit details
    Browse the repository at this point in the history

  3. Added account registration

    @mahithedula
    mahithedula committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    396a24e View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2023

  1. 1. Added swipe cards. 

    2. Added bottom nav bar.
    @shashankshk
    shashankshk committed Apr 23, 2023
    Configuration menu
    Copy the full SHA
    ec3a212 View commit details
    Browse the repository at this point in the history

  2. Resolved merge conflicts

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

  3. Merge pull request #30 from CMU-17-356/mobile-app-initial 

    Initial screens
    @dzellmer
    dzellmer authored Apr 23, 2023
    Configuration menu
    Copy the full SHA
    5c2084d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'sprint-2' into Backend-ODM

    @dzellmer
    dzellmer authored Apr 23, 2023
    Configuration menu
    Copy the full SHA
    ca990e6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #33 from CMU-17-356/Backend-ODM 

    Backend odm
    @dzellmer
    dzellmer authored Apr 23, 2023
    Configuration menu
    Copy the full SHA
    75b82b6 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. Update clothing model

    @dzellmer
    dzellmer committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    e544d93 View commit details
    Browse the repository at this point in the history

  2. Finished survey-screen

    @mahithedula
    mahithedula committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    e5835a9 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. Backend APIs

    @Hissah-CMU
    Hissah-CMU committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    6f4f8f8 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. Merge branch 'sprint-2-Backend-APIs' of https://github.com/CMU-17-356… 

    …/cmu-17-356-final-project-s23-stylelabz into backend_fetch_clothing
    @dzellmer
    dzellmer committed May 1, 2023
    Configuration menu
    Copy the full SHA
    9846175 View commit details
    Browse the repository at this point in the history

  2. Server deployment to fly.io

    @dzellmer
    dzellmer committed May 1, 2023
    Configuration menu
    Copy the full SHA
    001ee5d View commit details
    Browse the repository at this point in the history

  3. Resolved merge conflicts

    @shashankshk
    shashankshk committed May 1, 2023
    Configuration menu
    Copy the full SHA
    d4f5010 View commit details
    Browse the repository at this point in the history

  4. - Modify Backend APIs 

    - Add unit test
    @Hissah-CMU
    Hissah-CMU committed May 1, 2023
    Configuration menu
    Copy the full SHA
    908b350 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Merge pull request #34 from CMU-17-356/mobile-app-initial-surveyscreen 

    Mobile app initial surveyscreen
    @dzellmer
    dzellmer authored May 2, 2023
    Configuration menu
    Copy the full SHA
    e9292a1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sprint-2-Backend-APIs' of https://github.com/CMU-17-356… 

    …/cmu-17-356-final-project-s23-stylelabz into backend_fetch_clothing
    @dzellmer
    dzellmer committed May 2, 2023
    Configuration menu
    Copy the full SHA
    bb0fa31 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #35 from CMU-17-356/backend_fetch_clothing 

    Backend fetch clothing
    @dzellmer
    dzellmer authored May 2, 2023
    Configuration menu
    Copy the full SHA
    bb5f5e7 View commit details
    Browse the repository at this point in the history

  4. Added limit for clothing fetch

    @dzellmer
    dzellmer committed May 2, 2023
    Configuration menu
    Copy the full SHA
    eeb44c0 View commit details
    Browse the repository at this point in the history

  5. Prototype pagination for clothing list

    @dzellmer
    dzellmer committed May 2, 2023
    Configuration menu
    Copy the full SHA
    d908f21 View commit details
    Browse the repository at this point in the history

  6. Compress survey response models & routes

    @dzellmer
    dzellmer committed May 2, 2023
    Configuration menu
    Copy the full SHA
    a309745 View commit details
    Browse the repository at this point in the history

  7. Added swipe model

    @dzellmer
    dzellmer committed May 2, 2023
    Configuration menu
    Copy the full SHA
    15d3f8f View commit details
    Browse the repository at this point in the history

  8. - Modify survey, login and registration APIs

    @Hissah-CMU
    Hissah-CMU committed May 2, 2023
    Configuration menu
    Copy the full SHA
    b94f02d View commit details
    Browse the repository at this point in the history

  9. Update tsconfig

    @dzellmer
    dzellmer committed May 2, 2023
    Configuration menu
    Copy the full SHA
    4728bce View commit details
    Browse the repository at this point in the history

  10. Merge branch 'sprint-2-Backend-APIs' into backend_swipe_control

    @dzellmer
    dzellmer authored May 2, 2023
    Configuration menu
    Copy the full SHA
    4f7f990 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #36 from CMU-17-356/backend_swipe_control 

    Backend swipe control
    @dzellmer
    dzellmer authored May 2, 2023
    Configuration menu
    Copy the full SHA
    078415b View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. - Update unit test files

    @Hissah-CMU
    Hissah-CMU committed May 3, 2023
    Configuration menu
    Copy the full SHA
    0a19e95 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/sprint-2-Backend-APIs' into spri… 

    …nt-2-Backend-APIs
    @Hissah-CMU
    Hissah-CMU committed May 3, 2023
    Configuration menu
    Copy the full SHA
    99514b1 View commit details
    Browse the repository at this point in the history

  3. API integration for user and survey

    @shashankshk
    shashankshk committed May 3, 2023
    Configuration menu
    Copy the full SHA
    fc65477 View commit details
    Browse the repository at this point in the history

  4. Format controller files

    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    de1d77a View commit details
    Browse the repository at this point in the history

  5. Basic pagination for clothing

    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    7d826ef View commit details
    Browse the repository at this point in the history

  6. Merge branch 'sprint-2-Backend-APIs' of https://github.com/CMU-17-356… 

    …/cmu-17-356-final-project-s23-stylelabz into sprint-2-Backend-APIs
    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    1de6b28 View commit details
    Browse the repository at this point in the history

  7. Add recommendation route

    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    a21349b View commit details
    Browse the repository at this point in the history

  8. Filter-based clothing retrieval

    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    2cfc743 View commit details
    Browse the repository at this point in the history

  9. Add survey filter to recommendations

    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    57672fd View commit details
    Browse the repository at this point in the history

  10. Updated tests and survey model

    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    1d8251c View commit details
    Browse the repository at this point in the history

  11. Add boundaryId + userId query to GET /clothing

    @dzellmer
    dzellmer committed May 3, 2023
    Configuration menu
    Copy the full SHA
    494f616 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2023

  1. Added user login, registration and swipe API.

    @shashankshk
    shashankshk committed May 4, 2023
    Configuration menu
    Copy the full SHA
    bd3dad2 View commit details
    Browse the repository at this point in the history

  2. Fetch swipe results

    @dzellmer
    dzellmer committed May 4, 2023
    Configuration menu
    Copy the full SHA
    b39427d View commit details
    Browse the repository at this point in the history

  3. Update login error handling

    @dzellmer
    dzellmer committed May 4, 2023
    Configuration menu
    Copy the full SHA
    144c17e View commit details
    Browse the repository at this point in the history

  4. Fix userId bug in GET /swipe

    @dzellmer
    dzellmer committed May 4, 2023
    Configuration menu
    Copy the full SHA
    cb8feda View commit details
    Browse the repository at this point in the history

  5. Pagination for recommendations

    @dzellmer
    dzellmer committed May 4, 2023
    Configuration menu
    Copy the full SHA
    4e20eb9 View commit details
    Browse the repository at this point in the history

  6. Add upsert to swipes

    @dzellmer
    dzellmer committed May 4, 2023
    Configuration menu
    Copy the full SHA
    ca62af8 View commit details
    Browse the repository at this point in the history

  7. Update logic in recommendation handler

    @dzellmer
    dzellmer committed May 4, 2023
    Configuration menu
    Copy the full SHA
    2ea23c3 View commit details
    Browse the repository at this point in the history

  8. API integration for recommendation.

    @shashankshk
    shashankshk committed May 4, 2023
    Configuration menu
    Copy the full SHA
    ff2355e View commit details
    Browse the repository at this point in the history

  9. Merge pull request #38 from CMU-17-356/api-integration 

    Api integration
    @dzellmer
    dzellmer authored May 4, 2023
    Configuration menu
    Copy the full SHA
    3909beb View commit details
    Browse the repository at this point in the history

  10. Merge pull request #37 from CMU-17-356/sprint-2-Backend-APIs 

    Sprint 2 backend APIs
    @dzellmer
    dzellmer authored May 4, 2023
    Configuration menu
    Copy the full SHA
    8585939 View commit details
    Browse the repository at this point in the history