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

1331 Commits

Author SHA1 Message Date
smilerz
4bc4ce0d7c bug fix url import 2021-05-01 16:30:22 -05:00
smilerz
c50bd039ef recipe import tests 2021-05-01 16:30:22 -05:00
smilerz
5fff5b97da simplified url import 2021-05-01 16:30:21 -05:00
smilerz
2c27e06bfb add data for url_import test 2021-05-01 16:30:21 -05:00
smilerz
e4044016c3 added all ATK sites to custom scraper 2021-05-01 16:30:21 -05:00
smilerz
52df886372 added cooksillustrated custom scraper 2021-05-01 16:30:21 -05:00
smilerz
c7949edb18 ensure time is always a number 2021-05-01 16:30:21 -05:00
smilerz
342a261017 added ability to create custom scrapers 2021-05-01 16:30:21 -05:00
smilerz
e5984abd97 removed old json importer 2021-05-01 16:30:21 -05:00
smilerz
2ea3e4f8f3 updated import from source to use text scraper 2021-05-01 16:30:21 -05:00
smilerz
98b3b002f9 remove old html_import function 2021-05-01 16:30:21 -05:00
smilerz
d2a1a0ac32 wrapper for recipe_scrapers to parse text input 2021-05-01 16:30:21 -05:00
smilerz
2ceefdd9b0 fixed broken tab 2021-05-01 16:30:21 -05:00
smilerz
b22392726f delete bookmarklet on import 2021-05-01 16:30:21 -05:00
smilerz
b89fedd07f removed console message 2021-05-01 16:30:21 -05:00
smilerz
a263771383 fixed ingredient display on preview 2021-05-01 16:30:21 -05:00
smilerz
7cc757ac33 redirect to import url for processing 2021-05-01 16:30:21 -05:00
smilerz
6acbd6d308 added hack to fix scopes & CORS for bookmarklet 2021-05-01 16:30:21 -05:00
smilerz
30a357e27f added CORS middleware 2021-05-01 16:30:21 -05:00
smilerz
7bc3292301 added bookmarklet model and api 2021-05-01 16:30:21 -05:00
smilerz
7fb440a855 bookmarklet passing data to form 2021-05-01 16:30:21 -05:00
smilerz
0e27ddab74 added bookmarklet that doesn't work yet 2021-05-01 16:30:21 -05:00
smilerz
0a38049ce4 Squashed commit of the following: 
commit 81a8734fac
Merge: abcef54 f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Mar 20 22:41:13 2021 +0100

    Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support

    Add iOS webclip icon support

commit abcef54e72
Merge: e15c92c 7527646
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Mar 20 22:30:43 2021 +0100

    Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1

    Bump recipe-scrapers from 12.2.0 to 12.2.1

commit e15c92cda5
Merge: 58fc269 45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Mar 20 22:26:06 2021 +0100

    Merge pull request #501 from smilerz/main_fork

    fix json direct import when wrapped in @graph

commit 45dba6fad2
Author: smilerz <smilerz@gmail.com>
Date:   Fri Mar 19 13:23:55 2021 -0500

    fix json direct import when wrapped in @graph

commit f67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de>
Date:   Fri Mar 19 15:49:12 2021 +0100

    Add generated icons from icongenerator.

commit 53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de>
Date:   Fri Mar 19 12:48:58 2021 +0100

    Fix errors in favicon SVG.

commit 7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Mar 19 05:51:22 2021 +0000

    Bump recipe-scrapers from 12.2.0 to 12.2.1

    Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1.
    - [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
    - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1)

    Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-01 16:30:21 -05:00
