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: Archive cocktails and fix of the cocktail unsaved changes detection bug #353

Merged
merged 4 commits into from
Aug 24, 2024

Conversation

jo-gross
Copy link
Owner

@jo-gross jo-gross commented Aug 6, 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

Added option to "hide" some of unused cocktails by archiving them. They will appear not directly in the search lists - no other effects.

Affected sites (please check during review):

  • [workspaceId]/manage/cocktails/<cocktailId/create> - Change validation fixed, added archive button to the bottom
  • [workspaceId]/manage/cocktails/index - Seperated list in archived and not, expandable at the bottom
  • [workspaceId]/index - Seperated cocktails in search modal by archived (search sensitive)
  • [workspaceId]/search - Seperated cocktails at search page by archived (search sensitive)

Signed-off-by: Johannes Groß <mail@gross-johannes.de>
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross requested a review from jhns-de August 6, 2024 15:57
@jo-gross jo-gross linked an issue Aug 6, 2024 that may be closed by this pull request
1 task
@jo-gross jo-gross changed the title feat: Archive cocktails and cocktail unsaved change detection bug fix feat: Archive cocktails and fix of the cocktail unsaved changes detection bug Aug 6, 2024
@jo-gross jo-gross enabled auto-merge (squash) August 6, 2024 15:59
…-archive-cocktails

# Conflicts:
#	components/modals/SearchModal.tsx
#	pages/workspaces/[workspaceId]/manage/cocktails/index.tsx
Signed-off-by: Johannes Groß <mail@gross-johannes.de>
@jo-gross jo-gross disabled auto-merge August 24, 2024 08:22
@jo-gross jo-gross merged commit c3e8144 into main Aug 24, 2024
2 of 3 checks passed
@jo-gross jo-gross deleted the 348-feat-archive-cocktails branch August 24, 2024 08:22
jg-semantic-release-bot bot pushed a commit that referenced this pull request Aug 24, 2024
# [1.8.0](v1.7.3...v1.8.0) (2024-08-24)

### Bug Fixes

* conalco ingredient import ([a4b5b41](a4b5b41))
* Fixed closing modal bug in chrome/-ium and safari and added stackable modals ([#352](#352)) ([ebba732](ebba732))
* Loading ui bug ([#349](#349)) ([be6a9ab](be6a9ab))
* manage xy made image expandable ([#366](#366)) ([a4b5dca](a4b5dca))
* mange xy head bar now sticky to the top ([#364](#364)) ([a7f0093](a7f0093))
* Mobile tag input not working on chrome ([#356](#356)) ([7e80948](7e80948))
* scroll to top on search page when cocktail gets selected ([#363](#363)) ([a883568](a883568))
* Small ui stuff at cocktail form (glass sorting, garnish opt label, ...) ([#380](#380)) ([3329c27](3329c27))
* user leave and remove buttons ([#365](#365)) ([3d67066](3d67066))
* View settings dropdown on main page is now scrollable ([#362](#362)) ([3e2670c](3e2670c))
* Wrong unit conversion after conalco import ([#336](#336)) ([d9a44f2](d9a44f2))

### Features

* 'new version' popup at workspace selection page after new release ([#372](#372)) ([6c47b29](6c47b29))
* Added cocktail description to cocktail card at search modal and search page ([#351](#351)) ([6f7f0c4](6f7f0c4))
* Added glass and garnish col to manage cocktail view ([#378](#378)) ([1fbf183](1fbf183))
* Archive cocktails and fix of the cocktail unsaved changes detection bug  ([#353](#353)) ([c3e8144](c3e8144))
* Custom ice ([#354](#354)) ([708a698](708a698))
@jg-semantic-release-bot
Copy link

🎉 This PR is included in version 1.8.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: Archive cocktails
2 participants