-
Notifications
You must be signed in to change notification settings - Fork 1
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
[1]: Water footprint calculator #3
Merged
arpankumarde
merged 13 commits into
arghyam:main
from
kevalkanp1011:water-footprint-calculator
Aug 6, 2024
Merged
[1]: Water footprint calculator #3
arpankumarde
merged 13 commits into
arghyam:main
from
kevalkanp1011:water-footprint-calculator
Aug 6, 2024
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
- JWT Authorization added
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolve the conflicts
Conflict has been resolved |
simran142002
approved these changes
Aug 6, 2024
arpankumarde
approved these changes
Aug 6, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great, I'm merging it
simran142002
changed the title
Water footprint calculator
[#1] : Water footprint calculator
Aug 9, 2024
simran142002
changed the title
[#1] : Water footprint calculator
https://github.com/arghyam/ripple-effect/issues/1 : Water footprint calculator
Aug 9, 2024
simran142002
changed the title
https://github.com/arghyam/ripple-effect/issues/1 : Water footprint calculator
[1] : Water footprint calculator
Aug 9, 2024
simran142002
changed the title
[1] : Water footprint calculator
[1]: Water footprint calculator
Aug 9, 2024
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.
#1
Apis for Water Footprint Calculator Added
1. Add Ingredient Row
route: "/add-ingredient-row"
Request Schema:
rowOrder: number
3. Add Ingredient Row Item
route: "/add-ingredient-row-item"
Request Schema:
itemId: number,
rowId: number,
name: string,
amt: number,
unit: string,
waterFootprint: number,
unselectedBgImageUrl: string,
selectedBgImageUrl: string,
sampleImageUrl: string,
sampleImageSize: number,
scaleFactor: number,
iconScalefactor: number,
cornerType: string,
doneXOffSet: number,
doneYOffSet: number,
pluseXOffSet: number,
pluseYOffSet: number,
minusXOffSet: number,
minusYOffSet: number,
xOffset: number,
yOffset: number
4. Fetch Ingredients
route: "/fetch-ingredients"
Request Schema:
none
5. Calculate Water Footprint
route: "/calc-water-footprint"
Request Schema:
user_id: string,
data: {ingredient_id: number, amt: number}