diff --git a/docs/docs/assets/img/discord-notification-example.webp b/docs/docs/assets/img/discord-notification-example.webp new file mode 100644 index 000000000..bd6c5147b Binary files /dev/null and b/docs/docs/assets/img/discord-notification-example.webp differ diff --git a/docs/docs/assets/img/gotify-notification-example.webp b/docs/docs/assets/img/gotify-notification-example.webp new file mode 100644 index 000000000..2546dee9f Binary files /dev/null and b/docs/docs/assets/img/gotify-notification-example.webp differ diff --git a/docs/docs/community-guide/.header.md b/docs/docs/community-guide/.header.md new file mode 100644 index 000000000..04650626f --- /dev/null +++ b/docs/docs/community-guide/.header.md @@ -0,0 +1,2 @@ +!!! info + This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed! diff --git a/docs/docs/api-usage/bulk-url-import.md b/docs/docs/community-guide/bulk-url-import.md similarity index 95% rename from docs/docs/api-usage/bulk-url-import.md rename to docs/docs/community-guide/bulk-url-import.md index 130e42d9a..f81a15cd2 100644 --- a/docs/docs/api-usage/bulk-url-import.md +++ b/docs/docs/community-guide/bulk-url-import.md @@ -1,5 +1,5 @@ !!! info - This example was submitted by a user. Have an Example? Submit a PR! + This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed! Recipes can be imported in bulk from a file containing a list of URLs. This can be done using the following bash or python scripts with the `list` file containing one URL per line. diff --git a/docs/docs/api-usage/home-assistant.md b/docs/docs/community-guide/home-assistant.md similarity index 92% rename from docs/docs/api-usage/home-assistant.md rename to docs/docs/community-guide/home-assistant.md index 4de60be82..d97b07b23 100644 --- a/docs/docs/api-usage/home-assistant.md +++ b/docs/docs/community-guide/home-assistant.md @@ -1,3 +1,7 @@ +!!! info + This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed! + + In a lot of ways, Home Assistant is why this project exists! Since it Mealie has a robust API it makes it a great fit for interacting with Home Assistant and pulling information into your dashboard. ### Get Todays Meal in Lovelace diff --git a/docs/docs/getting-started/ios.md b/docs/docs/community-guide/ios.md similarity index 94% rename from docs/docs/getting-started/ios.md rename to docs/docs/community-guide/ios.md index e261eb6ea..a8ef325e9 100644 --- a/docs/docs/getting-started/ios.md +++ b/docs/docs/community-guide/ios.md @@ -1,4 +1,9 @@ # Using iOS Shortcuts with Mealie + +!!! info + This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed! + + ![](../assets/img/iphone-image.png){: align=right style="height:400px;width:400px"} diff --git a/docs/docs/community-guide/swag.md b/docs/docs/community-guide/swag.md index 68e1944da..96f170afc 100644 --- a/docs/docs/community-guide/swag.md +++ b/docs/docs/community-guide/swag.md @@ -1,5 +1,10 @@ # Using SWAG as Reverse Proxy +!!! info + This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed! + + + To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag) SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encryptâ„¢) sets up an Nginx web server and reverse proxy with PHP support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention. diff --git a/docs/docs/api-usage/getting-started.md b/docs/docs/getting-started/api-usage.md similarity index 100% rename from docs/docs/api-usage/getting-started.md rename to docs/docs/getting-started/api-usage.md diff --git a/docs/docs/getting-started/notifications.md b/docs/docs/getting-started/notifications.md index 976b1f67b..ae006f8d3 100644 --- a/docs/docs/getting-started/notifications.md +++ b/docs/docs/getting-started/notifications.md @@ -47,13 +47,13 @@ New events can be created and viewed in admin Toolbox `/admin/toolbox?tab=event- !!! tip The feedback provided from the test feature is only an indicated of if the URL you provided is valid, not if the message was successfully sent. Be sure to check the notification feed for the test message. -![Add Notification Image](../../assets/img/add-notification.webp) +![Add Notification Image](../assets/img/add-notification.webp) ## Examples ### Discord -![Discord]() +![Discord](../assets/img/discord-notification-example.webp) ### Gotify -![Gotify]() \ No newline at end of file +![Gotify](../assets/img/gotify-notification-example.webp) \ No newline at end of file diff --git a/docs/docs/getting-started/organizing-recipes.md b/docs/docs/getting-started/organizing-recipes.md index eb78a4de4..7cc76c0c5 100644 --- a/docs/docs/getting-started/organizing-recipes.md +++ b/docs/docs/getting-started/organizing-recipes.md @@ -19,7 +19,7 @@ Below are some general guidelines that were considered when creating the organiz In the diagram below you will see what we came up with using the new custom pages feature. The large circles indicate pages, and the rectangles indicate categories. We've grouped several 'like' categories with each other as a way to quickly find similar items. -![Mealie Diagram](../../assets/img/mealie-diagram.webp) +![Mealie Diagram](../assets/img/mealie-diagram.webp) ## Toolbox The toolbox gives you multiple options to clean-up and organize your recipes. You can acces it through the 'Settings' menu or through the [dashboard](../site-administration/dashboard.md). diff --git a/docs/docs/overrides/api.html b/docs/docs/overrides/api.html index e1bb9f54a..58276d551 100644 --- a/docs/docs/overrides/api.html +++ b/docs/docs/overrides/api.html @@ -14,7 +14,7 @@
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 18da2b21b..80d1530ff 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -56,20 +56,20 @@ nav: - Organizing Recipes: "getting-started/organizing-recipes.md" - Planning Meals: "getting-started/meal-planner.md" - External Notifications: "getting-started/notifications.md" - - iOS Shortcuts: "getting-started/ios.md" + - API Usage: "getting-started/api-usage.md" - Site Administration: + - Dashboard: "site-administration/dashboard.md" - User Settings: "site-administration/user-settings.md" - Site Settings: "site-administration/site-settings.md" - Building Pages: "site-administration/building-pages.md" - User Management: "site-administration/user-management.md" - - Dashboard: "site-administration/dashboard.md" - Backups and Restore: "site-administration/backups-and-exports.md" - Recipe Migration: "site-administration/migration-imports.md" - - API Usage: - - Getting Started: "api-usage/getting-started.md" - - Home Assistant: "api-usage/home-assistant.md" - - Bulk Url Import: "api-usage/bulk-url-import.md" - - Community Guide: "community-guide/swag.md" + - Community Guides: + - iOS Shortcuts: "community-guide/ios.md" + - Reverse Proxy (SWAG): "community-guide/swag.md" + - Home Assistant: "community-guide/home-assistant.md" + - Bulk Url Import: "community-guide/bulk-url-import.md" - API Reference: "api/redoc.md" - Contributors Guide: - Non-Code: "contributors/non-coders.md" diff --git a/frontend/src/components/Recipe/Parts/Helpers/ImageUploadBtn.vue b/frontend/src/components/Recipe/Parts/Helpers/ImageUploadBtn.vue index dc5505455..67aef81bc 100644 --- a/frontend/src/components/Recipe/Parts/Helpers/ImageUploadBtn.vue +++ b/frontend/src/components/Recipe/Parts/Helpers/ImageUploadBtn.vue @@ -27,7 +27,7 @@
diff --git a/frontend/src/components/Recipe/RecipeViewer/index.vue b/frontend/src/components/Recipe/RecipeViewer/index.vue index a138940a3..bc2d4b6f9 100644 --- a/frontend/src/components/Recipe/RecipeViewer/index.vue +++ b/frontend/src/components/Recipe/RecipeViewer/index.vue @@ -21,7 +21,7 @@ {{ recipe.recipeYield }} - + diff --git a/frontend/src/pages/Admin/ManageUsers/index.vue b/frontend/src/pages/Admin/ManageUsers/index.vue index 1589131d0..c11a02015 100644 --- a/frontend/src/pages/Admin/ManageUsers/index.vue +++ b/frontend/src/pages/Admin/ManageUsers/index.vue @@ -14,7 +14,7 @@ mdi-account-plus-outline - + {{ $t("group.groups") }} {{ $globals.icons.group }} @@ -55,7 +55,12 @@ export default { }, }, mounted() { - this.$store.dispatch("requestAllGroups"); + this.reqGroups(); + }, + methods: { + reqGroups() { + this.$store.dispatch("requestAllGroups"); + }, }, }; diff --git a/frontend/src/pages/Recipe/ViewRecipe.vue b/frontend/src/pages/Recipe/ViewRecipe.vue index 0be281451..938377bfa 100644 --- a/frontend/src/pages/Recipe/ViewRecipe.vue +++ b/frontend/src/pages/Recipe/ViewRecipe.vue @@ -45,7 +45,7 @@