Merge branch 'migration-redesign' of https://github.com/hay-kot/mealie into migration-redesign

docs/docs/getting-started/meal-planner.md

@@ -1,7 +1,7 @@
 # Meal Planner
 
 ## Working with Meal Plans
-In Mealie you can create a mealplan based off the calendar inputs on the meal planner page. There is no limit to how long or how short a meal plan is. You may also create duplicate meal plans for the same date range. After selecting your date range, click on the card for each day and seach through recipes to find your choice. After selecting a recipe for all meals save the plan. You can also randomly generate meal plans.
+In Mealie you can create a mealplan based off the calendar inputs on the meal planner page. There is no limit to how long or how short a meal plan is. You may also create duplicate meal plans for the same date range. After selecting your date range, click on the card for each day and search through recipes to find your choice. After selecting a recipe for all meals save the plan. You can also randomly generate meal plans.
 
 To edit the meal in a meal plan simply select the edit button on the card in the timeline. Similiarly, to delete a mealplan click the delete button on the card in the timeline. Currently there is no support to change the date range in a meal plan.
 

docs/docs/getting-started/migration-imports.md

@@ -1,13 +1,13 @@
 # Migration
 
-### Chowdown
+## Chowdown
+To migrate recipes from a Chowdown 
+  1. Download the code repository as a .zip file
+  2. Upload the .zip file in the Chowdown section in Mealie
+  3. Select import on the newly available migration. 
 
-In the Admin page on the in the Migration section you can provide a URL for a repo hosting a [Chowdown](https://github.com/clarklab/chowdown) repository and Mealie will pull the images and recipes from the instance and automatically import them into the database. Due to the nature of the yaml format you may have mixed results but you should get an error report of the recipes that had errors and will need to be manually added. Note that you can only import the repo as a whole. You cannot import individual recipes. 
-
-We'd like to support additional migration paths. [See open issues.](https://github.com/hay-kot/mealie/issues)
-
-### Nextcloud Recipes
-Nextcloud recipes can be imported from either a zip file the contains the data stored in Nextcloud. The zip file can be uploaded from the frontend or placed in the data/migrations/Nextcloud directory. See the example folder structure below to ensure your recipes are able to be imported. 
+## Nextcloud Recipes
+Nextcloud recipes can be imported from a zip file the contains the data stored in Nextcloud. The zip file can be uploaded from the frontend or placed in the data/migrations/nextcloud directory. See the example folder structure below to ensure your recipes are able to be imported. 
 
 ```
 nextcloud_recipes.zip
@@ -21,6 +21,3 @@ nextcloud_recipes.zip
   └── recipe_3
       └── recipe.json
 ```
-
-**Currently Proposed Are:**
-- Open Eats

frontend/src/components/Settings/Theme/ColorPickerDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <v-btn block :color="value" @click="dialog = true">
+    <!-- <v-btn block :color="value" @click="dialog = true">
       {{ buttonText }}
     </v-btn>
     <v-dialog v-model="dialog" width="400">
@@ -30,7 +30,34 @@
           <v-btn text @click="dialog = false"> {{$t('general.select')}} </v-btn>
         </v-card-actions>
       </v-card>
-    </v-dialog>
+    </v-dialog> -->
+
+    <v-text-field
+      v-model="value"
+      v-mask="mask"
+      hide-details
+      class="ma-0 pa-0"
+      solo
+    >
+      <template v-slot:append>
+        <v-menu
+          v-model="menu"
+          top
+          nudge-bottom="105"
+          nudge-left="16"
+          :close-on-content-click="false"
+        >
+          <template v-slot:activator="{ on }">
+            <div :style="swatchStyle" v-on="on" swatches-max-height="300" />
+          </template>
+          <v-card>
+            <v-card-text class="pa-0">
+              <v-color-picker v-model="value" flat show-swatches />
+            </v-card-text>
+          </v-card>
+        </v-menu>
+      </template>
+    </v-text-field>
   </div>
 </template>
 
@@ -44,21 +71,30 @@ export default {
     return {
       dialog: false,
       swatches: false,
-      color: "#FF00FF",
+      color: "#1976D2FF",
+      mask: "!#XXXXXXXX",
+      menu: false,
     };
   },
-
+  computed: {
+    swatchStyle() {
+      const { value, menu } = this;
+      return {
+        backgroundColor: value,
+        cursor: "pointer",
+        height: "30px",
+        width: "30px",
+        borderRadius: menu ? "50%" : "4px",
+        transition: "border-radius 200ms ease-in-out",
+      };
+    },
+  },
   watch: {
     color() {
       this.updateColor();
     },
   },
   methods: {
-    toggleSwatches() {
-      if (this.swatches) {
-        this.swatches = false;
-      } else this.swatches = true;
-    },
     updateColor() {
       this.$emit("input", this.color);
     },

mealie/services/migrations/chowdown.py

@@ -1,8 +1,6 @@
 import shutil
-import zipfile
 from pathlib import Path
 
-import git
 import yaml
 from app_config import IMG_DIR, TEMP_DIR
 from services.recipe_services import Recipe