cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,354 Commits 2 Branches 0 Tags 57 MiB
c1a22ea2a6
Commit Graph

314 Commits

Author SHA1 Message Date
dependabot[bot]
3460319a35
Bump typescript from 4.3.2 to 4.4.3 in /vue 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.2 to 4.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.2...v4.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-11 11:11:31 +00:00
dependabot[bot]
f64b3bca00
Bump workbox-precaching from 6.2.4 to 6.3.0 in /vue 
Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.2.4 to 6.3.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.2.4...v6.3.0)

---
updated-dependencies:
- dependency-name: workbox-precaching
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-11 11:11:11 +00:00
vabene1111
163d5a3892
Merge pull request #883 from vabene1111/dependabot/npm_and_yarn/vue/workbox-routing-6.3.0 
Bump workbox-routing from 6.2.4 to 6.3.0 in /vue
 2021-09-11 13:10:38 +02:00
dependabot[bot]
1007a9f884
Bump workbox-routing from 6.2.4 to 6.3.0 in /vue 
Bumps [workbox-routing](https://github.com/googlechrome/workbox) from 6.2.4 to 6.3.0.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.2.4...v6.3.0)

---
updated-dependencies:
- dependency-name: workbox-routing
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-11 11:10:18 +00:00
vabene1111
9d0d72a7b2
Merge pull request #877 from vabene1111/dependabot/npm_and_yarn/vue/typescript-4.4.2 
Bump typescript from 4.3.2 to 4.4.2 in /vue
 2021-09-11 13:10:00 +02:00
vabene1111
29602e2f27
Merge pull request #876 from vabene1111/dependabot/npm_and_yarn/vue/workbox-precaching-6.2.4 
Bump workbox-precaching from 6.1.5 to 6.2.4 in /vue
 2021-09-11 13:09:55 +02:00
vabene1111
eb8c06032e
Merge pull request #874 from vabene1111/dependabot/npm_and_yarn/vue/typescript-eslint/parser-4.31.0 
Bump @typescript-eslint/parser from 4.26.1 to 4.31.0 in /vue
 2021-09-11 13:09:45 +02:00
vabene1111
c0d1987545
Merge pull request #873 from vabene1111/dependabot/npm_and_yarn/vue/workbox-strategies-6.2.4 
Bump workbox-strategies from 6.1.5 to 6.2.4 in /vue
 2021-09-11 13:09:41 +02:00
vabene1111
79c1f2eb86
Merge branch 'develop' into generic_card_fix 2021-09-11 13:09:02 +02:00
vabene1111
1be24e80de
Merge pull request #878 from smilerz/filter_by_rating 
Filter by rating
 2021-09-11 13:08:14 +02:00
Oliver Cervera
882075199c Translated using Weblate (Italian) 
Currently translated at 85.8% (109 of 127 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-11 09:06:06 +00:00
smilerz
c8bff1660b transposed v-model 2021-09-10 14:51:37 -05:00
smilerz
f6eb1b69cb card loading fixes 2021-09-10 11:37:27 -05:00
smilerz
6888233b6a fixed mispelled parameter 2021-09-10 06:44:09 -05:00
smilerz
cd137f9da3 yarn build 2021-09-09 19:07:16 -05:00
smilerz
aae3b679aa filter by recipe 2021-09-09 18:55:47 -05:00
smilerz
249557f8ef filter by rating 2021-09-09 15:23:46 -05:00
dependabot[bot]
72c98a0f8a
Bump typescript from 4.3.2 to 4.4.2 in /vue 
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.2 to 4.4.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.2...v4.4.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 04:03:31 +00:00
dependabot[bot]
66c4a28c8f
Bump workbox-precaching from 6.1.5 to 6.2.4 in /vue 
Bumps [workbox-precaching](https://github.com/googlechrome/workbox) from 6.1.5 to 6.2.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.1.5...v6.2.4)

---
updated-dependencies:
- dependency-name: workbox-precaching
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 04:03:11 +00:00
dependabot[bot]
c3246853d5
Bump @typescript-eslint/parser from 4.26.1 to 4.31.0 in /vue 
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.26.1 to 4.31.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.31.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 04:02:47 +00:00
dependabot[bot]
e796a55ff9
Bump workbox-strategies from 6.1.5 to 6.2.4 in /vue 
Bumps [workbox-strategies](https://github.com/googlechrome/workbox) from 6.1.5 to 6.2.4.
- [Release notes](https://github.com/googlechrome/workbox/releases)
- [Commits](https://github.com/googlechrome/workbox/compare/v6.1.5...v6.2.4)

---
updated-dependencies:
- dependency-name: workbox-strategies
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-09 04:02:25 +00:00
vabene1111
51dd137d96
Merge branch 'develop' into create_inputList 2021-09-09 05:44:43 +02:00
smilerz
83a747739a add new from ListInput 2021-09-08 14:01:21 -05:00
smilerz
5f37af5710 Move/Merge updated to handle object vs id 2021-09-08 09:16:58 -05:00
Kaibu
9bdcf09f60 started reworking books 2021-09-08 16:15:33 +02:00
vabene1111
04c047bd31 fixed keyword url parameter type in search view 2021-09-08 15:44:36 +02:00
vabene1111
19d152461c various fixes food serializer 2021-09-08 15:05:54 +02:00
vabene1111
68b64ba8e2 Merge branch 'pr/865' into develop 2021-09-08 09:42:16 +02:00
vabene1111
b3477332e7
Merge pull request #866 from smilerz/log_pagination 
implemented pagination on Log apis
 2021-09-08 09:32:51 +02:00
vabene1111
8edc01db26
Merge pull request #861 from smilerz/food_tree_patch 
post food_tree bug fixing
 2021-09-08 09:11:00 +02:00
smilerz
8420995aa8 updated RecipeSearch API 2021-09-07 13:52:14 -05:00
Oliver Cervera
5c4bf20c6f Translated using Weblate (Italian) 
Currently translated at 83.1% (99 of 119 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-07 16:06:03 +00:00
Afaren
e32813281a Translated using Weblate (French) 
Currently translated at 100.0% (119 of 119 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-09-07 16:06:03 +00:00
smilerz
4d27a80cd5 implemented pagination on Log apis 2021-09-07 07:35:17 -05:00
smilerz
c9d1a9b551 finished unit page 2021-09-06 14:00:32 -05:00
smilerz
84744560e0 infinite loader bug fixing 2021-09-06 12:28:14 -05:00
smilerz
7053a857c2 reworked MergeMixin to handle non-trees 2021-09-06 10:45:16 -05:00
smilerz
f12558951a moved keyword Vue to generic components 2021-09-05 16:26:01 -05:00
smilerz
638dd96812 finished making FoodList completely generic 2021-09-05 14:15:58 -05:00
smilerz
d33a49538e Squashed commit of the following: 2021-09-05 11:18:57 -05:00
smilerz
d1556f69c2 WIP 2021-09-05 11:17:28 -05:00
smilerz
cd0259ad26 remove console messages 2021-09-04 16:47:12 -05:00
smilerz
b147c975b8 post food_tree bug fixing 2021-09-04 16:41:57 -05:00
vabene1111
16d125a243 fixed search facets and sub recipe 2021-09-04 19:26:42 +02:00
vabene1111
b129753d4e
Merge branch 'develop' into keyword_todo 2021-09-04 18:30:49 +02:00
vabene1111
de8ceba3bc compiled and updated javascript resources 2021-09-04 18:17:07 +02:00
vabene1111
d70f1f9fc7 several small fixes to new components 2021-09-04 18:11:50 +02:00
vabene1111
d6e0faf7f4
Merge pull request #846 from smilerz/food_tree 
Food tree
 2021-09-04 17:47:10 +02:00
Oliver Cervera
a4707c09f9 Translated using Weblate (Italian) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-04 08:06:02 +00:00
Oliver Cervera
4360289b56 Translated using Weblate (Italian) 
Currently translated at 95.9% (94 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-09-02 11:06:01 +00:00
smilerz
ac08ede464 refactored genericAPI as ApiMixin 2021-09-01 12:28:33 -05:00
Oliver Cervera
47946332f4 Translated using Weblate (Italian) 
Currently translated at 73.4% (72 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-08-31 23:32:11 +00:00
smilerz
70089998fe Fix after rebase 2021-08-31 14:59:00 -05:00
smilerz
65fbbabec5 finished food view 2021-08-31 14:58:41 -05:00
smilerz
52abba1f16 stubbed out all Food GenericModalForms 2021-08-31 14:58:41 -05:00
smilerz
a1d1cbac5d refactored Generic API 2021-08-31 14:58:40 -05:00
smilerz
caeb47aee9 bind data in dynamic fields to parent model 2021-08-31 14:58:40 -05:00
smilerz
23ecce7930 stubbed out generic form modal 2021-08-31 14:58:40 -05:00
smilerz
30b513cb58 Squashed commit of the following: 
commit 7e9a8d4d86
Author: smilerz <smilerz@gmail.com>
Date:   Thu Aug 26 21:56:59 2021 -0500

    test case to detect 833

commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
 2021-08-31 14:58:40 -05:00
smilerz
ba07e98cae Squashed commit of the following: 
commit 75e46b8023
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:27:31 2021 -0500

    fix #883

commit 2a1e1953ee
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 21:08:35 2021 -0500

    consolidated recently viewed into FTS queryset

commit aa2d0eafb1
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:43:52 2021 -0500

    fixed cookie reactivity

commit b74fdb3825
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:37:43 2021 -0500

    exact match appears first on keyword/food/unit searches

commit b00c189fd6
Author: smilerz <smilerz@gmail.com>
Date:   Wed Aug 25 16:36:14 2021 -0500

    add pagination reset on search query change
 2021-08-31 14:58:40 -05:00
smilerz
4714162c0b WIP 2021-08-31 14:58:40 -05:00
smilerz
44aa05fe5c Fix after rebase 2021-08-31 14:58:39 -05:00
smilerz
35dc981713 generic api mixin 2021-08-31 14:58:39 -05:00
smilerz
f7b2af7f97 working WIP 2021-08-31 14:58:39 -05:00
smilerz
d606ea8db3 moved food and keyword to generic cards 2021-08-31 14:58:39 -05:00
smilerz
72b4bd7e5c finished food view 2021-08-31 14:58:39 -05:00
smilerz
d5e9c5d8f8 food layout complete, edit food working 2021-08-31 14:58:38 -05:00
smilerz
b56c2429c7 WIP 2021-08-31 14:58:38 -05:00
smilerz
0559143f0e initial Vue components 2021-08-31 14:58:38 -05:00
smilerz
a605113b00 abstract merge function to handle all related models 2021-08-31 14:58:38 -05:00
smilerz
2808e3033d fixes keyword filter on OR search 2021-08-31 14:58:38 -05:00
vabene1111
cd8085acf8 search persistence time limit 2021-08-31 09:21:40 +02:00
vabene1111
88fb6e32ef
Merge pull request #839 from smilerz/fix_search 
Fix search
 2021-08-31 08:57:14 +02:00
Oliver Cervera
1e330e8ff7 Translated using Weblate (Italian) 
Currently translated at 43.8% (43 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/
 2021-08-30 22:31:01 +00:00
Oliver Cervera
8c6cc2edcd Added translation using Weblate (Italian) 2021-08-29 22:19:54 +00:00
smilerz
7e9a8d4d86 test case to detect 833 2021-08-26 21:56:59 -05:00
smilerz
2a1e1953ee consolidated recently viewed into FTS queryset 2021-08-25 21:08:35 -05:00
smilerz
aa2d0eafb1 fixed cookie reactivity 2021-08-25 16:43:52 -05:00
smilerz
b00c189fd6 add pagination reset on search query change 2021-08-25 16:36:14 -05:00
smilerz
78ebd18ed8 fixes keyword filter on OR search 2021-08-24 22:01:02 -05:00
Jesse
16e8b24947 Translated using Weblate (Dutch) 
Currently translated at 100.0% (98 of 98 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/nl/
 2021-08-24 18:28:20 +00:00
vabene1111
8b3827e56c small tweaks 2021-08-22 14:28:58 +02:00
vabene1111
4a1a45032e small tweaks and fixes 2021-08-22 14:18:46 +02:00
vabene1111
d744da2c3d fixed integration 2021-08-22 13:54:33 +02:00
vabene1111
31cb9e283a Merge branch 'develop' into feature/fulltext-search 
# Conflicts:
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/import_response_view.js
#	cookbook/static/vue/js/offline_view.js
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	cookbook/static/vue/js/supermarket_view.js
#	cookbook/static/vue/js/user_file_view.js
#	requirements.txt
#	vue/src/apps/RecipeSearchView/RecipeSearchView.vue
#	vue/src/components/GenericMultiselect.vue
#	vue/src/locales/en.json
 2021-08-22 13:28:57 +02:00
vabene1111
43dbb1d973 Merge branch 'search_and_keywords' of https://github.com/smilerz/recipes into smilerz-search_and_keywords 
# Conflicts:
#	cookbook/admin.py
#	cookbook/helper/recipe_search.py
#	cookbook/integration/chowdown.py
#	cookbook/integration/integration.py
#	cookbook/management/commands/rebuildindex.py
#	cookbook/managers.py
#	cookbook/migrations/0142_build_full_text_index.py
#	cookbook/models.py
#	cookbook/schemas.py
#	cookbook/serializer.py
#	cookbook/static/vue/css/keyword_list_view.css
#	cookbook/static/vue/js/chunk-vendors.js
#	cookbook/static/vue/js/keyword_list_view.js
#	cookbook/tests/api/test_api_keyword.py
#	cookbook/views/api.py
#	cookbook/views/data.py
#	cookbook/views/views.py
#	recipes/settings.py
#	vue/package.json
#	vue/src/apps/KeywordListView/KeywordListView.vue
#	vue/src/components/KeywordCard.vue
#	vue/src/locales/en.json
#	vue/src/utils/openapi/api.ts
#	vue/yarn.lock
 2021-08-22 13:14:23 +02:00
vabene1111
8ecb1af16c Merge branch 'translate-develop' into develop 
# Conflicts:
#	cookbook/locale/fr/LC_MESSAGES/django.po
 2021-08-17 08:41:53 +02:00
dependabot[bot]
9735c03031
Bump url-parse from 1.5.1 to 1.5.3 in /vue 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-16 07:00:40 +00:00
smilerz
5d8ebc513a minor cleanup 2021-08-13 11:23:47 -05:00
smilerz
170673f467 hierarchical keyword filtering in recipe search 2021-08-13 09:58:02 -05:00
Afaren
3f848b42af Translated using Weblate (French) 
Currently translated at 100.0% (78 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-08-12 13:09:43 +00:00
Afaren
36a0693b49 Translated using Weblate (French) 
Currently translated at 2.5% (2 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/
 2021-08-11 16:51:30 +00:00
Afaren
f3fd087b81 Added translation using Weblate (French) 2021-08-10 15:08:26 +00:00
Danny Tsui
8e8d25071c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 73.0% (57 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2021-08-10 08:51:29 +00:00
Danny Tsui
0e48ee60cb Translated using Weblate (Chinese (Simplified)) 
Currently translated at 57.6% (45 of 78 strings)

Translation: Tandoor/Recipes Frontend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/zh_Hans/
 2021-08-04 21:51:26 +00:00
Danny Tsui
314d8d41d1 Added translation using Weblate (Chinese (Simplified)) 2021-08-03 16:27:47 +00:00
Danny Tsui
02fd73f43e Added translation using Weblate (Chinese (Traditional)) 2021-08-03 15:59:53 +00:00
smilerz
1f21631c5a yarn build 2021-07-30 16:30:23 -05:00
smilerz
2da0f5c478 keyword update, tests sqlite and PG 2021-07-30 14:00:09 -05:00
smilerz
2f91c2f86e Fix after rebase 2021-07-29 16:38:33 -05:00