+
+
diff --git a/docs/docs/getting-started/iOS.md b/docs/docs/getting-started/ios.md
similarity index 90%
rename from docs/docs/getting-started/iOS.md
rename to docs/docs/getting-started/ios.md
index 1ec3362d6f2b..e261eb6ea29f 100644
--- a/docs/docs/getting-started/iOS.md
+++ b/docs/docs/getting-started/ios.md
@@ -1,5 +1,5 @@
# Using iOS Shortcuts with Mealie
-{: align=right style="height:400px;width:400px"}
+{: align=right style="height:400px;width:400px"}
User [brasilikum](https://github.com/brasilikum) opened an issue on the main repo about how they had created an [iOS shortcut](https://github.com/hay-kot/mealie/issues/103) for interested users. This is a useful utility for iOS users who browse for recipes in their web browser from their devices.
@@ -13,7 +13,7 @@ Don't know what an iOS shortcut is? Neither did I! Experienced iOS users may alr
Basically it is a visual scripting language that lets a user build an automation in a guided fashion. The automation can be [shared with anyone](https://www.icloud.com/shortcuts/6ae356d5fc644cfa8983a3c90f242fbb) but if it is a user creation, you'll have to jump through a few hoops to make an untrusted automation work on your device. In brasilikum's shortcut, you need to make changes for it to work. Recent updates to the project have changed some of the syntax and folder structure since its original creation.
-{: align=right style="height:500;width:400px"}
+{: align=right style="height:500;width:400px"}
@@ -32,4 +32,4 @@ Basically it is a visual scripting language that lets a user build an automation
-Having made those changes, you should now be able to share a website to the shortcut and have mealie grab all the necessary information!
+Having made those changes, you should now be able to share a website to the shortcut and have mealie grab all the necessary information!
\ No newline at end of file
diff --git a/docs/docs/getting-started/meal-planner.md b/docs/docs/getting-started/meal-planner.md
index f8dbdc72dd9b..7ea89b35f048 100644
--- a/docs/docs/getting-started/meal-planner.md
+++ b/docs/docs/getting-started/meal-planner.md
@@ -9,5 +9,5 @@ To edit the meal in a meal plan simply select the edit button on the card in the
## Shopping Lists
For any meal plan created you can view a breakdown of all the ingredients and use an experimental sort function to sort similarly ingredients. This is a very new feature and results of the auto sort may vary.
-
+
diff --git a/docs/docs/getting-started/organizing-recipes.md b/docs/docs/getting-started/organizing-recipes.md
new file mode 100644
index 000000000000..67b42d609095
--- /dev/null
+++ b/docs/docs/getting-started/organizing-recipes.md
@@ -0,0 +1,8 @@
+# Organizing Recipes
+
+!!! tip
+ Below is a suggestion of guidelines my wife and I use for organizing our recipes within Mealie. Mealie is fairly flexible, so feel free to utilize how you'd like! ๐
+
+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.
+
+
\ No newline at end of file
diff --git a/docs/docs/getting-started/recipes.md b/docs/docs/getting-started/recipes.md
index 5daa859a2fa3..9169c6b9ce3d 100644
--- a/docs/docs/getting-started/recipes.md
+++ b/docs/docs/getting-started/recipes.md
@@ -4,20 +4,15 @@
Adding a recipe can be as easy as copying the recipe URL into mealie and letting the web scrapper try to pull down the information. Currently this scraper is implemented with [scrape-schema-recipe package](https://pypi.org/project/scrape-schema-recipe/). You may have mixed results on some websites, especially with blogs or non specific recipe websites. See the bulk import Option below for another a convenient way to add blog style recipes into Mealie.
-
-
-
## Recipe Editor
Recipes can be edited and created via the UI. This is done with both a form based approach where you have a UI to work with as well as with a in browser JSON Editor. The JSON editor allows you to easily copy and paste data from other sources.
You can also add a custom recipe with the UI editor built into the web view.
-
-
## Bulk Import
Mealie also supports bulk import of recipe instructions and ingredients. Select "Bulk Add" in the editor and paste in your plain text data to be parsed. Each line is treated as one entry and will be appended to the existing ingredients or instructions if they exist. Empty lines will be stripped from the text.
-
+
## Schema
Recipes are stored in the json-like format in mongoDB and then sent and edited in json format on the frontend. Each recipes uses [Recipe Schema](https://schema.org/Recipe) as a general guide with some additional properties specific to Mealie.
diff --git a/docs/docs/getting-started/site-settings.md b/docs/docs/getting-started/site-settings.md
deleted file mode 100644
index 51fe5a688fa2..000000000000
--- a/docs/docs/getting-started/site-settings.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Site Settings Panel
-!!! danger
- As this is still a **BETA** It is recommended that you backup your data often and store in more than one place. Ad-hear to backup best practices with the [3-2-1 Backup Rule](https://en.wikipedia.org/wiki/Backup)
-
-## General Settings
-In your site settings page you can select several options to change the layout of your homepage. You can choose to display the recent recipes, how many cards to show for each section, and which category sections to display. You can additionally select which language to use by default. Note the currently homepage settings are saved in your browser. In the future a database entry will be made for site settings so the homepage is consistent across users.
-
-
-
-## Theme Settings
-Color themes can be created and set from the UI in the settings page. You can select an existing color theme or create a new one. On creation of a new color theme, the default colors will be used, then you can select and save as you'd like. By default the "default" theme will be loaded for all new users visiting the site. All created color themes are available to all users of the site. Theme Colors will be set for both light and dark modes.
-
-
-
-!!! note
- Theme data is stored in localstorage in the browser. Calling "Save colors and apply theme will refresh the local storage with the selected theme as well save the theme to the database.
-
-
-## Backups
-Site backups can easily be taken and download from the UI. To import, simply select the backup you'd like to restore and check which items you'd like to import.
-
-## Meal Planner
-In the meal planner section you can select categories to be used as apart of the random recipe selector in the meal plan creator.
-
-Meal planner webhooks are post requests sent from Mealie to an external endpoint. The body of the message is the Recipe JSON of the scheduled meal. If no meal is schedule, no request is sent. The webhook functionality can be enabled or disabled as well as scheduled. Note that you must "Save Webhooks" prior to any changes taking affect server side.
-
-
diff --git a/docs/docs/getting-started/updating.md b/docs/docs/getting-started/updating.md
new file mode 100644
index 000000000000..9a200153fcb6
--- /dev/null
+++ b/docs/docs/getting-started/updating.md
@@ -0,0 +1,21 @@
+# Updating Mealie
+
+!!! warning "Read The Release Notes"
+ You MUST read the release notes prior to upgrading your container. Currently Mealie provides no database migrations as doing such would slow down development and hinder major changes that may need to happen prior to v1.0.0. Mealie has a robust backup and restore system for managing your data.
+
+ ### Before Upgrading
+ - Read The Release Notes
+ - Identify Breaking Changes
+ - Create a Backup and Download from the UI
+ - Upgrade
+
+## Backing Up Your Data
+
+[See Backups and Restore Section](/site-administration/backups-and-exports/) for details on backing up your data
+
+## Docker
+For all setups using Docker the updating process look something like this
+
+- Stop the container using docker-compose down
+- Pull the latest image using docker-compose pull
+- Start the container again using docker-compose up -d
diff --git a/docs/docs/gifs/editor-demo.gif b/docs/docs/gifs/editor-demo.gif
deleted file mode 100644
index 0cacaa3a2878..000000000000
Binary files a/docs/docs/gifs/editor-demo.gif and /dev/null differ
diff --git a/docs/docs/gifs/url-demo.gif b/docs/docs/gifs/url-demo.gif
deleted file mode 100644
index 2c30e906e6f2..000000000000
Binary files a/docs/docs/gifs/url-demo.gif and /dev/null differ
diff --git a/docs/docs/html/api.html b/docs/docs/html/api.html
deleted file mode 100644
index 7c6d0eba3315..000000000000
--- a/docs/docs/html/api.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- - - -
- A Place for All Your Recipes
-
- View Demo
- ยท
- Report Bug
- ยท
- API
- ยท
-
- Request Feature
-
- ยท
- Docker Hub
-
-
-
-
-## License
-
-Distributed under the MIT License. See `LICENSE` for more information.
-
-
-
-## Contact
-Project Link: [https://github.com/hay-kot/mealie](https://github.com/hay-kot/mealie)
-
-
-
-
-## Acknowledgements
-
-* [Talk Python Training for helping me learn python](https://training.talkpython.fm/)
-* [Academind for helping me learn Javascript and Vue.js](https://academind.com/)
-
-
-
-[product-screenshot]: img/home_screenshot.png
+---
+title: Home
+template: home.html
+---
diff --git a/docs/docs/overrides/api.html b/docs/docs/overrides/api.html
new file mode 100644
index 000000000000..50778c3f3877
--- /dev/null
+++ b/docs/docs/overrides/api.html
@@ -0,0 +1,24 @@
+
+{% extends "main.html" %}
+{% block tabs %}
+{{ super() }}
+
+
+
+
+
+
+
+
+
+{% endblock %}
+{% block content %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/docs/docs/overrides/home.html b/docs/docs/overrides/home.html
new file mode 100644
index 000000000000..bf1991973bf0
--- /dev/null
+++ b/docs/docs/overrides/home.html
@@ -0,0 +1,361 @@
+
+
+{% extends "main.html" %}
+{% block tabs %}
+{{ super() }}
+
+
+
+
+ + 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. +
+ + Get started + + + View the Demo + ++ Quickly and easily import recipes from sites around the web using the built in recipe scrapper. +
++ Keep your data safe with automatic backups in any format supported by Jinja2 templates +
+Use a beautiful and intuitive user interface to create, edit, and delete recipes. Recipe editor supports markdown syntax
+Create Meal Plans for the week, month, or year!
++ Add new users with sign-up links or simply create a new user in the admin panel. +
++ Sort users into groups to share recipes with the whole family, but keep your Meal Plans separate. +
+Schedule webhooks to send notifications to 3rd party services with todays Meal Plan data.
+API Driven application gives you full control of the backend server with interactive documentation
+
