Commit Graph

311 Commits

Author SHA1 Message Date
smilerz
7406dedb74 Fix after rebase 2021-07-29 16:38:25 -05:00
smilerz
b556bed56e fuzzy match on lookups 2021-07-29 16:38:25 -05:00
smilerz
32c488f4a8 link to search settings in recipe search 2021-07-29 16:38:25 -05:00
vabene1111
c6990ef2d8 fixed fraction issue 2021-07-29 17:11:01 +02:00
vabene1111
8642298eda recipe book context menu 2021-07-29 16:32:15 +02:00
vabene1111
e92dbcd63e compiled javascript 2021-07-13 16:47:45 +02:00
vabene1111
9809f58c28 supermarket view done 2021-07-08 19:00:23 +02:00
vabene1111
da57e656eb several search related improvements 2021-07-07 17:45:05 +02:00
Kaibu
5518199f64 search and car styling 2021-06-30 15:36:56 +02:00
Kaibu
c4905d39c1 minor ui/ux improvements 2021-06-30 04:12:52 +02:00
vabene1111
272341f1dc further improvements to search view 2021-06-28 18:35:20 +02:00
vabene1111
a7c89cc32e build javascript dependencies 2021-06-21 13:32:26 +02:00
Kaibu
a88d7625dc social login buttons 2021-06-20 14:58:56 +02:00
vabene1111
a9a0716c45 import response improvements 2021-06-17 14:08:03 +02:00
Kaibu
a695261b9c share intend 2021-06-17 03:01:22 +02:00
Kaibu
ef200a4283 ui fixes 2021-06-16 19:13:03 +02:00
vabene1111
b3504699b1 allow disable sharing for spaces 2021-06-15 21:12:43 +02:00
vabene1111
cdf4476345 recipe share link in modal 2021-06-15 20:57:25 +02:00
vabene1111
2b7769e92f fixed report abuse button showing even if not shared 2021-06-15 09:04:05 +02:00
vabene1111
7b55bcb045 indicate adv. settings set by button color search view 2021-06-14 19:03:53 +02:00
vabene1111
528da111f9 Revert "meal plan fixes"
This reverts commit 926097a699.
2021-06-13 18:11:22 +02:00
vabene1111
926097a699 meal plan fixes 2021-06-13 18:11:05 +02:00
vabene1111
0b3e86f6fd imprioved recipe print view 2021-06-13 17:04:52 +02:00
vabene1111
08bc87960b added abuse prevention for share links 2021-06-12 21:15:23 +02:00
vabene1111
5e9ce955bc minor fixes 2021-06-09 18:53:20 +02:00
vabene1111
061aefd233 new file system updates 2021-06-09 14:02:33 +02:00
vabene1111
9eb17df575 added basic support for files 2021-06-08 20:17:48 +02:00
vabene1111
c71a7dad24 updated javascript dependencies 2021-06-08 17:26:39 +02:00
vabene1111
87e8268a43 build sources 2021-06-08 13:12:40 +02:00
vabene1111
5b79db0725 Merge branch 'develop' of https://github.com/vabene1111/recipes into develop
# Conflicts:
#	cookbook/static/vue/js/recipe_search_view.js
#	cookbook/static/vue/js/recipe_view.js
#	vue/webpack-stats.json
2021-06-08 13:12:22 +02:00
vabene1111
3aade540c1 file view 2021-06-08 13:12:04 +02:00
Kaibu
2539d19ff4 minor theme fixes 2021-06-08 12:22:08 +02:00
Kaibu
3d60379ed0 style fixes 2021-06-05 18:10:10 +02:00
vabene1111
6fc0c02674 started work on supermarket edit view 2021-05-31 18:40:59 +02:00
Kaibu
7aa1c7b53b minor theme fixes 2021-05-31 01:02:46 +02:00
Kaibu
ad24a44588 new tandoor theme added, minor ux fixes 2021-05-31 00:47:59 +02:00
vabene1111
9f4eb91287 fixed search settinggs cookie 2021-05-30 21:02:32 +02:00
vabene1111
9982cae7c3 persistent search settings 2021-05-30 20:40:46 +02:00
vabene1111
b10163e309 recently viewed 2021-05-30 19:40:46 +02:00
vabene1111
4f09970130 fixed frontend localization 2021-05-30 17:12:59 +02:00
vabene1111
a14e33973c signup, reset and other account stuff 2021-05-26 22:36:53 +02:00
vabene1111
fe3e611dd1 show recently added recipes in search 2021-05-20 16:45:41 +02:00
vabene1111
e774845ade fixed and updates openapi shema 2021-05-20 11:43:31 +02:00
vabene1111
f0ba8eb788 recettetek importer 2021-05-18 18:47:53 +02:00
smilerz
d7afbc5745 truncate query params on url 2021-05-01 16:30:23 -05:00
smilerz
018fa0a62f updated bookmarklet to work with updated import process 2021-05-01 16:30:22 -05:00
smilerz
b89fedd07f removed console message 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
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
vabene1111
3daebc4170
Merge branch 'develop' into json_import 2021-05-01 22:39:20 +02:00
vabene1111
aafbc497cc search view fixes/updates 2021-05-01 22:16:29 +02:00
vabene1111
cc34496c00 added missing files last commit 2021-04-28 11:27:28 +02:00
vabene1111
d06e6c0ab3 updated webpack loader and lots of javscript stuff 2021-04-28 09:41:06 +02:00
vabene1111
5ee718b578 added persistent search settings and tweaked view 2021-04-26 18:00:54 +02:00
vabene1111
058d705170 meal plan in search 2021-04-18 17:19:11 +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
vabene1111
880db58d38 v2 search filtering 2021-04-17 21:28:29 +02: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
987be4b04d Fix after rebase 2021-04-16 09:02:27 -05:00
smilerz
4d4af5fdf2 removed console message 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
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
83fce6461a import raw json/html 2021-04-16 09:02:01 -05:00
vabene1111
e38f50c352 v2 search basic display of recipes 2021-04-15 22:49:30 +02:00
vabene1111
c1abff8da0 v2 search basics 2021-04-15 22:12:31 +02:00
vabene1111
a1502bffd1 translations doc 2021-04-15 18:43:02 +02:00
vabene1111
fb0f424d82 migrated new vue component system to vue native translations 2021-04-11 18:08:29 +02:00
vabene1111
77ba482b79 possible fixed code ql 2021-04-11 17:34:02 +02:00
vabene1111
cce373a522 started migrating frontend localization 2021-04-11 17:03:09 +02:00
vabene1111
f21de5eddc fixed public share links 2021-04-10 14:36:56 +02:00
vabene1111
fad40dab6c client api generation 2021-04-08 22:05:05 +02:00
vabene1111
81a8734fac
Merge pull request #499 from sebimarkgraf/fix/432-ios-webclip-support
Add iOS webclip icon support
2021-03-20 22:41:13 +01:00
Sebastian Markgraf
f67bb3cb98
Add generated icons from icongenerator. 2021-03-19 15:49:12 +01:00
Sebastian Markgraf
53b584da56
Fix errors in favicon SVG. 2021-03-19 12:48:58 +01:00
vabene1111
bb0f3e1778 build recipe view 2021-03-18 23:25:25 +01:00
smilerz
9137fbfb97 Merge remote-tracking branch 'upstream/develop' into recipe_description 2021-03-18 15:33:50 -05:00
vabene1111
8a051b531d import response view 2021-03-18 20:00:13 +01:00
vabene1111
e00b6b9293 fixed meal plan creation from recipe context menu 2021-03-18 11:56:47 +01:00
vabene1111
8c9ee37c46 updated external image viewer 2021-03-18 11:53:32 +01:00
vabene1111
daf0be37fd upgraded javascritp dependencies 2021-03-18 11:18:09 +01:00
smilerz
d3e6b34a63 added description to search and recipe view 2021-03-06 16:32:59 -06:00
vabene1111
59b2da933d fixed tests 2021-02-25 08:27:22 +01:00
vabene1111
b6b505c361 fixed nutrition scaling fractiosn 2021-02-18 11:11:07 +01:00
vabene1111
97cef449c9 fixed recipe template rendering scaling issue 2021-02-18 09:37:17 +01:00
vabene1111
e727cae020 fixed typo that broke fractions 2021-02-18 09:17:42 +01:00
vabene1111
150d4c7309 refactor assset and paths 2021-02-15 21:01:54 +01:00
vabene1111
ac9922ff61 manifest fixes 2021-02-15 16:08:18 +01:00
vabene1111
20e9d4a990 new style and icon 2021-02-13 18:04:33 +01:00
vabene1111
103878e107 shopping list shortcut link 2021-02-03 23:05:42 +01:00
vabene1111
b698fad83a fixed no_amount ingredients showing units in ingredient list 2021-01-26 22:00:46 +01:00
vabene1111
5e53c66eaa added ingredient headers again 2021-01-26 21:55:36 +01:00
vabene1111
9fd87dbf23 fixed misaligned check buttons 2021-01-24 16:14:56 +01:00
vabene1111
6992bf83aa added customizable Servings text 2021-01-21 20:05:46 +01:00
vabene1111
5b8a22762b fixed print for new recipe view 2021-01-21 19:40:47 +01:00
vabene1111
47c690526e service worker stuff work in progress 2021-01-21 16:16:49 +01:00
vabene1111
b563447674 ingredient linking fixed + tests fixed 2021-01-19 21:26:20 +01:00
vabene1111
2e3e629406 actually decent service worker wip 2021-01-17 18:33:12 +01:00
vabene1111
d7894e07e9 service worker stuff 2021-01-17 16:58:50 +01:00
vabene1111
63dbdfa4a6 removed service worker stuff 2021-01-17 14:47:13 +01:00
vabene1111
f18980a9e2 workbox expirments 2021-01-14 13:31:56 +01:00
vabene1111
08733751aa add to book reimplemented 2021-01-14 01:21:15 +01:00
vabene1111
b271f81af2 updated hook + compiled again 2021-01-14 00:05:42 +01:00
vabene1111
d99e523608 added pre commit hooks and some other workflow stuff 2021-01-14 00:00:26 +01:00
vabene1111
50829dce47 fixed access for shared recipes 2021-01-13 22:59:19 +01:00
vabene1111
910dc29f06 updated javascript files 2021-01-13 22:48:50 +01:00
vabene1111
642015b368 testing docker stuff 2021-01-13 22:17:40 +01:00
vabene1111
bf9b8a0230 updated ci + build static files 2021-01-13 13:28:31 +01:00
vabene1111
e69d1c3408 save 2021-01-13 01:23:20 +01:00
vabene1111
cb913f6cea some test code and playing around 2021-01-11 15:04:35 +01:00
vabene1111
5bb20bd479 Merge branch 'develop' into feature/vue 2021-01-11 10:04:55 +01:00
vabene1111
db6fe4256f added shortcuts to manifest 2021-01-10 10:27:50 +01:00
vabene1111
b93b16d6eb save WIP
not really getting the feel for this, will continue later, need to really learn how this works
2021-01-09 23:27:25 +01:00
vabene1111
6acf4bb831 Revert "temp save vue transition stuff"
This reverts commit 976cedd536.
2021-01-09 23:11:37 +01:00
Johannes Stefan
b5e08a4828 added webmanifest to static files to improve mobile (shortcut) experience 2021-01-09 00:19:09 +01:00
vabene1111
976cedd536 temp save vue transition stuff 2021-01-08 22:31:48 +01:00
vabene1111
9044f9e1ff testing with vue mixings and components 2021-01-07 23:58:04 +01:00
vabene1111
fdeede5717 updated vue and vue bootrap + template improvements 2021-01-05 22:53:08 +01:00
vabene1111
d3bc440c83 meal plan quality of life stuff 2020-12-14 17:37:51 +01:00
vabene1111
7732aa7646 added support for fractions 2020-12-14 14:08:11 +01:00
vabene1111
b490673866 javascript toasts 2020-07-08 21:01:01 +02:00
vabene1111
5b916e955c WIP page leave confirm 2020-07-05 22:15:00 +02:00
vabene1111
2c5fbc558e fixed recipe image preview scaling in large search 2020-07-01 18:56:00 +02:00
vabene1111
3a2ba773cf layout before flex test 2020-06-29 11:30:24 +02:00
vabene1111
525ad6dd98 removed debug code and cdn dependencies 2020-06-23 20:36:04 +02:00
vabene1111
0a8270e7cf api documentation basics 2020-06-16 17:21:50 +02:00
vabene1111
f530b3dc7a dependency cleanup 2020-06-11 19:00:17 +02:00
vabene1111
60a533f9c8 Merge branch 'develop' into feature/meal-planning 2020-06-10 16:01:21 +02:00
vabene1111
ec8a879efa improved pdf viewer 2020-06-10 15:40:24 +02:00
vabene1111
1d6375bf84 fixed pdf js files missing 2020-06-09 12:28:48 +02:00
vabene1111
3aedbfbdc3 Merge branch 'develop' into feature/meal-planning
# Conflicts:
#	requirements.txt
2020-06-04 13:12:52 +02:00
vabene1111
7f08815482 added .map files 2020-06-03 22:40:48 +02:00
vabene1111
6c0a81a4c5 fixed bnroken tooltips and buttons 2020-06-03 22:36:17 +02:00
vabene1111
233f2a911f nothing working yet 2020-06-02 14:33:27 +02:00
vabene1111
989d8765d7 basic vue stuff working 2020-06-02 12:47:36 +02:00
vabene1111
2fcd207dc7 basic api 2020-06-02 12:04:14 +02:00
vabene1111
6aedba09f3 removed some decentral cdn deps 2020-06-01 23:17:16 +02:00
vabene1111
7b17a1acfa removed all cdn dependencies 2020-06-01 23:13:38 +02:00
vabene1111
dd5996084d make jquery local 2020-06-01 13:51:55 +02:00
vabene1111
123dc1a74d meal plan entry view 2020-05-08 00:10:23 +02:00
vabene1111
77e778caac new search design basics + Boostrap fixes 2020-05-02 00:49:29 +02:00
vabene1111
84a8308bf3 updated tabulator js to 4.6 2020-03-31 01:20:49 +02:00
vabene1111
ffdcbff540 dark theming tabulator + select 2020-02-14 00:35:52 +01:00
vabene1111
c96159e15c dark mode 2020-02-04 22:00:47 +01:00
vabene1111
7449380434 meal plan WIP 2020-01-17 16:02:14 +01:00
vabene1111
77b1089b7f added favicon 2019-12-08 17:09:25 +01:00
vabene1111
82986f21f4 updated tabulator + added auto focus 2019-12-08 13:56:24 +01:00
vabene1111
8eca629410 cleanup and dependency updates + new nav 2019-11-19 19:59:53 +01:00
vabene1111
6590bec117 finished up form media 2018-05-17 21:47:22 +02:00
vabene1111
f2edbbcdd6 cleand up form media 2018-05-16 00:14:54 +02:00
vabene1111
890956e8a1 basic custom media working 2018-05-15 23:57:53 +02:00
vabene1111
87b7f0d204 emojis and migrations 2018-05-14 11:31:17 +02:00
vabene1111
284beb47af generic forms ... 2018-05-03 00:09:03 +02:00
vabene1111
b3a45d8069 fontawesome 2018-05-02 21:50:14 +02:00