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.

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

feat: Added option to make cocktail ingredients and steps optional #404

Merged
merged 13 commits into from
Sep 11, 2024

Conversation

jo-gross
Copy link
Owner

@jo-gross jo-gross commented Aug 30, 2024

Closing issues:

Before you mark this PR as ready, please check the following points

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of
them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before
merging your code.

  • I´e created all necessary migrations?
  • The format is correct (pnpm format:check, if invalid pnpm format:fix)
  • No build errors (pnpm build)
  • I´ve tested the implemented function by my own
  • Ensure the pr title fits the conventional commit standard

Describe your work, what changed

Some cocktails have optional ingredients (like egg) or steps. I´ve added options to make them optional.

Affected sites (please check during review):

  • [workspaceId]/index - Cocktail card and info pane displays the optional state
  • [workspaceId]/manage/cocktails/<[id]|create> - Cocktail ingredients got an optional toggle, aswell as the step

Further comments

Merge only after #402 was closed.

Signed-off-by: Johannes Groß <mail@gross-johannes.de>
…eld, general popup behavior improved

Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
…-cocktail-info-splitup-into-notes-and-make-hints

# Conflicts:
#	next.config.js
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross linked an issue Aug 30, 2024 that may be closed by this pull request
1 task
…d-make-hints' into 401-feat-optional-cocktail-ingredients
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross marked this pull request as ready for review August 30, 2024 14:32
@jo-gross jo-gross requested a review from jhns-de August 30, 2024 14:32
@jo-gross jo-gross enabled auto-merge (squash) September 9, 2024 08:09
…-optional-cocktail-ingredients

# Conflicts:
#	components/modals/CocktailDetailModal.tsx
#	pages/workspaces/[workspaceId]/manage/cocktails/index.tsx
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross merged commit 83e7f8c into main Sep 11, 2024
4 checks passed
@jo-gross jo-gross deleted the 401-feat-optional-cocktail-ingredients branch September 11, 2024 08:41
jg-semantic-release-bot bot pushed a commit that referenced this pull request Sep 11, 2024
# [1.9.0](v1.8.2...v1.9.0) (2024-09-11)

### Bug Fixes

* Form validation and error message handling ([cdda452](cdda452))
* Routing when updating an cocktail from the search view ([a5abba8](a5abba8))

### Features

* added cocktail ratings ([#415](#415)) ([850646a](850646a))
* added image crop option when selecting images (cocktail, ingredient, glass and garnish) ([#413](#413)) ([d5ec542](d5ec542))
* Added name similarity check at ingredient-, cocktail-, garnish- and glassform ([#403](#403)) ([0183a0a](0183a0a))
* Added notes to cocktails, redesigned the cocktail info popup field, general popup behavior improved ([#402](#402)) ([a57aeee](a57aeee))
* Added offline availability with service workers ([#405](#405)) by [@Resaki1](https://github.com/resaki1) ([43798b3](43798b3))
* Added option to make cocktail ingredients and steps optional ([#404](#404)) ([83e7f8c](83e7f8c))
@jg-semantic-release-bot
Copy link

🎉 This PR is included in version 1.9.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat: Optional cocktail ingredients and steps
2 participants