From a2b59d677433faa02530ec1f2685a8ac8a0f90a9 Mon Sep 17 00:00:00 2001 From: HamsterCoder Date: Mon, 26 Feb 2024 20:41:02 +0100 Subject: [PATCH] Add lesson 10 on food. --- public/assets-raw-orig/bottle.jpg | 3 + public/assets-raw-orig/cup.jpg | 3 + public/assets-raw-orig/fork.jpg | 3 + public/assets-raw-orig/glass.jpg | 3 + public/assets-raw-orig/knife.jpg | 4 +- public/assets-raw-orig/plate.jpg | 3 + public/assets-raw-orig/spoon.jpg | 4 +- public/assets-raw-orig/teaspoon.jpg | 3 + public/assets-raw/blueberry-copy.jpg | 3 - public/assets/bottle.jpg | 3 + public/assets/bottle.webp | 3 + public/assets/cup.jpg | 3 + public/assets/cup.webp | 3 + public/assets/fork.jpg | 3 + public/assets/fork.webp | 3 + public/assets/glass.jpg | 3 + public/assets/glass.webp | 3 + public/assets/knife.jpg | 4 +- public/assets/knife.webp | 4 +- public/assets/plate.jpg | 3 + public/assets/plate.webp | 3 + public/assets/spoon.jpg | 4 +- public/assets/spoon.webp | 4 +- public/assets/teaspoon.jpg | 3 + public/assets/teaspoon.webp | 3 + src/api/lessons.ts | 7 ++ src/dictionary/serbian-course.ts | 42 +++++++- src/lessons/srb-ru/lesson-10-ru.ts | 156 +++++++++++++++++++++++++++ 28 files changed, 270 insertions(+), 16 deletions(-) create mode 100644 public/assets-raw-orig/bottle.jpg create mode 100644 public/assets-raw-orig/cup.jpg create mode 100644 public/assets-raw-orig/fork.jpg create mode 100644 public/assets-raw-orig/glass.jpg create mode 100644 public/assets-raw-orig/plate.jpg create mode 100644 public/assets-raw-orig/teaspoon.jpg delete mode 100644 public/assets-raw/blueberry-copy.jpg create mode 100644 public/assets/bottle.jpg create mode 100644 public/assets/bottle.webp create mode 100644 public/assets/cup.jpg create mode 100644 public/assets/cup.webp create mode 100644 public/assets/fork.jpg create mode 100644 public/assets/fork.webp create mode 100644 public/assets/glass.jpg create mode 100644 public/assets/glass.webp create mode 100644 public/assets/plate.jpg create mode 100644 public/assets/plate.webp create mode 100644 public/assets/teaspoon.jpg create mode 100644 public/assets/teaspoon.webp create mode 100644 src/lessons/srb-ru/lesson-10-ru.ts diff --git a/public/assets-raw-orig/bottle.jpg b/public/assets-raw-orig/bottle.jpg new file mode 100644 index 0000000..d351546 --- /dev/null +++ b/public/assets-raw-orig/bottle.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e963c1dc2d4b22009bb1091913c02848390b9e33dd5f0e38e27cdaddf5cc4e69 +size 81656 diff --git a/public/assets-raw-orig/cup.jpg b/public/assets-raw-orig/cup.jpg new file mode 100644 index 0000000..6902ac5 --- /dev/null +++ b/public/assets-raw-orig/cup.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f5810ab118438f0d9b260d09ff62c4f174637230601739f1f246a83a6a18ddc +size 154179 diff --git a/public/assets-raw-orig/fork.jpg b/public/assets-raw-orig/fork.jpg new file mode 100644 index 0000000..72de16a --- /dev/null +++ b/public/assets-raw-orig/fork.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cef16aa296f7ce5bf0d8afa89177eac7b49554fedbba2eb9f45725e4e7e5a578 +size 68396 diff --git a/public/assets-raw-orig/glass.jpg b/public/assets-raw-orig/glass.jpg new file mode 100644 index 0000000..c8f3958 --- /dev/null +++ b/public/assets-raw-orig/glass.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec6822b54f7de0621ef3bcc8f5ff74db920c87be893549ba88bbfc1626425c8c +size 131438 diff --git a/public/assets-raw-orig/knife.jpg b/public/assets-raw-orig/knife.jpg index 68fef49..6638288 100644 --- a/public/assets-raw-orig/knife.jpg +++ b/public/assets-raw-orig/knife.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6c26d6e9203a90dbb9a1513ea83506edb81be7c75777571cb1b6b1b98b7815c -size 113547 +oid sha256:bb6ee2d4b92bd748cfe890e6eb6bf7795dac64ede5f0591dc6e8542d476037b3 +size 65217 diff --git a/public/assets-raw-orig/plate.jpg b/public/assets-raw-orig/plate.jpg new file mode 100644 index 0000000..e049db9 --- /dev/null +++ b/public/assets-raw-orig/plate.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09ae4fda3c4693092ed04f0a668fc2eda0f9d7c5ca2be49eedf2fca8783043d9 +size 69841 diff --git a/public/assets-raw-orig/spoon.jpg b/public/assets-raw-orig/spoon.jpg index 4cca9f0..f4407bf 100644 --- a/public/assets-raw-orig/spoon.jpg +++ b/public/assets-raw-orig/spoon.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e14cd24c0d7cd168c300c060e6e72689e160476715e13904d1d8d7360bb7cf7 -size 120656 +oid sha256:43daf5f1c94a6f23857d36b8c646ea46624ac20bc87a3f941a547704b4c7bbdf +size 57965 diff --git a/public/assets-raw-orig/teaspoon.jpg b/public/assets-raw-orig/teaspoon.jpg new file mode 100644 index 0000000..0b8b4a9 --- /dev/null +++ b/public/assets-raw-orig/teaspoon.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d207cefd7c654236de32987242c789c02f024bda4a99f11cbd01ded695bad68 +size 47145 diff --git a/public/assets-raw/blueberry-copy.jpg b/public/assets-raw/blueberry-copy.jpg deleted file mode 100644 index 11dc379..0000000 --- a/public/assets-raw/blueberry-copy.jpg +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8c2653a4d97b6c1e1ea703344c519757c9692a1b825e0274e90fde5e077fb33 -size 1343963 diff --git a/public/assets/bottle.jpg b/public/assets/bottle.jpg new file mode 100644 index 0000000..3d1389d --- /dev/null +++ b/public/assets/bottle.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c361f3679ecd2ee07940f2edb7529f72de964c5572a97f2e10d0261175dff55d +size 40364 diff --git a/public/assets/bottle.webp b/public/assets/bottle.webp new file mode 100644 index 0000000..69d981c --- /dev/null +++ b/public/assets/bottle.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab1a576bbd1b7f419433f4613699aac1d73353466fa279fdd8b6aa190a42a483 +size 20826 diff --git a/public/assets/cup.jpg b/public/assets/cup.jpg new file mode 100644 index 0000000..4b31c49 --- /dev/null +++ b/public/assets/cup.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8b6b44e1164654cc36a96e712182347ab206f3b350a2c256a3fa69592b08176 +size 36822 diff --git a/public/assets/cup.webp b/public/assets/cup.webp new file mode 100644 index 0000000..c952b82 --- /dev/null +++ b/public/assets/cup.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89a1c61c4f3494c1ecea76a35582a7153341221bcb0a738eee44fc7ea1d8db1e +size 21262 diff --git a/public/assets/fork.jpg b/public/assets/fork.jpg new file mode 100644 index 0000000..cf3c899 --- /dev/null +++ b/public/assets/fork.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6f648b4917acc4ca4c6e65e7f748fad3740e9017646404226f11e4ceb538972 +size 30614 diff --git a/public/assets/fork.webp b/public/assets/fork.webp new file mode 100644 index 0000000..4b3856e --- /dev/null +++ b/public/assets/fork.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe794c73783d56c1788563cd63a6f6a0624aa6c24991c95ece6d48dc26812999 +size 14862 diff --git a/public/assets/glass.jpg b/public/assets/glass.jpg new file mode 100644 index 0000000..829812e --- /dev/null +++ b/public/assets/glass.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c62ded69d7f5863b569fbf1ee8dd07ca15daca976c7c03aff25f592fc610a1e +size 28090 diff --git a/public/assets/glass.webp b/public/assets/glass.webp new file mode 100644 index 0000000..c0366ef --- /dev/null +++ b/public/assets/glass.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ba792d5af565ee719863b694e5d0e4555af880c5a7684dd271617c503bd9136 +size 16980 diff --git a/public/assets/knife.jpg b/public/assets/knife.jpg index 4fca3b7..dfec921 100644 --- a/public/assets/knife.jpg +++ b/public/assets/knife.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cca9f37c008660825bdabe4a6f67d944db97475b91289df66d31aa6e95bc1ae -size 16938 +oid sha256:a5b0580b86a8a4f0e33fa47dbcbf39362bf588a2b6d8a56c985c9cae75c6f7e5 +size 29777 diff --git a/public/assets/knife.webp b/public/assets/knife.webp index 1bd3fc8..5bdf128 100644 --- a/public/assets/knife.webp +++ b/public/assets/knife.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc6582167d8f46caaa30819e7fefb60c840f762805b9b748c8395ba3339c60d9 -size 8052 +oid sha256:a7b07487f30b7e53542045c1a0c94e5692f068380d58c35728cb7d4b8dcdda9a +size 15358 diff --git a/public/assets/plate.jpg b/public/assets/plate.jpg new file mode 100644 index 0000000..6eb3c62 --- /dev/null +++ b/public/assets/plate.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a9aa37885edba413efafa9814ccef2e5efb75812a2ad19986684ca4a8f97fa4 +size 32958 diff --git a/public/assets/plate.webp b/public/assets/plate.webp new file mode 100644 index 0000000..bff4562 --- /dev/null +++ b/public/assets/plate.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ac63938acf6fe1a4461d3ed2a17889ad56ac0da3a26fd6bfe7ab4558cad8764 +size 17378 diff --git a/public/assets/spoon.jpg b/public/assets/spoon.jpg index ed0d067..d0177ce 100644 --- a/public/assets/spoon.jpg +++ b/public/assets/spoon.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:16d9b1efef4448acb7b000a997f89f77e800141f9ec5804bcf772aa560ed26ce -size 18144 +oid sha256:951aa3292412fc8da38e3405dd5ef114ada143d4e4169b0484550d4997f961d1 +size 27090 diff --git a/public/assets/spoon.webp b/public/assets/spoon.webp index 7fcf796..ec04758 100644 --- a/public/assets/spoon.webp +++ b/public/assets/spoon.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:76a07c8aa5bc9d8f0ecc4bec8e7862c07fb275b57dc486cbfdbf1a982371a1b7 -size 7858 +oid sha256:077363cc5ebad8b0e0544dd379050c355bb8fde46bba058443491756cd1faf34 +size 10720 diff --git a/public/assets/teaspoon.jpg b/public/assets/teaspoon.jpg new file mode 100644 index 0000000..79fe2b3 --- /dev/null +++ b/public/assets/teaspoon.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f9139a7090668263961498eef0133c14ce0701d79c20b31cbe41807fba789f5 +size 22495 diff --git a/public/assets/teaspoon.webp b/public/assets/teaspoon.webp new file mode 100644 index 0000000..d073d3b --- /dev/null +++ b/public/assets/teaspoon.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bced98cd79fb8d31c09b3b7f11272d478fb6d2bd8606eedbaaf05338802905ba +size 7876 diff --git a/src/api/lessons.ts b/src/api/lessons.ts index 9759205..5584d30 100644 --- a/src/api/lessons.ts +++ b/src/api/lessons.ts @@ -37,6 +37,10 @@ import { challenges as challenges9, description as description9, } from '../lessons/srb-ru/lesson-9-ru'; +import { + challenges as challenges10, + description as description10, +} from '../lessons/srb-ru/lesson-10-ru'; const lessonsMap: Record = { [description1.id]: challenges1, @@ -48,6 +52,7 @@ const lessonsMap: Record = { [description7.id]: challenges7, [description8.id]: challenges8, [description9.id]: challenges9, + [description10.id]: challenges10, }; const descriptionMap: Record = { @@ -60,6 +65,7 @@ const descriptionMap: Record = { [description7.id]: description7, [description8.id]: description8, [description9.id]: description9, + [description10.id]: description10, }; const lessons: LessonDescription[] = [ @@ -72,6 +78,7 @@ const lessons: LessonDescription[] = [ description7, description8, description9, + description10, ]; export function getLessonDescriptionById( diff --git a/src/dictionary/serbian-course.ts b/src/dictionary/serbian-course.ts index cfa760f..f53daaf 100644 --- a/src/dictionary/serbian-course.ts +++ b/src/dictionary/serbian-course.ts @@ -21,7 +21,15 @@ export type DictionaryKeys = | 'kupus' | 'tikvica' | 'bundeva' - | 'šargarepa'; + | 'šargarepa' + | 'viljuška' + | 'kašika' + | 'nož' + | 'kašičica' + | 'tanjir' + | 'čaša' + | 'šolja' + | 'flaša'; export const dictionary: Record = { paradajz: { @@ -96,6 +104,38 @@ export const dictionary: Record = { en: 'carrot', ru: 'морковь', }, + viljuška: { + en: 'fork', + ru: 'вилка', + }, + kašika: { + en: 'spoon', + ru: 'ложка', + }, + nož: { + en: 'knife', + ru: 'нож', + }, + kašičica: { + en: 'teaspoon', + ru: 'чайная ложка', + }, + tanjir: { + en: 'plate', + ru: 'тарелка', + }, + čaša: { + en: 'glass', + ru: 'стакан', + }, + šolja: { + en: 'cup', + ru: 'чашка', + }, + flaša: { + en: 'bottle', + ru: 'бутылка', + }, }; export const englishSerbianDictionary: Record = Object.entries( diff --git a/src/lessons/srb-ru/lesson-10-ru.ts b/src/lessons/srb-ru/lesson-10-ru.ts new file mode 100644 index 0000000..e2bb081 --- /dev/null +++ b/src/lessons/srb-ru/lesson-10-ru.ts @@ -0,0 +1,156 @@ +import { + ChallengeDescription, + ChallengeType, +} from '@components/Challenge/types'; +import { LessonDescription } from '@components/Lesson/Lesson'; + +// Lesson: Kuhinski pribor +// 1. Viljuška WordPicture challenge +// 2. Kašika WordPicture challenge +// 3. Nož WordPicture challenge +// 4. KašiĆica WordPicture challenge +// 5. Tanjir WordPicture challenge +// 6. Čaša WordPicture challenge +// 7. Šolja WordPicture challenge +// 8. Flaša WordPicture challenge +// 9. TranslateChips challenge Kafa je u šolji. +// 10. TranslateChips challenge Vino je u flaši. +// 11. TranslateChips challenge Voda je u čaši. +// 12. TranslateChips challenge Supa je u tanjiru. +// 13. TranslateChips challenge Da li mogu da dobijem nož. +// 14. TranslateChips challenge Da li mogu da dobijem kašiku? +// 15. TranslateChips challenge Da li mogu da dobijem viljušku? +// 16. TranslateChips challenge Da li mogu da dobijem kašičicu? + +export const description: LessonDescription = { + id: 'food/kitchenware', + name: 'food/kitchenware', + displayName: 'Посуда и приборы', + topic: 'food', + displayTopic: 'Еда', + image: 'kitchenware', + description: 'Учим названия предметов посуды и кухонных приборов', +}; + +export const challenges: ChallengeDescription[] = [ + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'viljuška', + images: ['fork', 'spoon', 'knife'], + }, + }, + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'kašika', + images: ['spoon', 'fork', 'knife'], + }, + }, + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'nož', + images: ['knife', 'teaspoon', 'spoon'], + }, + }, + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'kašičica', + images: ['teaspoon', 'fork', 'spoon'], + }, + }, + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'tanjir', + images: ['plate', 'glass', 'bottle'], + }, + }, + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'čaša', + images: ['glass', 'cup', 'bottle'], + }, + }, + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'šolja', + images: ['cup', 'glass', 'bottle'], + }, + }, + { + type: ChallengeType.WORD_PICTURE, + data: { + word: 'flaša', + images: ['bottle', 'cup', 'glass'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Kafa je u šolji.', + answer: ['Кофе в чашке.'], + wrongChips: ['тарелке.', 'бутылке.', 'стакане.'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Vino je u flaši.', + answer: ['Вино в бутылке.'], + wrongChips: ['стакане.', 'чашке.', 'тарелке.'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Voda je u čaši.', + answer: ['Вода в стакане.'], + wrongChips: ['бутылке.', 'тарелке.', 'чашке.'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Supa je u tanjiru.', + answer: ['Суп в тарелке.'], + wrongChips: ['бутылке.', 'чашке.', 'стакане.'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Da li mogu da dobijem nož.', + answer: ['Можно мне нож.'], + wrongChips: ['вилку.', 'ложку.', 'чашку.'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Da li mogu da dobijem kašiku?', + answer: ['Можно мне ложку.'], + wrongChips: ['вилку.', 'нож.', 'чашку.'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Da li mogu da dobijem viljušku?', + answer: ['Можно мне вилку.'], + wrongChips: ['ложку.', 'тарелку.', 'стакан.'], + }, + }, + { + type: ChallengeType.TRANSLATE_CHIPS, + data: { + sentence: 'Da li mogu da dobijem kašičicu?', + answer: ['Можно мне чайную ложку.'], + wrongChips: ['ложку.', 'нож.', 'тарелку.'], + }, + }, +];