Skip to content

Feat/rezeptanzeige#205

Merged
Nicoolaus merged 32 commits into
Projektabschlussfrom
feat/Rezeptanzeige
Jun 10, 2026
Merged

Feat/rezeptanzeige#205
Nicoolaus merged 32 commits into
Projektabschlussfrom
feat/Rezeptanzeige

Conversation

@Nicoolaus

Copy link
Copy Markdown
Collaborator

Wuhu

GalacticCodeGambit and others added 30 commits May 12, 2026 16:59
Removed participant names from the review protocol.
* Refactor CSS class names for consistency and clarity

* Refactor CSS variables for improved readability and consistency

* Remove unnecessary stylelint directive for cleaner CSS

* Refactor variable names for consistency in recipe filtering functions

* Fix css
…rsions (#174)

* Pin npm dependencies to specific versions for stability

* Remove duplicate npm dependencies for cleaner package management
…Rezeptanzeige

# Conflicts:
#	.github/workflows/lint.yml
#	README.md
#	project/backend/Recipe.py
#	project/backend/RecipeSUCUK.py
#	project/backend/Routes.py
#	project/frontend/app/globals.css
#	project/frontend/app/homepage/homepage.tsx
#	project/frontend/app/recipeFinder/page.tsx
#	project/frontend/app/recipeFinder/popup.tsx
#	project/frontend/app/recipeFinder/style.css
…ptanzeige

# Conflicts:
#	README.md
#	project/backend/RecipeSUCUK.py
#	project/backend/SearchRecipeNames.py
#	project/frontend/app/recipeFinder/page.tsx
#	project/frontend/app/recipeFinder/style.css
…ptanzeige

# Conflicts:
#	project/backend/Auth.py
#	project/backend/Database.py
#	project/backend/EmailService.py
#	project/backend/Ingredient.py
#	project/backend/RecipeSUCUK.py
#	project/backend/Routes.py
#	project/backend/SearchRecipeNames.py
#	project/backend/domain/recipe.py
#	project/frontend/app/profile/changePasswordPopup.tsx
#	project/frontend/app/recipeFinder/style.css
…ptanzeige

# Conflicts:
#	project/backend/Auth.py
#	project/backend/Database.py
#	project/backend/EmailService.py
#	project/backend/Ingredient.py
#	project/backend/RecipeSUCUK.py
#	project/backend/Routes.py
#	project/backend/SearchRecipeNames.py
#	project/backend/domain/recipe.py
#	project/frontend/app/profile/changePasswordPopup.tsx
#	project/frontend/app/recipeFinder/style.css
…zeptanzeige

# Conflicts:
#	project/backend/Auth.py
#	project/backend/Database.py
#	project/backend/domain/recipe.py
…nto feat/Rezeptanzeige

# Conflicts:
#	project/data/LazyCookDB.sqlite3
@Nicoolaus Nicoolaus merged commit 0c95dd0 into Projektabschluss Jun 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants