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

MVP Complete, Pushing dev to main #34

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

MVP Complete, Pushing dev to main #34

wants to merge 81 commits into from

Commits on Jul 8, 2023

  1. merged dev branch and resolved conflict in index.js

    @mxlisandro
    mxlisandro committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    a0cfc6a View commit details
    Browse the repository at this point in the history

  2. created dashboard component

    @mxlisandro
    mxlisandro committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    13d75c9 View commit details
    Browse the repository at this point in the history

  3. Added font-family Virgil

    @alroro
    alroro committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    4559559 View commit details
    Browse the repository at this point in the history

  4. added next parameter

    @agriffith18
    agriffith18 committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    2ec6e83 View commit details
    Browse the repository at this point in the history

  5. merged changes from dev

    @agriffith18
    agriffith18 committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    36258c6 View commit details
    Browse the repository at this point in the history

  6. Homepage, Dashboard and Contents basic structure completed

    @mxlisandro
    mxlisandro committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    f80b168 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into LO/AR/React 

    updated and merged dev with feature
    @mxlisandro
    mxlisandro committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    2bcd92e View commit details
    Browse the repository at this point in the history

  8. modified login/register components

    @mxlisandro
    mxlisandro committed Jul 8, 2023
    Configuration menu
    Copy the full SHA
    0e4d6d8 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. added .env to .gitignore

    @mxlisandro
    mxlisandro committed Jul 9, 2023
    Configuration menu
    Copy the full SHA
    d5033a1 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. .env update

    @agriffith18
    agriffith18 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    65cc5a0 View commit details
    Browse the repository at this point in the history

  2. accepted incoming changes on server.js

    @agriffith18
    agriffith18 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    c64a819 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #15 from BranchTech-Solutions/LO/AR/React 

    Lo/ar/react
    @alroro
    alroro authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    d6f7274 View commit details
    Browse the repository at this point in the history

  4. minor update

    @agriffith18
    agriffith18 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    cbc9033 View commit details
    Browse the repository at this point in the history

  5. minor changes

    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    cd10420 View commit details
    Browse the repository at this point in the history

  6. minor changes

    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    6b50e6a View commit details
    Browse the repository at this point in the history

  7. minor change to dashboard

    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    b63c093 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'dev' of https://github.com/BranchTech-Solutions/fridgeW… 

    …izard into RH/login
    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    bc4546d View commit details
    Browse the repository at this point in the history

  9. minor change to dashboard

    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    399389a View commit details
    Browse the repository at this point in the history

  10. fixed tailwind file

    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    107b003 View commit details
    Browse the repository at this point in the history

  11. merge

    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ba6af84 View commit details
    Browse the repository at this point in the history

  12. removed .env file

    @Gambarou
    Gambarou committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f457322 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #18 from BranchTech-Solutions/RH/login 

    Rh/login
    @alroro
    alroro authored Jul 11, 2023
    Configuration menu
    Copy the full SHA
    f34849c View commit details
    Browse the repository at this point in the history

  14. added dashboard logic. not complete yet.

    @mxlisandro
    mxlisandro committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    920a412 View commit details
    Browse the repository at this point in the history

  15. merged roberts and LO/AR/React branch

    @mxlisandro
    mxlisandro committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    46c75e5 View commit details
    Browse the repository at this point in the history

  16. small update

    @agriffith18
    agriffith18 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    635b2c0 View commit details
    Browse the repository at this point in the history

  17. pulled from dev

    @agriffith18
    agriffith18 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    7bd5646 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'dev' into AG/server

    @agriffith18
    agriffith18 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    4668643 View commit details
    Browse the repository at this point in the history

  19. resolved conflicts

    @agriffith18
    agriffith18 committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    e57a175 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. troubleshooting logic on expDate

    @mxlisandro
    mxlisandro committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    9deb1a8 View commit details
    Browse the repository at this point in the history

  2. Feature: working on the homepage and switching between the login and … 

    …register pages
    @Gambarou
    Gambarou committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    9e4369d View commit details
    Browse the repository at this point in the history

  3. date automatically changes base on input and started work on post req… 

    …uest
    @mxlisandro
    mxlisandro committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    5833e45 View commit details
    Browse the repository at this point in the history

  4. routes mainly complete still need to test

    @agriffith18
    agriffith18 committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    474b90d View commit details
    Browse the repository at this point in the history

  5. changes

    @juliazlx
    juliazlx committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    43e7cea View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. started post form

    @mxlisandro
    mxlisandro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    6ac82c4 View commit details
    Browse the repository at this point in the history

  2. routes as of wed

    @agriffith18
    agriffith18 committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    b332330 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #20 from BranchTech-Solutions/AG/server 

    Ag/server
    @alroro
    alroro authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    22f0a0d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dev' into db

    @juliazlx
    juliazlx authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    d94a1a3 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' into LO/AR/React

    @alroro
    alroro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    5653578 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into db

    @juliazlx
    juliazlx authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    767297b View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19 from BranchTech-Solutions/db 

    changes
    @mxlisandro
    mxlisandro authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    d2b0e25 View commit details
    Browse the repository at this point in the history

  8. ## Overview 

    **Issue Type**

