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

Develop #19

Merged
merged 56 commits into from
Jun 3, 2024
Merged

Develop #19

merged 56 commits into from
Jun 3, 2024

Commits on May 1, 2024

  1. Merge pull request #6 from sjohn198/main 

    Make branches equal
    @cmaloney111
    cmaloney111 authored May 1, 2024
    Configuration menu
    Copy the full SHA
    5cfc207 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. fixed delete

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

  2. Merge branch 'add_orders' of https://github.com/sjohn198/SafeHaven in… 

    …to add_orders
    @sjohn198
    sjohn198 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    bbde2ff View commit details
    Browse the repository at this point in the history

  3. Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into … 

    …Develop
    @sjohn198
    sjohn198 committed May 15, 2024
    Configuration menu
    Copy the full SHA
    c500920 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into … 

    …Develop
    @sjohn198
    sjohn198 committed May 17, 2024
    Configuration menu
    Copy the full SHA
    0668407 View commit details
    Browse the repository at this point in the history

  2. prettier applied

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

Commits on May 20, 2024

  1. Add eslint package.json

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

  2. Make it so price doesn't increment like quantity

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

Commits on May 22, 2024

  1. Update README.md

    @cmaloney111
    cmaloney111 authored May 22, 2024
    Configuration menu
    Copy the full SHA
    e545b1b View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. merged with Develop

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

  2. added logout functionality

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

Commits on May 26, 2024

  1. manage orders is functional

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

  2. Add eslint package.json

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

  3. Make it so price doesn't increment like quantity

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

  4. Change user schema

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

  5. added new files

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

  6. Merge branch 'add_orders' of https://github.com/sjohn198/SafeHaven in… 

    …to add_orders
    @sjohn198
    sjohn198 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    7aee6fc View commit details
    Browse the repository at this point in the history

  7. added search bar file

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

  8. Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into … 

    …Develop
    @sjohn198
    sjohn198 committed May 26, 2024
    Configuration menu
    Copy the full SHA
    6ad1768 View commit details
    Browse the repository at this point in the history

  9. fixed manage order table

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

Commits on May 28, 2024

  1. Product Pages - No functionality

    @RayLui2
    RayLui2 committed May 28, 2024
    1 Configuration menu
    Copy the full SHA
    eb316aa View commit details
    Browse the repository at this point in the history

  2. Separate users added

    @BrawlPaul
    BrawlPaul committed May 28, 2024
    Configuration menu
    Copy the full SHA
    0d73382 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'signup_login' into Develop

    @BrawlPaul
    BrawlPaul committed May 28, 2024
    Configuration menu
    Copy the full SHA
    2174e6f View commit details
    Browse the repository at this point in the history

  4. Mega change for presentation (to add orders and inventory)

    @cmaloney111
    cmaloney111 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    940366a View commit details
    Browse the repository at this point in the history

  5. jest

    @jkalsi1
    jkalsi1 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    b9d1bf4 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Develop' of https://github.com/sjohn198/SafeHaven into … 

    …Develop
    @jkalsi1
    jkalsi1 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    1cae489 View commit details
    Browse the repository at this point in the history

  7. jest files

    @jkalsi1
    jkalsi1 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    caf9b60 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. testing started:

    @jkalsi1
    jkalsi1 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    111169c View commit details
    Browse the repository at this point in the history

  2. Editing inventory page

    @RayLui2
    RayLui2 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    bc0bda7 View commit details
    Browse the repository at this point in the history

  3. Editing inventory page

    @RayLui2
    RayLui2 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    1594d9a View commit details
    Browse the repository at this point in the history

  4. works really well

    @sjohn198
    sjohn198 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    64a7209 View commit details
    Browse the repository at this point in the history

  5. works even better

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

  6. Add important details to product page

    @cmaloney111
    cmaloney111 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    85ac455 View commit details
    Browse the repository at this point in the history

  7. Change

    @cmaloney111
    cmaloney111 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    c6dc7e4 View commit details
    Browse the repository at this point in the history

  8. Fix product page editing and change navbar styles

    @cmaloney111
    cmaloney111 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    61d45eb View commit details
    Browse the repository at this point in the history

  9. test on Form working

    @jkalsi1
    jkalsi1 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    30311de View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Merge pull request #14 from sjohn198/styling 

    Styling
    @cmaloney111
    cmaloney111 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    5c64c3c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #13 from sjohn198/manage_orders 

    works even better
    @cmaloney111
    cmaloney111 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    e051ecc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #12 from sjohn198/S2inventory 

    Editing inventory page
    @cmaloney111
    cmaloney111 authored May 31, 2024
    Configuration menu
    Copy the full SHA
    34017fa View commit details
    Browse the repository at this point in the history

  4. coverage added to gitignore

    @jkalsi1
    jkalsi1 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    1a1ab9d View commit details
    Browse the repository at this point in the history

  5. Products for Specific ID now

    @RayLui2
    RayLui2 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    d199813 View commit details
    Browse the repository at this point in the history

  6. delete account option + hidden password

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

Commits on Jun 2, 2024

  1. search bar and begin orders for each user

    @sjohn198
    sjohn198 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    f51e960 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #16 from sjohn198/ProductToUsers 

    Products for Specific ID now
    @sjohn198
    sjohn198 authored Jun 2, 2024
    Configuration menu
    Copy the full SHA
    e609718 View commit details
    Browse the repository at this point in the history

  3. fixed some conflicts

    @sjohn198
    sjohn198 committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    bb84c40 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. added profile deletion and profile editing ability

    @BrawlPaul
    BrawlPaul committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    fd237b8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Develop' into edit_profile

    @cmaloney111
    cmaloney111 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    076b8e0 View commit details
    Browse the repository at this point in the history

  3. orders for specific ID and search bar

    @sjohn198
    sjohn198 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    cc35763 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #18 from sjohn198/add_orders 

    Add orders
    @cmaloney111
    cmaloney111 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    f40a787 View commit details
    Browse the repository at this point in the history

  5. Create main.yml

    @cmaloney111
    cmaloney111 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    5928266 View commit details
    Browse the repository at this point in the history

  6. Update main.yml

    @cmaloney111
    cmaloney111 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    3ccd66b View commit details
    Browse the repository at this point in the history

  7. Add build

    @cmaloney111
    cmaloney111 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    47774a0 View commit details
    Browse the repository at this point in the history

  8. rebuild

    @cmaloney111
    cmaloney111 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c522644 View commit details
    Browse the repository at this point in the history

  9. Update main.yml

    @cmaloney111
    cmaloney111 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2ee9067 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #15 from sjohn198/testing 

    Unit Testing
    @BrawlPaul
    BrawlPaul authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    25a0cfd View commit details
    Browse the repository at this point in the history

  11. Merge pull request #17 from sjohn198/edit_profile 

    Editing Profile + Delete User Profile
    @cmaloney111
    cmaloney111 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    9db86a6 View commit details
    Browse the repository at this point in the history