Skip to content

Commit

Permalink
Add lesson 10 on food.
Browse files Browse the repository at this point in the history
  • Loading branch information
HamsterCoder committed Feb 26, 2024
1 parent 89ddf42 commit a2b59d6
Show file tree
Hide file tree
Showing 28 changed files with 270 additions and 16 deletions.
3 changes: 3 additions & 0 deletions public/assets-raw-orig/bottle.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets-raw-orig/cup.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets-raw-orig/fork.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets-raw-orig/glass.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/assets-raw-orig/knife.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets-raw-orig/plate.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/assets-raw-orig/spoon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets-raw-orig/teaspoon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions public/assets-raw/blueberry-copy.jpg

This file was deleted.

3 changes: 3 additions & 0 deletions public/assets/bottle.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/bottle.webp
Git LFS file not shown
3 changes: 3 additions & 0 deletions public/assets/cup.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/cup.webp
Git LFS file not shown
3 changes: 3 additions & 0 deletions public/assets/fork.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/fork.webp
Git LFS file not shown
3 changes: 3 additions & 0 deletions public/assets/glass.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/glass.webp
Git LFS file not shown
4 changes: 2 additions & 2 deletions public/assets/knife.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/assets/knife.webp
Git LFS file not shown
3 changes: 3 additions & 0 deletions public/assets/plate.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/plate.webp
Git LFS file not shown
4 changes: 2 additions & 2 deletions public/assets/spoon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions public/assets/spoon.webp
Git LFS file not shown
3 changes: 3 additions & 0 deletions public/assets/teaspoon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/assets/teaspoon.webp
Git LFS file not shown
7 changes: 7 additions & 0 deletions src/api/lessons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, ChallengeDescription[]> = {
[description1.id]: challenges1,
Expand All @@ -48,6 +52,7 @@ const lessonsMap: Record<string, ChallengeDescription[]> = {
[description7.id]: challenges7,
[description8.id]: challenges8,
[description9.id]: challenges9,
[description10.id]: challenges10,
};

const descriptionMap: Record<string, LessonDescription> = {
Expand All @@ -60,6 +65,7 @@ const descriptionMap: Record<string, LessonDescription> = {
[description7.id]: description7,
[description8.id]: description8,
[description9.id]: description9,
[description10.id]: description10,
};

const lessons: LessonDescription[] = [
Expand All @@ -72,6 +78,7 @@ const lessons: LessonDescription[] = [
description7,
description8,
description9,
description10,
];

export function getLessonDescriptionById(
Expand Down
42 changes: 41 additions & 1 deletion src/dictionary/serbian-course.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<DictionaryKeys, Translation> = {
paradajz: {
Expand Down Expand Up @@ -96,6 +104,38 @@ export const dictionary: Record<DictionaryKeys, Translation> = {
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<string, string> = Object.entries(
Expand Down
156 changes: 156 additions & 0 deletions src/lessons/srb-ru/lesson-10-ru.ts
Original file line number Diff line number Diff line change
@@ -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: ['ложку.', 'нож.', 'тарелку.'],
},
},
];

0 comments on commit a2b59d6

Please sign in to comment.