mirror of
				https://github.com/mealie-recipes/mealie.git
				synced 2025-10-31 10:13:32 -04:00 
			
		
		
		
	* added support for SQL keywords IS, IN, LIKE, NOT deprecated datetime workaround for "<> null" updated frontend reference for "<> null" to "IS NOT NULL" * tests * refactored query filtering to leverage orm * added CONTAINS ALL keyword * tests * fixed bug where "and" or "or" was in an attr name * more tests * linter fixes * TIL this works
		
			
				
	
	
		
			387 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			Vue
		
	
	
	
	
	
			
		
		
	
	
			387 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			Vue
		
	
	
	
	
	
| <template>
 | |
|   <div>
 | |
|     <v-app-bar v-if="!disableToolbar" color="transparent" flat class="mt-n1 flex-sm-wrap rounded">
 | |
|       <slot name="title">
 | |
|         <v-icon v-if="title" large left>
 | |
|           {{ displayTitleIcon }}
 | |
|         </v-icon>
 | |
|         <v-toolbar-title class="headline"> {{ title }} </v-toolbar-title>
 | |
|       </slot>
 | |
|       <v-spacer></v-spacer>
 | |
|       <v-btn :icon="$vuetify.breakpoint.xsOnly" text :disabled="recipes.length === 0" @click="navigateRandom">
 | |
|         <v-icon :left="!$vuetify.breakpoint.xsOnly">
 | |
|           {{ $globals.icons.diceMultiple }}
 | |
|         </v-icon>
 | |
|         {{ $vuetify.breakpoint.xsOnly ? null : $t("general.random") }}
 | |
|       </v-btn>
 | |
| 
 | |
|       <v-menu v-if="$listeners.sortRecipes" offset-y left>
 | |
|         <template #activator="{ on, attrs }">
 | |
|           <v-btn text :icon="$vuetify.breakpoint.xsOnly" v-bind="attrs" :loading="sortLoading" v-on="on">
 | |
|             <v-icon :left="!$vuetify.breakpoint.xsOnly">
 | |
|               {{ preferences.sortIcon }}
 | |
|             </v-icon>
 | |
|             {{ $vuetify.breakpoint.xsOnly ? null : $t("general.sort") }}
 | |
|           </v-btn>
 | |
|         </template>
 | |
|         <v-list>
 | |
|           <v-list-item @click="sortRecipes(EVENTS.az)">
 | |
|             <v-icon left>
 | |
|               {{ $globals.icons.orderAlphabeticalAscending }}
 | |
|             </v-icon>
 | |
|             <v-list-item-title>{{ $t("general.sort-alphabetically") }}</v-list-item-title>
 | |
|           </v-list-item>
 | |
|           <v-list-item @click="sortRecipes(EVENTS.rating)">
 | |
|             <v-icon left>
 | |
|               {{ $globals.icons.star }}
 | |
|             </v-icon>
 | |
|             <v-list-item-title>{{ $t("general.rating") }}</v-list-item-title>
 | |
|           </v-list-item>
 | |
|           <v-list-item @click="sortRecipes(EVENTS.created)">
 | |
|             <v-icon left>
 | |
|               {{ $globals.icons.newBox }}
 | |
|             </v-icon>
 | |
|             <v-list-item-title>{{ $t("general.created") }}</v-list-item-title>
 | |
|           </v-list-item>
 | |
|           <v-list-item @click="sortRecipes(EVENTS.updated)">
 | |
|             <v-icon left>
 | |
|               {{ $globals.icons.update }}
 | |
|             </v-icon>
 | |
|             <v-list-item-title>{{ $t("general.updated") }}</v-list-item-title>
 | |
|           </v-list-item>
 | |
|           <v-list-item @click="sortRecipes(EVENTS.lastMade)">
 | |
|             <v-icon left>
 | |
|               {{ $globals.icons.chefHat }}
 | |
|             </v-icon>
 | |
|             <v-list-item-title>{{ $t("general.last-made") }}</v-list-item-title>
 | |
|           </v-list-item>
 | |
|         </v-list>
 | |
|       </v-menu>
 | |
|       <ContextMenu
 | |
|         v-if="!$vuetify.breakpoint.xsOnly"
 | |
|         :items="[
 | |
