release: prep beta 3 (#1349)

* docs: add tag documentation * bump docker-compose tags * minor language changes * beta3 changelog * auto-gen API docs * bump version * bump recipe-scrapers
mealie-recipes · Jun 7, 2022 · 56eb0bc · 56eb0bc
1 parent eca8a96
commit 56eb0bc
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 32 deletions.
diff --git a/docs/docs/changelog/v1.0.0beta-3.md b/docs/docs/changelog/v1.0.0beta-3.md
@@ -0,0 +1,36 @@
+### Bug Fixes
+
+- Update issue links in v1.0.0beta-2 changelog ([#1312](https://github.com/hay-kot/mealie/issues/1312))
+- Bad import path ([#1313](https://github.com/hay-kot/mealie/issues/1313))
+- Printer page refs ([#1314](https://github.com/hay-kot/mealie/issues/1314))
+- Consolidate stores to fix mismatched state
+- Bump @vue/composition-api from 1.6.1 to 1.6.2 in /frontend ([#1275](https://github.com/hay-kot/mealie/issues/1275))
+- Shopping list label editor  ([#1333](https://github.com/hay-kot/mealie/issues/1333))
+
+### Features
+
+- Default unit fractions to True
+- Add unit abbreviation support ([#1332](https://github.com/hay-kot/mealie/issues/1332))
+- Attached images by drag and drop for recipe steps ([#1341](https://github.com/hay-kot/mealie/issues/1341))
+
+### Docs
+
+- Render homepage social media link images at 32x32 size ([#1310](https://github.com/hay-kot/mealie/issues/1310))
+
+### Miscellaneous Tasks
+
+- Init git-cliff config
+- Bump @types/sortablejs in /frontend ([#1287](https://github.com/hay-kot/mealie/issues/1287))
+- Bump @babel/eslint-parser in /frontend ([#1290](https://github.com/hay-kot/mealie/issues/1290))
+
+### Refactor
+
+- Unify recipe-organizer components ([#1340](https://github.com/hay-kot/mealie/issues/1340))
+
+### Security
+
+- Delay server response whenever username is non existing ([#1338](https://github.com/hay-kot/mealie/issues/1338))
+
+### Wip
+
+- Pagination-repository ([#1316](https://github.com/hay-kot/mealie/issues/1316))
diff --git a/docs/docs/documentation/getting-started/faq.md b/docs/docs/documentation/getting-started/faq.md
@@ -1,42 +1,50 @@
 # Frequently Asked Questions
 
+## Is it Safe to Upgrade Mealie?
+
+Yes. If you are using the v1 branches (including beta), you can upgrade to the latest version of Mealie without performing a site Export/Restore. This process was required in previous versions of Mealie, however we've automated the database migration process to make it easier to upgrade. Not that if you were using the v0.5.x version, you CANNOT upgrade to the latest version automatically. You must follow the migration instructions in the documentation.
+
+**Links**
+
+- [Migration From v0.5.x](./migrating-to-mealie-v1.md)
+
 ## How can I change the theme?
 
-You can change the theme by settings the environment variables on the frontend container. 
+You can change the theme by settings the environment variables on the frontend container.
 
 Links:
 
-- [Frontend Theme](/mealie/documentation/getting-started/installation/frontend-config#themeing)
+- [Frontend Theme](./installation/frontend-config#themeing)
 
 ## How can I change the language?
 
 Languages need to be set on the frontend and backend containers as ENV variables.
 
 Links
 
-- [Frontend Config](/mealie/documentation/getting-started/installation/frontend-config/)
-- [Backend Config](/mealie/documentation/getting-started/installation/backend-config/)
+- [Frontend Config](./installation/frontend-config/)
+- [Backend Config](./installation/backend-config/)
 
 ## How can I change the Login Session Timeout?
 
 Login session can be configured by setting the `TOKEN_TIME` variable on the backend container.
 
-- [Backend Config](/mealie/documentation/getting-started/installation/backend-config/)
+- [Backend Config](./installation/backend-config/)
 
 ## Can I serve Mealie on a subpath?
 
 No. Due to limitations from the Javascript Framework, mealie doesn't support serving Mealie on a subpath.
 
-## Can I install Mealie without docker? 
+## Can I install Mealie without docker?
 
 Yes, you can install Mealie on your local machine. HOWEVER, it is recommended that you don't. Managing non-system versions of python, node, and npm is a pain. Moreover updating and upgrading your system with this configuration is unsupported and will likely require manual interventions. If you insist on installing Mealie on your local machine, you can use the links below to help guide your path.
 
-- [Advanced Installation](/mealie/documentation/getting-started/installation/advanced/)
+- [Advanced Installation](./installation/advanced/)
 
-## How I can attach an Image or Video to a Recipe? 
+## How I can attach an Image or Video to a Recipe?
 
 Yes. Mealie's Recipe Steps and other fields support the markdown syntax and therefor supports images and videos. To attach an image to the recipe, you can upload it as an asset and use the provided copy button to generate the html image tag required to render the image. For videos, Mealie provides no way to host videos. You'll need to host your videos with another provider and embed them in your recipe. Generally, the video provider will provide a link to the video and the html tag required to render the video. For example, youtube provides the following link that works inside a step. You can adjust the width and height attributes as necessary to ensure a fit.
 
 ```html
 <iframe width="560" height="315" src="https://www.youtube.com/embed/nAUwKeO93bY" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-```
+```
diff --git a/docs/docs/documentation/getting-started/installation/installation-checklist.md b/docs/docs/documentation/getting-started/installation/installation-checklist.md
@@ -85,6 +85,17 @@ These backups are just plain .zip files that you can download from the UI or acc
 
 ## Appendix
 
+### Docker Tags
+
+`mealie:frontend-v1.0.0beta-x` **and** `mealie:api-v1.0.0beta-x`
+
+These are the tags for the latest beta release of the frontend docker-container. These are currently considered the latest and most stable releases and the recommended way of using Mealie.
+
+`mealie:frontend-nightly`**and** `mealie:api-nightly`
+
+The nightly build are the latest and greatest builds that are built directly off of every commit to the `mealie-next` branch and as such may contain bugs. These are great to help the community catch bugs before they hit the stable release or if you like living on the edge.
+
+
 ### Docker Diagram
 
 While the docker-compose file should work without modification, some users want to tailor it to their installation. This diagram shows network and volume architecture for the default setup. You can use this to help you customize your configuration.

diff --git a/docs/docs/documentation/getting-started/installation/postgres.md b/docs/docs/documentation/getting-started/installation/postgres.md
@@ -10,7 +10,7 @@
 version: "3.7"
 services:
   mealie-frontend:
-    image: hkotel/mealie:frontend-v1.0.0beta-2
+    image: hkotel/mealie:frontend-v1.0.0beta-3
     container_name: mealie-frontend
     depends_on:
       - mealie-api
@@ -23,7 +23,7 @@ services:
     volumes:
       - mealie-data:/app/data/ # (3)
   mealie-api:
-    image: hkotel/mealie:api-v1.0.0beta-2
+    image: hkotel/mealie:api-v1.0.0beta-3
     container_name: mealie-api
     depends_on:
       - postgres

diff --git a/docs/docs/documentation/getting-started/installation/sqlite.md b/docs/docs/documentation/getting-started/installation/sqlite.md
@@ -12,7 +12,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th
 version: "3.7"
 services:
   mealie-frontend:
-    image: hkotel/mealie:frontend-v1.0.0beta2
+    image: hkotel/mealie:frontend-v1.0.0beta-3
     container_name: mealie-frontend
     environment:
     # Set Frontend ENV Variables Here
@@ -23,7 +23,7 @@ services:
     volumes:
       - mealie-data:/app/data/ # (3)
   mealie-api:
-    image: hkotel/mealie:api-v1.0.0beta2
+    image: hkotel/mealie:api-v1.0.0beta-3
     container_name: mealie-api
     volumes:
       - mealie-data:/app/data/

diff --git a/docs/docs/documentation/getting-started/introduction.md b/docs/docs/documentation/getting-started/introduction.md
@@ -5,16 +5,12 @@
 
     You should likely find bugs, errors, and unfinished pages within the application. To find the current status of the release you can checkout the [project on github](https://github.com/hay-kot/mealie/projects/7) or reach out on discord.
 
-    You should also be aware that Mealie v1 Beta does not have the backup/export feature available. This is the next priority for Mealie v1
-    and is currently being worked out. 
 
-Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and Mealie will automatically import the relevant data or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications. 
+Mealie is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and Mealie will automatically import the relevant data or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications.
 
 [Remember to join the Discord](https://discord.gg/QuStdQGSGK)
 
 
-
-
 ## Key Features
 - 🔍 Fuzzy search
 - 🏷️ Tag recipes with categories or tags to flexible sorting
@@ -40,15 +36,15 @@ Mealie is a self hosted recipe manager and meal planner with a RestAPI backend a
 ## FAQ
 
 ### Why An API?
-An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based of Meal Plan data to remind you to defrost the chicken, marinade the steak, or start the CrockPot. Additionally, you can access nearly any backend service via the API giving you total control to extend the application. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation. 
+An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based of Meal Plan data to remind you to defrost the chicken, marinade the steak, or start the CrockPot. Additionally, you can access nearly any backend service via the API giving you total control to extend the application. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation.
 
 ### Why a Database?
-Some users of static-site generator applications like ChowDown have expressed concerns about their data being stuck in a database. Considering this is a new project it is a valid concern to be worried about your data. Mealie specifically addresses this concern by provided automatic daily backups that export your data in json, plain-text markdown files, and/or custom Jinja2 templates. **This puts you in controls of how your data is represented** when exported from Mealie, which means you can easily migrate to any other service provided Mealie doesn't work for you. 
+Some users of static-site generator applications like ChowDown have expressed concerns about their data being stuck in a database. Considering this is a new project it is a valid concern to be worried about your data. Mealie specifically addresses this concern by provided automatic daily backups that export your data in json, plain-text markdown files, and/or custom Jinja2 templates. **This puts you in controls of how your data is represented** when exported from Mealie, which means you can easily migrate to any other service provided Mealie doesn't work for you.
 
 As to why we need a database?
 
-- **Developer Experience:** Without a database a lot of the work to maintain your data is taken on by the developer instead of a battle tested platform for storing data. 
-- **Multi User Support:** With a solid database as backend storage for your data Mealie can better support multi-user sites and avoid read/write access errors when multiple actions are taken at the same time. 
+- **Developer Experience:** Without a database a lot of the work to maintain your data is taken on by the developer instead of a battle tested platform for storing data.
+- **Multi User Support:** With a solid database as backend storage for your data Mealie can better support multi-user sites and avoid read/write access errors when multiple actions are taken at the same time.
 
 ## Built With
 
@@ -68,7 +64,6 @@ As to why we need a database?
 
 Contributions are what make the open source community such an amazing place to learn, develop, and create. Any contributions you make are **greatly appreciated**. See the [Contributors Guide](../../contributors/non-coders.md) for help getting started.
 
-If you are not a coder, you can still contribute financially. Financial contributions help me prioritize working on this project over others and help me to know that there is a real demand for project development. 
+If you are not a coder, you can still contribute financially. Financial contributions help me prioritize working on this project over others and help me to know that there is a real demand for project development.
 
 <a href="https://www.buymeacoffee.com/haykot" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-green.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>
-
diff --git a/docs/docs/overrides/api.html b/docs/docs/overrides/api.html
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
@@ -88,6 +88,7 @@ nav:
           - Improving Ingredient Parser: "contributors/guides/ingredient-parser.md"
 
   - Change Log:
+      - v1.0.0beta-3: "changelog/v1.0.0beta-3.md"
       - v1.0.0beta-2: "changelog/v1.0.0beta-2.md"
       - v1.0.0 Beta: "changelog/v1.0.0.md"
       - v0.5.2 Misc Updates: "changelog/v0.5.2.md"

diff --git a/mealie/core/settings/static.py b/mealie/core/settings/static.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 
-APP_VERSION = "v1.0.0beta-2"
+APP_VERSION = "v1.0.0beta-3"
 
 CWD = Path(__file__).parent
 BASE_DIR = CWD.parent.parent.parent
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -30,12 +30,12 @@ passlib = "^1.7.4"
 lxml = "^4.7.1"
 Pillow = "^8.2.0"
 apprise = "^0.9.6"
-recipe-scrapers = "^14.1.0"
+recipe-scrapers = "^14.3.0"
 psycopg2-binary = {version = "^2.9.1", optional = true}
 gunicorn = "^20.1.0"
 emails = "^0.6"
 python-ldap = "^3.3.1"
-pydantic = "^1.9.0"
+pydantic = "^1.9.1"
 tzdata = "^2021.5"
 pyhumps = "^3.5.3"