diff --git a/Dockerfile b/Dockerfile index e3e13e558..2528d200b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,25 +14,11 @@ RUN apk add --no-cache libxml2-dev \ libffi-dev \ python3 \ python3-dev \ - openssl \ - bash \ - sudo \ - # freetype-dev \ - # fribidi-dev \ - # harfbuzz-dev \ jpeg-dev \ lcms2-dev \ openjpeg-dev \ - # tcl-dev \ - # tiff-dev \ - # tk-dev \ zlib-dev -ADD depends /depends -RUN cd /depends \ - && chmod +x install_webp.sh \ - && chmod +x download-and-extract.sh \ - && ./install_webp.sh ENV ENV True EXPOSE 80 diff --git a/frontend/src/components/FormHelpers/CategorySelector.vue b/frontend/src/components/FormHelpers/CategorySelector.vue index 390bd60d6..3457206b5 100644 --- a/frontend/src/components/FormHelpers/CategorySelector.vue +++ b/frontend/src/components/FormHelpers/CategorySelector.vue @@ -1,18 +1,32 @@ diff --git a/frontend/src/components/FormHelpers/TagSelector.vue b/frontend/src/components/FormHelpers/TagSelector.vue new file mode 100644 index 000000000..348ed90c0 --- /dev/null +++ b/frontend/src/components/FormHelpers/TagSelector.vue @@ -0,0 +1,79 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/Recipe/MobileRecipeCard.vue b/frontend/src/components/Recipe/MobileRecipeCard.vue index a11accdbb..c0df606bf 100644 --- a/frontend/src/components/Recipe/MobileRecipeCard.vue +++ b/frontend/src/components/Recipe/MobileRecipeCard.vue @@ -7,7 +7,7 @@ > - + diff --git a/frontend/src/components/Recipe/RecipeCard.vue b/frontend/src/components/Recipe/RecipeCard.vue index e60801f3a..2fec71f47 100644 --- a/frontend/src/components/Recipe/RecipeCard.vue +++ b/frontend/src/components/Recipe/RecipeCard.vue @@ -7,7 +7,7 @@ @click="$emit('click')" min-height="275" > - +
-
+

{{ title }}

export default { props: { - items: Array, + items: { + default: [], + }, title: { default: null, }, diff --git a/frontend/src/components/UI/CategorySidebar.vue b/frontend/src/components/UI/CategorySidebar.vue index 301f85b8f..58373847b 100644 --- a/frontend/src/components/UI/CategorySidebar.vue +++ b/frontend/src/components/UI/CategorySidebar.vue @@ -51,6 +51,11 @@ export default { to: "/recipes/all", title: this.$t("page.all-recipes"), }, + { + icon: "mdi-magnify", + to: "/search", + title: "search", + }, ], }; }, diff --git a/frontend/src/components/UI/Search/SearchBar.vue b/frontend/src/components/UI/Search/SearchBar.vue index c781625d4..564e36995 100644 --- a/frontend/src/components/UI/Search/SearchBar.vue +++ b/frontend/src/components/UI/Search/SearchBar.vue @@ -27,7 +27,7 @@ @click="navOnClick ? null : selected(item.item.slug, item.item.name)" > - + - - - - - - - mdi-filter - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/src/pages/SearchPage/FilterSelector.vue b/frontend/src/pages/SearchPage/FilterSelector.vue new file mode 100644 index 000000000..c46649e51 --- /dev/null +++ b/frontend/src/pages/SearchPage/FilterSelector.vue @@ -0,0 +1,69 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/pages/SearchPage/index.vue b/frontend/src/pages/SearchPage/index.vue new file mode 100644 index 000000000..50533313a --- /dev/null +++ b/frontend/src/pages/SearchPage/index.vue @@ -0,0 +1,178 @@ + + + + + \ No newline at end of file diff --git a/mealie/run.sh b/mealie/run.sh index 5e51291a0..a6f5fc967 100755 --- a/mealie/run.sh +++ b/mealie/run.sh @@ -2,6 +2,7 @@ # Initialize Database Prerun python mealie/db/init_db.py +python mealie/services/image/minify.py ## Migrations # TODO