From 010aafa69bcad2b114450cadb95d558f6f88db0a Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Wed, 25 May 2022 19:33:58 -0800 Subject: [PATCH] feat: add reports to bulk recipe import (url) (#1294) * remove unused docker and caddy configs * add experimental nested configs * switch to nest under docker-compose * remove v-card * bulk parser backend re-implementation * refactor UI for bulk importer * remove migration specific report text --- .vscode/settings.json | 9 +- docs/Caddyfile | 15 -- docs/Dockerfile | 10 -- docs/docker-compose.yml | 11 -- frontend/pages/group/reports/_id.vue | 21 +-- frontend/pages/recipe/create/bulk.vue | 138 +++++++++++++----- frontend/pages/recipe/create/debug.vue | 4 +- frontend/pages/recipe/create/new.vue | 4 +- frontend/pages/recipe/create/url.vue | 4 +- frontend/pages/recipe/create/zip.vue | 4 +- frontend/types/api-types/reports.ts | 2 +- .../routes/groups/controller_group_reports.py | 11 +- mealie/routes/recipe/recipe_crud_routes.py | 41 +----- mealie/schema/reports/reports.py | 1 + .../services/scraper/recipe_bulk_scraper.py | 104 +++++++++++++ 15 files changed, 240 insertions(+), 139 deletions(-) delete mode 100644 docs/Caddyfile delete mode 100644 docs/Dockerfile delete mode 100644 docs/docker-compose.yml create mode 100644 mealie/services/scraper/recipe_bulk_scraper.py diff --git a/.vscode/settings.json b/.vscode/settings.json index a8937982d9fc..fd7656f7da65 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -46,5 +46,12 @@ "python.linting.mypyEnabled": true, "python.sortImports.path": "${workspaceFolder}/.venv/bin/isort", "search.mode": "reuseEditor", - "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "test_*.py"] + "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "test_*.py"], + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.patterns": { + "package.json": "package-lock.json, yarn.lock, .eslintrc.js, tsconfig.json, .prettierrc, .editorconfig", + "pyproject.toml": "poetry.lock, alembic.ini, .pylintrc, .flake8", + "netlify.toml": "runtime.txt", + "docker-compose.yml": "Dockerfile, .dockerignore, docker-compose.dev.yml, docker-compose.yml" + } } diff --git a/docs/Caddyfile b/docs/Caddyfile deleted file mode 100644 index 8c88f454f97e..000000000000 --- a/docs/Caddyfile +++ /dev/null @@ -1,15 +0,0 @@ -{ - auto_https off -} - -:80 { - root * /srv - encode gzip - uri strip_suffix / - - handle { - try_files {path} {path}/ /index.html - file_server - } - -} \ No newline at end of file diff --git a/docs/Dockerfile b/docs/Dockerfile deleted file mode 100644 index 28300928d044..000000000000 --- a/docs/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM python:3.8-slim as build-stage -WORKDIR /app -RUN pip install --no-cache-dir mkdocs mkdocs-material -COPY . . -RUN mkdocs build - -FROM caddy:alpine -WORKDIR /app -COPY ./Caddyfile /etc/caddy/Caddyfile -COPY --from=build-stage /app/site /srv \ No newline at end of file diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml deleted file mode 100644 index aec59adad234..000000000000 --- a/docs/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: "3" -services: - wiki: - container_name: mealie-docs - image: mealie-docs - ports: - - 8888:80 - build: - context: . - dockerfile: Dockerfile - restart: always diff --git a/frontend/pages/group/reports/_id.vue b/frontend/pages/group/reports/_id.vue index 660badca04fc..6624791ed807 100644 --- a/frontend/pages/group/reports/_id.vue +++ b/frontend/pages/group/reports/_id.vue @@ -4,9 +4,7 @@ - - Recipes can be migrated from another supported application to Mealie. This is a great way to get started with - Mealie. + @@ -31,8 +29,9 @@ - + diff --git a/frontend/pages/recipe/create/bulk.vue b/frontend/pages/recipe/create/bulk.vue index ceebb660a88b..34b4f40d05e7 100644 --- a/frontend/pages/recipe/create/bulk.vue +++ b/frontend/pages/recipe/create/bulk.vue @@ -1,15 +1,15 @@