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

Feedback #1

Merged
merged 183 commits into from
Jul 17, 2022
Merged

Feedback #1

merged 183 commits into from
Jul 17, 2022

Commits on Jun 13, 2022

  1. Setting up GitHub Classroom Feedback

    @github-classroom
    github-classroom[bot] committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    4a03ae1 View commit details
    Browse the repository at this point in the history

  2. changes in html,.env

    @nishayaraj
    nishayaraj committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    8e5468a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #2 from nss-evening-cohort-19/branch1 

    changes in html,.env
    @nishayaraj
    nishayaraj committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    fece320 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2022

  1. added sample data

    @gitNitroTitan
    gitNitroTitan committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    d64d1c2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from nss-evening-cohort-19/setup-jk 

    added sample data
    @gitNitroTitan
    gitNitroTitan committed Jun 14, 2022
    Configuration menu
    Copy the full SHA
    5dddd1e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2022

  1. package.json changes

    @nishayaraj
    nishayaraj committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    feadd19 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #24 from nss-evening-cohort-19/nmr_setups 

    package.json changes
    @nishayaraj
    nishayaraj committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    324e18a View commit details
    Browse the repository at this point in the history

  3. utility functions and files added

    @gitNitroTitan
    gitNitroTitan committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    bddf988 View commit details
    Browse the repository at this point in the history

  4. removed duplicate code

    @gitNitroTitan
    gitNitroTitan committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    2859d8f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #25 from nss-evening-cohort-19/branch1-jk 

    utility functions and files added
    @gitNitroTitan
    gitNitroTitan committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    34bd2e3 View commit details
    Browse the repository at this point in the history

  6. Please read comment below for more detailed look.

    @Massacre-Saint
    Massacre-Saint committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    898c672 View commit details
    Browse the repository at this point in the history

  7. Please read comments for deatils. Updated pathing

    @Massacre-Saint
    Massacre-Saint committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    a674466 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #28 from nss-evening-cohort-19/welcomeLogin-jm 

    Please read comments for more detailed notes. Created welcomeLogin page with authentication.
    @gitNitroTitan
    gitNitroTitan committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    66dc776 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2022

  1. added navbar and events

    @nishayaraj
    nishayaraj committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    930b3ec View commit details
    Browse the repository at this point in the history

  2. merged from main and resolved conflicts

    @nishayaraj
    nishayaraj committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    feea4bc View commit details
    Browse the repository at this point in the history

  3. done

    @lesleyjkeyes
    lesleyjkeyes committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    9b12875 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #29 from nss-evening-cohort-19/nmr_nav 

    added navbar and events
    @nishayaraj
    nishayaraj committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    08d3267 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. merge conflict

    @lesleyjkeyes
    lesleyjkeyes committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    69554e5 View commit details
    Browse the repository at this point in the history

  2. cards on dom

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    269cb1c View commit details
    Browse the repository at this point in the history

  3. added cards on dom

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    9608272 View commit details
    Browse the repository at this point in the history

  4. created home page, buttons not functional yet

    @lesleyjkeyes
    lesleyjkeyes committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    7c30296 View commit details
    Browse the repository at this point in the history

  5. added add/edit item form

    @nishayaraj
    nishayaraj committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    2f46cad View commit details
    Browse the repository at this point in the history

  6. added revenue page

    @Massacre-Saint
    Massacre-Saint committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    3e58d62 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #30 from nss-evening-cohort-19/LK-setup 

    Lk setup
    @lesleyjkeyes
    lesleyjkeyes committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    42834a7 View commit details
    Browse the repository at this point in the history

  8. dom cards

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    c76ee9e View commit details
    Browse the repository at this point in the history

  9. merge

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    631230f View commit details
    Browse the repository at this point in the history

  10. Merge branch 'main' into nmr_itemForm

    @nishayaraj
    nishayaraj committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    a87ea2a View commit details
    Browse the repository at this point in the history

  11. cards on dom

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    e436b6f View commit details
    Browse the repository at this point in the history

  12. Merge pull request #31 from nss-evening-cohort-19/branch2-jk 

    Branch2 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    faf9136 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'main' into nmr_itemForm

    @nishayaraj
    nishayaraj committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    46b2a30 View commit details
    Browse the repository at this point in the history

  14. items rendered

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    6764345 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'main' into revRender-jm

    @Massacre-Saint
    Massacre-Saint committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    1adc67a View commit details
    Browse the repository at this point in the history

  16. Merge pull request #32 from nss-evening-cohort-19/revRender-jm 

    Created revenue page
    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    1257724 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'main' into branch3-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    37b980d View commit details
    Browse the repository at this point in the history

  18. forEach loop fixed

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    a0297fe View commit details
    Browse the repository at this point in the history

  19. Merge branch 'main' into nmr_itemForm

    @nishayaraj
    nishayaraj committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    92428ba View commit details
    Browse the repository at this point in the history

  20. Merge pull request #33 from nss-evening-cohort-19/branch3-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    5b60ce2 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'main' into nmr_itemForm

    @nishayaraj
    nishayaraj committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    a0d4018 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2022

  1. Saving changes to merge main branch

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    54aaab9 View commit details
    Browse the repository at this point in the history

  2. fixed merge conflicts

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    4554aca View commit details
    Browse the repository at this point in the history

  3. added card borders for viewing pleasure

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    1e0336f View commit details
    Browse the repository at this point in the history

  4. added connected home page view orders button

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    e8a1fbf View commit details
    Browse the repository at this point in the history

  5. Merge pull request #37 from nss-evening-cohort-19/branch4-jk 

    Branch4 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    c8bc252 View commit details
    Browse the repository at this point in the history

  6. Changed some sample data and added functionality for stretch

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    7c87d40 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into createOrder-jm

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    eb06e2f View commit details
    Browse the repository at this point in the history

  8. addPayment form and create and add item form created

    @nishayaraj
    nishayaraj committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    f7bac4d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into nmr_itemForm

    @nishayaraj
    nishayaraj committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    13a88b0 View commit details
    Browse the repository at this point in the history

  10. form changes

    @nishayaraj
    nishayaraj committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    91e9ea9 View commit details
    Browse the repository at this point in the history

  11. home buttons in progress

    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    faa5276 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #39 from nss-evening-cohort-19/nmr_itemForm 

    Nmr item form
    @nishayaraj
    nishayaraj committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    06a943b View commit details
    Browse the repository at this point in the history

  13. Added promise for single item and create order/item

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    52cfef2 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into LK-homeButtons

    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    b2368b1 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'main' into createOrder-jm

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    2b6afe2 View commit details
    Browse the repository at this point in the history

  16. Home buttons functional as well as the website link in the nav bar

    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    8f3216a View commit details
    Browse the repository at this point in the history

  17. Added all promise calls

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    c025318 View commit details
    Browse the repository at this point in the history

  18. workign more in depth with card data

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    e522460 View commit details
    Browse the repository at this point in the history

  19. FIxed changes <3

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    e4920cc View commit details
    Browse the repository at this point in the history

  20. Merge pull request #40 from nss-evening-cohort-19/createOrder-jm 

    Added all promise calls and fixed sample data
    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    913f270 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'main' into LK-homeButtons

    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    042b7b8 View commit details
    Browse the repository at this point in the history

  22. fixed showOrders

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    2b57035 View commit details
    Browse the repository at this point in the history

  23. fixed showOrders

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    c090167 View commit details
    Browse the repository at this point in the history

  24. fixed sample data and cards

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    d7113e5 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #41 from nss-evening-cohort-19/branch5-jk 

    Branch5 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    cb2a96a View commit details
    Browse the repository at this point in the history

  26. Setting up for merge main

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    e1fc1d7 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'main' into details-jm

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    93a4e75 View commit details
    Browse the repository at this point in the history

  28. fixing conflicts

    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    5e154f6 View commit details
    Browse the repository at this point in the history

  29. Merge pull request #42 from nss-evening-cohort-19/LK-homeButtons 

    Lk home buttons
    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    fa63bd0 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'main' into details-jm

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    ba8ce4d View commit details
    Browse the repository at this point in the history

  31. saved current code

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    84014a0 View commit details
    Browse the repository at this point in the history

  32. Added some html for details

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    121308a View commit details
    Browse the repository at this point in the history

  33. create order issues

    @nishayaraj
    nishayaraj committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    ea0495f View commit details
    Browse the repository at this point in the history

  34. We fixed the changes for the form

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    a5c0dbf View commit details
    Browse the repository at this point in the history

  35. We fixed all the form issues and corrections

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    e95ccd2 View commit details
    Browse the repository at this point in the history

  36. Merge pull request #43 from nss-evening-cohort-19/nmr_createUpdateOrder 

    create order issues
    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    6d6341f View commit details
    Browse the repository at this point in the history

  37. Merge branch 'main' into details-jm

    @Massacre-Saint
    Massacre-Saint committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    2152b66 View commit details
    Browse the repository at this point in the history

  38. stuffs

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    2df7583 View commit details
    Browse the repository at this point in the history

  39. edit order button now functioning

    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    78e74fe View commit details
    Browse the repository at this point in the history

  40. delete completed

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    d2fd614 View commit details
    Browse the repository at this point in the history

  41. fixed update bug

    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    6123203 View commit details
    Browse the repository at this point in the history

  42. Merge pull request #44 from nss-evening-cohort-19/LK-editOrder 

    edit order button now functioning
    @lesleyjkeyes
    lesleyjkeyes committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    d1dafa6 View commit details
    Browse the repository at this point in the history

  43. delete fixed

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    85f9875 View commit details
    Browse the repository at this point in the history

  44. merged prior commit

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    42b4656 View commit details
    Browse the repository at this point in the history

  45. delete merge

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    a2ad92e View commit details
    Browse the repository at this point in the history

  46. Merge pull request #45 from nss-evening-cohort-19/branch7-jk 

    Branch7 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    2003f32 View commit details
    Browse the repository at this point in the history

  47. almost completed new ReadMe file for team

    @gitNitroTitan
    gitNitroTitan committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    2fd0beb View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2022

  1. Added details page with showItems.

    @Massacre-Saint
    Massacre-Saint committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    ad7e74b View commit details
    Browse the repository at this point in the history

  2. FIxed merge conflicts

    @Massacre-Saint
    Massacre-Saint committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    5064e87 View commit details
    Browse the repository at this point in the history

  3. Connected form to button

    @Massacre-Saint
    Massacre-Saint committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    179823e View commit details
    Browse the repository at this point in the history

  4. Deleted unneccessary page

    @Massacre-Saint
    Massacre-Saint committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    f86ee13 View commit details
    Browse the repository at this point in the history

  5. Connected the buttons on the items for forms

    @Massacre-Saint
    Massacre-Saint committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    c62d762 View commit details
    Browse the repository at this point in the history

  6. changes to readme

    @gitNitroTitan
    gitNitroTitan committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    f0fc9d1 View commit details
    Browse the repository at this point in the history

  7. ready for next pull

    @gitNitroTitan
    gitNitroTitan committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    f275606 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Merge pull request #47 from nss-evening-cohort-19/branch8-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    13e5295 View commit details
    Browse the repository at this point in the history

  2. Search filter by name or phone

    @nishayaraj
    nishayaraj committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    0a2a1be View commit details
    Browse the repository at this point in the history

  3. simple styling

    @nishayaraj
    nishayaraj committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    cfdff21 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into branch8-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    5c1f9fb View commit details
    Browse the repository at this point in the history

  5. Merge pull request #48 from nss-evening-cohort-19/details-jm 

    Show items and added event listeners
    @Massacre-Saint
    Massacre-Saint committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    89c2b63 View commit details
    Browse the repository at this point in the history

  6. new branch

    @gitNitroTitan
    gitNitroTitan committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    85c47a7 View commit details
    Browse the repository at this point in the history

  7. merge new item changes

    @gitNitroTitan
    gitNitroTitan committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    3c1f807 View commit details
    Browse the repository at this point in the history

  8. new branch changes from merge

    @gitNitroTitan
    gitNitroTitan committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    b3ed3db View commit details
    Browse the repository at this point in the history

  9. Merge pull request #51 from nss-evening-cohort-19/nmr_updateOrder 

    Nmr update order
    @nishayaraj
    nishayaraj committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    08e6d71 View commit details
    Browse the repository at this point in the history

  10. new merge from main

    @gitNitroTitan
    gitNitroTitan committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    9288953 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. update item working, need to fix sum bug

    @lesleyjkeyes
    lesleyjkeyes committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    81c69e9 View commit details
    Browse the repository at this point in the history

  2. bug issue on updating order type fixed

    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    845c96d View commit details
    Browse the repository at this point in the history

  3. Added some merge data but need to fix

    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    18a390a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #52 from nss-evening-cohort-19/LK-updateAddItem 

    update item working, need to fix sum bug
    @lesleyjkeyes
    lesleyjkeyes committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    f4cae78 View commit details
    Browse the repository at this point in the history

  5. working on parseInt

    @gitNitroTitan
    gitNitroTitan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    9bf8ca6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into details-merge-jm

    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    0f9aebe View commit details
    Browse the repository at this point in the history

  7. added incoming changes

    @gitNitroTitan
    gitNitroTitan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    b0d045c View commit details
    Browse the repository at this point in the history

  8. bug fix

    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    edea253 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into nmr_filter

    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    c710629 View commit details
    Browse the repository at this point in the history

  10. add item and delete item now working

    @lesleyjkeyes
    lesleyjkeyes committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    0b08eed View commit details
    Browse the repository at this point in the history

  11. Merge pull request #54 from nss-evening-cohort-19/LK-addItem 

    add item and delete item now working
    @lesleyjkeyes
    lesleyjkeyes committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    4393ccb View commit details
    Browse the repository at this point in the history

  12. Merge branch 'main' into branch9-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    f34e599 View commit details
    Browse the repository at this point in the history

  13. fixed item sum bug

    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    356ec22 View commit details
    Browse the repository at this point in the history

  14. Merge data works

    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    7303531 View commit details
    Browse the repository at this point in the history

  15. Fixed merge conflicts

    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    b3b2672 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #55 from nss-evening-cohort-19/nmr_filter 

    Nmr filter
    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    d5bd363 View commit details
    Browse the repository at this point in the history

  17. delete orders items promise created

    @gitNitroTitan
    gitNitroTitan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    527e63f View commit details
    Browse the repository at this point in the history

  18. Merge branch 'main' into branch9-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    c04b06a View commit details
    Browse the repository at this point in the history

  19. Fixed error

    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    55b0552 View commit details
    Browse the repository at this point in the history

  20. d

    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    51ce683 View commit details
    Browse the repository at this point in the history

  21. Added the final touches to allow users to see the order items

    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    b52967b View commit details
    Browse the repository at this point in the history

  22. Merge pull request #58 from nss-evening-cohort-19/details-merge-jm 

    Details Page
    @Massacre-Saint
    Massacre-Saint committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    365ca23 View commit details
    Browse the repository at this point in the history

  23. filter events for order status

    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    db11de7 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'main' into nmr_filterUpdates

    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    e2ba862 View commit details
    Browse the repository at this point in the history

  25. added some CSS

    @gitNitroTitan
    gitNitroTitan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    e2ce585 View commit details
    Browse the repository at this point in the history

  26. fixed merge conflicts with pull

    @gitNitroTitan
    gitNitroTitan committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    04deb18 View commit details
    Browse the repository at this point in the history

  27. close order form status working

    @nishayaraj
    nishayaraj committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    1d31b4b View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. bugs

    @lesleyjkeyes
    lesleyjkeyes committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    08c6c19 View commit details
    Browse the repository at this point in the history

  2. delete all associated items when order deleted

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    7fc103a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #61 from nss-evening-cohort-19/nmr_filterUpdates 

    Order status change
    @nishayaraj
    nishayaraj committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    3b5daf4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into branch9-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    d0a41b2 View commit details
    Browse the repository at this point in the history

  5. edit btn disabling working after order status change

    @nishayaraj
    nishayaraj committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    aea10fc View commit details
    Browse the repository at this point in the history

  6. some minor styling added, delete all order items

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    585d41c View commit details
    Browse the repository at this point in the history

  7. closed status added

    @nishayaraj
    nishayaraj committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    4e5e6af View commit details
    Browse the repository at this point in the history

  8. Merge pull request #64 from nss-evening-cohort-19/branch9-jk 

    Branch9 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    fde9680 View commit details
    Browse the repository at this point in the history

  9. resolved merge conflict

    @nishayaraj
    nishayaraj committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    1b72764 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #65 from nss-evening-cohort-19/updateStatus 

    Update status
    @nishayaraj
    nishayaraj committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    7e49e58 View commit details
    Browse the repository at this point in the history

  11. adding better buttons

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    1c1b828 View commit details
    Browse the repository at this point in the history

  12. merge conflict with new main

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    83ad9e8 View commit details
    Browse the repository at this point in the history

  13. add, edit and delete item bugs fixed

    @lesleyjkeyes
    lesleyjkeyes committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    235d7c5 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' of https://github.com/nss-evening-cohort-19/pos-s… 

    …ystem-team-1
    @lesleyjkeyes
    lesleyjkeyes committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    0697e14 View commit details
    Browse the repository at this point in the history

  15. merge conflicts

    @lesleyjkeyes
    lesleyjkeyes committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    ad1aaa6 View commit details
    Browse the repository at this point in the history

  16. merged to main

    @lesleyjkeyes
    lesleyjkeyes committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    f4cc4e1 View commit details
    Browse the repository at this point in the history

  17. cautionary commit

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    ead36a8 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #66 from nss-evening-cohort-19/LK-itemBug 

    Lk item bug
    @lesleyjkeyes
    lesleyjkeyes committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    0add06d View commit details
    Browse the repository at this point in the history

  19. Merge branch 'main' into branch10-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    61b9f61 View commit details
    Browse the repository at this point in the history

  20. fixed default import issue

    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    b47b056 View commit details
    Browse the repository at this point in the history

  21. Merge pull request #67 from nss-evening-cohort-19/branch10-jk 

    Branch10 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    f7f1918 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2022

  1. open closed status radio button working, navbar filter by phone numbe… 

    …r and name working
    @nishayaraj
    nishayaraj committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    801189b View commit details
    Browse the repository at this point in the history

  2. changed order status display

    @nishayaraj
    nishayaraj committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    61616b7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #68 from nss-evening-cohort-19/nmr_stretchBranch 

    Nmr stretch branch
    @nishayaraj
    nishayaraj committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    a93a044 View commit details
    Browse the repository at this point in the history

  4. buttons instead of links, uid added

    @gitNitroTitan
    gitNitroTitan committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    d257b02 View commit details
    Browse the repository at this point in the history

  5. merge conflict from push

    @gitNitroTitan
    gitNitroTitan committed Jun 23, 2022
    Configuration menu
    Copy the full SHA
    07be4cf View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2022

  1. delete order working but items not deleting when order deleted

    @gitNitroTitan
    gitNitroTitan committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    27295b8 View commit details
    Browse the repository at this point in the history

  2. readme

    @nishayaraj
    nishayaraj committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    b7f1136 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #69 from nss-evening-cohort-19/branch10-jk 

    Branch10 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    ac6719a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into nmr_finalTouches

    @nishayaraj
    nishayaraj committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    d33fb5f View commit details
    Browse the repository at this point in the history

  5. working delete items

    @nishayaraj
    nishayaraj committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    992ed31 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #75 from nss-evening-cohort-19/nmr_finalTouches 

    Nmr final touches
    @nishayaraj
    nishayaraj committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    22b2871 View commit details
    Browse the repository at this point in the history

  7. added revenue fetch and update functions, fixed bugs

    @nishayaraj
    nishayaraj committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    a07e72b View commit details
    Browse the repository at this point in the history

  8. fixed commit

    @Massacre-Saint
    Massacre-Saint committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    d9fc96e View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into nmr_finalTouches

    @Massacre-Saint
    Massacre-Saint committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    1212945 View commit details
    Browse the repository at this point in the history

  10. delete order works

    @nishayaraj
    nishayaraj committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    e6b8548 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #76 from nss-evening-cohort-19/nmr-fix-revenue 

    added revenue fetch and update functions, fixed bugs
    @nishayaraj
    nishayaraj committed Jun 24, 2022
    Configuration menu
    Copy the full SHA
    e3ba8a7 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2022

  1. Fixed merge conflicts

    @Massacre-Saint
    Massacre-Saint committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    35f8e83 View commit details
    Browse the repository at this point in the history

  2. Fixed all known issues.

    @Massacre-Saint
    Massacre-Saint committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    aa27e3d View commit details
    Browse the repository at this point in the history

  3. cards styled a little

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    d27bf6b View commit details
    Browse the repository at this point in the history

  4. added style to login page for loom

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    e92d72a View commit details
    Browse the repository at this point in the history

  5. links and images in Readme updated

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    b895b70 View commit details
    Browse the repository at this point in the history

  6. fixed readme separations

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    476934e View commit details
    Browse the repository at this point in the history

  7. fixed a few more issues

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    09a1247 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #77 from nss-evening-cohort-19/fixedDelete 

    Fixed delete
    @Massacre-Saint
    Massacre-Saint committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    56a0629 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'main' into branch12-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    ac77650 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #78 from nss-evening-cohort-19/branch12-jk 

    Branch12 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    a5c1720 View commit details
    Browse the repository at this point in the history

  11. FIxed view and closed

    @Massacre-Saint
    Massacre-Saint committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    a0eaef4 View commit details
    Browse the repository at this point in the history

  12. touched up readMe

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    74ce196 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #79 from nss-evening-cohort-19/fixedView-jm 

    FIxed view and closed
    @Massacre-Saint
    Massacre-Saint committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    3ae7051 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'main' into branch12-jk

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    9b3aac9 View commit details
    Browse the repository at this point in the history

  15. ready

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    1756cd5 View commit details
    Browse the repository at this point in the history

  16. netlify link update

    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    9b7d7b7 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #80 from nss-evening-cohort-19/branch13-jk 

    Branch13 jk
    @gitNitroTitan
    gitNitroTitan committed Jun 25, 2022
    Configuration menu
    Copy the full SHA
    2a70d2b View commit details
    Browse the repository at this point in the history