smilerz
4aaecb4ada updated links to import recipes 2021-05-01 16:30:21 -05:00
smilerz
3f5e64fc4a added collapsable cards 2021-05-01 16:30:21 -05:00
smilerz
154527ef1b cosmetic cleanup 2021-05-01 16:30:21 -05:00
smilerz
788e253749 added image import 2021-05-01 16:30:21 -05:00
smilerz
7c8b489857 consolidated integration imports into url_import 2021-05-01 16:30:21 -05:00
smilerz
cdc25b480d staged app import tabs 2021-05-01 16:30:21 -05:00
smilerz
1568d86143 fixed missing space in keyword when adding recipe 2021-05-01 16:30:21 -05:00
smilerz
adeb360837 removed unused templates 2021-05-01 16:30:20 -05:00
smilerz
9cc6a1dc79 combined json import and source import 2021-05-01 16:30:20 -05:00
smilerz
6a13619bbd more fix from super ugly merge 2021-05-01 16:30:20 -05:00
smilerz
58e33ef31a more cleanup from ugly merge 2021-05-01 16:30:20 -05:00
smilerz
36841d74af fixed ugly merge 2021-05-01 16:30:20 -05:00
smilerz
8094c7d53a added drag and drop to ingredients 2021-05-01 16:30:20 -05:00
smilerz
71e02c0916 manually parse json 2021-05-01 16:30:20 -05:00
smilerz
25fb41baed update urls.py 2021-05-01 16:30:20 -05:00
smilerz
34ff484830 commit merge from Patralos/recipes 2021-05-01 16:30:20 -05:00
smilerz
91e36eb222 updated URL import page with tab interface 2021-05-01 16:30:20 -05:00
smilerz
55ba568f3c import raw json/html 2021-05-01 16:30:20 -05:00
smilerz
8f3f1c230c refactored json parser to create functions for each sub parser 2021-05-01 16:30:20 -05:00
Patrick Pirker
1690abaf47 replace common fractions with their concrete value (else parsing is not possible) 2021-05-01 16:30:20 -05:00
Patrick Pirker
7414033495 Allow recipes to be imported from json directly 2021-05-01 16:30:20 -05:00
vabene1111
d1b9d15816 recipe_scrapers deprectation fix 2021-05-01 22:56:00 +02:00
vabene1111
3daebc4170
Merge branch 'develop' into json_import 2021-05-01 22:39:20 +02:00
vabene1111
67485c0ea3
Merge pull request #585 from TimPansino/develop 
Fix crash on missing photos in paprika
 2021-05-01 22:18:27 +02:00