- [ ] Bug
- [x] Feature
- [ ] Tech Debt

**Description**
Completed and styled the homepage which allows the user to click and navigate to the login page. Also added a favicon for the browser tab. Added new font mynerve to be able to use in the project. The logo in the header will try to navigate back to the homepage if you click it. If you are logged in it will stay on the current page.
    @Gambarou
    Gambarou committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    d867a2f View commit details
    Browse the repository at this point in the history

  9. quick commit before switching to dev

    @mxlisandro
    mxlisandro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    7342f83 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'dev' into LO/AR/React 

    Merging updates from dev to feature branch# the commit.
    @mxlisandro
    mxlisandro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    796efe3 View commit details
    Browse the repository at this point in the history

  11. merged feature with dev and updated dependencies

    @mxlisandro
    mxlisandro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    1ff64f1 View commit details
    Browse the repository at this point in the history

  12. merged with dev

    @Gambarou
    Gambarou committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    9988700 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #22 from BranchTech-Solutions/RH/Homepage 

    Rh/homepage
    @alroro
    alroro authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    3f1d22e View commit details
    Browse the repository at this point in the history

  14. added table with delete button (not working)

    @mxlisandro
    mxlisandro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    468e659 View commit details
    Browse the repository at this point in the history

  15. merged dev branch to LO/AR/React

    @mxlisandro
    mxlisandro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    8b3dd45 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'dev' into AR/expiringSoon

    @alroro
    alroro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    d9d07b5 View commit details
    Browse the repository at this point in the history

  17. merged with dev

    @alroro
    alroro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    87b36e0 View commit details
    Browse the repository at this point in the history

  18. push to create pull request

    @mxlisandro
    mxlisandro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    0108d2e View commit details
    Browse the repository at this point in the history

  19. Merge pull request #23 from BranchTech-Solutions/LO/AR/React 

    Lo/ar/react
    @Gambarou
    Gambarou authored Jul 13, 2023
    Configuration menu
    Copy the full SHA
    bf38aa0 View commit details
    Browse the repository at this point in the history

  20. Logic for Exp Soon module complete, need to hard code testing data

    @alroro
    alroro committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    58f6388 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Expring Soon logic complete

    @alroro
    alroro committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    ba7d5e1 View commit details
    Browse the repository at this point in the history

  2. Expired Component Complete

    @alroro
    alroro committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    cfa5ad3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into AR/expiringSoon

    @alroro
    alroro committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    3fcec78 View commit details
    Browse the repository at this point in the history

  4. updated README

    @alroro
    alroro committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    2a8c967 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #24 from BranchTech-Solutions/AR/expiringSoon 

    Ar/expiring soon
    @agriffith18
    agriffith18 authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    eebca2a View commit details
    Browse the repository at this point in the history

  6. What? 

    Completed the homepage and the styling for it. Added a custom font mynerve. Added new state to the dashboard that holds the fridgeContents of the user, also for loading. Completed the functionality for deleting items from the fridge contents.

