mirror of
https://github.com/hay-kot/mealie.git
synced 2025-08-22 22:43:34 -07:00
Refactor/response models (#161)
* cleanup
* split app/db versioning
* async file response
* refactor/recipe viewer + minor ui improvements
* auto grow size
* added async file responses
* docs/changelog
* "/" to open search bar
* docs/changelog
* change imports to use @/ for imports
* cleanup
* cleanup
* db to session
* theme + settings refactor
* bug/image save fix
* fixed failing tests
* fix last json bug - #155
* fix settings import
* fixed router link for site title
* add version tag
* v0.2.1 (#157)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
* Dropping Mongo From Dev Branch (#89)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* initial pass
* second pass cleanup
* backup card framework
* backup card functionality
* translation
* upload button vile creation
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* dev bug: change data location to prevent reloads
* api docs
* api docs bug
* workflow update
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* Add French Translation (#93)
* New tests (#94)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
Co-authored-by: Hayden <hay-kot@pm.me>
* Mealplan CRUD Tests (#95)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix typos (#96)
* Settings, Themes and Migration Route Tests (#100)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Refactor + New Docker File (#105)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
Co-authored-by: Hayden <hay-kot@pm.me>
* Meal planner improvements (#107)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
* mealplan redesign
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#108)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#113)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
* UI updates + name validation
* docs: changelog + sp
* fixed route links
* changelog
Co-authored-by: Hayden <hay-kot@pm.me>
* fixed menu links
* fixed poetry install on docker.dev build
* Migration redesign (#119)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix link to dev-notes.md (#110)
* translation: add swedish (#128)
* language: da is Danish
* translations: add swedish
* scraper: unescape html in instructions (#129)
Some urls erroneously deliver escaped html their instructions,
sometimes they are even escaped on multiple levels like here:
https://www.ica.se/recept/kladdig-kladdkaka-722982/
```
>>> normalize_instruction("S&auml;tt ugnen p&aring; 200&deg;C.")
'Sätt ugnen på 200°C.'
```
* v0.2.0 Updates (#130)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
* test todos
* bug/added docker volume
* chowdow test data
* partial image recipe image testing
* added card section card
* settings form
* homepage cetegory ui
* frontend category placeholder
* fixed broken scheduler
* remove old files
* removed temp test
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix missing translations key (#133)
* translation: add simplified & traditional chinese
* Fix missing translations
* fix chinese translations
* v0.2.0 Release Candidate (#141)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* notes hot fix
* bug: mongo updates fail #99
* Fix error message (#101)
* gh funding
* Create Issue Templates (#125)
* Create bug_report.md
* Create config.yml
Included a link to feature requests.
* Update config.yml
Fixed link I had for testing to the actual link
* Update bug_report.md
fix capitalization
* Update .github/ISSUE_TEMPLATE/bug_report.md
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* merge kentors changes
* refactor/recipe routers
* category/tag database relationship and endpoints
* frontend category management
* update branch todos
* bug/normalize recipe steps html
* remove console.log + refactor categories
* fix categories database errors
* refactor/ router endpoint
* refactor/ remove old code
* drag and drop ingredients
* general cleanup
* route refactoring
* changelog
* api refactoring + random cleanup
* fixed backwards sort
* Update mkdocs.yml (#137)
Fix warning from Deploy Docs github action
* fixed navigate on enter in search
* refactor/create global css
* added category scroll
* cleanup todos
* debug routes
* docs/new gifs & general updates
* cleanup
* fix list test
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* fix build
* fix duplicate editor
* fixed docker mount problem
* python 3.9
* added tasks for non-docker development
* remove old scripts
* dev updates
* fixed no image upload option
* get version from backend
* final docs pass
* .gitignore
* feature/markdown support for description and steps
* package-lock
* rename production task
* category import errors on import (#150)
Co-authored-by: hay-kot <hay-kot@pm.me>
* Feature/improved notifications (#152)
* category import errors on import
* Import Error Hotfix (#148)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
* Dropping Mongo From Dev Branch (#89)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* initial pass
* second pass cleanup
* backup card framework
* backup card functionality
* translation
* upload button vile creation
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* dev bug: change data location to prevent reloads
* api docs
* api docs bug
* workflow update
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* Add French Translation (#93)
* New tests (#94)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
Co-authored-by: Hayden <hay-kot@pm.me>
* Mealplan CRUD Tests (#95)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix typos (#96)
* Settings, Themes and Migration Route Tests (#100)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Refactor + New Docker File (#105)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
Co-authored-by: Hayden <hay-kot@pm.me>
* Meal planner improvements (#107)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
* mealplan redesign
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#108)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#113)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
* UI updates + name validation
* docs: changelog + sp
* fixed route links
* changelog
Co-authored-by: Hayden <hay-kot@pm.me>
* fixed menu links
* fixed poetry install on docker.dev build
* Migration redesign (#119)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix link to dev-notes.md (#110)
* translation: add swedish (#128)
* language: da is Danish
* translations: add swedish
* scraper: unescape html in instructions (#129)
Some urls erroneously deliver escaped html their instructions,
sometimes they are even escaped on multiple levels like here:
https://www.ica.se/recept/kladdig-kladdkaka-722982/
```
>>> normalize_instruction("S&auml;tt ugnen p&aring; 200&deg;C.")
'Sätt ugnen på 200°C.'
```
* v0.2.0 Updates (#130)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
* test todos
* bug/added docker volume
* chowdow test data
* partial image recipe image testing
* added card section card
* settings form
* homepage cetegory ui
* frontend category placeholder
* fixed broken scheduler
* remove old files
* removed temp test
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix missing translations key (#133)
* translation: add simplified & traditional chinese
* Fix missing translations
* fix chinese translations
* v0.2.0 Release Candidate (#141)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* notes hot fix
* bug: mongo updates fail #99
* Fix error message (#101)
* gh funding
* Create Issue Templates (#125)
* Create bug_report.md
* Create config.yml
Included a link to feature requests.
* Update config.yml
Fixed link I had for testing to the actual link
* Update bug_report.md
fix capitalization
* Update .github/ISSUE_TEMPLATE/bug_report.md
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* merge kentors changes
* refactor/recipe routers
* category/tag database relationship and endpoints
* frontend category management
* update branch todos
* bug/normalize recipe steps html
* remove console.log + refactor categories
* fix categories database errors
* refactor/ router endpoint
* refactor/ remove old code
* drag and drop ingredients
* general cleanup
* route refactoring
* changelog
* api refactoring + random cleanup
* fixed backwards sort
* Update mkdocs.yml (#137)
Fix warning from Deploy Docs github action
* fixed navigate on enter in search
* refactor/create global css
* added category scroll
* cleanup todos
* debug routes
* docs/new gifs & general updates
* cleanup
* fix list test
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* fix build
* fix duplicate editor
* fixed docker mount problem
* python 3.9
* added tasks for non-docker development
* remove old scripts
* dev updates
* fixed no image upload option
* get version from backend
* final docs pass
* .gitignore
* feature/markdown support for description and steps
* package-lock
* rename production task
* category import errors on import
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Bastien <43323819+Batgame@users.noreply.github.com>
Co-authored-by: sephrat <34862846+sephrat@users.noreply.github.com>
Co-authored-by: Nick CJ <17556895+nickcj931@users.noreply.github.com>
Co-authored-by: dekvall <dkvldev@gmail.com>
Co-authored-by: wengtad <wengtad93@gmail.com>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* test notifications
* unified notifications
* docs/changelog
Co-authored-by: hay-kot <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Bastien <43323819+Batgame@users.noreply.github.com>
Co-authored-by: sephrat <34862846+sephrat@users.noreply.github.com>
Co-authored-by: Nick CJ <17556895+nickcj931@users.noreply.github.com>
Co-authored-by: dekvall <dkvldev@gmail.com>
Co-authored-by: wengtad <wengtad93@gmail.com>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* Refactor/response models (#156) - First Pass
* cleanup
* split app/db versioning
* async file response
* refactor/recipe viewer + minor ui improvements
* auto grow size
* added async file responses
* docs/changelog
* "/" to open search bar
* docs/changelog
* change imports to use @/ for imports
* cleanup
* cleanup
* db to session
* theme + settings refactor
* bug/image save fix
* fixed failing tests
* fix last json bug - #155
* fix settings import
* fixed router link for site title
Co-authored-by: hay-kot <hay-kot@pm.me>
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Bastien <43323819+Batgame@users.noreply.github.com>
Co-authored-by: sephrat <34862846+sephrat@users.noreply.github.com>
Co-authored-by: Nick CJ <17556895+nickcj931@users.noreply.github.com>
Co-authored-by: dekvall <dkvldev@gmail.com>
Co-authored-by: wengtad <wengtad93@gmail.com>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* Revert "v0.2.1 (#157)" (#158)
This reverts commit a899f46464
.
* v0.2.1 (#159)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
* Dropping Mongo From Dev Branch (#89)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* initial pass
* second pass cleanup
* backup card framework
* backup card functionality
* translation
* upload button vile creation
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* dev bug: change data location to prevent reloads
* api docs
* api docs bug
* workflow update
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* Add French Translation (#93)
* New tests (#94)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
Co-authored-by: Hayden <hay-kot@pm.me>
* Mealplan CRUD Tests (#95)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix typos (#96)
* Settings, Themes and Migration Route Tests (#100)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Refactor + New Docker File (#105)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
Co-authored-by: Hayden <hay-kot@pm.me>
* Meal planner improvements (#107)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
* mealplan redesign
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#108)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#113)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
* UI updates + name validation
* docs: changelog + sp
* fixed route links
* changelog
Co-authored-by: Hayden <hay-kot@pm.me>
* fixed menu links
* fixed poetry install on docker.dev build
* Migration redesign (#119)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix link to dev-notes.md (#110)
* translation: add swedish (#128)
* language: da is Danish
* translations: add swedish
* scraper: unescape html in instructions (#129)
Some urls erroneously deliver escaped html their instructions,
sometimes they are even escaped on multiple levels like here:
https://www.ica.se/recept/kladdig-kladdkaka-722982/
```
>>> normalize_instruction("S&auml;tt ugnen p&aring; 200&deg;C.")
'Sätt ugnen på 200°C.'
```
* v0.2.0 Updates (#130)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
* test todos
* bug/added docker volume
* chowdow test data
* partial image recipe image testing
* added card section card
* settings form
* homepage cetegory ui
* frontend category placeholder
* fixed broken scheduler
* remove old files
* removed temp test
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix missing translations key (#133)
* translation: add simplified & traditional chinese
* Fix missing translations
* fix chinese translations
* v0.2.0 Release Candidate (#141)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* notes hot fix
* bug: mongo updates fail #99
* Fix error message (#101)
* gh funding
* Create Issue Templates (#125)
* Create bug_report.md
* Create config.yml
Included a link to feature requests.
* Update config.yml
Fixed link I had for testing to the actual link
* Update bug_report.md
fix capitalization
* Update .github/ISSUE_TEMPLATE/bug_report.md
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* merge kentors changes
* refactor/recipe routers
* category/tag database relationship and endpoints
* frontend category management
* update branch todos
* bug/normalize recipe steps html
* remove console.log + refactor categories
* fix categories database errors
* refactor/ router endpoint
* refactor/ remove old code
* drag and drop ingredients
* general cleanup
* route refactoring
* changelog
* api refactoring + random cleanup
* fixed backwards sort
* Update mkdocs.yml (#137)
Fix warning from Deploy Docs github action
* fixed navigate on enter in search
* refactor/create global css
* added category scroll
* cleanup todos
* debug routes
* docs/new gifs & general updates
* cleanup
* fix list test
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* fix build
* fix duplicate editor
* fixed docker mount problem
* python 3.9
* added tasks for non-docker development
* remove old scripts
* dev updates
* fixed no image upload option
* get version from backend
* final docs pass
* .gitignore
* feature/markdown support for description and steps
* package-lock
* rename production task
* category import errors on import (#150)
Co-authored-by: hay-kot <hay-kot@pm.me>
* Feature/improved notifications (#152)
* category import errors on import
* Import Error Hotfix (#148)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
* Dropping Mongo From Dev Branch (#89)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* initial pass
* second pass cleanup
* backup card framework
* backup card functionality
* translation
* upload button vile creation
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* dev bug: change data location to prevent reloads
* api docs
* api docs bug
* workflow update
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* Add French Translation (#93)
* New tests (#94)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
Co-authored-by: Hayden <hay-kot@pm.me>
* Mealplan CRUD Tests (#95)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix typos (#96)
* Settings, Themes and Migration Route Tests (#100)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
Co-authored-by: Hayden <hay-kot@pm.me>
* Refactor + New Docker File (#105)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
Co-authored-by: Hayden <hay-kot@pm.me>
* Meal planner improvements (#107)
* dev-bug: fixed vscode freezes
* test: refactor database init to support tests
* mealplan CRUD testing
* restructure test folder
* git attributes
* tests: migration, settings, theme routes testing
* docker-file shrink
* rebuild
* refactor: moving directories around
* adding funding
* mealplan redesign
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#108)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
Co-authored-by: Hayden <hay-kot@pm.me>
* Upload component (#113)
* unified upload button + download backups
* javascript toolings
* fix vuetur config
* fixed type check error
* refactor: clean up bag javascript
* UI updates + name validation
* docs: changelog + sp
* fixed route links
* changelog
Co-authored-by: Hayden <hay-kot@pm.me>
* fixed menu links
* fixed poetry install on docker.dev build
* Migration redesign (#119)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix link to dev-notes.md (#110)
* translation: add swedish (#128)
* language: da is Danish
* translations: add swedish
* scraper: unescape html in instructions (#129)
Some urls erroneously deliver escaped html their instructions,
sometimes they are even escaped on multiple levels like here:
https://www.ica.se/recept/kladdig-kladdkaka-722982/
```
>>> normalize_instruction("S&auml;tt ugnen p&aring; 200&deg;C.")
'Sätt ugnen på 200°C.'
```
* v0.2.0 Updates (#130)
* migration redesign init
* new color picker
* changelog
* added UI language selection
* fix layout issue on recipe editor
* remove git as dependency
* added UI editor for original URL
* CI/CD Tests
* test: fixed migration routes
* test todos
* bug/added docker volume
* chowdow test data
* partial image recipe image testing
* added card section card
* settings form
* homepage cetegory ui
* frontend category placeholder
* fixed broken scheduler
* remove old files
* removed temp test
Co-authored-by: Hayden <hay-kot@pm.me>
* Fix missing translations key (#133)
* translation: add simplified & traditional chinese
* Fix missing translations
* fix chinese translations
* v0.2.0 Release Candidate (#141)
* Fix link to Docker Hub
Found an extra s. DESTROYED it.
* Release v0.1.0 Candidate (#85)
* Changed uvicorn port to 80
* Changed port in docker-compose to match dockerfile
* Readded environment variables in docker-compose
* production image rework
* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available
* fixed instrucitons on parse
* add last_recipe
* automated testing
* roadmap update
* Sqlite (#75)
* file structure
* auto-test
* take 2
* refactor ap scheduler and startup process
* fixed scraper error
* database abstraction
* database abstraction
* port recipes over to new schema
* meal migration
* start settings migration
* finale mongo port
* backup improvements
* migration imports to new DB structure
* unused import cleanup
* docs strings
* settings and theme import logic
* cleanup
* fixed tinydb error
* requirements
* fuzzy search
* remove scratch file
* sqlalchemy models
* improved search ui
* recipe models almost done
* sql modal population
* del scratch
* rewrite database model mixins
* mostly grabage
* recipe updates
* working sqllite
* remove old files and reorganize
* final cleanup
Co-authored-by: Hayden <hay-kot@pm.me>
* Backup card (#78)
* backup / import dialog
* upgrade to new tag method
* New import card
* rename settings.py to app_config.py
* migrate to poetry for development
* fix failing test
Co-authored-by: Hayden <hay-kot@pm.me>
* added mkdocs to docker-compose
* Translations (#72)
* Translations + danish
* changed back proxy target to use ENV
* Resolved more merge conflicts
* Removed test in translation
* Documentation of translations
* Updated translations
* removed old packages
Co-authored-by: Hayden <64056131+hay-kot@users.noreply.github.com>
* fail to start bug fixes
* feature: prep/cook/total time slots (#80)
Co-authored-by: Hayden <hay-kot@pm.me>
* missing bind attributes
* Bug fixes (#81)
* fix: url remains after succesful import
* docs: changelog + update todos
* arm image
* arm compose
* compose updates
* update poetry
* arm support
Co-authored-by: Hayden <hay-kot@pm.me>
* dockerfile hotfix
* dockerfile hotfix
* Version Release Final Touches (#84)
* Remove slim
* bug: opacity issues
* bug: startup failure with no database
* ci/cd on dev branch
* formatting
* v0.1.0 documentation
Co-authored-by: Hayden <hay-kot@pm.me>
* db init hotfix
* bug: fix crash in mongo
* fix mongo bug
* fixed version notifier
* finale changelog
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
* build container
* webscraper hotfix
* notes hot fix
* bug: mongo updates fail #99
* Fix error message (#101)
* gh funding
* Create Issue Templates (#125)
* Create bug_report.md
* Create config.yml
Included a link to feature requests.
* Update config.yml
Fixed link I had for testing to the actual link
* Update bug_report.md
fix capitalization
* Update .github/ISSUE_TEMPLATE/bug_report.md
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* merge kentors changes
* refactor/recipe routers
* category/tag database relationship and endpoints
* frontend category management
* update branch todos
* bug/normalize recipe steps html
* remove console.log + refactor categories
* fix categories database errors
* refactor/ router endpoint
* refactor/ remove old code
* drag and drop ingredients
* general cleanup
* route refactoring
* changelog
* api refactoring + random cleanup
* fixed backwards sort
* Update mkdocs.yml (#137)
Fix warning from Deploy Docs github action
* fixed navigate on enter in search
* refactor/create global css
* added category scroll
* cleanup todos
* debug routes
* docs/new gifs & general updates
* cleanup
* fix list test
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* fix build
* fix duplicate editor
* fixed docker mount problem
* python 3.9
* added tasks for non-docker development
* remove old scripts
* dev updates
* fixed no image upload option
* get version from backend
* final docs pass
* .gitignore
* feature/markdown support for description and steps
* package-lock
* rename production task
* category import errors on import
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Bastien <43323819+Batgame@users.noreply.github.com>
Co-authored-by: sephrat <34862846+sephrat@users.noreply.github.com>
Co-authored-by: Nick CJ <17556895+nickcj931@users.noreply.github.com>
Co-authored-by: dekvall <dkvldev@gmail.com>
Co-authored-by: wengtad <wengtad93@gmail.com>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* test notifications
* unified notifications
* docs/changelog
Co-authored-by: hay-kot <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Bastien <43323819+Batgame@users.noreply.github.com>
Co-authored-by: sephrat <34862846+sephrat@users.noreply.github.com>
Co-authored-by: Nick CJ <17556895+nickcj931@users.noreply.github.com>
Co-authored-by: dekvall <dkvldev@gmail.com>
Co-authored-by: wengtad <wengtad93@gmail.com>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* Refactor/response models (#156) - First Pass
* cleanup
* split app/db versioning
* async file response
* refactor/recipe viewer + minor ui improvements
* auto grow size
* added async file responses
* docs/changelog
* "/" to open search bar
* docs/changelog
* change imports to use @/ for imports
* cleanup
* cleanup
* db to session
* theme + settings refactor
* bug/image save fix
* fixed failing tests
* fix last json bug - #155
* fix settings import
* fixed router link for site title
Co-authored-by: hay-kot <hay-kot@pm.me>
* version update
Co-authored-by: kentora <=>
Co-authored-by: Hayden <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Bastien <43323819+Batgame@users.noreply.github.com>
Co-authored-by: sephrat <34862846+sephrat@users.noreply.github.com>
Co-authored-by: Nick CJ <17556895+nickcj931@users.noreply.github.com>
Co-authored-by: dekvall <dkvldev@gmail.com>
Co-authored-by: wengtad <wengtad93@gmail.com>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
* debug page starter
* version docker releases
* test caddy web server
* run to start
* path
* roll back docker
* caddy take 2
* fix static path
* remove static files from FastAPI
Co-authored-by: hay-kot <hay-kot@pm.me>
Co-authored-by: Richard Mitic <richard.h.mitic@gmail.com>
Co-authored-by: kentora <kentora@kentora.dk>
Co-authored-by: David Young <davidy@funkypenguin.co.nz>
Co-authored-by: Bastien <43323819+Batgame@users.noreply.github.com>
Co-authored-by: sephrat <34862846+sephrat@users.noreply.github.com>
Co-authored-by: Nick CJ <17556895+nickcj931@users.noreply.github.com>
Co-authored-by: dekvall <dkvldev@gmail.com>
Co-authored-by: wengtad <wengtad93@gmail.com>
Co-authored-by: Alexei Pesic <pesic.alexei@gmail.com>
Co-authored-by: Andrew <dpieski@gmail.com>
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
This commit is contained in:
parent
e8f385f655
commit
774c5d6b45
14 changed files with 208 additions and 61 deletions
56
.github/workflows/dockerbuild.release.yml
vendored
Normal file
56
.github/workflows/dockerbuild.release.yml
vendored
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
name: Docker Build Production
|
||||||
|
|
||||||
|
on:
|
||||||
|
release:
|
||||||
|
types: [published]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
#
|
||||||
|
# Get Release Version
|
||||||
|
#
|
||||||
|
- uses: oprypin/find-latest-tag@v1
|
||||||
|
with:
|
||||||
|
repository: hay-kot/mealie # The repository to scan.
|
||||||
|
releases-only: true # We know that all relevant tags have a GitHub release for them.
|
||||||
|
id: mealie_version # The step ID to refer to later.
|
||||||
|
#
|
||||||
|
# Checkout
|
||||||
|
#
|
||||||
|
- name: checkout code
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
#
|
||||||
|
# Setup QEMU
|
||||||
|
#
|
||||||
|
- name: Set up QEMU
|
||||||
|
id: qemu
|
||||||
|
uses: docker/setup-qemu-action@v1
|
||||||
|
with:
|
||||||
|
image: tonistiigi/binfmt:latest
|
||||||
|
platforms: all
|
||||||
|
#
|
||||||
|
# Setup Buildx
|
||||||
|
#
|
||||||
|
- name: install buildx
|
||||||
|
id: buildx
|
||||||
|
uses: docker/setup-buildx-action@v1
|
||||||
|
with:
|
||||||
|
install: true
|
||||||
|
#
|
||||||
|
# Login to Docker Hub
|
||||||
|
#
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v1
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
#
|
||||||
|
# Build
|
||||||
|
#
|
||||||
|
- name: build the image
|
||||||
|
run: |
|
||||||
|
docker build --push \
|
||||||
|
--tag hkotel/mealie:${{ steps.mealie_version.outputs.tag }} \
|
||||||
|
--platform linux/amd64,linux/arm/v7,linux/arm64 .
|
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
@ -17,5 +17,6 @@
|
||||||
"i18n-ally.keystyle": "nested",
|
"i18n-ally.keystyle": "nested",
|
||||||
"cSpell.words": [
|
"cSpell.words": [
|
||||||
"performant"
|
"performant"
|
||||||
]
|
],
|
||||||
|
"search.mode": "reuseEditor"
|
||||||
}
|
}
|
||||||
|
|
21
Caddyfile
Normal file
21
Caddyfile
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
{
|
||||||
|
auto_https off
|
||||||
|
}
|
||||||
|
|
||||||
|
:80 {
|
||||||
|
@proxied path /api/* /docs /openapi.json
|
||||||
|
|
||||||
|
root * /app/dist
|
||||||
|
encode gzip
|
||||||
|
uri strip_suffix /
|
||||||
|
|
||||||
|
handle @proxied {
|
||||||
|
reverse_proxy http://127.0.0.1:9000
|
||||||
|
}
|
||||||
|
|
||||||
|
handle {
|
||||||
|
try_files {path}.html {path} /
|
||||||
|
file_server
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -7,7 +7,7 @@ RUN npm run build
|
||||||
|
|
||||||
FROM python:3.9-alpine
|
FROM python:3.9-alpine
|
||||||
|
|
||||||
RUN apk add --no-cache libxml2-dev libxslt-dev libxml2
|
RUN apk add --no-cache libxml2-dev libxslt-dev libxml2 caddy
|
||||||
ENV ENV prod
|
ENV ENV prod
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
@ -30,9 +30,12 @@ RUN apk add --update --no-cache --virtual .build-deps \
|
||||||
|
|
||||||
|
|
||||||
COPY ./mealie /app
|
COPY ./mealie /app
|
||||||
|
COPY ./Caddyfile /app
|
||||||
COPY --from=build-stage /app/dist /app/dist
|
COPY --from=build-stage /app/dist /app/dist
|
||||||
RUN rm -rf /app/test /app/.temp
|
RUN rm -rf /app/test /app/.temp
|
||||||
|
|
||||||
|
|
||||||
VOLUME [ "/app/data/" ]
|
VOLUME [ "/app/data/" ]
|
||||||
CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"]
|
RUN chmod +x /app/run.sh
|
||||||
|
CMD /app/run.sh
|
||||||
|
|
||||||
|
# CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"]
|
||||||
|
|
|
@ -5,6 +5,7 @@ const prefix = baseURL + "debug";
|
||||||
|
|
||||||
const debugURLs = {
|
const debugURLs = {
|
||||||
version: `${prefix}/version`,
|
version: `${prefix}/version`,
|
||||||
|
lastRecipe: `${prefix}/last-recipe-json`,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -12,4 +13,8 @@ export default {
|
||||||
let response = await apiReq.get(debugURLs.version);
|
let response = await apiReq.get(debugURLs.version);
|
||||||
return response.data;
|
return response.data;
|
||||||
},
|
},
|
||||||
|
async getLastJson() {
|
||||||
|
let response = await apiReq.get(debugURLs.lastRecipe);
|
||||||
|
return response.data;
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
38
frontend/src/components/Debug/LastRecipe.vue
Normal file
38
frontend/src/components/Debug/LastRecipe.vue
Normal file
|
@ -0,0 +1,38 @@
|
||||||
|
<template>
|
||||||
|
<v-card>
|
||||||
|
<v-card-title>Last Scrapped JSON Data</v-card-title>
|
||||||
|
<v-card-text>
|
||||||
|
<VJsoneditor
|
||||||
|
@error="logError()"
|
||||||
|
v-model="lastRecipeJson"
|
||||||
|
height="1500px"
|
||||||
|
:options="jsonEditorOptions"
|
||||||
|
/>
|
||||||
|
</v-card-text>
|
||||||
|
</v-card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import VJsoneditor from "v-jsoneditor";
|
||||||
|
import api from "@/api";
|
||||||
|
export default {
|
||||||
|
components: { VJsoneditor },
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
lastRecipeJson: {},
|
||||||
|
jsonEditorOptions: {
|
||||||
|
mode: "code",
|
||||||
|
search: false,
|
||||||
|
mainMenuBar: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
async mounted() {
|
||||||
|
this.lastRecipeJson = await api.meta.getLastJson();
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
</style>
|
37
frontend/src/components/Debug/LogFile.vue
Normal file
37
frontend/src/components/Debug/LogFile.vue
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
<template>
|
||||||
|
<v-card>
|
||||||
|
<v-card-title>Last Scrapped JSON Data</v-card-title>
|
||||||
|
<v-card-text>
|
||||||
|
<VJsoneditor
|
||||||
|
@error="logError()"
|
||||||
|
v-model="lastRecipeJson"
|
||||||
|
height="1500px"
|
||||||
|
:options="jsonEditorOptions"
|
||||||
|
/>
|
||||||
|
</v-card-text>
|
||||||
|
</v-card>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import VJsoneditor from "v-jsoneditor";
|
||||||
|
export default {
|
||||||
|
components: { VJsoneditor },
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
lastRecipeJson: "",
|
||||||
|
jsonEditorOptions: {
|
||||||
|
mode: "code",
|
||||||
|
search: false,
|
||||||
|
mainMenuBar: false,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
async mounted() {
|
||||||
|
this.lastRecipeJson = "Hello \n 123 \n 567"
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
</style>
|
20
frontend/src/pages/Debug.vue
Normal file
20
frontend/src/pages/Debug.vue
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<LastRecipe />
|
||||||
|
<LogFile class="mt-2" />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import LastRecipe from "@/components/Debug/LastRecipe";
|
||||||
|
import LogFile from "@/components/Debug/LogFile";
|
||||||
|
export default {
|
||||||
|
components: {
|
||||||
|
LastRecipe,
|
||||||
|
LogFile,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
</style>
|
|
@ -7,12 +7,14 @@ import SettingsPage from "./pages/SettingsPage";
|
||||||
import AllRecipesPage from "./pages/AllRecipesPage";
|
import AllRecipesPage from "./pages/AllRecipesPage";
|
||||||
import CategoryPage from "./pages/CategoryPage";
|
import CategoryPage from "./pages/CategoryPage";
|
||||||
import MeaplPlanPage from "./pages/MealPlanPage";
|
import MeaplPlanPage from "./pages/MealPlanPage";
|
||||||
|
import Debug from "./pages/Debug";
|
||||||
import MealPlanThisWeekPage from "./pages/MealPlanThisWeekPage";
|
import MealPlanThisWeekPage from "./pages/MealPlanThisWeekPage";
|
||||||
import api from "@/api";
|
import api from "@/api";
|
||||||
|
|
||||||
export const routes = [
|
export const routes = [
|
||||||
{ path: "/", component: HomePage },
|
{ path: "/", component: HomePage },
|
||||||
{ path: "/mealie", component: HomePage },
|
{ path: "/mealie", component: HomePage },
|
||||||
|
{ path: "/debug", component: Debug },
|
||||||
{ path: "/search", component: SearchPage },
|
{ path: "/search", component: SearchPage },
|
||||||
{ path: "/recipes/all", component: AllRecipesPage },
|
{ path: "/recipes/all", component: AllRecipesPage },
|
||||||
{ path: "/recipes/:category", component: CategoryPage },
|
{ path: "/recipes/:category", component: CategoryPage },
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module.exports = {
|
module.exports = {
|
||||||
transpileDependencies: ["vuetify"],
|
transpileDependencies: ["vuetify"],
|
||||||
publicPath: process.env.NODE_ENV === "production" ? "/static/" : "/",
|
publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
|
||||||
outputDir: process.env.NODE_ENV === "production" ? "./dist" : "../mealie/web",
|
outputDir: process.env.NODE_ENV === "production" ? "./dist" : "../mealie/web",
|
||||||
devServer: {
|
devServer: {
|
||||||
proxy: {
|
proxy: {
|
||||||
|
@ -12,10 +12,10 @@ module.exports = {
|
||||||
},
|
},
|
||||||
pluginOptions: {
|
pluginOptions: {
|
||||||
i18n: {
|
i18n: {
|
||||||
locale: 'en',
|
locale: "en",
|
||||||
fallbackLocale: 'en',
|
fallbackLocale: "en",
|
||||||
localeDir: 'locales',
|
localeDir: "locales",
|
||||||
enableInSFC: true
|
enableInSFC: true,
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,16 +1,14 @@
|
||||||
import uvicorn
|
import uvicorn
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.staticfiles import StaticFiles
|
|
||||||
|
|
||||||
# import utils.startup as startup
|
# import utils.startup as startup
|
||||||
from app_config import APP_VERSION, PORT, PRODUCTION, WEB_PATH, docs_url, redoc_url
|
from app_config import APP_VERSION, PORT, WEB_PATH, docs_url, redoc_url
|
||||||
from routes import (
|
from routes import (
|
||||||
backup_routes,
|
backup_routes,
|
||||||
debug_routes,
|
debug_routes,
|
||||||
meal_routes,
|
meal_routes,
|
||||||
migration_routes,
|
migration_routes,
|
||||||
setting_routes,
|
setting_routes,
|
||||||
static_routes,
|
|
||||||
theme_routes,
|
theme_routes,
|
||||||
)
|
)
|
||||||
from routes.recipe import (
|
from routes.recipe import (
|
||||||
|
@ -31,10 +29,6 @@ app = FastAPI(
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def mount_static_files():
|
|
||||||
app.mount("/static", StaticFiles(directory=WEB_PATH, html=True))
|
|
||||||
|
|
||||||
|
|
||||||
def start_scheduler():
|
def start_scheduler():
|
||||||
import services.scheduler.scheduled_jobs
|
import services.scheduler.scheduled_jobs
|
||||||
|
|
||||||
|
@ -62,24 +56,7 @@ def api_routers():
|
||||||
app.include_router(debug_routes.router)
|
app.include_router(debug_routes.router)
|
||||||
|
|
||||||
|
|
||||||
if PRODUCTION:
|
|
||||||
mount_static_files()
|
|
||||||
|
|
||||||
api_routers()
|
api_routers()
|
||||||
|
|
||||||
# API 404 Catch all CALL AFTER ROUTERS
|
|
||||||
@app.get("/api/{full_path:path}", status_code=404, include_in_schema=False)
|
|
||||||
def invalid_api():
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
app.include_router(static_routes.router)
|
|
||||||
|
|
||||||
|
|
||||||
# Generate API Documentation
|
|
||||||
# if not PRODUCTION:
|
|
||||||
# generate_api_docs(app)
|
|
||||||
|
|
||||||
start_scheduler()
|
start_scheduler()
|
||||||
init_settings()
|
init_settings()
|
||||||
|
|
||||||
|
@ -92,6 +69,7 @@ if __name__ == "__main__":
|
||||||
port=PORT,
|
port=PORT,
|
||||||
reload=True,
|
reload=True,
|
||||||
debug=True,
|
debug=True,
|
||||||
|
log_level="info",
|
||||||
workers=1,
|
workers=1,
|
||||||
forwarded_allow_ips="*",
|
forwarded_allow_ips="*",
|
||||||
)
|
)
|
||||||
|
|
|
@ -22,7 +22,7 @@ async def get_last_recipe_json():
|
||||||
return json.loads(f.read())
|
return json.loads(f.read())
|
||||||
|
|
||||||
|
|
||||||
@router.get("/log/{num}", response_class=HTMLResponse)
|
@router.get("/log/{num}")
|
||||||
async def get_log(num: int):
|
async def get_log(num: int):
|
||||||
""" Doc Str """
|
""" Doc Str """
|
||||||
with open(LOGGER_FILE, "rb") as f:
|
with open(LOGGER_FILE, "rb") as f:
|
||||||
|
@ -53,4 +53,4 @@ def tail(f, lines=20):
|
||||||
block_end_byte -= BLOCK_SIZE
|
block_end_byte -= BLOCK_SIZE
|
||||||
block_number -= 1
|
block_number -= 1
|
||||||
all_read_text = b"".join(reversed(blocks))
|
all_read_text = b"".join(reversed(blocks))
|
||||||
return b"<br/>".join(all_read_text.splitlines()[-total_lines_wanted:])
|
return b"/n".join(all_read_text.splitlines()[-total_lines_wanted:])
|
||||||
|
|
|
@ -1,24 +0,0 @@
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from fastapi import APIRouter, responses
|
|
||||||
from fastapi.responses import FileResponse
|
|
||||||
|
|
||||||
CWD = Path(__file__).parent
|
|
||||||
WEB_PATH = CWD.parent.joinpath("dist")
|
|
||||||
BASE_HTML = WEB_PATH.joinpath("index.html")
|
|
||||||
router = APIRouter(include_in_schema=False)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/favicon.ico")
|
|
||||||
def facivon():
|
|
||||||
return responses.RedirectResponse(url="/mealie/favicon.ico")
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/")
|
|
||||||
async def root():
|
|
||||||
return FileResponse(BASE_HTML)
|
|
||||||
|
|
||||||
|
|
||||||
@router.get("/{full_path:path}")
|
|
||||||
async def root_plus(full_path):
|
|
||||||
return FileResponse(BASE_HTML)
|
|
10
mealie/run.sh
Normal file
10
mealie/run.sh
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
## Migrations
|
||||||
|
# TODO
|
||||||
|
|
||||||
|
## Web Server
|
||||||
|
caddy start --config ./Caddyfile
|
||||||
|
|
||||||
|
## Start API
|
||||||
|
uvicorn app:app --host 0.0.0.0 --port 9000
|
Loading…
Add table
Add a link
Reference in a new issue