|           {
 | |
|             title: $tc('general.toggle-view'),
 | |
|             icon: $globals.icons.eye,
 | |
|             event: 'toggle-dense-view',
 | |
|           },
 | |
|         ]"
 | |
|         @toggle-dense-view="toggleMobileCards()"
 | |
|       />
 | |
|     </v-app-bar>
 | |
|     <div v-if="recipes" class="mt-2">
 | |
|       <v-row v-if="!useMobileCards">
 | |
|         <v-col v-for="(recipe, index) in recipes" :key="recipe.slug + index" :sm="6" :md="6" :lg="4" :xl="3">
 | |
|           <v-lazy>
 | |
|             <RecipeCard
 | |
|               :name="recipe.name"
 | |
|               :description="recipe.description"
 | |
|               :slug="recipe.slug"
 | |
|               :rating="recipe.rating"
 | |
|               :image="recipe.image"
 | |
|               :tags="recipe.tags"
 | |
|               :recipe-id="recipe.id"
 | |
|             />
 | |
|           </v-lazy>
 | |
|         </v-col>
 | |
|       </v-row>
 | |
|       <v-row v-else dense>
 | |
|         <v-col
 | |
|           v-for="recipe in recipes"
 | |
|           :key="recipe.name"
 | |
|           cols="12"
 | |
|           :sm="singleColumn ? '12' : '12'"
 | |
|           :md="singleColumn ? '12' : '6'"
 | |
|           :lg="singleColumn ? '12' : '4'"
 | |
|           :xl="singleColumn ? '12' : '3'"
 | |
|         >
 | |
|           <v-lazy>
 | |
|             <RecipeCardMobile
 | |
|               :name="recipe.name"
 | |
|               :description="recipe.description"
 | |
|               :slug="recipe.slug"
 | |
|               :rating="recipe.rating"
 | |
|               :image="recipe.image"
 | |
|               :tags="recipe.tags"
 | |
|               :recipe-id="recipe.id"
 | |
|             />
 | |
|           </v-lazy>
 | |
|         </v-col>
 | |
|       </v-row>
 | |
|     </div>
 | |
|     <v-card v-intersect="infiniteScroll"></v-card>
 | |
|     <v-fade-transition>
 | |
|       <AppLoader v-if="loading" :loading="loading" />
 | |
|     </v-fade-transition>
 | |
|   </div>
 | |
| </template>
 | |
| 
 | |
| <script lang="ts">
 | |
| import {
 | |
|   computed,
 | |
|   defineComponent,
 | |
|   onMounted,
 | |
|   reactive,
 | |
|   ref,
 | |
|   toRefs,
 | |
|   useAsync,
 | |
|   useContext,
 | |
|   useRouter,
 | |
|   watch,
 | |
| } from "@nuxtjs/composition-api";
 | |
| import { useThrottleFn } from "@vueuse/core";
 | |
| import RecipeCard from "./RecipeCard.vue";
 | |
| import RecipeCardMobile from "./RecipeCardMobile.vue";
 | |
| import { useAsyncKey } from "~/composables/use-utils";
 | |
| import { useLazyRecipes } from "~/composables/recipes";
 | |
| import { Recipe } from "~/lib/api/types/recipe";
 | |
| import { useUserSortPreferences } from "~/composables/use-users/preferences";
 | |
| import { RecipeSearchQuery } from "~/lib/api/user/recipes/recipe";
 | |
| 
 | |
| const REPLACE_RECIPES_EVENT = "replaceRecipes";
 | |
| const APPEND_RECIPES_EVENT = "appendRecipes";
 | |
| 
 | |