Why?
These changes allow the user to delete items from their fridge contents, as well as add items.

How?
Using useEffects and useStates to populate the fridge contents.

Testing?
N/A

Screenshots (optional)
0

Anything Else?
No.
    @Gambarou
    Gambarou committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    5295dba View commit details
    Browse the repository at this point in the history

  7. merged with dev

    @Gambarou
    Gambarou committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    0614731 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #25 from BranchTech-Solutions/RH/Dashboard 

    Rh/dashboard
    @mxlisandro
    mxlisandro authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    6296596 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. fixed some issues with adding items and deleting items

    @Gambarou
    Gambarou committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    a346926 View commit details
    Browse the repository at this point in the history

  2. merge with dev

    @Gambarou
    Gambarou committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    84bb5f6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #26 from BranchTech-Solutions/RH/Dashboard 

    Rh/dashboard
    @juliazlx
    juliazlx authored Jul 15, 2023
    Configuration menu
    Copy the full SHA
    42a9668 View commit details
    Browse the repository at this point in the history

  4. category is now being added to fridgeItems in order to get tracked by… 

    … graph
    @mxlisandro
    mxlisandro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    6fb8de0 View commit details
    Browse the repository at this point in the history

  5. removed console log in deleteFood

    @mxlisandro
    mxlisandro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    b85c3f7 View commit details
    Browse the repository at this point in the history

  6. minor change

    @Gambarou
    Gambarou committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    79a5aaf View commit details
    Browse the repository at this point in the history

  7. minor change

    @Gambarou
    Gambarou committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    63c5244 View commit details
    Browse the repository at this point in the history

  8. Graph done

    @alroro
    alroro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    85c099b View commit details
    Browse the repository at this point in the history

  9. fixed an issue with the purchase date not changing to the appropriate… 

    … date
    @Gambarou
    Gambarou committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    89d08c2 View commit details
    Browse the repository at this point in the history

  10. button click and graph button added

    @mxlisandro
    mxlisandro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    f8467d0 View commit details
    Browse the repository at this point in the history

  11. button click and graph button added

    @mxlisandro
    mxlisandro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    7b63941 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #30 from BranchTech-Solutions/AR/graph 

    Ar/graph
    @mxlisandro
    mxlisandro authored Jul 15, 2023
    Configuration menu
    Copy the full SHA
    289ef5d View commit details
    Browse the repository at this point in the history

  13. Merge pull request #31 from BranchTech-Solutions/LO/Graph2 

    Lo/graph2
    @alroro
    alroro authored Jul 15, 2023
    Configuration menu
    Copy the full SHA
    8ad2486 View commit details
    Browse the repository at this point in the history

  14. changed the dashboard around

    @Gambarou
    Gambarou committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    fbb850c View commit details
    Browse the repository at this point in the history

  15. minor change to github button

    @Gambarou
    Gambarou committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    dd393a4 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #32 from BranchTech-Solutions/RH/Dashboard 

    Rh/dashboard
    @mxlisandro
    mxlisandro authored Jul 15, 2023
    Configuration menu
    Copy the full SHA
    4bb2dd8 View commit details
    Browse the repository at this point in the history

  17. changes commited before updating dev

    @mxlisandro
    mxlisandro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    e76ee57 View commit details
    Browse the repository at this point in the history

  18. merged dev with feature branch

    @mxlisandro
    mxlisandro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    b7ff500 View commit details
    Browse the repository at this point in the history

  19. pruchaseDate state reverts back to current date once form is submitted

    @mxlisandro
    mxlisandro committed Jul 15, 2023
    Configuration menu
    Copy the full SHA
    5fe4fa1 View commit details
    Browse the repository at this point in the history

  20. Merge pull request #33 from BranchTech-Solutions/LO/Graph2 

    Lo/graph2
    @juliazlx
    juliazlx authored Jul 15, 2023
    Configuration menu
    Copy the full SHA
    6ead4d3 View commit details
    Browse the repository at this point in the history