Merge branch 'mealie-next' into fix-register-flow

frontend/components/Domain/Recipe/RecipePage/RecipePageParts/RecipePageInstructions.vue

@@ -356,8 +356,9 @@
   </section>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 import { VueDraggable } from "vue-draggable-plus";
+import { computed, nextTick, onMounted, ref, watch } from "vue";
 import RecipeIngredientHtml from "../../RecipeIngredientHtml.vue";
 import type { RecipeStep, IngredientReferences, RecipeIngredient, RecipeAsset, Recipe } from "~/lib/api/types/recipe";
 import { parseIngredientText } from "~/composables/recipes";
@@ -376,64 +377,33 @@ interface MergerHistory {
   sourceText: string;
 }
 
-export default defineNuxtComponent({
+const instructionList = defineModel<RecipeStep[]>("modelValue", { required: true, default: () => [] });
-  components: {
+const assets = defineModel<RecipeAsset[]>("assets", { required: true, default: () => [] });
-    VueDraggable,
+
-    RecipeIngredientHtml,
+const props = defineProps({
-    DropZone,
-    RecipeIngredients,
-  },
-  props: {
-    modelValue: {
-      type: Array as () => RecipeStep[],
-      required: false,
-      default: () => [],
-    },
   recipe: {
     type: Object as () => NoUndefinedField<Recipe>,
     required: true,
   },
-    assets: {
-      type: Array as () => RecipeAsset[],
-      required: true,
-    },
   scale: {
     type: Number,
     default: 1,
   },
-  },
+});
-  emits: ["update:modelValue", "click-instruction-field", "update:assets"],
+
+const emit = defineEmits(["click-instruction-field", "update:assets"]);
 
-  setup(props, context) {
-    const i18n = useI18n();
 const BASE_URL = useRequestURL().origin;
 
 const { isCookMode, toggleCookMode, isEditForm } = usePageState(props.recipe.slug);
 
-    const state = reactive({
+const dialog = ref(false);
-      dialog: false,
+const disabledSteps = ref<number[]>([]);
-      disabledSteps: [] as number[],
+const unusedIngredients = ref<RecipeIngredient[]>([]);
-      unusedIngredients: [] as RecipeIngredient[],
+const usedIngredients = ref<RecipeIngredient[]>([]);
-      usedIngredients: [] as RecipeIngredient[],
-    });
 
 const showTitleEditor = ref<{ [key: string]: boolean }>({});
 
-    const actionEvents = [
-      {
-        text: i18n.t("recipe.toggle-section") as string,
-        event: "toggle-section",
-      },
-      {
-        text: i18n.t("recipe.link-ingredients") as string,
-        event: "link-ingredients",
-      },
-      {
-        text: i18n.t("recipe.merge-above") as string,
-        event: "merge-above",
-      },
-    ];
-
 // ===============================================================
 // UI State Helpers
 
@@ -441,51 +411,53 @@ export default defineNuxtComponent({
   return !(title === null || title === "" || title === undefined);
 }
 
-    watch(props.modelValue, (v) => {
+watch(instructionList, (v) => {
-      state.disabledSteps = [];
+  disabledSteps.value = [];
 
   v.forEach((element: RecipeStep) => {
     if (element.id !== undefined) {
       showTitleEditor.value[element.id!] = hasSectionTitle(element.title!);
     }
   });
-    });
+}, { deep: true });
 
 const showCookMode = ref(false);
 
-    // Eliminate state with an eager call to watcher?
 onMounted(() => {
-      props.modelValue.forEach((element: RecipeStep) => {
+  instructionList.value.forEach((element: RecipeStep) => {
     if (element.id !== undefined) {
       showTitleEditor.value[element.id!] = hasSectionTitle(element.title!);
     }
 
-        // showCookMode.value = false;
     if (showCookMode.value === false && element.ingredientReferences && element.ingredientReferences.length > 0) {
       showCookMode.value = true;
     }
 
     showTitleEditor.value = { ...showTitleEditor.value };
   });
+
+  if (assets.value === undefined) {
+    emit("update:assets", []);
+  }
 });
 
 function toggleDisabled(stepIndex: number) {
   if (isEditForm.value) {
     return;
   }
-      if (state.disabledSteps.includes(stepIndex)) {
+  if (disabledSteps.value.includes(stepIndex)) {
-        const index = state.disabledSteps.indexOf(stepIndex);
+    const index = disabledSteps.value.indexOf(stepIndex);
     if (index !== -1) {
-          state.disabledSteps.splice(index, 1);
+      disabledSteps.value.splice(index, 1);
     }
   }
   else {
-        state.disabledSteps.push(stepIndex);
+    disabledSteps.value.push(stepIndex);
   }
 }
 
 function isChecked(stepIndex: number) {
-      if (state.disabledSteps.includes(stepIndex) && !isEditForm.value) {
+  if (disabledSteps.value.includes(stepIndex) && !isEditForm.value) {
     return "disabled-card";
   }
 }
@@ -501,18 +473,7 @@ export default defineNuxtComponent({
   showTitleEditor.value = temp;
 }
 
-    const instructionList = ref<RecipeStep[]>([...props.modelValue]);
-
-    watch(
-      () => props.modelValue,
-      (newVal) => {
-        instructionList.value = [...newVal];
-      },
-      { deep: true },
-    );
-
 function onDragEnd() {
-      context.emit("update:modelValue", [...instructionList.value]);
   drag.value = false;
 }
 
@@ -525,20 +486,20 @@ export default defineNuxtComponent({
 function openDialog(idx: number, text: string, refs?: IngredientReferences[]) {
   if (!refs) {
     instructionList.value[idx].ingredientReferences = [];
-        refs = props.modelValue[idx].ingredientReferences as IngredientReferences[];
+    refs = instructionList.value[idx].ingredientReferences as IngredientReferences[];
   }
 
   setUsedIngredients();
   activeText.value = text;
   activeIndex.value = idx;
-      state.dialog = true;
+  dialog.value = true;
   activeRefs.value = refs.map(ref => ref.referenceId ?? "");
 }
 
-    const availableNextStep = computed(() => activeIndex.value < props.modelValue.length - 1);
+const availableNextStep = computed(() => activeIndex.value < instructionList.value.length - 1);
 
 function setIngredientIds() {
-      const instruction = props.modelValue[activeIndex.value];
+  const instruction = instructionList.value[activeIndex.value];
   instruction.ingredientReferences = activeRefs.value.map((ref) => {
     return {
       referenceId: ref,
@@ -547,12 +508,12 @@ export default defineNuxtComponent({
 
   // Update the visibility of the cook mode button
   showCookMode.value = false;
-      props.modelValue.forEach((element) => {
+  instructionList.value.forEach((element) => {
     if (showCookMode.value === false && element.ingredientReferences && element.ingredientReferences.length > 0) {
       showCookMode.value = true;
     }
   });
-      state.dialog = false;
+  dialog.value = false;
 }
 
 function saveAndOpenNextLinkIngredients() {
@@ -563,7 +524,7 @@ export default defineNuxtComponent({
   }
 
   setIngredientIds();
-      const nextStep = props.modelValue[currentStepIndex + 1];
+  const nextStep = instructionList.value[currentStepIndex + 1];
   // close dialog before opening to reset the scroll position
   nextTick(() => openDialog(currentStepIndex + 1, nextStep.text, nextStep.ingredientReferences));
 }
@@ -571,7 +532,7 @@ export default defineNuxtComponent({
 function setUsedIngredients() {
   const usedRefs: { [key: string]: boolean } = {};
 
-      props.modelValue.forEach((element) => {
+  instructionList.value.forEach((element) => {
     element.ingredientReferences?.forEach((ref) => {
       if (ref.referenceId !== undefined) {
         usedRefs[ref.referenceId!] = true;
@@ -579,11 +540,11 @@ export default defineNuxtComponent({
     });
   });
 
-      state.usedIngredients = props.recipe.recipeIngredient.filter((ing) => {
+  usedIngredients.value = props.recipe.recipeIngredient.filter((ing) => {
     return ing.referenceId !== undefined && ing.referenceId in usedRefs;
   });
 
-      state.unusedIngredients = props.recipe.recipeIngredient.filter((ing) => {
+  unusedIngredients.value = props.recipe.recipeIngredient.filter((ing) => {
     return !(ing.referenceId !== undefined && ing.referenceId in usedRefs);
   });
 }
@@ -630,11 +591,11 @@ export default defineNuxtComponent({
   mergeHistory.value.push({
     target,
     source,
-        targetText: props.modelValue[target].text,
+    targetText: instructionList.value[target].text,
-        sourceText: props.modelValue[source].text,
+    sourceText: instructionList.value[source].text,
   });
 
-      instructionList.value[target].text += " " + props.modelValue[source].text;
+  instructionList.value[target].text += " " + instructionList.value[source].text;
   instructionList.value.splice(source, 1);
 }
 
@@ -692,13 +653,13 @@ export default defineNuxtComponent({
     }
   }
 
-      const allCollapsed = sectionSteps.every(idx => state.disabledSteps.includes(idx));
+  const allCollapsed = sectionSteps.every(idx => disabledSteps.value.includes(idx));
 
   if (allCollapsed) {
-        state.disabledSteps = state.disabledSteps.filter(idx => !sectionSteps.includes(idx));
+    disabledSteps.value = disabledSteps.value.filter(idx => !sectionSteps.includes(idx));
   }
   else {
-        state.disabledSteps = [...state.disabledSteps, ...sectionSteps];
+    disabledSteps.value = [...disabledSteps.value, ...sectionSteps];
   }
 }
 
@@ -709,19 +670,6 @@ export default defineNuxtComponent({
 const api = useUserApi();
 const { recipeAssetPath } = useStaticRoutes();
 
-    const imageUploadMode = ref(false);
-
-    function toggleDragMode() {
-      console.log("Toggling Drag Mode");
-      imageUploadMode.value = !imageUploadMode.value;
-    }
-
-    onMounted(() => {
-      if (props.assets === undefined) {
-        context.emit("update:assets", []);
-      }
-    });
-
 const loadingStates = ref<{ [key: number]: boolean }>({});
 
 async function handleImageDrop(index: number, files: File[]) {
@@ -750,7 +698,7 @@ export default defineNuxtComponent({
     return; // TODO: Handle error
   }
 
-      context.emit("update:assets", [...props.assets, data]);
+  emit("update:assets", [...assets.value, data]);
   const assetUrl = BASE_URL + recipeAssetPath(props.recipe.id, data.fileName as string);
   const text = `<img src="${assetUrl}" height="100%" width="100%"/>`;
   instructionList.value[index].text += text;
@@ -768,51 +716,6 @@ export default defineNuxtComponent({
   };
   input.click();
 }
-
-    const breakpoint = useDisplay();
-
-    return {
-      // Image Uploader
-      toggleDragMode,
-      handleImageDrop,
-      imageUploadMode,
-      openImageUpload,
-      loadingStates,
-
-      // Rest
-      onDragEnd,
-      drag,
-      togglePreviewState,
-      toggleCollapseSection,
-      previewStates,
-      ...toRefs(state),
-      actionEvents,
-      activeRefs,
-      activeText,
-      getIngredientByRefId,
-      showTitleEditor,
-      mergeAbove,
-      moveTo,
-      openDialog,
-      setIngredientIds,
-      availableNextStep,
-      saveAndOpenNextLinkIngredients,
-      undoMerge,
-      toggleDisabled,
-      isChecked,
-      toggleShowTitle,
-      instructionList,
-      autoSetReferences,
-      parseIngredientText,
-      toggleCookMode,
-      showCookMode,
-      isCookMode,
-      isEditForm,
-      insert,
-      breakpoint,
-    };
-  },
-});
 </script>
 
 <style lang="css" scoped>

frontend/pages/household/mealplan/planner/view.vue

@@ -4,14 +4,14 @@
       <v-col v-for="(day, index) in plan" :key="index" cols="12" sm="12" md="4" lg="4" xl="2"
         class="col-borders my-1 d-flex flex-column">
         <v-card class="mb-2 border-left-primary rounded-sm px-2">
-          <v-container class="px-0">
+          <v-container class="px-0 d-flex align-center" height="56px">
             <v-row no-gutters style="width: 100%;">
-              <v-col cols="10">
+              <v-col cols="10" class="d-flex align-center">
                 <p class="pl-2 my-1">
                   {{ $d(day.date, "short") }}
                 </p>
               </v-col>
-              <v-col class="d-flex justify-top" cols="2">
+              <v-col class="d-flex align-center" cols="2">
                 <GroupMealPlanDayContextMenu v-if="day.recipes.length" :recipes="day.recipes" />
               </v-col>
             </v-row>
@@ -38,25 +38,17 @@
   </v-container>
 </template>
 
-<script lang="ts">
+<script lang="ts" setup>
 import type { MealsByDate } from "./types";
 import type { ReadPlanEntry } from "~/lib/api/types/meal-plan";
 import GroupMealPlanDayContextMenu from "~/components/Domain/Household/GroupMealPlanDayContextMenu.vue";
 import RecipeCardMobile from "~/components/Domain/Recipe/RecipeCardMobile.vue";
 import type { RecipeSummary } from "~/lib/api/types/recipe";
 
-export default defineNuxtComponent({
+const props = defineProps<{
-  components: {
+  mealplans: MealsByDate[];
-    GroupMealPlanDayContextMenu,
+}>();
-    RecipeCardMobile,
+
-  },
-  props: {
-    mealplans: {
-      type: Array as () => MealsByDate[],
-      required: true,
-    },
-  },
-  setup(props) {
 type DaySection = {
   title: string;
   meals: ReadPlanEntry[];
@@ -110,10 +102,4 @@ export default defineNuxtComponent({
     return acc;
   }, [] as Days[]);
 });
-
-    return {
-      plan,
-    };
-  },
-});
 </script>