diff --git a/.gitattributes b/.gitattributes index 8c643959441..5639ab15033 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -*.css linguist-detectable=false \ No newline at end of file +*.css linguist-detectable=false +*.html linguist-detectable=false \ No newline at end of file diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml index 3ba6b1d6c6e..210e84fbc38 100644 --- a/.github/workflows/pytest.yml +++ b/.github/workflows/pytest.yml @@ -4,7 +4,6 @@ on: branches: - master - dev - - cd/cd pull_request: branches: - master @@ -31,15 +30,15 @@ jobs: with: virtualenvs-create: true virtualenvs-in-project: true - #---------------------------------------------- - # load cached venv if cache exists - #---------------------------------------------- - - name: Load cached venv - id: cached-poetry-dependencies - uses: actions/cache@v2 - with: - path: .venv - key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} + # #---------------------------------------------- + # # load cached venv if cache exists + # #---------------------------------------------- + # - name: Load cached venv + # id: cached-poetry-dependencies + # uses: actions/cache@v2 + # with: + # path: .venv + # key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }} #---------------------------------------------- # install dependencies if cache does not exist #---------------------------------------------- diff --git a/.gitignore b/.gitignore index f7732da6fd0..93d96aca709 100644 --- a/.gitignore +++ b/.gitignore @@ -10,19 +10,18 @@ mealie/temp/api.html .temp/ -mealie/data/backups/* -mealie/data/debug/* -mealie/data/img/* -mealie/data/migration/* -!mealie/dist/* +app_data/backups/* +app_data/debug/* +app_data/img/* +app_data/migration/* #Exception to keep folders !mealie/dist/.gitkeep -!mealie/data/backups/.gitkeep -!mealie/data/backups/dev_sample_data* -!mealie/data/debug/.gitkeep -!mealie/data/migration/.gitkeep -!mealie/data/img/.gitkeep +!app_data/backups/.gitkeep +!app_data/backups/dev_sample_data* +!app_data/debug/.gitkeep +!app_data/migration/.gitkeep +!app_data/img/.gitkeep .DS_Store node_modules @@ -153,3 +152,4 @@ ENV/ node_modules/ mealie/data/debug/last_recipe.json *.sqlite +app_data/db/test.db diff --git a/.vscode/settings.json b/.vscode/settings.json index 24b79e7fc63..be59f4b7ee1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "python.formatting.provider": "black", - "python.pythonPath": ".venv/bin/python3.8", + "python.pythonPath": ".venv/bin/python3.9", "python.linting.pylintEnabled": true, "python.linting.enabled": true, "python.autoComplete.extraPaths": ["mealie", "mealie/mealie"], @@ -9,11 +9,13 @@ "python.testing.unittestEnabled": false, "python.testing.nosetestsEnabled": false, "python.testing.pytestEnabled": true, + "python.testing.autoTestDiscoverOnSaveEnabled": false, "cSpell.enableFiletypes": ["!javascript", "!python"], "python.testing.pytestArgs": ["mealie"], "i18n-ally.localesPaths": "frontend/src/locales", - "i18n-ally.enabledFrameworks": [ - "vue" - ], - "i18n-ally.keystyle": "nested" + "i18n-ally.enabledFrameworks": ["vue"], + "i18n-ally.keystyle": "nested", + "cSpell.words": [ + "performant" + ] } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index ddd50dbffab..f4aad8fdc3c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -13,15 +13,42 @@ "group": "test" }, { - "label": "Production: Build and Start Docker Compose", - "command": "./dev/scripts/docker-compose.sh", - "type": "shell", - "args": [], - "problemMatcher": ["$tsc"], - "presentation": { - "reveal": "always" - }, - "group": "test" + "label": "Production: Build and Start Docker Compose", + "command": "./dev/scripts/docker-compose.sh", + "type": "shell", + "args": [], + "problemMatcher": ["$tsc"], + "presentation": { + "reveal": "always" + }, + "group": "test" + }, + { + "label": "Dev: Start local Backend", + "command": "../${config:python.pythonPath}", + "args": ["app.py"], + "options": { + "cwd": "${workspaceFolder}/mealie/" + }, + "type": "shell", + "problemMatcher": [], + "presentation": { + "reveal": "always", + "group": "groupA" + } + }, + { + "label": "Dev: Start local Frontend", + "command": "npm run serve", + "type": "shell", + "options": { + "cwd": "${workspaceFolder}/frontend/" + }, + "problemMatcher": [], + "presentation": { + "reveal": "always", + "group": "groupA" } + } ] } diff --git a/Dockerfile b/Dockerfile index dd4b51eb90a..ad18c37d440 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,28 +5,34 @@ RUN npm install COPY ./frontend/ . RUN npm run build -# FROM tiangolo/uvicorn-gunicorn-fastapi:python3.8-slim -FROM mrnr91/uvicorn-gunicorn-fastapi:python3.8 - +FROM python:3.9-alpine +RUN apk add --no-cache libxml2-dev libxslt-dev libxml2 +ENV ENV prod +EXPOSE 80 WORKDIR /app -RUN apt-get update -y && \ - apt-get install -y python-pip python-dev git curl python3-dev libxml2-dev libxslt1-dev zlib1g-dev --no-install-recommends && \ - rm -rf /var/lib/apt/lists/* && \ +COPY ./pyproject.toml /app/ + +RUN apk add --update --no-cache --virtual .build-deps \ + curl \ + g++ \ + python3-dev \ + musl-dev \ + gcc \ + build-base && \ curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \ cd /usr/local/bin && \ ln -s /opt/poetry/bin/poetry && \ - poetry config virtualenvs.create false + poetry config virtualenvs.create false && \ + cd /app/ && poetry install --no-root --no-dev && \ + apk --purge del .build-deps -COPY ./pyproject.toml /app/ COPY ./mealie /app -RUN poetry install --no-root --no-dev COPY --from=build-stage /app/dist /app/dist RUN rm -rf /app/test /app/.temp -ENV ENV prod -ENV APP_MODULE "app:app" -VOLUME [ "/app/data" ] +VOLUME [ "/app/data/" ] +CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"] diff --git a/Dockerfile.arm b/Dockerfile.arm deleted file mode 100644 index 6f35a9284f2..00000000000 --- a/Dockerfile.arm +++ /dev/null @@ -1,33 +0,0 @@ -FROM node:lts-alpine as build-stage -WORKDIR /app -COPY ./frontend/package*.json ./ -RUN npm install -COPY ./frontend/ . -RUN npm run build - -FROM mrnr91/uvicorn-gunicorn-fastapi:python3.8 - - -COPY ./requirements.txt /app/requirements.txt - -WORKDIR /app - -RUN apt-get update -y && \ - apt-get install -y python-pip python-dev git curl --no-install-recommends - -RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \ - cd /usr/local/bin && \ - ln -s /opt/poetry/bin/poetry && \ - poetry config virtualenvs.create false - -COPY ./pyproject.toml ./app/poetry.lock* /app/ - -COPY ./mealie /app -RUN poetry install --no-root --no-dev -COPY --from=build-stage /app/dist /app/dist -RUN rm -rf /app/test /app/.temp - -ENV ENV prod -ENV APP_MODULE "app:app" - -VOLUME [ "/app/data" ] diff --git a/Dockerfile.dev b/Dockerfile.dev index 5bc4891a379..56845551b60 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -8,8 +8,7 @@ RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get- ln -s /opt/poetry/bin/poetry && \ poetry config virtualenvs.create false -RUN mkdir /app/ -COPY ./pyproject.toml ./app/poetry.lock* /app/ +COPY ./pyproject.toml ./poetry.lock* /app/ WORKDIR /app @@ -17,7 +16,6 @@ RUN poetry install --no-root COPY ./mealie /app - ENTRYPOINT [ "python" ] CMD [ "app.py" ] \ No newline at end of file diff --git a/README.md b/README.md index 91a1ae3a18f..3fb695f21f1 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Request Feature ยท - Docker Hub + Docker Hub