| export default defineComponent({
 | |
|   components: {
 | |
|     RecipeCard,
 | |
|     RecipeCardMobile,
 | |
|   },
 | |
|   props: {
 | |
|     disableToolbar: {
 | |
|       type: Boolean,
 | |
|       default: false,
 | |
|     },
 | |
|     icon: {
 | |
|       type: String,
 | |
|       default: null,
 | |
|     },
 | |
|     title: {
 | |
|       type: String,
 | |
|       default: null,
 | |
|     },
 | |
|     singleColumn: {
 | |
|       type: Boolean,
 | |
|       default: false,
 | |
|     },
 | |
|     recipes: {
 | |
|       type: Array as () => Recipe[],
 | |
|       default: () => [],
 | |
|     },
 | |
|     query: {
 | |
|       type: Object as () => RecipeSearchQuery,
 | |
|       default: null,
 | |
|     },
 | |
|   },
 | |
|   setup(props, context) {
 | |
|     const preferences = useUserSortPreferences();
 | |
| 
 | |
|     const EVENTS = {
 | |
|       az: "az",
 | |
|       rating: "rating",
 | |
|       created: "created",
 | |
|       updated: "updated",
 | |
|       lastMade: "lastMade",
 | |
|       shuffle: "shuffle",
 | |
|     };
 | |
| 
 | |
|     const { $globals, $vuetify } = useContext();
 | |
|     const useMobileCards = computed(() => {
 | |
|       return $vuetify.breakpoint.smAndDown || preferences.value.useMobileCards;
 | |
|     });
 | |
| 
 | |
|     const displayTitleIcon = computed(() => {
 | |
|       return props.icon || $globals.icons.tags;
 | |
|     });
 | |
| 
 | |
|     const state = reactive({
 | |
|       sortLoading: false,
 | |
|     });
 | |
| 
 | |
|     const router = useRouter();
 | |
|     function navigateRandom() {
 | |
|       if (props.recipes.length > 0) {
 | |
|         const recipe = props.recipes[Math.floor(Math.random() * props.recipes.length)];
 | |
|         if (recipe.slug !== undefined) {
 | |
|           router.push(`/recipe/${recipe.slug}`);
 | |
|         }
 | |
|       }
 | |
|     }
 | |
| 
 | |
|     const page = ref(1);
 | |
|     const perPage = 32;
 | |
|     const hasMore = ref(true);
 | |
|     const ready = ref(false);
 | |
|     const loading = ref(false);
 | |
| 
 | |
|     const { fetchMore } = useLazyRecipes();
 | |
| 
 | |
|     const queryFilter = computed(() => {
 | |
|       const orderBy = props.query?.orderBy || preferences.value.orderBy;
 | |
|       return preferences.value.filterNull && orderBy ? `${orderBy} IS NOT NULL` : null;
 | |
|     });
 | |
| 
 | |
|     async function fetchRecipes(pageCount = 1) {
 | |
|       return await fetchMore(
 | |
|         page.value,
 | |
|         // we double-up the first call to avoid a bug with large screens that render the entire first page without scrolling, preventing additional loading
 | |
|         perPage * pageCount,
 | |
|         props.query?.orderBy || preferences.value.orderBy,
 | |
|         props.query?.orderDirection || preferences.value.orderDirection,
 | |
|         props.query,
 | |
|         // filter out recipes that have a null value for the property we're sorting by
 | |
|         queryFilter.value
 | |
|       );
 | |
|     }
 | |
| 
 | |
|     onMounted(async () => {
 | |
|       if (props.query) {
 | |
|         const newRecipes = await fetchRecipes(2);
 | |
| 
 | |
|         // since we doubled the first call, we also need to advance the page
 | |
|         page.value = page.value + 1;
 | |
| 
 | |
|         context.emit(REPLACE_RECIPES_EVENT, newRecipes);
 | |
|         ready.value = true;
 | |
|       }
 | |
|     });
 | |
| 
 | |
|     watch(
 | |
|       () => props.query,
 | |
|       async (newValue: RecipeSearchQuery | undefined) => {
 | |
|         if (newValue) {
 | |
|           page.value = 1;
 | |
|           const newRecipes = await fetchRecipes(2);
 | |
| 
 | |
|           // since we doubled the first call, we also need to advance the page
 | |
|           page.value = page.value + 1;
 | |
| 
 | |
|           context.emit(REPLACE_RECIPES_EVENT, newRecipes);
 | |
|           ready.value = true;
 | |
|         }
 | |
|       }
 | |
|     );
 | |
| 
 | |
|     const infiniteScroll = useThrottleFn(() => {
 | |
|       useAsync(async () => {
 | |
|         if (!ready.value || !hasMore.value || loading.value) {
 | |
|           return;
 | |
|         }
 | |
| 
 | |
|         loading.value = true;
 | |
|         page.value = page.value + 1;
 | |
| 
 | |
|         const newRecipes = await fetchRecipes();
 | |
|         if (!newRecipes.length) {
 | |
|           hasMore.value = false;
 | |
|         } else {
 | |
|           context.emit(APPEND_RECIPES_EVENT, newRecipes);
 | |
|         }
 | |
| 
 | |
|         loading.value = false;
 | |
|       }, useAsyncKey());
 | |
|     }, 500);
 | |
| 
 | |
|     function sortRecipes(sortType: string) {
 | |
|       if (state.sortLoading || loading.value) {
 | |
|         return;
 | |
|       }
 | |
| 
 | |
|       function setter(
 | |
|         orderBy: string,
 | |
|         ascIcon: string,
 | |
|         descIcon: string,
 | |
|         defaultOrderDirection = "asc",
 | |
|         filterNull = false
 | |
|       ) {
 | |
|         if (preferences.value.orderBy !== orderBy) {
 | |
|           preferences.value.orderBy = orderBy;
 | |
|           preferences.value.orderDirection = defaultOrderDirection;
 | |
|           preferences.value.filterNull = filterNull;
 | |
|         } else {
 | |
|           preferences.value.orderDirection = preferences.value.orderDirection === "asc" ? "desc" : "asc";
 | |
|         }
 | |
|         preferences.value.sortIcon = preferences.value.orderDirection === "asc" ? ascIcon : descIcon;
 | |
|       }
 | |
| 
 | |
|       switch (sortType) {
 | |
|         case EVENTS.az:
 | |
|           setter(
 | |
|             "name",
 | |
|             $globals.icons.sortAlphabeticalAscending,
 | |
|             $globals.icons.sortAlphabeticalDescending,
 | |
|             "asc",
 | |
|             false
 | |
|           );
 | |
|           break;
 | |
|         case EVENTS.rating:
 | |
|           setter("rating", $globals.icons.sortAscending, $globals.icons.sortDescending, "desc", true);
 | |
|           break;
 | |
|         case EVENTS.created:
 | |
|           setter(
 | |
|             "created_at",
 | |
|             $globals.icons.sortCalendarAscending,
 | |
|             $globals.icons.sortCalendarDescending,
 | |
|             "desc",
 | |
|             false
 | |
|           );
 | |
|           break;
 | |
|         case EVENTS.updated:
 | |
|           setter("update_at", $globals.icons.sortClockAscending, $globals.icons.sortClockDescending, "desc", false);
 | |
|           break;
 | |
|         case EVENTS.lastMade:
 | |
|           setter(
 | |
|             "last_made",
 | |
|             $globals.icons.sortCalendarAscending,
 | |
|             $globals.icons.sortCalendarDescending,
 | |
|             "desc",
 | |
|             true
 | |
|           );
 | |
|           break;
 | |
|         default:
 | |
|           console.log("Unknown Event", sortType);
 | |
|           return;
 | |
|       }
 | |
| 
 | |
|       useAsync(async () => {
 | |
|         // reset pagination
 | |
|         page.value = 1;
 | |
|         hasMore.value = true;
 | |
| 
 | |
|         state.sortLoading = true;
 | |
|         loading.value = true;
 | |
| 
 | |
|         // fetch new recipes
 | |
|         const newRecipes = await fetchRecipes();
 | |
|         context.emit(REPLACE_RECIPES_EVENT, newRecipes);
 | |
| 
 | |
|         state.sortLoading = false;
 | |
|         loading.value = false;
 | |
|       }, useAsyncKey());
 | |
|     }
 | |
| 
 | |
|     function toggleMobileCards() {
 | |
|       preferences.value.useMobileCards = !preferences.value.useMobileCards;
 | |
|     }
 | |
| 
 | |
|     return {
 | |
|       ...toRefs(state),
 | |
|       displayTitleIcon,
 | |
|       EVENTS,
 | |
|       infiniteScroll,
 | |
|       loading,
 | |
|       navigateRandom,
 | |
|       preferences,
 | |
|       sortRecipes,
 | |
|       toggleMobileCards,
 | |
|       useMobileCards,
 | |
|     };
 | |
|   },
 | |
| });
 | |
| </script>
 | |
| 
 | |
| <style>
 | |
| .transparent {
 | |
|   opacity: 1;
 | |
| }
 | |
| </style>
 |