feat: improve BaseDialog on mobile and use it globally (#7076)

Co-authored-by: Michael Genson <71845777+michael-genson@users.noreply.github.com>

frontend/components/Domain/Recipe/RecipeDialogBulkAdd.vue

@@ -1,91 +1,60 @@
 <template>
   <div class="text-center">
-    <v-dialog
+    <BaseButton @click="dialog = true">
+      {{ $t("new-recipe.bulk-add") }}
+    </BaseButton>
+    <BaseDialog
       v-model="dialog"
       width="800"
+      :title="$t('new-recipe.bulk-add')"
+      :icon="$globals.icons.createAlt"
+      :submit-text="$t('general.add')"
+      :disable-submit-on-enter="true"
+      can-submit
+      @submit="save"
     >
-      <template #activator="{ props: activatorProps }">
+      <v-card-text>
-        <BaseButton
+        <v-textarea
-          v-bind="activatorProps"
+          v-model="inputText"
-          @click="inputText = inputTextProp"
+          variant="outlined"
-        >
+          rows="12"
-          {{ $t("new-recipe.bulk-add") }}
+          hide-details
-        </BaseButton>
+          autofocus
-      </template>
+          :placeholder="$t('new-recipe.paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list')"
+        />
 
-      <v-card>
+        <v-divider />
-        <v-app-bar
+        <v-list lines="two">
-          density="compact"
-          dark
-          color="primary"
-          class="mb-2 position-relative left-0 top-0 w-100"
-        >
-          <v-icon
-            size="large"
-            start
-          >
-            {{ $globals.icons.createAlt }}
-          </v-icon>
-          <v-toolbar-title class="headline">
-            {{ $t("new-recipe.bulk-add") }}
-          </v-toolbar-title>
-          <v-spacer />
-        </v-app-bar>
-
-        <v-card-text>
-          <v-textarea
-            v-model="inputText"
-            variant="outlined"
-            rows="12"
-            hide-details
-            :placeholder="$t('new-recipe.paste-in-your-recipe-data-each-line-will-be-treated-as-an-item-in-a-list')"
-          />
-
-          <v-divider />
           <template
             v-for="(util) in utilities"
             :key="util.id"
           >
             <v-list-item
-              density="compact"
+              class="px-0"
-              class="py-1"
             >
-              <v-list-item-title>
+              <template #prepend>
-                <v-list-item-subtitle class="wrap-word">
+                <v-avatar>
-                  {{ util.description }}
+                  <v-btn
-                </v-list-item-subtitle>
+                    icon
+                    variant="tonal"
+                    base-color="info"
+                    :title="$t('general.run')"
+                    @click="util.action"
+                  >
+                    <v-icon>
+                      {{ $globals.icons.play }}
+                    </v-icon>
+                  </v-btn>
+                </v-avatar>
+              </template>
+              <v-list-item-title class="text-pre-wrap">
+                {{ util.description }}
               </v-list-item-title>
-              <BaseButton
-                size="small"
-                color="info"
-                @click="util.action"
-              >
-                <template #icon>
-                  {{ $globals.icons.robot }}
-                </template>
-                {{ $t("general.run") }}
-              </BaseButton>
             </v-list-item>
-            <v-divider class="mx-2" />
           </template>
-        </v-card-text>
+        </v-list>
-
+      </v-card-text>
-        <v-divider />
+    </BaseDialog>
-
-        <v-card-actions>
-          <BaseButton
-            cancel
-            @click="dialog = false"
-          />
-          <v-spacer />
-          <BaseButton
-            save
-            color="success"
-            @click="save"
-          />
-        </v-card-actions>
-      </v-card>
-    </v-dialog>
   </div>
 </template>
 

frontend/components/Domain/Recipe/RecipeOrganizerDialog.vue

@@ -1,62 +1,30 @@
 <template>
   <div>
-    <v-dialog
+    <BaseDialog
       v-model="dialog"
       width="500"
+      :title="properties.title"
+      :icon="properties.icon"
+      can-submit
+      :submit-disabled="!name"
+      @submit="select"
     >
-      <v-card>
+      <v-form>
-        <v-app-bar
+        <v-card-text>
-          density="compact"
+          <v-text-field
-          dark
+            v-model="name"
-          color="primary mb-2 position-relative left-0 top-0 w-100 pl-3"
+            :label="properties.label"
-        >
+            :rules="[rules.required]"
-          <v-icon
+            autofocus
-            size="large"
+          />
-            start
+          <v-checkbox
-            class="mt-1"
+            v-if="itemType === Organizer.Tool"
-          >
+            v-model="onHand"
-            {{ itemType === Organizer.Tool ? $globals.icons.potSteam
+            :label="$t('tool.on-hand')"
-              : itemType === Organizer.Category ? $globals.icons.categories
+          />
-                : $globals.icons.tags }}
+        </v-card-text>
-          </v-icon>
+      </v-form>
-
+    </BaseDialog>
-          <v-toolbar-title class="headline">
-            {{ properties.title }}
-          </v-toolbar-title>
-
-          <v-spacer />
-        </v-app-bar>
-        <v-card-title />
-        <v-form @submit.prevent="select">
-          <v-card-text>
-            <v-text-field
-              v-model="name"
-              density="compact"
-              :label="properties.label"
-              :rules="[rules.required]"
-              autofocus
-            />
-            <v-checkbox
-              v-if="itemType === Organizer.Tool"
-              v-model="onHand"
-              :label="$t('tool.on-hand')"
-            />
-          </v-card-text>
-          <v-card-actions>
-            <BaseButton
-              cancel
-              @click="dialog = false"
-            />
-            <v-spacer />
-            <BaseButton
-              type="submit"
-              create
-              :disabled="!name"
-            />
-          </v-card-actions>
-        </v-form>
-      </v-card>
-    </v-dialog>
   </div>
 </template>
 
@@ -65,6 +33,8 @@ import { useUserApi } from "~/composables/api";
 import { useCategoryStore, useTagStore, useToolStore } from "~/composables/store";
 import { type RecipeOrganizer, Organizer } from "~/lib/api/types/non-generated";
 
+const { $globals } = useNuxtApp();
+
 const CREATED_ITEM_EVENT = "created-item";
 
 interface Props {
@@ -115,18 +85,21 @@ const properties = computed(() => {
       return {
         title: i18n.t("tag.create-a-tag"),
         label: i18n.t("tag.tag-name"),
+        icon: $globals.icons.tags,
         api: userApi.tags,
       };
     case Organizer.Tool:
       return {
         title: i18n.t("tool.create-a-tool"),
         label: i18n.t("tool.tool-name"),
+        icon: $globals.icons.potSteam,
         api: userApi.tools,
       };
     default:
       return {
         title: i18n.t("category.create-a-category"),
         label: i18n.t("category.category-name"),
+        icon: $globals.icons.categories,
         api: userApi.categories,
       };
   }
@@ -139,12 +112,9 @@ const rules = {
 async function select() {
   if (store) {
     // @ts-expect-error the same state is used for different organizer types, which have different requirements
-    await store.actions.createOne({ name: name.value, onHand: onHand.value });
+    const newItem = await store.actions.createOne({ name: name.value, onHand: onHand.value });
+    emit(CREATED_ITEM_EVENT, newItem);
   }
-
-  const newItem = store.store.value.find(item => item.name === name.value);
-
-  emit(CREATED_ITEM_EVENT, newItem);
   dialog.value = false;
 }
 </script>

frontend/components/Domain/Recipe/RecipeOrganizerPage.vue

@@ -26,6 +26,7 @@
       v-if="updateTarget"
       v-model="dialogs.update"
       :title="$t('general.update')"
+      :icon="$globals.icons.edit"
       can-confirm
       @confirm="updateOne()"
     >

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

@@ -1,117 +1,101 @@
 <template>
   <section @keyup.ctrl.z="undoMerge">
     <!-- Ingredient Link Editor -->
-    <v-dialog
+    <BaseDialog
-      v-if="dialog"
       v-model="dialog"
-      width="600"
+      :title="$t('recipe.ingredient-linker')"
+      :icon="$globals.icons.link"
+      width="100%"
+      max-width="600px"
+      max-height="40%"
     >
-      <v-card :ripple="false">
+      <v-card-text class="pt-4">
-        <v-sheet
+        <p>
-          color="primary"
+          {{ activeText }}
-          class="mt-n1 mb-3 pa-3 d-flex align-center"
+        </p>
-          style="border-radius: 6px; width: 100%;"
+        <v-divider class="my-4" />
-        >
+        <template v-if="Object.keys(groupedUnusedIngredients).length > 0">
-          <v-icon
+          <h4 class="ml-1">
-            size="large"
+            {{ $t("recipe.unlinked") }}
-            start
+          </h4>
-          >
+          <template v-for="(ingredients, title) in groupedUnusedIngredients" :key="title">
-            {{ $globals.icons.link }}
+            <h4 v-if="title" class="py-3 ml-1 pl-4">
-          </v-icon>
+              {{ title }}
-          <v-toolbar-title class="headline">
-            {{ $t("recipe.ingredient-linker") }}
-          </v-toolbar-title>
-          <v-spacer />
-        </v-sheet>
-
-        <v-card-text class="pt-4">
-          <p>
-            {{ activeText }}
-          </p>
-          <v-divider class="mb-4" />
-          <template v-if="Object.keys(groupedUnusedIngredients).length > 0">
-            <h4 class="py-3 ml-1">
-              {{ $t("recipe.unlinked") }}
             </h4>
-            <template v-for="(ingredients, title) in groupedUnusedIngredients" :key="title">
+            <v-checkbox-btn
-              <h4 v-if="title" class="py-3 ml-1 pl-4">
+              v-for="ing in ingredients"
-                {{ title }}
+              :key="ing.referenceId"
-              </h4>
+              v-model="activeRefs"
-              <v-checkbox-btn
+              :value="ing.referenceId"
-                v-for="ing in ingredients"
+              class="ml-4"
-                :key="ing.referenceId"
+            >
-                v-model="activeRefs"
+              <template #label>
-                :value="ing.referenceId"
+                <RecipeIngredientHtml :ingredient="ing" :scale="scale" />
-                class="ml-4"
+              </template>
-              >
+            </v-checkbox-btn>
-                <template #label>
-                  <RecipeIngredientHtml :ingredient="ing" :scale="scale" />
-                </template>
-              </v-checkbox-btn>
-            </template>
           </template>
+        </template>
 
-          <template v-if="Object.keys(groupedUsedIngredients).length > 0">
+        <template v-if="Object.keys(groupedUsedIngredients).length > 0">
-            <h4 class="py-3 ml-1">
+          <h4 class="py-3 ml-1">
-              {{ $t("recipe.linked-to-other-step") }}
+            {{ $t("recipe.linked-to-other-step") }}
+          </h4>
+          <template v-for="(ingredients, title) in groupedUsedIngredients" :key="title">
+            <h4 v-if="title" class="py-3 ml-1 pl-4">
+              {{ title }}
             </h4>
-            <template v-for="(ingredients, title) in groupedUsedIngredients" :key="title">
+            <v-checkbox-btn
-              <h4 v-if="title" class="py-3 ml-1 pl-4">
+              v-for="ing in ingredients"
-                {{ title }}
+              :key="ing.referenceId"
-              </h4>
+              v-model="activeRefs"
-              <v-checkbox-btn
+              :value="ing.referenceId"
-                v-for="ing in ingredients"
+              class="ml-4"
-                :key="ing.referenceId"
+            >
-                v-model="activeRefs"
+              <template #label>
-                :value="ing.referenceId"
+                <RecipeIngredientHtml :ingredient="ing" :scale="scale" />
-                class="ml-4"
+              </template>
-              >
+            </v-checkbox-btn>
-                <template #label>
-                  <RecipeIngredientHtml :ingredient="ing" :scale="scale" />
-                </template>
-              </v-checkbox-btn>
-            </template>
           </template>
-        </v-card-text>
+        </template>
+      </v-card-text>
 
-        <v-divider />
+      <v-divider />
 
-        <v-card-actions>
+      <template #card-actions>
+        <BaseButton
+          cancel
+          @click="dialog = false"
+        />
+        <v-spacer />
+        <div class="d-flex flex-wrap justify-end">
           <BaseButton
-            cancel
+            class="my-1"
-            @click="dialog = false"
+            color="info"
+            @click="autoSetReferences"
+          >
+            <template #icon>
+              {{ $globals.icons.robot }}
+            </template>
+            {{ $t("recipe.auto") }}
+          </BaseButton>
+          <BaseButton
+            class="ml-2 my-1"
+            save
+            @click="setIngredientIds"
           />
-          <v-spacer />
+          <BaseButton
-          <div class="d-flex flex-wrap justify-end">
+            v-if="availableNextStep"
-            <BaseButton
+            class="ml-2 my-1"
-              class="my-1"
+            @click="saveAndOpenNextLinkIngredients"
-              color="info"
+          >
-              @click="autoSetReferences"
+            <template #icon>
-            >
+              {{ $globals.icons.forward }}
-              <template #icon>
+            </template>
-                {{ $globals.icons.robot }}
+            {{ $t("recipe.nextStep") }}
-              </template>
+          </BaseButton>
-              {{ $t("recipe.auto") }}
+        </div>
-            </BaseButton>
+      </template>
-            <BaseButton
+    </BaseDialog>
-              class="ml-2 my-1"
-              save
-              @click="setIngredientIds"
-            />
-            <BaseButton
-              v-if="availableNextStep"
-              class="ml-2 my-1"
-              @click="saveAndOpenNextLinkIngredients"
-            >
-              <template #icon>
-                {{ $globals.icons.forward }}
-              </template>
-              {{ $t("recipe.nextStep") }}
-            </BaseButton>
-          </div>
-        </v-card-actions>
-      </v-card>
-    </v-dialog>
 
     <div class="d-flex justify-space-between justify-start">
       <h2
@@ -851,6 +835,10 @@ function openImageUpload(index: number) {
   font-size: 1.5rem;
 }
 
+.v-card-text {
+  font-size: 1rem;
+}
+
 .recipe-step-title {
   /* Multiline display */
   white-space: normal;

frontend/components/Domain/Recipe/RecipeTimelineBadge.vue

@@ -24,7 +24,7 @@
       </v-btn>
       <BaseDialog
         v-model="showTimeline"
-        :title="timelineAttrs.title"
+        :title="$t('recipe.timeline')"
         :icon="$globals.icons.timelineText"
         width="70%"
       >
@@ -53,8 +53,6 @@ const props = withDefaults(defineProps<Props>(), {
   recipeName: "",
 });
 
-const i18n = useI18n();
-const { smAndDown } = useDisplay();
 const showTimeline = ref(false);
 
 function toggleTimeline() {
@@ -62,13 +60,7 @@ function toggleTimeline() {
 }
 
 const timelineAttrs = computed(() => {
-  let title = i18n.t("recipe.timeline");
-  if (smAndDown.value) {
-    title += ` – ${props.recipeName}`;
-  }
-
   return {
-    title,
     queryFilter: `recipe.slug="${props.slug}"`,
   };
 });

frontend/components/global/BaseDialog.vue

@@ -14,7 +14,13 @@
       @click:outside="emit('cancel')"
       @keydown.esc="emit('cancel')"
     >
-      <v-card height="100%">
+      <v-card height="100%" :loading="loading">
+        <template #loader="{ isActive }">
+          <v-progress-linear
+            :active="isActive"
+            indeterminate
+          />
+        </template>
         <v-toolbar
           dark
           density="comfortable"
@@ -28,17 +34,12 @@
             {{ title }}
           </v-toolbar-title>
         </v-toolbar>
-        <v-progress-linear
-          v-if="loading"
-          class="mt-1"
-          indeterminate
-          color="primary"
-        />
 
         <div>
           <slot v-bind="{ submitEvent }" />
         </div>
 
+        <v-spacer />
         <v-divider class="mx-2" />
 
         <v-card-actions>

frontend/lib/icons/icons.ts

@@ -107,6 +107,7 @@ import {
   mdiOpenInNew,
   mdiOrderAlphabeticalAscending,
   mdiPageLayoutBody,
+  mdiPlay,
   mdiPlus,
   mdiPlusCircle,
   mdiPotSteamOutline,
@@ -252,6 +253,7 @@ export const icons = {
   openInNew: mdiOpenInNew,
   orderAlphabeticalAscending: mdiOrderAlphabeticalAscending,
   pageLayoutBody: mdiPageLayoutBody,
+  play: mdiPlay,
   printer: mdiPrinter,
   printerSettings: mdiPrinterPosCog,
   refreshCircle: mdiRefreshCircle,

frontend/pages/admin/manage/groups/index.vue

@@ -20,6 +20,7 @@
     <BaseDialog
       v-model="state.confirmDialog"
       :title="$t('general.confirm')"
+      :icon="$globals.icons.alertCircle"
       color="error"
       can-confirm
       @confirm="deleteGroup(state.deleteTarget)"

frontend/pages/admin/manage/households/index.vue

@@ -38,6 +38,7 @@
     <BaseDialog
       v-model="confirmDialog"
       :title="$t('general.confirm')"
+      :icon="$globals.icons.alertCircle"
       color="error"
       can-confirm
       @confirm="deleteHousehold(deleteTarget)"

frontend/pages/admin/manage/users/index.vue

@@ -4,6 +4,7 @@
     <BaseDialog
       v-model="state.deleteDialog"
       :title="$t('general.confirm')"
+      :icon="$globals.icons.alertCircle"
       color="error"
       can-confirm
       @confirm="deleteUser(state.deleteTargetId)"

frontend/pages/shopping-lists/[id].vue

@@ -6,6 +6,7 @@
     <BaseDialog
       v-model="state.checkAllDialog"
       :title="$t('general.confirm')"
+      :icon="$globals.icons.checkboxOutline"
       can-confirm
       @confirm="checkAll"
     >
@@ -17,6 +18,7 @@
     <BaseDialog
       v-model="state.uncheckAllDialog"
       :title="$t('general.confirm')"
+      :icon="$globals.icons.checkboxBlankOutline"
       can-confirm
       @confirm="uncheckAll"
     >
@@ -28,6 +30,7 @@
     <BaseDialog
       v-model="state.deleteCheckedDialog"
       :title="$t('general.confirm')"
+      :icon="$globals.icons.alertCircle"
       can-confirm
       @confirm="deleteChecked"
     >

frontend/pages/shopping-lists/index.vue

@@ -6,6 +6,7 @@
     <BaseDialog
       v-model="state.createDialog"
       :title="$t('shopping-list.create-shopping-list')"
+      :icon="$globals.icons.formatListCheck"
       can-submit
       @submit="createOne"
     >
@@ -43,6 +44,7 @@
     <BaseDialog
       v-model="state.deleteDialog"
       :title="$t('general.confirm')"
+      :icon="$globals.icons.alertCircle"
       color="error"
       can-confirm
       @confirm="deleteOne"