@@ -72,7 +72,6 @@ Mealie also provides a secure API for interactions from 3rd party applications. * [Vue.js](https://vuejs.org/) * [Vuetify](https://vuetifyjs.com/en/) * [FastAPI](https://fastapi.tiangolo.com/) -* [MongoDB](https://www.mongodb.com/) * [Docker](https://www.docker.com/) diff --git a/mealie/data/backups/.gitkeep b/app_data/backups/.gitkeep similarity index 100% rename from mealie/data/backups/.gitkeep rename to app_data/backups/.gitkeep diff --git a/mealie/data/backups/dev_sample_data_2021-Jan-12.zip b/app_data/backups/dev_sample_data_2021-Jan-12.zip similarity index 100% rename from mealie/data/backups/dev_sample_data_2021-Jan-12.zip rename to app_data/backups/dev_sample_data_2021-Jan-12.zip diff --git a/mealie/data/debug/.gitkeep b/app_data/debug/.gitkeep similarity index 100% rename from mealie/data/debug/.gitkeep rename to app_data/debug/.gitkeep diff --git a/mealie/data/img/.gitkeep b/app_data/img/.gitkeep similarity index 100% rename from mealie/data/img/.gitkeep rename to app_data/img/.gitkeep diff --git a/mealie/data/migration/.gitkeep b/app_data/migration/.gitkeep similarity index 100% rename from mealie/data/migration/.gitkeep rename to app_data/migration/.gitkeep diff --git a/mealie/data/templates/recipes.md b/app_data/templates/recipes.md similarity index 100% rename from mealie/data/templates/recipes.md rename to app_data/templates/recipes.md diff --git a/dev/dev-notes.md b/dev/dev-notes.md index 7cb8c825881..81433795e8e 100644 --- a/dev/dev-notes.md +++ b/dev/dev-notes.md @@ -16,15 +16,12 @@ Don't forget to [join the Discord](https://discord.gg/R6QDyJgbD2)! # Todo's -Documentation -- [ ] V0.1.0 Release Notes -- [ ] Nextcloud Migration How To -- [ ] New Docker Setup with Sqlite -- [ ] Update Env Variables -- [ ] New Roadmap / Milestones +Test +- [ ] Image Upload Test +- [ ] Rename and Upload Image Test +- [x] Chowdown Migration End Point Test Frontend -- [x] Prep / Cook / Total Time Indicator + Editor - [ ] No Meal Today Page instead of Null - [ ] Recipe Print Page - [ ] Recipe Editor Data Validation Client Side @@ -32,12 +29,7 @@ Frontend - [ ] Advanced Search Page, draft started - [ ] Filter by Category - [ ] Filter by Tags -- [ ] Search Bar redesign - - [x] Initial - - [ ] Results redesign -- [ ] Replace Backups card with something like Home Assistant -- [x] Replace import card with something like Home Assistant - - [x] Select which imports to do +- [ ] Search Bar Results Redesign Backend - [ ] Database Import @@ -46,11 +38,10 @@ Backend - [ ] Meal Plans - [x] Settings - [x] Themes -- [x] Remove Print / Debug Code +- [ ] Remove Print / Debug Code - [ ] Support how to sections and how to steps - [ ] Recipe request by category/tags - SQL - [ ] Setup Database Migrations diff --git a/dev/favicon.png b/dev/favicon.png new file mode 100644 index 00000000000..0ca99249ead Binary files /dev/null and b/dev/favicon.png differ diff --git a/dev/scripts/scrape_recipe.py b/dev/scripts/scrape_recipe.py old mode 100644 new mode 100755 diff --git a/dev/scripts/start-dev-svr.ps1 b/dev/scripts/start-dev-svr.ps1 deleted file mode 100644 index cdc305afeea..00000000000 --- a/dev/scripts/start-dev-svr.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -$CWD = Get-Location - -$pyFolder = Join-Path -Path $CWD -ChildPath "mealie" -$pyVenv = Join-Path -Path $CWD -ChildPath "/venv/Scripts/python.exe" -$pyScript = Join-Path -Path $CWD -ChildPath "/mealie/app.py" - -$pythonCommand = "powershell.exe -NoExit -Command $pyVenv $pyScript" - -$vuePath = Join-Path -Path $CWD -ChildPath "/frontend" -$npmCommand = "powershell.exe -NoExit -Command npm run serve" - -wt -d $pyFolder "powershell.exe" $pythonCommand `; split-pane -d $vuePath "powershell.exe" $npmCommand - -Start-Process chrome "http://127.0.0.1:8000/docs" -Start-Process chrome "http://127.0.0.1:8080 -" - diff --git a/docker-compose.arm.yml b/docker-compose.arm.yml deleted file mode 100644 index 5c7bc88dee2..00000000000 --- a/docker-compose.arm.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Use root/example as user/password credentials -# Frontend/Backend Served via the same Uvicorn Server -version: "3.1" -services: - mealie: - build: - context: ./ - dockerfile: Dockerfile.arm - container_name: mealie - restart: always - ports: - - 9090:80 - environment: - db_type: sql - volumes: - - ./mealie/data/:/app/data diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 368aad065d4..c8fb6a7497a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -26,40 +26,17 @@ services: ports: - 9921:9000 environment: - db_type: mongo + db_type: sqlite TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly. - db_username: root - db_password: example - db_host: mongo - db_port: 27017 volumes: + - ./app_data:/app_data - ./mealie:/app mealie-docs: image: squidfunk/mkdocs-material restart: always ports: - - 9924:8000 + - 9923:8000 volumes: - ./docs:/docs - # Database - mongo: - image: mongo - restart: always - ports: - - 9923:27017 - environment: - TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly. - MONGO_INITDB_ROOT_USERNAME: root - MONGO_INITDB_ROOT_PASSWORD: example - - # Database UI - mongo-express: - image: mongo-express - restart: always - ports: - - 9922:8081 - environment: - ME_CONFIG_MONGODB_ADMINUSERNAME: root - ME_CONFIG_MONGODB_ADMINPASSWORD: example diff --git a/docker-compose.yml b/docker-compose.yml index b79e26eb84f..457f81576d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,26 +7,6 @@ services: container_name: mealie restart: always ports: - - 9099:80 + - 9090:80 environment: - db_type: mongo - db_username: root - db_password: example - db_host: mongo - db_port: 27017 - # volumes: - # - ./mealie/data/:/app/data - mongo: - image: mongo - restart: always - environment: - MONGO_INITDB_ROOT_USERNAME: root - MONGO_INITDB_ROOT_PASSWORD: example - mongo-express: # Optional Mongo GUI - image: mongo-express - restart: always - ports: - - 9091:8081 - environment: - ME_CONFIG_MONGODB_ADMINUSERNAME: root - ME_CONFIG_MONGODB_ADMINPASSWORD: example + db_type: sqlite diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index 1ea3ab2b43e..91cd537664f 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -1,10 +1,68 @@ # Release Notes +## v0.2.0 - Now with Test! +This is, what I think, is a big release! Tons of new features and some great quality of life improvements with some additional features. You may find that I made promises to include some fixes/features in v0.2.0. The short of is I greatly underestimated the work needed to refactor the database to a usable state and integrate categories in a way that is useful for users. This shouldn't be taken as a sign that I'm dropping those feature requests or ignoring them. I felt it was better to push a release in the current state rather than drag on development to try and fulfil all of the promises I made. + +!!! warning "Upgrade Process" + Database Breaks! I have not yet implemented a database migration service. As such, upgrades cannot be done by simply pulling the image. You must first export your recipes, update your deployment, and then import your recipes. This pattern is likely to be how upgrades take place prior to v1.0. After v1.0 migrations will be done automatically. + +### Bug Fixes + - Remove ability to save recipe with no name + - Fixed data validation error on missing parameters + - Fixed failed database initialization at startup - Closes #98 + - Fixed misaligned text on various cards + - Fixed bug that blocked opening links in new tabs - Closes #122 + - Fixed router link bugs - Closes #122 + - Fixed navigation on keyboard selection - Closes #139 + +### Features and Improvements + - ๐Ÿณ Dockerfile now 1/5 of the size! + - ๐ŸŒŽ UI Language Selection + Additional Supported Language + - **Home Page** + - By default your homepage will display only the recently added recipes. You can configured sections to show on the home-screen based of categories on the settings page. + - A new sidebar is now shown on the main page that lists all the categories in the database. Clicking on them navigates into a page that shows only recipes. + - Basic Sort functionality has been added. More options are on the way! + - **Meal Planner** + - Improved Search (Fuzzy Search) + - New Scheduled card support + - **Recipe Editor** + - Ingredients are now sortable via drag-and-drop + - Known categories now show up in the dropdown - Closes 83 + - Initial code for data validation to prevent errors + - **Migrations** + - Card based redesign + - Upload from the UI + - Unified Chowdown / Nextcloud import process. (Removed Git as a dependency) + - **API** + - Category and Tag endpoints added + - Major Endpoint refactor + - Improved API documentation + - Link to your Local API is now on your `/settings/site`. You can use it to explore your API. + + - **Style** + - Continued work on button/style unification + - Adding icons to buttons + - New Color Theme Picker UI + +### Development + - Fixed Vetur config file. Autocomplete in VSCode works! + - File/Folder restructuring + - Added Prettier config + - Fixed incorrect layout code + - FastAPI Route tests for major operations - WIP (shallow testing) + +### Breaking Changes + +!!! error "Breaking Changes" + - API endpoints have been refactored to adhear to a more consistent standard. This is a WIP and more changes are likely to occur. + - Officially Dropped MongoDB Support + - Database Breaks! We have not yet implemented a database migration service. As such, upgrades cannot be done by simply pulling the image. You must first export your recipes, update your deployment, and then import your recipes. This pattern is likely to be how upgrades take place prior to v1.0. After v1.0 migrations will be done automatically. + ## v0.1.0 - Initial Beta ### Bug Fixes - - Fixed Can't delete recipe after changing name - Closes Issue #67 - - Fixed No image when added by URL, and can;t add an image - Closes Issue #66 - - Fixed Images saved with no way to delete when add recipe via URL fails - Closes Issue #43 + - Fixed Can't delete recipe after changing name - Closes Closes #67 + - Fixed No image when added by URL, and can't add an image - Closes Closes #66 + - Fixed Images saved with no way to delete when add recipe via URL fails - Closes Closes #43 ### Features - Additional Language Support @@ -23,7 +81,7 @@ - Major code refactoring to support new database layer - Global variable refactor -### Break Changes +### Breaking Changes - Internal docker port is now 80 instead of 9000. You MUST remap the internal port to connect to the UI. @@ -38,8 +96,8 @@ A quality update with major props to [zackbcom](https://github.com/zackbcom) for - Fixed empty backup failure without markdown template - Fixed opacity issues with marked steps - [mtoohey31](https://github.com/mtoohey31) - Fixed hot-reloading development environment - [grssmnn](https://github.com/grssmnn) - - Fixed recipe not saving without image - Issue #7 + Issue #54 - - Fixed parsing error on image property null - Issue #43 + - Fixed recipe not saving without image - Closes #7 + Closes #54 + - Fixed parsing error on image property null - Closes #43 ### General Improvements - Added Confirmation component to deleting recipes - [zackbcom](https://github.com/zackbcom) @@ -52,7 +110,7 @@ A quality update with major props to [zackbcom](https://github.com/zackbcom) for - Users can now add custom json key/value pairs to all recipes via the editor for access in 3rd part applications. For example users can add a "message" field in the extras that can be accessed on API calls to play a message over google home. - Improved image rendering (nearly x2 speed) - Improved documentation + API Documentation - - Improved recipe parsing - Issue #51 + - Improved recipe parsing - Closes #51 - User feedback on backup importing ## v0.0.1 - Pre-release Patch @@ -63,8 +121,8 @@ A quality update with major props to [zackbcom](https://github.com/zackbcom) for ### Recipes - Added user feedback on bad URL - - Better backend data validation for updating recipes, avoid small syntax errors corrupting database entry. [Issue #8](https://github.com/hay-kot/mealie/issues/8) - - Fixed spacing issue while editing new recipes in JSON + - Better backend data validation for updating recipes, avoid small syntax errors corrupting database entry. [Closes #8](https://github.com/hay-kot/mealie/issues/8) + - Fixed spacing Closes while editing new recipes in JSON ## v0.0.0 - Initial Pre-release The initial pre-release. It should be semi-functional but does not include a lot of user feedback You may notice errors that have no user feedback and have no idea what went wrong. diff --git a/docs/docs/contributors/developers-guide/code-contributions.md b/docs/docs/contributors/developers-guide/code-contributions.md index 6b12973b186..9d5385e0904 100644 --- a/docs/docs/contributors/developers-guide/code-contributions.md +++ b/docs/docs/contributors/developers-guide/code-contributions.md @@ -12,7 +12,7 @@ We use github to host code, to track issues and feature requests, as well as acc Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests: 1. Fork the repo and create your branch from `dev`. -2. Read the page in in [dev/dev-notes.md](https://github.com/hay-kot/mealie/blob/0.1.0/dev/dev-notes.md) to get an idea on where the project is at. +2. Read the page in in [dev/dev-notes.md](https://github.com/hay-kot/mealie/blob/master/dev/dev-notes.md) to get an idea on where the project is at. 3. If you're interested on working on major changes please get in touch on discord and coordinate with other developers. No sense in doubling up on work if someones already on it. 4. If you've changed APIs, update the documentation. 5. Issue that pull request! diff --git a/docs/docs/contributors/developers-guide/starting-dev-server.md b/docs/docs/contributors/developers-guide/starting-dev-server.md index 9a3ee56a2ea..4dd92f7409c 100644 --- a/docs/docs/contributors/developers-guide/starting-dev-server.md +++ b/docs/docs/contributors/developers-guide/starting-dev-server.md @@ -14,7 +14,16 @@ There are VSCode tasks created in the .vscode folder. You can use these to quick ## Without Docker -?? TODO +Prerequisites + +- Python 3.8+ +- Poetry +- Nodejs +- npm + +change directories into the mealie directory and run poetry install. cd into the frontend directory and run npm install. After installing dependencies, you can use vscode tasks to run the front and backend server. Use the command pallette to access the tasks. + +Alternatively you can run `npm run serve` in the frontend directory and `python app.py` in the mealie directory to get everything up and running for development. ## Trouble Shooting diff --git a/docs/docs/getting-started/backups-and-exports.md b/docs/docs/getting-started/backups-and-exports.md index 668ddb3e83f..af8d074fdbc 100644 --- a/docs/docs/getting-started/backups-and-exports.md +++ b/docs/docs/getting-started/backups-and-exports.md @@ -1,5 +1,4 @@ -# Backup and Export -![](../img/admin-backup.png) +# Backup and Imports All recipe data can be imported and exported as necessary from the UI. Under the admin page you'll find the section for using Backups and Exports. @@ -7,6 +6,8 @@ To create an export simple add the tag and the markdown template and click Backu To import a backup it must be in your backups folder. If it is in the backup folder it will automatically show up as an source to restore from. Selected the desired backup and import the backup file. +![](../gifs/backup-demo-v1.gif) + ## Custom Templating On export you can select a template to use to render files using the jinja2 syntax. This can be done to export recipes in other formats besides regular .json.Look at this example for rendering a markdown recipe using the jinja2 syntax. diff --git a/docs/docs/getting-started/install.md b/docs/docs/getting-started/install.md index 8663fcd1655..9be2ed5e75c 100644 --- a/docs/docs/getting-started/install.md +++ b/docs/docs/getting-started/install.md @@ -1,5 +1,5 @@ # Installation -To deploy docker on your local network it is highly recommended to use docker to deploy the image straight from dockerhub. Using the docker-compose below you should be able to get a stack up and running easily by changing a few default values and deploying. Currently MongoDB and SQLite are supported. MongoDB support will be dropped in v0.2.0 so it is recommended to go with SQLite for new deployments. Postrgres support is planned for the next release, however for most loads you may find SQLite performant enough. +To deploy docker on your local network it is highly recommended to use docker to deploy the image straight from dockerhub. Using the docker-compose below you should be able to get a stack up and running easily by changing a few default values and deploying. Currently only SQLite is supported. Postrgres support is planned, however for most loads you may find SQLite performant enough. [Get Docker](https://docs.docker.com/get-docker/) @@ -39,63 +39,15 @@ services: ``` - -## Docker Compose with Mongo - DEPRECIATED - -```yaml -# docker-compose.yml -version: "3.1" -services: - mealie: - container_name: mealie - image: hkotel/mealie:latest - restart: always - ports: - - 9000:80 - environment: - db_username: root # Your Mongo DB Username - Please Change - db_password: example # Your Mongo DB Password - Please Change - db_host: mongo - db_port: 27017 # The Default port for Mongo DB - TZ: America/Anchorage - volumes: - - ./mealie/data/:/app/data/ - - mongo: - image: mongo - restart: always - volumes: - - ./mongo:/data/db - environment: - MONGO_INITDB_ROOT_USERNAME: root # Change! - MONGO_INITDB_ROOT_PASSWORD: example # Change! - - mongo-express: # Optional Mongo GUI - image: mongo-express - restart: always - ports: - - 9091:8081 - environment: - ME_CONFIG_MONGODB_ADMINUSERNAME: root - ME_CONFIG_MONGODB_ADMINPASSWORD: example - -``` - - ## Env Variables -| Variables | default | description | -| -------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- | -| db_type | sqlite | The database type to be used. Current Options 'sqlite' and 'mongo' | -| mealie_db_name | mealie | The name of the database to be created in Mongodb | -| mealie_port | 9000 | The port exposed by mealie. **do not change this if you're running in docker** If you'd like to use another port, map 9000 to another port of the host. | -| db_username | root | The Mongodb username you specified in your mongo container | -| db_password | example | The Mongodb password you specified in your mongo container | -| db_host | mongo | The host address of MongoDB if you're in docker and using the same network you can use mongo as the host name | -| db_port | 27017 | the port to access MongoDB 27017 is the default for mongo | -| api_docs | True | Turns on/off access to the API documentation locally. | -| TZ | | You should set your time zone accordingly so the date/time features work correctly | +| Variables | default | description | +| ----------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- | +| db_type | sqlite | The database type to be used. Current Options 'sqlite' | +| mealie_port | 9000 | The port exposed by mealie. **do not change this if you're running in docker** If you'd like to use another port, map 9000 to another port of the host. | +| api_docs | True | Turns on/off access to the API documentation locally. | +| TZ | UTC | You should set your time zone accordingly so the date/time features work correctly | ## Deployed as a Python Application -Alternatively, this project is built on Python and Mongodb. If you are dead set on deploying on a linux machine you can run this in an python environment with a dedicated MongoDatabase. Provided that you know thats how you want to host the application, I'll assume you know how to do that. I may or may not get around to writing this guide. I'm open to pull requests if anyone has a good guide on it. \ No newline at end of file +Alternatively, this project is built on Python and SQLite. If you are dead set on deploying on a linux machine you can run this in an python virtual env. Provided that you know thats how you want to host the application, I'll assume you know how to do that. I may or may not get around to writing this guide. I'm open to pull requests if anyone has a good guide on it. diff --git a/docs/docs/getting-started/meal-planner.md b/docs/docs/getting-started/meal-planner.md index 3e71a549e12..d58005308f2 100644 --- a/docs/docs/getting-started/meal-planner.md +++ b/docs/docs/getting-started/meal-planner.md @@ -1,11 +1,11 @@ # Meal Planner ## Working with Meal Plans -In Mealie you can create a mealplan based off the calendar inputs on the meal planner page. There is no limit to how long or how short a meal plan is. You may also create duplicate meal plans for the same date range. After selecting your date range, click on the card for each day and seach through recipes to find your choice. After selecting a recipe for all meals save the plan. You can also randomly generate meal plans. +In Mealie you can create a mealplan based off the calendar inputs on the meal planner page. There is no limit to how long or how short a meal plan is. You may also create duplicate meal plans for the same date range. After selecting your date range, click on the card for each day and search through recipes to find your choice. After selecting a recipe for all meals save the plan. You can also randomly generate meal plans. -To edit the meal in a meal plan simply select the edit button on the card in the timeline. Similiarly, to delete a mealplan click the delete button on the card in the timeline. Currently there is no support to change the date range in a meal plan. +To edit the meal in a meal plan simply select the edit button on the card in the timeline. Similarly, to delete a mealplan click the delete button on the card in the timeline. Currently there is no support to change the date range in a meal plan. !!! warning In coming a future release recipes for meals will be restricted to specific categories. -![](../gifs/meal-plan-demo.gif) +![](../gifs/meal-plan-demo-v2.gif) diff --git a/docs/docs/getting-started/migration-imports.md b/docs/docs/getting-started/migration-imports.md index 7d417026be8..38260f1a8a4 100644 --- a/docs/docs/getting-started/migration-imports.md +++ b/docs/docs/getting-started/migration-imports.md @@ -1,13 +1,13 @@ # Migration -### Chowdown +## Chowdown +To migrate recipes from a Chowdown + 1. Download the code repository as a .zip file + 2. Upload the .zip file in the Chowdown section in Mealie + 3. Select import on the newly available migration. -In the Admin page on the in the Migration section you can provide a URL for a repo hosting a [Chowdown](https://github.com/clarklab/chowdown) repository and Mealie will pull the images and recipes from the instance and automatically import them into the database. Due to the nature of the yaml format you may have mixed results but you should get an error report of the recipes that had errors and will need to be manually added. Note that you can only import the repo as a whole. You cannot import individual recipes. - -We'd like to support additional migration paths. [See open issues.](https://github.com/hay-kot/mealie/issues) - -### Nextcloud Recipes -Nextcloud recipes can be imported from either a zip file the contains the data stored in Nextcloud. The zip file can be uploaded from the frontend or placed in the data/migrations/Nextcloud directory. See the example folder structure below to ensure your recipes are able to be imported. +## Nextcloud Recipes +Nextcloud recipes can be imported from a zip file the contains the data stored in Nextcloud. The zip file can be uploaded from the frontend or placed in the data/migrations/nextcloud directory. See the example folder structure below to ensure your recipes are able to be imported. ``` nextcloud_recipes.zip @@ -21,6 +21,3 @@ nextcloud_recipes.zip โ””โ”€โ”€ recipe_3 โ””โ”€โ”€ recipe.json ``` - -**Currently Proposed Are:** -- Open Eats \ No newline at end of file diff --git a/docs/docs/getting-started/recipes.md b/docs/docs/getting-started/recipes.md index 7dab655b914..5daa859a2fa 100644 --- a/docs/docs/getting-started/recipes.md +++ b/docs/docs/getting-started/recipes.md @@ -10,7 +10,7 @@ Adding a recipe can be as easy as copying the recipe URL into mealie and letting ## Recipe Editor Recipes can be edited and created via the UI. This is done with both a form based approach where you have a UI to work with as well as with a in browser JSON Editor. The JSON editor allows you to easily copy and paste data from other sources. -You can also add a custom recipe with the UI editor built into the web view. After logging in as a user you'll have access to the editor to make changes to all the content in the recipe. +You can also add a custom recipe with the UI editor built into the web view. ![](../gifs/editor-demo.gif) diff --git a/docs/docs/getting-started/site-settings.md b/docs/docs/getting-started/site-settings.md index 7dc6266cd7c..e349f40197b 100644 --- a/docs/docs/getting-started/site-settings.md +++ b/docs/docs/getting-started/site-settings.md @@ -2,18 +2,22 @@ !!! danger As this is still a **BETA** It is recommended that you backup your data often and store in more than one place. Ad-hear to backup best practices with the [3-2-1 Backup Rule](https://en.wikipedia.org/wiki/Backup) +## General Settings +In your site settings page you can select several options to change the layout of your homepage. You can choose to display the recent recipes, how many cards to show for each section, and which category sections to display. You can additionally select which language to use by default. Note the currently homepage settings are saved in your browser. In the future a database entry will be made for site settings so the homepage is consistent across users. + +![](../gifs/homepage-settings-v1.gif) ## Theme Settings Color themes can be created and set from the UI in the settings page. You can select an existing color theme or create a new one. On creation of a new color theme, the default colors will be used, then you can select and save as you'd like. By default the "default" theme will be loaded for all new users visiting the site. All created color themes are available to all users of the site. Theme Colors will be set for both light and dark modes. -![](../gifs/theme-demo.gif) +![](../gifs/theme-demo-v2.gif) !!! note - Theme data is stored in localstorage in the browser. Calling "Save colors and apply theme will refresh the localstorage with the selected theme as well save the theme to the database. - - + Theme data is stored in localstorage in the browser. Calling "Save colors and apply theme will refresh the local storage with the selected theme as well save the theme to the database. +## Backups +Site backups can easily be taken and download from the UI. To import, simply select the backup you'd like to restore and check which items you'd like to import. ## Meal Planner Webhooks Meal planner webhooks are post requests sent from Mealie to an external endpoint. The body of the message is the Recipe JSON of the scheduled meal. If no meal is schedule, no request is sent. The webhook functionality can be enabled or disabled as well as scheduled. Note that you must "Save Webhooks" prior to any changes taking affect server side. diff --git a/docs/docs/gifs/backup-demo-v1.gif b/docs/docs/gifs/backup-demo-v1.gif new file mode 100644 index 00000000000..db9c9b49460 Binary files /dev/null and b/docs/docs/gifs/backup-demo-v1.gif differ diff --git a/docs/docs/gifs/homepage-settings-v1.gif b/docs/docs/gifs/homepage-settings-v1.gif new file mode 100644 index 00000000000..b652d8441b8 Binary files /dev/null and b/docs/docs/gifs/homepage-settings-v1.gif differ diff --git a/docs/docs/gifs/meal-plan-demo-v2.gif b/docs/docs/gifs/meal-plan-demo-v2.gif new file mode 100644 index 00000000000..fc14405b237 Binary files /dev/null and b/docs/docs/gifs/meal-plan-demo-v2.gif differ diff --git a/docs/docs/gifs/meal-plan-demo.gif b/docs/docs/gifs/meal-plan-demo.gif deleted file mode 100644 index f0b6b4f7374..00000000000 Binary files a/docs/docs/gifs/meal-plan-demo.gif and /dev/null differ diff --git a/docs/docs/gifs/theme-demo-v2.gif b/docs/docs/gifs/theme-demo-v2.gif new file mode 100644 index 00000000000..14028a178b0 Binary files /dev/null and b/docs/docs/gifs/theme-demo-v2.gif differ diff --git a/docs/docs/gifs/theme-demo.gif b/docs/docs/gifs/theme-demo.gif deleted file mode 100644 index b1fbb34a3a3..00000000000 Binary files a/docs/docs/gifs/theme-demo.gif and /dev/null differ diff --git a/docs/docs/index.md b/docs/docs/index.md index 7c5886d464f..f71658a840a 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -25,9 +25,9 @@ ![Product Name Screen Shot][product-screenshot] -**Mealie** is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and mealie will automatically import the relevant data or add a family recipe with the UI editor. +**Mealie** is a self hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family. Easily add recipes into your database by providing the url and Mealie will automatically import the relevant data or add a family recipe with the UI editor. Mealie also provides an API for interactions from 3rd party applications. -Mealie also provides an API for interactions from 3rd party applications. **Why does my recipe manager need an API?** An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based of Meal Plan data to remind you to defrost the chicken, marinade the steak, or start the CrockPot. Additionally, you can access any available API from the backend server. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation. +**Why does my recipe manager need an API?** An API allows integration into applications like [Home Assistant](https://www.home-assistant.io/) that can act as notification engines to provide custom notifications based of Meal Plan data to remind you to defrost the chicken, marinade the steak, or start the CrockPot. Additionally, you can access any available API from the backend server. To explore the API spin up your server and navigate to http://yourserver.com/docs for interactive API documentation. [Remember to join the Discord](https://discord.gg/R6QDyJgbD2)! @@ -35,29 +35,37 @@ Mealie also provides an API for interactions from 3rd party applications. **Why In some of the demo gifs the styling may be different than the finale application. demos were done during development prior to finale styling. !!! warning - Note that this is a **ALPHA** release and that means things may break and or change down the line. I'll do my best to make sure that any API changes are thoughtful and necessary in order not to break things. Additionally, I'll do my best to provide a migration path if the database schema ever changes. That said, one of the nice things about MongoDB is that it's flexible! + Note that this is a **BETA** release and that means things may break and or change down the line. I'll do my best to make sure that any API changes are thoughtful and necessary in order not to break things. Additionally, I'll do my best to provide a migration path if the database schema ever changes. Do not use programs like watchtower to auto update your container. You **WILL** run into issues if you do this, ### Main Features #### Recipes - Automatic web scrapping for common recipe platforms - - Interactive API Documentation thanks to [FastAPI](https://fastapi.tiangolo.com/) and [Swagger](https://petstore.swagger.io/) - - UI Recipe Editor - - JSON Recipe Editor in browser - - Custom tags and categories - - Rate recipes - - Add notes to recipes - - Migration From Other Platforms + - UI recipe editor + - JSON recipe editor + - Additional recipe data + - custom notes + - ratings + - categories and tags + - total, cook, and prep time indicators + - View recipes by category + - Basic fuzzy search + - Migration from other platforms - Chowdown - - Open Eats - **Coming Soon** + - Nextcloud Cookbook #### Meal Planner - - Random Meal plan generation based off categories - - Expose notes in the API to allow external applications to access relevant information for meal plans + - Random meal plan generation + +#### API + - The entire application is built on a restful API and can be accessed by the user + - Scheduled Webhooks + - Interactive API Documentation thanks to [FastAPI](https://fastapi.tiangolo.com/) and [Swagger](https://petstore.swagger.io/) + - Custom "API Extras" in recipes for custom key/value pairs to extendable API uses #### Database Import / Export - - Easily Import / Export your recipes from the UI - - Export recipes in markdown format for universal access + - Easily import / export your recipes from the UI + - Export recipes in any format for universal access using Jinja2 - Use the default or a custom jinja2 template ### Built With @@ -65,7 +73,6 @@ Mealie also provides an API for interactions from 3rd party applications. **Why * [Vue.js](https://vuejs.org/) * [Vuetify](https://vuetifyjs.com/en/) * [FastAPI](https://fastapi.tiangolo.com/) -* [MongoDB](https://www.mongodb.com/) * [Docker](https://www.docker.com/) diff --git a/docs/docs/roadmap.md b/docs/docs/roadmap.md index c436a6a97b9..74c0a1ef5ec 100644 --- a/docs/docs/roadmap.md +++ b/docs/docs/roadmap.md @@ -1,52 +1,4 @@ # Development Road Map -!!! Current Release - v0.1.0 BETA - This is technically a pre-release, as such take care to backup data and be aware that breaking changes in future releases are a real possibility. - -Feature placement is not set in stone. This is much more of a guideline than anything else. - -## v x.x.x - No planned target, but eventually... - -### Frontend -- [ ] Login / Logout Navigation - * [ ] Initial Page - * [ ] Logic / Function Calls - * [ ] Password Reset -### Backend -- [ ] Image Minification -- [ ] User Setup - * [ ] Authentication - * [ ] Default Admin/Superuser Account - * [ ] Password Reset - * [ ] User Accounts - * [ ] Edit / Delete - -## v0.2.0 - Targets - - -!!! error "MAJOR BREAKING CHANGE" - MongoDB will no longer be supported as of v0.2.0. Review the database migration page for details on migration to SQL (It's very easy) - -## New Features -### Frontend -- [ ] Advanced search - - [ ] Category Filter - - [ ] Tag Filter - - [x] Fuzzy Search -- [ ] Backup card redesign -- [ ] Additional Backup / Import Features - - [ ] Import Recipes Force/Rebase options - - [ ] Upload .zip file -- [ ] Improved Color Picker -- [ ] Meal Plan redesign -### Backend -- [ ] PostgreSQL Support -- [ ] Setup SQL Migrations - -## Breaking Changes -- Internal port 9000 changed to port 80 for better Traefik support -- MongoDB support dropped -## Code Chores -- [ ] Remove MongoDB Interface Code -- [ ] Dockerfile Trim +See the [Github META issue for tracking the Road Map](https://github.com/hay-kot/mealie/issues/122) diff --git a/frontend/.env.development b/frontend/.env.development index bd3a290a5d3..a974085c8da 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -1 +1 @@ -VUE_APP_API_BASE_URL=http://10.10.10.12:9921 \ No newline at end of file +VUE_APP_API_BASE_URL=http://localhost:9000 \ No newline at end of file diff --git a/frontend/.vscode/settings.json b/frontend/.vscode/settings.json deleted file mode 100644 index b0b5a72c639..00000000000 --- a/frontend/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "cSpell.enableFiletypes": [ - "!javascript" - ] -} \ No newline at end of file diff --git a/frontend/jsconfig.json b/frontend/jsconfig.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 7061fce7497..7f7e1ce4ece 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1966,6 +1966,16 @@ "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", @@ -1992,6 +2002,53 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -2008,6 +2065,16 @@ "minipass": "^3.1.1" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz", @@ -2024,6 +2091,18 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.1.2", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz", + "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -10175,6 +10254,11 @@ "is-plain-obj": "^1.0.0" } }, + "sortablejs": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz", + "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==" + }, "source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", @@ -11521,87 +11605,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.1.2", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz", - "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.4.9", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.9.tgz", @@ -11641,6 +11644,14 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vuedraggable": { + "version": "2.24.3", + "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz", + "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==", + "requires": { + "sortablejs": "1.10.2" + } + }, "vuetify": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.4.2.tgz", diff --git a/frontend/package.json b/frontend/package.json index 19ed57974cc..9d5aa8837ed 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -17,6 +17,7 @@ "vue": "^2.6.11", "vue-i18n": "^8.22.4", "vue-router": "^3.4.9", + "vuedraggable": "^2.24.3", "vuetify": "^2.4.2", "vuex": "^3.6.0", "vuex-persistedstate": "^4.0.0-beta.3" @@ -54,5 +55,11 @@ "> 1%", "last 2 versions", "not dead" - ] + ], + "prettier": { + "trailingComma": "es5", + "tabWidth": 2, + "semi": true, + "singleQuote": false + } } diff --git a/frontend/public/index.html b/frontend/public/index.html index 59b9ff16619..a28fe4e63a9 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -8,6 +8,7 @@ Mealie +