-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
C beane313/issue16/addSomeStyling #18
Open
CBeane313
wants to merge
62
commits into
main
Choose a base branch
from
CBeane313/issue16
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
edits HTML and css to get us closer to what we are looking for in the pantry page
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Merges styling aspects into issue6 branch
Deleted extra code that was added due to merge conflict
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Co-authored-by: nikfbail <bail0301@morris.umn.edu> Co-authored-by: CBeane313 <beane039@morris.umn.edu>
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Changes some of the types of things to be pantry items instead of products
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Changes some styling to make product card a little cleaner for long notes/descriptions. Also edited the placeholder text for the pantry date
Co-authored-by: krug0102 <krug0102@morris.umn.edu>
Add `name` and `category` fields to PantryItem. Also added Sue's Pantry data. Co-authored-by: nikfbail <bail0301@morris.umn.edu>
Imported wrong schema, this fixes it.
FIxes all tests that began to fail after the change to make pantry items actually be pantry items instead of products.
Fixes the adding of a product to also add the product's name and category to the form.
Adds a space in between words to make it not squished
Ability to display number of items in a given category
Enables us to display the number of products in each category.
Fixes all the weird name change stuff with new category names
Reformatted document, and made category div flex
Also added a few tests. Adding a new item to the pantry test seems to be weird with new database schema.
Adds client tests to increase coverage to "acceptable" levels
…g0102/issue6 Merges Josh's revised testing files into the MegaSuperSigmaOmegaMegaBranch that is issue6
Fixes checkstyle for line that was more than 120 char
Still not enough to pass coverage tests
fixed routing issue when adding product to pantry from product id page, now it properly redirects to pantry page
Spaces out the add section to make room for the filter section that will be added
Adds a header to let you know where you are
This pull request introduces 4 alerts when merging af00110 into 4937d56 - view on LGTM.com new alerts:
|
Merge issue 6 into styling branch
This pull request introduces 4 alerts when merging 93cfb43 into 4937d56 - view on LGTM.com new alerts:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds some cool styling to some places