250 Commits

Author SHA1 Message Date
RealFoxie
4357c37d22
Add extra button "Next step" to ingredient linker dialog (#2920)
* Add "next step" button to ingredient linker dialog

clicking button will save current step ingredient links and show the next step in the dialog

* unload ingredient linker dialog to reset scroll position

* cleanup forward button in linking ingredients dialog

* add vertical spacing between buttons on smaller screens - recipe linker dialog

* align buttons equally to match alignment of `cancel`

---------

Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
2024-01-13 15:45:59 +00:00
Michael Genson
1e4fde88ed
feat: Add Suggestion To Use Bulk URL Import (#2852)
* fixed warning

* re-arranged menu options

* fixed broken link

* added bulk url suggestion

* simply bulk import url var

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2024-01-09 14:37:22 +00:00
boc-the-git
29c3cb2296
Add unique IDs to recipe notes (#2919) 2024-01-08 20:47:09 +00:00
Kuchenpirat
6e8b84be80
include OrganizerType in delete prompt
Co-authored-by: Elijah Mock <28277163+ekcom@users.noreply.github.com>
2024-01-08 10:45:37 +01:00
Kuchenpirat
ac9f335e59 update texts 2024-01-04 11:44:04 +00:00
Kuchenpirat
6a71af98bd
fix: show copy to clipboard failure (#2886)
* fix for AppButtonCopy

* add some logging

* fix if statement

* refactor, use .then

* check for copied

* Fix recipe share link

* refactor AppButtonCopy

* update tooltip text

* update use-copy

* logging

* fix is supported check

* more fixes for use-copy.ts

---------

Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>
2023-12-29 15:48:28 +00:00
Michael Genson
ca9f66ee24
feat: Remove OCR Support (#2838)
* remove ocr package

* remove tesseract

* remove OCR from app

* remove OCR from tests

* fix docs
2023-12-14 17:26:43 -09:00
Michael Genson
c9c568570f
fix cursor on recipe components (#2819)
Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
2023-12-11 09:58:05 +00:00
Michael Genson
f8ad72ec31
fix: Bulk URL Import Fixes (#2796)
* allow expections when fetching content

* removed extra bracket on import text

* added more fault tolerance and limited concurrency

* fix entries not being saved to report

* disable clicking into in-proress import

* conditionally render expansion
2023-12-07 17:08:47 +00:00
boc-the-git
6cec7f6dcd
Merge branch 'mealie-next' into fixes/ui-improvements 2023-11-25 20:53:49 +11:00
p0lycarpio
215bd7adaa fix build 2023-11-24 22:46:58 +01:00
p0lycarpio
3e4a6ac93b translate hardcoded strings 2023-11-24 22:28:15 +01:00
p0lycarpio
7fe7a87ff4 fix 2023-11-24 15:44:46 +01:00
p0lycarpio
645421b566 enable Markdown on comments and recipe timeline events 2023-11-24 10:41:58 +01:00
p0lycarpio
be43e5bccd improve spacing and fix layout on small screens 2023-11-24 10:40:35 +01:00
Michael Genson
0775072ffa
feat: add meal plan to shopping list (#2653)
* refactored recipe add to shopping list dialog

* added context menu to meal plan day

* cleaned up presentation

* consolidate repeated recipes

* added alerts

* lint

* lint v2

* fixed undefined recipeRef bug

* lint

* made scale + slug implementation less horrible
2023-11-21 18:11:10 +00:00
Kuchenpirat
63ac21bce2
feat: Add Categories, Tags and Tools to Manage Data Page (#2737)
* add categories

* add tags

* 🧹

* 🧹 l18n

* add tools

* remove broken on Hand for tools

* fix for tools onHand not updating from frontend

* tools: re-add "on Hand"

* remove itemized icon from create button

* change combine icon

* add divider to BaseOverflowButton

* divide and conquer

---------

Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>
2023-11-21 08:31:05 -06:00
Michael Genson
6c2ac73df7 fixed dead recipe link 2023-11-20 18:43:44 +00:00
Michael Genson
d440d51ffe
feat: plural foods and units, and aliases (#2674)
* added plural names and alias tables to foods/units

* updated models to include plural names and aliases

* updated parser to include plural and aliases

* fixed migrations

* fixed recursive models

* added plural abbreviation to migration

* updated parser and display prop

* update displays to use plurals

* fix display edgecase and remove print

* added/updated display tests

* fixed model bug and added parser tests

* added tests for aliases

* added new plural options to data management page

* removed unique constraint

* made base dialog more customizable

* added alias management to food and unit data pages

* removed unused awaits

* 🧹
2023-11-14 06:39:07 -09:00
Michael Grinspan
4b55b838ed
Fix: broken link to ingredient parser (#2707) 2023-11-07 23:15:07 +00:00
Michael Genson
80968b02bb
feat: Remove Explore URLs and make the normal URLs public (#2632)
* add groupSlug to most routes

* fixed more routing issues

* fixed jank and incorrect routes

* remove public explore links

* remove unused groupSlug and explore routes

* nuked explore pages

* fixed public toolstore bug

* fixed various routes missing group slug

* restored public app header menu

* fix janky login redirect

* 404 recipe API call returns to login

* removed unused explore layout

* force redirect when using the wrong group slug

* fixed dead admin links

* removed unused middleware from earlier attempt

* 🧹

* improve cookbooks sidebar
fixed sidebar link not working
fixed sidebar link target
hide cookbooks header when there are none

* added group slug to user

* fix $auth typehints

* vastly simplified groupSlug logic

* allow logged-in users to view other groups

* fixed some edgecases that bypassed isOwnGroup

* fixed static home ref

* 🧹

* fixed redirect logic

* lint warning

* removed group slug from group and user pages
refactored all components to use route groupSlug or user group slug
moved some group pages to recipe pages

* fixed some bad types

* 🧹

* moved groupSlug routes under /g/groupSlug

* move /recipe/ to /r/

* fix backend url generation and metadata injection

* moved shopping lists to root/other route fixes

* changed shared from /recipes/ to /r/

* fixed 404 redirect not awaiting

* removed unused import

* fix doc links

* fix public recipe setting not affecting public API

* fixed backend tests

* fix nuxt-generate command

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-11-05 16:07:02 -09:00
Arsène Reymond
f7f8c51661
feat: update organization icons (#2668)
* front: update filters icons

* remove duplicate

---------

Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>
2023-10-25 15:08:58 +00:00
Michael Genson
b153ddf858
feat: more shopping list enhancements (#2587)
* fix new position calculataion

* ensure consistent list item ordering

* fix recipe ref overflow on small screens

* added recipe ref elevation

* tweaked line height (for long notes)

* removed unused user dependency

* remove old shopping list items when there's >100

* 🤷

* cleaned up function generator

* fixed test

* fix potential type error

* made max position calc more efficient
2023-10-07 13:06:00 -08:00
Arsène Reymond
45022e1f1b
fixes: PWA & interface on small screens (#2536)
* fix pwa icons

* fix spacing and layouts for small screens

* translate missing strings

* Revert "translate missing strings"

This reverts commit 150a961a0811cfe7d25f2dd8d79baf70f9a422ec.

* fixes

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-10-07 11:36:47 -08:00
Michael Genson
bd79c1db2f
chore: Get Rid of Warnings (#2599)
* ignore unsafe html warnings

* remove unused import

* re-order attrs

* removed unused vars/imports

* removed unused import

* refactored v-html

* removed more unused things
2023-10-07 11:23:47 -08:00
Michael Genson
247a4de283
docs: fix old mealplanner route ref (#2590) 2023-10-07 11:21:46 -08:00
Michael Genson
b32e2f1bf7
fix: Recipe Card Section Infinite Loop (#2584)
* refactored recipe card section fetch

* minor optimization

* lint
2023-09-29 15:59:07 -08:00
Michael Genson
1074cad5dc
feat: disable admin option when using LDAP auth (#2583)
* fix typo

* add override readonly/disable support for autoform

* made admin permission conditionally disabled
2023-09-29 15:58:34 -08:00
Michael Genson
3e5596f898
fix: Home Doesn't Load For Non-Admin Users (#2556)
* added non-admin route for fetching current group

* simplified frontend group slug fetching

* exposed public link even if user can't invite

* 🧹
2023-09-19 09:06:39 -08:00
Grygon
9a04b11ee5
fix: #2534 - Add clearable ratings (#2541)
* Add clearable to RecipeRating, Fix #2534

* Make rating nullable

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-09-15 19:10:44 +00:00
Michael Genson
2dfbe9f08d
feat: Improved Ingredient Matching (#2535)
* added normalization to foods and units

* changed search to reference new normalized fields

* fix tests

* added parsed food matching to backend

* prevent pagination from ordering when searching

* added extra fuzzy matching to sqlite ing matching

* added tests

* only apply search ordering when order_by is null

* enabled post-search fuzzy matching for postgres

* fixed postgres fuzzy search test

* idk why this is failing

* 🤦

* simplified frontend ing matching
and restored automatic unit creation

* tightened food fuzzy threshold

* change to rapidfuzz

* sped up fuzzy matching with process

* fixed units not matching by abbreviation

* fast return for exact matches

* replace db searching with pure fuzz

* added fuzzy normalization

* tightened unit fuzzy matching thresh

* cleaned up comments/var names

* ran matching logic through the dryer

* oops

* simplified order by application logic
2023-09-15 17:19:34 +00:00
Hayden
2ad6af2cce
feat: consolidate deployment targets and publish to ghcr.io (#2539)
* WIP: proof of concept

* basic meta tag injection

* add support for scraping public/private links

* make tests go brrrrr

* cleanup initialization

* rewrite build config

* remove recipe meta on frontend

* make type checker happy

* remove other deployment methods

* fix issue with JSON response on un-authenticated request

* docs updates

* update tivy scanner

* fix linter stuff

* change registry tag

* build fixes

* fix same mistake I always make
2023-09-14 06:40:13 -08:00
Michael Genson
2c5e5a8421
feat: Public Recipe Browser (#2525)
* fixed incorrect var ref

* added public recipe pagination route

* refactored frontend public/explore API

* fixed broken public cards

* hid context menu from cards when public

* fixed public app header

* fixed random recipe

* added public food, category, tag, and tool routes

* not sure why I thought that would work

* added public organizer/foods stores

* disabled clicking on tags/categories

* added public link to profile page

* linting

* force a 404 if the group slug is missing or invalid

* oops

* refactored to fit sidebar into explore

* fixed invalid logic for app header

* removed most sidebar options from public

* added backend routes for public cookbooks

* added explore cookbook pages/apis

* codegen

* added backend tests

* lint

* fixes v-for keys

* I do not understand but sure why not

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-09-14 06:01:24 -08:00
Michael Genson
0a00a6ea0d
fix: removed HTML tags when copying recipe ingredients (#2533) 2023-08-31 09:08:44 -08:00
Hugo van Rijswijk
408ca88cb2
fix: ingredient item should be single-line (#2521)
This is an issue on non-chromium browsers. I guess Chromium has some sort of support for nested CSS, whereas other browsers don't.
2023-08-25 08:32:26 -08:00
Michael Genson
30717e50d3
made parsed ingredient reactive (#2520) 2023-08-25 08:32:06 -08:00
Michael Genson
693608d59f
feat: cook timer (#2508)
* updated base button group

* added kitchen timer

* added missing icon

* usability tweaks

* for for menu rendering over app bar

* clean up types

* fix for mp3 loading, maybe?

* spooky linter fixes

* for real this time

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-08-23 09:31:23 -08:00
Michael Genson
5c5432304f
fix: recipe timeline UI glitches (#2519)
* fix invalid undefined prop

* fixed weird rendering

* made items pop more against background

* fixed invalid v-if

* fixed indentation
2023-08-23 09:30:59 -08:00
Michael Genson
5213a61d9b
fix: logic for disableAmount in shopping list items (#2518) 2023-08-22 14:03:24 -08:00
Michael Genson
ae502c5652
added missing recipe list import (#2516) 2023-08-21 17:30:31 -08:00
Arsène Reymond
99e7717fec
UI/UX improvements (#2423)
* disable autofocus and hide keyboard on enter

* improve a11y

* fix non-translated string

* improve recipeTimeline UI

* format

* fixes
2023-08-21 18:41:18 +00:00
Michael Genson
d6e4829e6f
feat: Display Shopping List Item Recipe Refs (#2501)
* added recipe ref display to shopping list items

* added backend support for recipe notes

* added recipe note to item recipe ref display

* fixed note merge bug with 3+ notes

* tweak display

* lint

* updated alembic refs

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-08-21 09:18:37 -08:00
Hugo van Rijswijk
50a92c165c
feat: improve readability of ingredients list (#2502)
* feat: improve readability of notes in ingredients list

Makes the notes in the ingredients list more readable by making them slightly opaque. This creates a better visual separation between the notes and the rest of the ingredient.

* Use server display if available

* Move note to newline and make quantity more distinct

* Use safeMarkdown for shopping list

* Use component

* Wrap unit in accent color

* Update RecipeIngredientListItem to set food in bold
2023-08-21 15:32:09 +00:00
Michael Genson
2151451634
feat: Timeline Image Uploader Improvements (#2494)
* improved UI responsiveness and added image preview

* added global image cropper component

* added image cropper to last made dialog

* style tweaks

* added more specific text for creating event

* mopped up some slop

* renamed height and width vars

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-08-21 15:00:37 +00:00
Michael Genson
e24e28ae03
feat: Improved recipeYield Parsing For Fractions and Decimals (#2507)
* improved recipeYield parsing for fracs/decimals

* added fix for edgecase with weird fractions

* made typescript happy

* lint

* extracted yield calculation into composable

* fixed some gross edgecases

* added tests

* made bare return clearer

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-08-21 06:54:02 -08:00
Michael Genson
095edef95e
feat: Improve Public URL Readability (#2482)
* added support for group slugs

* modified frontend to use links with group slug

* fixed test refs

* unused import

---------

Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
2023-08-20 10:38:46 -08:00
Michael Genson
dfe4942451
feat: Recipe Timeline Images (#2444)
* refactored recipe image paths/service

* added routes for updating/fetching timeline images

* make generate

* added event image upload and rendering

* switched update to patch to preserve timestamp

* added tests

* tweaked order of requests

* always reload events when opening the timeline

* re-arranged elements to make them look nicer

* delete files when timeline event is deleted
2023-08-06 09:49:30 -08:00
Michael Genson
e71155a55d
fix: removed variable rendering on organizers page (#2477) 2023-07-31 08:22:54 -08:00
Carter
eea38a5b1e
fix: url format in the recipe chip (#2420) 2023-06-20 22:08:47 -08:00
Michael Genson
5d87b7e411
feature: query filter support for common SQL keywords (#2366)
* added support for SQL keywords IS, IN, LIKE, NOT
deprecated datetime workaround for "<> null"
updated frontend reference for "<> null" to "IS NOT NULL"

* tests

* refactored query filtering to leverage orm

* added CONTAINS ALL keyword

* tests

* fixed bug where "and" or "or" was in an attr name

* more tests

* linter fixes

* TIL this works
2023-05-06 14:28:40 -08:00