vabene1111
aafbc497cc search view fixes/updates 2021-05-01 22:16:29 +02:00
vabene1111
7bc4ae9870 fixed paprika importer 2021-05-01 19:19:48 +02:00
its_me_gb
7cd6a7c2a6 Import recipe keywords 2021-05-01 15:02:22 +01:00
Marcel Paluch
7a017899ee Translated using Weblate (German) 
Currently translated at 99.7% (370 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/de/
 2021-05-01 13:01:55 +00:00
its_me_gb
0ec29636b3 Add original source url to the first recipe step 2021-04-30 09:14:31 +01:00
its_me_gb
5ef5530392 Move the source url back into the step - inline with other importers 2021-04-30 08:40:00 +01:00
vabene1111
239ba5f861 fixed meal plan notes and recipe links 2021-04-29 17:15:06 +02:00
Timothy Pansino
43c71af2af
Fix crash on missing photos in paprika 2021-04-28 20:22:12 -07:00
its_me_gb
b9040cb3a4 parse the servings 2021-04-28 18:41:26 +01:00
its_me_gb
c710d42ccb Add the source url to description not step 2021-04-28 17:50:05 +01:00
its_me_gb
1bc5af1cab import local image, download if fails. 2021-04-28 13:47:51 +01:00
its_me_gb
23415f8a61 Initial importer created. 2021-04-28 13:47:51 +01:00
its_me_gb
d00fa10b9f Import the recipe image from the zip file. 2021-04-28 13:16:55 +01:00
vabene1111
cc34496c00 added missing files last commit 2021-04-28 11:27:28 +02:00
vabene1111
be84e44e43 recipe view enhancements 2021-04-28 11:27:20 +02:00
vabene1111
ae3eb6cfe5 removed one more old bundle render 2021-04-28 09:46:52 +02:00
vabene1111
d06e6c0ab3 updated webpack loader and lots of javscript stuff 2021-04-28 09:41:06 +02:00
its_me_gb
eba3bfa828 Basic import functionality working 2021-04-27 15:32:07 +01:00
vabene1111
5ee718b578 added persistent search settings and tweaked view 2021-04-26 18:00:54 +02:00
its_me_gb
6e91f34779 add RecipeKeeper as an import/export method 2021-04-26 16:55:08 +01:00
vabene1111
dc27f39393 added recently viewed to new search 2021-04-26 17:21:14 +02:00
vabene1111
ec95f8032c fixed recipe url import issue on some pages without images 2021-04-26 16:41:48 +02:00
Jesse
f2d761f7d9 Translated using Weblate (Dutch) 
Currently translated at 100.0% (371 of 371 strings)

Translation: Tandoor/Recipes Backend
Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/nl/
 2021-04-22 18:29:10 +00:00
smilerz
a1572a4809 changed keyword to get_or_create 2021-04-20 09:15:03 -05:00
smilerz
2b5dceee7c WIP 2021-04-20 08:09:42 -05:00
smilerz
66bb5b4328 strip spaces from food, keywords and units 2021-04-19 17:35:53 -05:00
smilerz
0f4cd4b17c fix ATK scraper 2021-04-19 14:37:26 -05:00
smilerz
ae3835b541 update ATK scraper 2021-04-19 14:31:48 -05:00
vabene1111
92c65ec1e8 fixed test meal plan 2021-04-18 21:21:41 +02:00
vabene1111
a376c3a5b6 meal plan random fix 2021-04-18 17:55:48 +02:00
vabene1111
058d705170 meal plan in search 2021-04-18 17:19:11 +02:00
vabene1111
4ad5d6ef2f fixed test + added api doc for new search 2021-04-18 15:01:39 +02:00
vabene1111
e676b4bac3 added api pagination for recipes 2021-04-18 14:05:19 +02:00
vabene1111
04488741c4 adv search mobile styling 2021-04-18 11:11:19 +02:00
vabene1111
99004ad34b new search and setting 2021-04-18 11:03:15 +02:00
vabene1111
f78f7dfc14 search ui improvements and filter 2021-04-18 02:55:50 +02:00
smilerz
49fb1e7183 login redirect to intended page 2021-04-17 18:34:56 -05:00
smilerz
7930c2417c update ATK scrape to handle empty headnote 2021-04-17 17:12:43 -05:00
vabene1111
880db58d38 v2 search filtering 2021-04-17 21:28:29 +02:00
smilerz
2f27413c0a
parse multiple ingredientGroups 
previous version assumed only a single item in a list - this loops through each item
 2021-04-17 14:12:24 -05:00
smilerz
5869a8ad1b fixes to pass tests 2021-04-17 13:43:34 -05:00
smilerz
0640a265fc added test for spruce eats 2021-04-17 13:42:56 -05:00
smilerz
d449fc8fd8 updated normalization to skip removing line breaks 2021-04-17 12:49:42 -05:00
smilerz
b9ee77709b updated ATK scraper to include header notes in instructions 2021-04-17 12:49:06 -05:00
smilerz
f594ba4c69 enable import button after error 2021-04-17 11:12:22 -05:00
vabene1111
d1d65d878c v2 search progress 2021-04-17 14:11:10 +02:00
vabene1111
3194a7580d basics of v2 search working 2021-04-17 12:57:02 +02:00
smilerz
ba061df1b6 catch attribute error on cooktime 2021-04-16 17:30:59 -05:00
smilerz
7cc515bcdf fix manual url import 2021-04-16 17:08:25 -05:00
smilerz
724748d38a corrected api import workflow 2021-04-16 14:09:10 -05:00
smilerz
b2c1c6e301 restored missing manual url scrape 2021-04-16 11:26:26 -05:00
smilerz
987be4b04d Fix after rebase 2021-04-16 09:02:27 -05:00
smilerz
ca84da68c4 catch attibute error when scrape missing schema 2021-04-16 09:02:04 -05:00
smilerz
eb2593aacd handle text in cook times during import 2021-04-16 09:02:04 -05:00
smilerz
496e04cfc8 convert servings to number on import 2021-04-16 09:02:04 -05:00
smilerz
d814d13d54 custom scraper fails safe 2021-04-16 09:02:03 -05:00
smilerz
d0cedaf7a1 added name parser 2021-04-16 09:02:03 -05:00
smilerz
01f504f7b1 updated tests to handle html decoding 2021-04-16 09:02:03 -05:00
smilerz
c716346f1f flake 2021-04-16 09:02:03 -05:00
smilerz
fef5236931 decode url strings in text_parser 2021-04-16 09:02:03 -05:00
smilerz
b115c37eb8 catch error on scrape.image() 2021-04-16 09:02:03 -05:00
smilerz
1e17f3703a trap error on scrape.title() 2021-04-16 09:02:03 -05:00
smilerz
468b986314 updated tests 2021-04-16 09:02:03 -05:00
smilerz
a531d135b5 remove html tags from description 2021-04-16 09:02:03 -05:00
smilerz
7524609cd0 retrieve bookmarklet ID from get 2021-04-16 09:02:03 -05:00
smilerz
a28f8e65d5 Revert "fixed broken tab" 
This reverts commit ca0a1aede3cc6cb3912bc1fe30c0aa22e3f481a6.
 2021-04-16 09:02:03 -05:00
smilerz
d193637091 added missing bookmarklet 2021-04-16 09:02:03 -05:00
smilerz
0953af05fc Revert "bug fix url import" 
This reverts commit 4ab8ca51e812d02911f4da801767612e52953a23.
 2021-04-16 09:02:03 -05:00
smilerz
19e8e5cb5b removed extra string normalization 2021-04-16 09:02:03 -05:00
smilerz
43c808380d updated migration 2021-04-16 09:02:03 -05:00
smilerz
7ab8b84044 updated recipe targets in tests to reflect html decoding 2021-04-16 09:02:03 -05:00
smilerz
d739fe6752 fixes #527 2021-04-16 09:02:03 -05:00
smilerz
a84c41e29f bug fix url import 2021-04-16 09:02:03 -05:00
smilerz
393aba1f31 url import bug fixes 2021-04-16 09:02:03 -05:00
smilerz
436a070730 bug fix tests 2021-04-16 09:02:03 -05:00
smilerz
2fe6788ce5 bug fix url import 2021-04-16 09:02:03 -05:00
smilerz
747d146389 recipe import tests 2021-04-16 09:02:03 -05:00
smilerz
efe4c4043d simplified url import 2021-04-16 09:02:03 -05:00
smilerz
c6739ba8e0 add data for url_import test 2021-04-16 09:02:02 -05:00
smilerz
50140db668 added all ATK sites to custom scraper 2021-04-16 09:02:02 -05:00
smilerz
028b2dfb22 added cooksillustrated custom scraper 2021-04-16 09:02:02 -05:00
smilerz
ec6a10ca0a ensure time is always a number 2021-04-16 09:02:02 -05:00
smilerz
3cf949bf8d added ability to create custom scrapers 2021-04-16 09:02:02 -05:00
smilerz
0a62225797 removed old json importer 2021-04-16 09:02:02 -05:00
smilerz
a54f4e1367 updated import from source to use text scraper 2021-04-16 09:02:02 -05:00
smilerz
bf3c30a8fb remove old html_import function 2021-04-16 09:02:02 -05:00
smilerz
f811f5996e wrapper for recipe_scrapers to parse text input 2021-04-16 09:02:02 -05:00
smilerz
a3490240f4 fixed broken tab 2021-04-16 09:02:02 -05:00
smilerz
b26aea96f4 delete bookmarklet on import 2021-04-16 09:02:02 -05:00
smilerz
4d4af5fdf2 removed console message 2021-04-16 09:02:02 -05:00
smilerz
3da74505d6 fixed ingredient display on preview 2021-04-16 09:02:02 -05:00
smilerz
c8a4861df8 redirect to import url for processing 2021-04-16 09:02:02 -05:00
smilerz
5e27cd606e added hack to fix scopes & CORS for bookmarklet 2021-04-16 09:02:02 -05:00
smilerz
a341fd8ebe added CORS middleware 2021-04-16 09:02:02 -05:00
smilerz
9a62b6e4e7 added bookmarklet model and api 2021-04-16 09:02:02 -05:00
smilerz
f80c44bca3 bookmarklet passing data to form 2021-04-16 09:02:02 -05:00
smilerz
09d2e9f831 added bookmarklet that doesn't work yet 2021-04-16 09:02:02 -05:00
smilerz
4d5a9e446f Squashed commit of the following: 
commit 81a8734fac
Merge: abcef54 f67bb3c
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Mar 20 22:41:13 2021 +0100

    Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support

    Add iOS webclip icon support

commit abcef54e72
Merge: e15c92c 7527646
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Mar 20 22:30:43 2021 +0100

    Merge pull request #498 from vabene1111/dependabot/pip/recipe-scrapers-12.2.1

    Bump recipe-scrapers from 12.2.0 to 12.2.1

commit e15c92cda5
Merge: 58fc269 45dba6f
Author: vabene1111 <vabene1111@users.noreply.github.com>
Date:   Sat Mar 20 22:26:06 2021 +0100

    Merge pull request #501 from smilerz/main_fork

    fix json direct import when wrapped in @graph

commit 45dba6fad2
Author: smilerz <smilerz@gmail.com>
Date:   Fri Mar 19 13:23:55 2021 -0500

    fix json direct import when wrapped in @graph

commit f67bb3cb98
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de>
Date:   Fri Mar 19 15:49:12 2021 +0100

    Add generated icons from icongenerator.

commit 53b584da56
Author: Sebastian Markgraf <Sebastian-Markgraf@t-online.de>
Date:   Fri Mar 19 12:48:58 2021 +0100

    Fix errors in favicon SVG.

commit 7527646319
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Mar 19 05:51:22 2021 +0000

    Bump recipe-scrapers from 12.2.0 to 12.2.1

    Bumps [recipe-scrapers](https://github.com/hhursev/recipe-scrapers) from 12.2.0 to 12.2.1.
    - [Release notes](https://github.com/hhursev/recipe-scrapers/releases)
    - [Commits](https://github.com/hhursev/recipe-scrapers/compare/12.2.0...12.2.1)

    Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-16 09:02:02 -05:00
smilerz
6a2c27749f updated links to import recipes 2021-04-16 09:02:02 -05:00
smilerz
de60e12073 added collapsable cards 2021-04-16 09:02:02 -05:00
smilerz
1188ed9227 cosmetic cleanup 2021-04-16 09:02:02 -05:00
smilerz
cb708e7e47 added image import 2021-04-16 09:02:02 -05:00
smilerz
215eadb4a0 consolidated integration imports into url_import 2021-04-16 09:02:02 -05:00