v0.2.0 (#143)

* Changed uvicorn port to 80

* Changed port in docker-compose to match dockerfile

* Readded environment variables in docker-compose

* production image rework

* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available

* fixed instrucitons on parse

* add last_recipe

* automated testing

* roadmap update

* Sqlite (#75)

* file structure

* auto-test

* take 2

* refactor ap scheduler and startup process

* fixed scraper error

* database abstraction

* database abstraction

* port recipes over to new schema

* meal migration

* start settings migration

* finale mongo port

* backup improvements

* migration imports to new DB structure

* unused import cleanup

* docs strings

* settings and theme import logic

* cleanup

* fixed tinydb error

* requirements

* fuzzy search

* remove scratch file

* sqlalchemy models

* improved search ui

* recipe models almost done

* sql modal population

* del scratch

* rewrite database model mixins

* mostly grabage

* recipe updates

* working sqllite

* remove old files and reorganize

* final cleanup

Co-authored-by: Hayden <[email protected]>

* Backup card (#78)

* backup / import dialog

* upgrade to new tag method

* New import card

* rename settings.py to app_config.py

* migrate to poetry for development

* fix failing test

Co-authored-by: Hayden <[email protected]>

* added mkdocs to docker-compose

* Translations (#72)

* Translations + danish

* changed back proxy target to use ENV

* Resolved more merge conflicts

* Removed test in translation

* Documentation of translations

* Updated translations

* removed old packages

Co-authored-by: Hayden <[email protected]>

* fail to start bug fixes

* feature: prep/cook/total time slots (#80)

Co-authored-by: Hayden <[email protected]>

* missing bind attributes

* Bug fixes (#81)

* fix: url remains after succesful import

* docs: changelog + update todos

* arm image

* arm compose

* compose updates

* update poetry

* arm support

Co-authored-by: Hayden <[email protected]>

* dockerfile hotfix

* dockerfile hotfix

* Version Release Final Touches (#84)

* Remove slim

* bug: opacity issues

* bug: startup failure with no database

* ci/cd on dev branch

* formatting

* v0.1.0 documentation

Co-authored-by: Hayden <[email protected]>

* db init hotfix

* bug: fix crash in mongo

* fix mongo bug

* fixed version notifier

* finale changelog

* Dropping Mongo From Dev Branch (#89)

* Fix link to Docker Hub

Found an extra s. DESTROYED it.

* initial pass

* second pass cleanup

* backup card framework

* backup card functionality

* translation

* upload button vile creation

* Release v0.1.0 Candidate (#85)

* Changed uvicorn port to 80

* Changed port in docker-compose to match dockerfile

* Readded environment variables in docker-compose

* production image rework

* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available

* fixed instrucitons on parse

* add last_recipe

* automated testing

* roadmap update

* Sqlite (#75)

* file structure

* auto-test

* take 2

* refactor ap scheduler and startup process

* fixed scraper error

* database abstraction

* database abstraction

* port recipes over to new schema

* meal migration

* start settings migration

* finale mongo port

* backup improvements

* migration imports to new DB structure

* unused import cleanup

* docs strings

* settings and theme import logic

* cleanup

* fixed tinydb error

* requirements

* fuzzy search

* remove scratch file

* sqlalchemy models

* improved search ui

* recipe models almost done

* sql modal population

* del scratch

* rewrite database model mixins

* mostly grabage

* recipe updates

* working sqllite

* remove old files and reorganize

* final cleanup

Co-authored-by: Hayden <[email protected]>

* Backup card (#78)

* backup / import dialog

* upgrade to new tag method

* New import card

* rename settings.py to app_config.py

* migrate to poetry for development

* fix failing test

Co-authored-by: Hayden <[email protected]>

* added mkdocs to docker-compose

* Translations (#72)

* Translations + danish

* changed back proxy target to use ENV

* Resolved more merge conflicts

* Removed test in translation

* Documentation of translations

* Updated translations

* removed old packages

Co-authored-by: Hayden <[email protected]>

* fail to start bug fixes

* feature: prep/cook/total time slots (#80)

Co-authored-by: Hayden <[email protected]>

* missing bind attributes

* Bug fixes (#81)

* fix: url remains after succesful import

* docs: changelog + update todos

* arm image

* arm compose

* compose updates

* update poetry

* arm support

Co-authored-by: Hayden <[email protected]>

* dockerfile hotfix

* dockerfile hotfix

* Version Release Final Touches (#84)

* Remove slim

* bug: opacity issues

* bug: startup failure with no database

* ci/cd on dev branch

* formatting

* v0.1.0 documentation

Co-authored-by: Hayden <[email protected]>

* db init hotfix

* bug: fix crash in mongo

* fix mongo bug

* fixed version notifier

* finale changelog

Co-authored-by: kentora <=>
Co-authored-by: Hayden <[email protected]>
Co-authored-by: Richard Mitic <[email protected]>
Co-authored-by: kentora <[email protected]>

* build container

* webscraper hotfix

* dev bug: change data location to prevent reloads

* api docs

* api docs bug

* workflow update

Co-authored-by: David Young <[email protected]>
Co-authored-by: Hayden <[email protected]>
Co-authored-by: Richard Mitic <[email protected]>
Co-authored-by: kentora <[email protected]>

* Add French Translation (#93)

* New tests (#94)

* dev-bug: fixed vscode freezes

* test: refactor database init to support tests

Co-authored-by: Hayden <[email protected]>

* Mealplan CRUD Tests (#95)

* dev-bug: fixed vscode freezes

* test: refactor database init to support tests

* mealplan CRUD testing

Co-authored-by: Hayden <[email protected]>

* Fix typos (#96)

* Settings, Themes and Migration Route Tests (#100)

* dev-bug: fixed vscode freezes

* test: refactor database init to support tests

* mealplan CRUD testing

* restructure test folder

* git attributes

* tests: migration, settings, theme routes testing

Co-authored-by: Hayden <[email protected]>

* Refactor + New Docker File (#105)

* dev-bug: fixed vscode freezes

* test: refactor database init to support tests

* mealplan CRUD testing

* restructure test folder

* git attributes

* tests: migration, settings, theme routes testing

* docker-file shrink

* rebuild

* refactor: moving directories around

* adding funding

Co-authored-by: Hayden <[email protected]>

* Meal planner improvements (#107)

* dev-bug: fixed vscode freezes

* test: refactor database init to support tests

* mealplan CRUD testing

* restructure test folder

* git attributes

* tests: migration, settings, theme routes testing

* docker-file shrink

* rebuild

* refactor: moving directories around

* adding funding

* mealplan redesign

Co-authored-by: Hayden <[email protected]>

* Upload component (#108)

* unified upload button + download backups

* javascript toolings

* fix vuetur config

* fixed type check error

* refactor: clean up bag javascript

Co-authored-by: Hayden <[email protected]>

* Upload component (#113)

* unified upload button + download backups

* javascript toolings

* fix vuetur config

* fixed type check error

* refactor: clean up bag javascript

* UI updates + name validation

* docs: changelog + sp

* fixed route links

* changelog

Co-authored-by: Hayden <[email protected]>

* fixed menu links

* fixed poetry install on docker.dev build

* Migration redesign (#119)

* migration redesign init

* new color picker

* changelog

* added UI language selection

* fix layout issue on recipe editor

* remove git as dependency

* added UI editor for original URL

* CI/CD Tests

* test: fixed migration routes

Co-authored-by: Hayden <[email protected]>

* Fix link to dev-notes.md (#110)

* translation: add swedish (#128)

* language: da is Danish

* translations: add swedish

* scraper: unescape html in instructions (#129)

Some urls erroneously deliver escaped html their instructions,
sometimes they are even escaped on multiple levels like here:

https://www.ica.se/recept/kladdig-kladdkaka-722982/

```
>>> normalize_instruction("S&amp;auml;tt ugnen p&amp;aring; 200&amp;deg;C.")
'Sätt ugnen på 200°C.'
```

* v0.2.0 Updates (#130)

* migration redesign init

* new color picker

* changelog

* added UI language selection

* fix layout issue on recipe editor

* remove git as dependency

* added UI editor for original URL

* CI/CD Tests

* test: fixed migration routes

* test todos

* bug/added docker volume

* chowdow test data

* partial image recipe image testing

* added card section card

* settings form

* homepage cetegory ui

* frontend category placeholder

* fixed broken scheduler

* remove old files

* removed temp test

Co-authored-by: Hayden <[email protected]>

* Fix missing translations key (#133)

* translation: add simplified & traditional chinese

* Fix missing translations

* fix chinese translations

* v0.2.0 Release Candidate (#141)

* Fix link to Docker Hub

Found an extra s. DESTROYED it.

* Release v0.1.0 Candidate (#85)

* Changed uvicorn port to 80

* Changed port in docker-compose to match dockerfile

* Readded environment variables in docker-compose

* production image rework

* Use opengraph metadata to make basic recipe cards when full recipe metadata is not available

* fixed instrucitons on parse

* add last_recipe

* automated testing

* roadmap update

* Sqlite (#75)

* file structure

* auto-test

* take 2

* refactor ap scheduler and startup process

* fixed scraper error

* database abstraction

* database abstraction

* port recipes over to new schema

* meal migration

* start settings migration

* finale mongo port

* backup improvements

* migration imports to new DB structure

* unused import cleanup

* docs strings

* settings and theme import logic

* cleanup

* fixed tinydb error

* requirements

* fuzzy search

* remove scratch file

* sqlalchemy models

* improved search ui

* recipe models almost done

* sql modal population

* del scratch

* rewrite database model mixins

* mostly grabage

* recipe updates

* working sqllite

* remove old files and reorganize

* final cleanup

Co-authored-by: Hayden <[email protected]>

* Backup card (#78)

* backup / import dialog

* upgrade to new tag method

* New import card

* rename settings.py to app_config.py

* migrate to poetry for development

* fix failing test

Co-authored-by: Hayden <[email protected]>

* added mkdocs to docker-compose

* Translations (#72)

* Translations + danish

* changed back proxy target to use ENV

* Resolved more merge conflicts

* Removed test in translation

* Documentation of translations

* Updated translations

* removed old packages

Co-authored-by: Hayden <[email protected]>

* fail to start bug fixes

* feature: prep/cook/total time slots (#80)

Co-authored-by: Hayden <[email protected]>

* missing bind attributes

* Bug fixes (#81)

* fix: url remains after succesful import

* docs: changelog + update todos

* arm image

* arm compose

* compose updates

* update poetry

* arm support

Co-authored-by: Hayden <[email protected]>

* dockerfile hotfix

* dockerfile hotfix

* Version Release Final Touches (#84)

* Remove slim

* bug: opacity issues

* bug: startup failure with no database

* ci/cd on dev branch

* formatting

* v0.1.0 documentation

Co-authored-by: Hayden <[email protected]>

* db init hotfix

* bug: fix crash in mongo

* fix mongo bug

* fixed version notifier

* finale changelog

Co-authored-by: kentora <=>
Co-authored-by: Hayden <[email protected]>
Co-authored-by: Richard Mitic <[email protected]>
Co-authored-by: kentora <[email protected]>

* build container

* webscraper hotfix

* notes hot fix

* bug: mongo updates fail #99

* Fix error message (#101)

* gh funding

* Create Issue Templates (#125)

* Create bug_report.md

* Create config.yml

Included a link to feature requests.

* Update config.yml

Fixed link I had for testing to the actual link

* Update bug_report.md

fix capitalization

* Update .github/ISSUE_TEMPLATE/bug_report.md

Co-authored-by: Stephen Brown II <[email protected]>

Co-authored-by: Stephen Brown II <[email protected]>

* merge kentors changes

* refactor/recipe routers

* category/tag database relationship and endpoints

* frontend category management

* update branch todos

* bug/normalize recipe steps html

* remove console.log +  refactor categories

* fix categories database errors

* refactor/ router endpoint

* refactor/ remove old code

* drag and drop ingredients

* general cleanup

* route refactoring

* changelog

* api refactoring + random cleanup

* fixed backwards sort

* Update mkdocs.yml (#137)

Fix warning from Deploy Docs github action

* fixed navigate on enter in search

* refactor/create global css

* added category scroll

* cleanup todos

* debug routes

* docs/new gifs & general updates

* cleanup

* fix list test

Co-authored-by: David Young <[email protected]>
Co-authored-by: Hayden <[email protected]>
Co-authored-by: Richard Mitic <[email protected]>
Co-authored-by: kentora <[email protected]>
Co-authored-by: Alexei Pesic <[email protected]>
Co-authored-by: Andrew <[email protected]>
Co-authored-by: Stephen Brown II <[email protected]>

* fix build

* fix duplicate editor

* fixed docker mount problem

* python 3.9

* added tasks for non-docker development

* remove old scripts

* dev updates

* fixed no image upload option

* get version from backend

* final docs pass

* .gitignore

Co-authored-by: kentora <=>
Co-authored-by: Hayden <[email protected]>
Co-authored-by: Richard Mitic <[email protected]>
Co-authored-by: kentora <[email protected]>
Co-authored-by: David Young <[email protected]>
Co-authored-by: Bastien <[email protected]>
Co-authored-by: sephrat <[email protected]>
Co-authored-by: Nick CJ <[email protected]>
Co-authored-by: dekvall <[email protected]>
Co-authored-by: wengtad <[email protected]>
Co-authored-by: Alexei Pesic <[email protected]>
Co-authored-by: Andrew <[email protected]>
Co-authored-by: Stephen Brown II <[email protected]>

.gitattributes

@@ -1 +1,2 @@
-*.css linguist-detectable=false
+*.css linguist-detectable=false
+*.html linguist-detectable=false

.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
       #----------------------------------------------

.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

.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"
+  ]
 }

.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"
       }
+    }
   ]
 }

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"]

Dockerfile.dev

@@ -8,16 +8,14 @@ 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
 
 RUN poetry install --no-root
 
 COPY ./mealie /app
 
-
 ENTRYPOINT [ "python" ]
 
 CMD [ "app.py" ]

README.md

@@ -33,7 +33,7 @@
     Request Feature
     </a>    
     ·
-    <a href="https://hub.docker.com/repository/docker/hkotel/mealie"> Docker Hub
+    <a href="https://hub.docker.com/r/hkotel/mealie"> Docker Hub
     </a>
 </p>
 
@@ -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/)
 
 

dev/dev-notes.md

@@ -16,28 +16,20 @@ 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
 - [ ] Organize Home Page my Category, ideally user selectable.
 - [ ] 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
 

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