Compare commits
No commits in common. "master" and "kazan-explore" have entirely different histories.
master
...
kazan-expl
@ -1,24 +0,0 @@
|
||||
const Router = require('express').Router
|
||||
|
||||
const router = Router()
|
||||
|
||||
router.post('/auth/login', (req, res) => {
|
||||
if (req.body.email === 'qwerty@mail.ru') {
|
||||
res.status(200).send(require('./json/login/login-success.json'))
|
||||
} else {
|
||||
res.status(401).send(require('./json/login/login-error.json'));
|
||||
}
|
||||
})
|
||||
|
||||
router.post('/auth/register', (req, res) => {
|
||||
res.status(400).send(require('./json/registration/registration-error.json'))
|
||||
// res.status(201).send(require('./json/registration/registration-error.json'))
|
||||
})
|
||||
|
||||
router.post('/auth/reset-password', (req, res) => {
|
||||
res.status(200).send(require('./json/reset-password/reset-password-success.json'))
|
||||
// res.status(404).send(require('./json/reset-password/reset-password-error.json'))
|
||||
})
|
||||
|
||||
|
||||
module.exports = router;
|
||||
@ -1,11 +0,0 @@
|
||||
{
|
||||
"success": false,
|
||||
"body": null,
|
||||
"errors": [
|
||||
{
|
||||
"code": "AUTH_INVALID_CREDENTIALS",
|
||||
"message": "Неверное имя пользователя или пароль"
|
||||
}
|
||||
],
|
||||
"warnings": []
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
{
|
||||
"success": true,
|
||||
"body": {
|
||||
"token": "AUTH_TOKEN"
|
||||
},
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{
|
||||
"success": false,
|
||||
"body": null,
|
||||
"errors": [
|
||||
{
|
||||
"code": "REGISTRATION_EMAIL_TAKEN",
|
||||
"message": "Электронная почта уже используется"
|
||||
}
|
||||
],
|
||||
"warnings": []
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
{
|
||||
"success": true,
|
||||
"body": {
|
||||
"userId": "12345",
|
||||
"token": "AUTH_TOKEN"
|
||||
},
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
{
|
||||
"success": false,
|
||||
"body": null,
|
||||
"errors": [
|
||||
{
|
||||
"code": "RESET_PASSWORD_EMAIL_NOT_FOUND",
|
||||
"message": "Адрес электронной почты не зарегистрирован"
|
||||
}
|
||||
],
|
||||
"warnings": []
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
{
|
||||
"success": true,
|
||||
"body": {
|
||||
"message": "Отправлено электронное письмо для сброса пароля"
|
||||
},
|
||||
"errors": [],
|
||||
"warnings": []
|
||||
}
|
||||
@ -1,6 +1,5 @@
|
||||
const router = require('express').Router();
|
||||
|
||||
router.use('/performer', require('./dashboard-performer'))
|
||||
router.use('/auth', require('./auth'))
|
||||
|
||||
module.exports = router;
|
||||
@ -16,8 +16,4 @@ router.get("/home", (request, response) => {
|
||||
response.send(require("./json/home-page-data/success.json"));
|
||||
});
|
||||
|
||||
router.get("/all-games", (request, response) => {
|
||||
response.send(require("./json/home-page-data/all-games.json"));
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
@ -1,149 +0,0 @@
|
||||
{
|
||||
"success": true,
|
||||
"data": [
|
||||
{
|
||||
"id": 1,
|
||||
"name": "The Witcher 3: Wild Hunt",
|
||||
"image": "game1",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_1",
|
||||
"description": "Эпическая RPG с открытым миром, в которой Геральт из Ривии охотится на монстров и раскрывает политические заговоры.",
|
||||
"category": "RPG"
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"name": "Red Dead Redemption 2",
|
||||
"image": "game2",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_2",
|
||||
"description": "Приключенческая игра с открытым миром на Диком Западе, рассказывающая историю Артура Моргана.",
|
||||
"category": "Adventures"
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"name": "Forza Horizon 5",
|
||||
"image": "game3",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_3",
|
||||
"description": "Гоночная игра с огромным открытым миром, действие которой происходит в Мексике.",
|
||||
"category": "Race"
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"name": "Atomic Heart",
|
||||
"image": "game4",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_4",
|
||||
"description": "Экшен-шутер с элементами RPG, разворачивающийся в альтернативной Советской России.",
|
||||
"category": "Shooters"
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"name": "Counter-Strike 2",
|
||||
"image": "game5",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_5",
|
||||
"description": "Популярный онлайн-шутер с соревновательным геймплеем и тактическими элементами.",
|
||||
"category": "Shooters"
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"name": "Grand Theft Auto V",
|
||||
"image": "game6",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_6",
|
||||
"description": "Игра с открытым миром, где можно погрузиться в криминальный мир Лос-Сантоса.",
|
||||
"category": "Adventures"
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"name": "Assassin’s Creed IV: Black Flag",
|
||||
"image": "game7",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_7",
|
||||
"description": "Приключенческая игра о пиратах и морских сражениях в эпоху золотого века пиратства.",
|
||||
"category": "Adventures"
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"name": "Spider-Man",
|
||||
"image": "game8",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_8",
|
||||
"description": "Игра о супергерое Человеке-пауке с захватывающими битвами и паркуром по Нью-Йорку.",
|
||||
"category": "Action"
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"name": "Assassin’s Creed Mirage",
|
||||
"image": "game9",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_9",
|
||||
"description": "Приключенческая игра с упором на скрытность, вдохновленная классическими частями серии.",
|
||||
"category": "Action"
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
"name": "Assassin’s Creed Valhalla",
|
||||
"image": "game10",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_10",
|
||||
"description": "RPG с открытым миром о викингах, включающая битвы, исследования и строительство поселений.",
|
||||
"category": "RPG"
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
"name": "ARK: Survival Evolved",
|
||||
"image": "game11",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_11",
|
||||
"description": "Выживание в открытом мире с динозаврами, строительством и многопользовательскими элементами.",
|
||||
"category": "Simulators"
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"name": "FIFA 23",
|
||||
"image": "game12",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_12",
|
||||
"description": "Популярный футбольный симулятор с улучшенной графикой и реалистичным геймплеем.",
|
||||
"category": "Sports"
|
||||
},
|
||||
{
|
||||
"id": 13,
|
||||
"name": "Dirt 5",
|
||||
"image": "game13",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_13",
|
||||
"description": "Аркадная гоночная игра с фокусом на ралли и внедорожных соревнованиях.",
|
||||
"category": "Race"
|
||||
},
|
||||
{
|
||||
"id": 14,
|
||||
"name": "Cyberpunk 2077",
|
||||
"image": "game14",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_14",
|
||||
"description": "RPG в киберпанк-сеттинге с нелинейным сюжетом и детализированным открытым миром.",
|
||||
"category": "RPG"
|
||||
},
|
||||
{
|
||||
"id": 15,
|
||||
"name": "Age of Empires IV",
|
||||
"image": "game15",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_15",
|
||||
"description": "Классическая стратегия в реальном времени с историческими кампаниями.",
|
||||
"category": "Strategies"
|
||||
},
|
||||
{
|
||||
"id": 16,
|
||||
"name": "Civilization VI",
|
||||
"image": "game16",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_16",
|
||||
"description": "Глобальная пошаговая стратегия, в которой игроки строят и развивают цивилизации.",
|
||||
"category": "Strategies"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -4,115 +4,87 @@
|
||||
"topSail": [
|
||||
{
|
||||
"image": "game1",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_1"
|
||||
"text": "$10"
|
||||
},
|
||||
{
|
||||
"image": "game2",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_2"
|
||||
"text": "$10"
|
||||
},
|
||||
{
|
||||
"image": "game3",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_3"
|
||||
"text": "$10"
|
||||
},
|
||||
{
|
||||
"image": "game4",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_4"
|
||||
"text": "$10"
|
||||
},
|
||||
{
|
||||
"image": "game5",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_5"
|
||||
"text": "$10"
|
||||
},
|
||||
{
|
||||
"image": "game6",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_6"
|
||||
"text": "$10"
|
||||
},
|
||||
{
|
||||
"image": "game7",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_7"
|
||||
"text": "$10"
|
||||
},
|
||||
{
|
||||
"image": "game8",
|
||||
"text": "$10",
|
||||
"imgPath": "img_top_8"
|
||||
"text": "$10"
|
||||
}
|
||||
],
|
||||
"categories": [
|
||||
{
|
||||
"image": "category1",
|
||||
"text": "гонки",
|
||||
"imgPath": "img_categories_1",
|
||||
"category": "Race"
|
||||
"text": "гонки"
|
||||
},
|
||||
{
|
||||
"image": "category2",
|
||||
"text": "глубокий сюжет",
|
||||
"imgPath": "img_categories_2",
|
||||
"category": ""
|
||||
"text": "глубокий сюжет"
|
||||
},
|
||||
{
|
||||
"image": "category3",
|
||||
"text": "симуляторы",
|
||||
"imgPath": "img_categories_3",
|
||||
"category": "Simulators"
|
||||
"text": "симуляторы"
|
||||
},
|
||||
{
|
||||
"image": "category4",
|
||||
"text": "открытый мир",
|
||||
"imgPath": "img_categories_4",
|
||||
"category": "RPG"
|
||||
"text": "открытый мир"
|
||||
},
|
||||
{
|
||||
"image": "category5",
|
||||
"text": "экшен",
|
||||
"imgPath": "img_categories_5",
|
||||
"category": "Action"
|
||||
"text": "экшен"
|
||||
},
|
||||
{
|
||||
"image": "category6",
|
||||
"text": "стратегии",
|
||||
"imgPath": "img_categories_6",
|
||||
"category": "Strategies"
|
||||
"text": "стратегии"
|
||||
},
|
||||
{
|
||||
"image": "category7",
|
||||
"text": "шутеры",
|
||||
"imgPath": "img_categories_7",
|
||||
"category": "Shooters"
|
||||
"text": "шутеры"
|
||||
},
|
||||
{
|
||||
"image": "category8",
|
||||
"text": "приключения",
|
||||
"imgPath": "img_categories_8",
|
||||
"category": "Adventures"
|
||||
"text": "приключения"
|
||||
}
|
||||
],
|
||||
"news": [
|
||||
{
|
||||
"image": "news1",
|
||||
"text": "Разработчики Delta Force: Hawk Ops представили крупномасштабный режим Havoc Warfare",
|
||||
"imgPath": "img_news_1"
|
||||
"text": "Разработчики Delta Force: Hawk Ops представили крупномасштабный режим Havoc Warfare"
|
||||
},
|
||||
{
|
||||
"image": "news2",
|
||||
"text": "Первый трейлер Assassin’s Creed Shadows — с темнокожим самураем в феодальной Японии",
|
||||
"imgPath": "img_news_2"
|
||||
"text": "Первый трейлер Assassin’s Creed Shadows — с темнокожим самураем в феодальной Японии"
|
||||
},
|
||||
{
|
||||
"image": "news3",
|
||||
"text": "Призрак Цусимы» вышел на ПК — и уже ставит рекорды для Sony",
|
||||
"imgPath": "img_news_3"
|
||||
"text": "Призрак Цусимы» вышел на ПК — и уже ставит рекорды для Sony"
|
||||
},
|
||||
{
|
||||
"image": "news4",
|
||||
"text": "Авторы Skull and Bones расширяют планы на второй сезо",
|
||||
"imgPath": "img_news_4"
|
||||
"text": "Авторы Skull and Bones расширяют планы на второй сезо"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@ -1,17 +1,12 @@
|
||||
[
|
||||
{
|
||||
"id": 0,
|
||||
"description": "10 часто используемых",
|
||||
"description": "1000 часто используемых",
|
||||
"imageFilename": "kart1.jpg"
|
||||
},
|
||||
{
|
||||
"id": 1,
|
||||
"description": "10 слов в Data Science",
|
||||
"imageFilename": "kart1.jpg"
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"description": "IT Basics Dictionary",
|
||||
"imageFilename": "kart1.jpg"
|
||||
}
|
||||
]
|
||||
|
||||
@ -146,130 +146,5 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"words": [
|
||||
{
|
||||
"id": 0,
|
||||
"word": "software",
|
||||
"translation": "программное обеспечение",
|
||||
"definition": "A collection of computer instructions that perform a specific task, typically for use by humans or machines.",
|
||||
"synonyms": ["код", "приложение", "управление программами"],
|
||||
"examples":
|
||||
[
|
||||
"I need to update the software on my new laptop.",
|
||||
"The company uses Windows as its operating system."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 1,
|
||||
"word": "hardware",
|
||||
"translation": "железо",
|
||||
"definition": "Physical components of a computer that process information, including processors and storage devices.",
|
||||
"synonyms": ["equipment", "приборы", "оборудование"],
|
||||
"examples":
|
||||
[
|
||||
"The keyboard is part of the hardware on this device.",
|
||||
"They upgraded their router to improve internet speed."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"word": "network",
|
||||
"translation": "сети",
|
||||
"definition": "A system of interconnected devices that communicate with each other through data transmission over a networked medium.",
|
||||
"synonyms": ["трансляция", "коммуникации", "диалог"],
|
||||
"examples":
|
||||
[
|
||||
"We use the internet to connect our devices in the same area.",
|
||||
"The company relies on their internal network for data sharing."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"word": "algorithm",
|
||||
"translation": "алгоритм",
|
||||
"definition": "A set of instructions that a computer follows to solve a problem or achieve a specific task.",
|
||||
"synonyms": ["процесс", "схема", "текст"],
|
||||
"examples":
|
||||
[
|
||||
"The algorithm for sorting numbers is easy to follow.",
|
||||
"The new software includes an advanced algorithm."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"word": "encryption",
|
||||
"translation": "криптография",
|
||||
"definition": "A technique that transforms information into a secure form, making it unreadable without the appropriate key.",
|
||||
"synonyms": ["шифрование", "окрышение", "опциональное"],
|
||||
"examples":
|
||||
[
|
||||
"Our data is encrypted to ensure its privacy and security.",
|
||||
"I need to use an encryption program for my important documents."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"word": "debugging",
|
||||
"translation": "поиск и исправление ошибок",
|
||||
"definition": "The process of identifying and correcting errors or defects in a computer program.",
|
||||
"synonyms": ["исправление", "сканирование", "анализ"],
|
||||
"examples":
|
||||
[
|
||||
"I need to debug the code for this new project.",
|
||||
"We use automated tools to find bugs."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"word": "API",
|
||||
"translation": "интерфейс приложения",
|
||||
"definition": "A set of rules and protocols that enables communication between software applications, typically over a network.",
|
||||
"synonyms": ["серверное программирование", "функциональная структура"],
|
||||
"examples":
|
||||
[
|
||||
"We use the API for our mobile app to access data from the backend server.",
|
||||
"I need to write an API for connecting my devices to the internet."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"word": "virtual",
|
||||
"translation": "виртуальный",
|
||||
"definition": "A representation of a thing that does not exist physically but exists in digital form.",
|
||||
"synonyms": ["высокопроизводительный", "представление", "цифровой"],
|
||||
"examples":
|
||||
[
|
||||
"I use virtual reality to experience different environments.",
|
||||
"Our company offers virtual office spaces for remote work."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"word": "infrastructure",
|
||||
"translation": "инфраструктура",
|
||||
"definition": "The underlying systems and equipment of a computer network or organization, including hardware, software, and physical connections.",
|
||||
"synonyms": ["оборудование", "устройство", "системы"],
|
||||
"examples":
|
||||
[
|
||||
"Our IT infrastructure is robust to ensure reliable operations.",
|
||||
"They need to improve their internet infrastructure for better connectivity."
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"word": "hacker",
|
||||
"translation": "хакер",
|
||||
"definition": "A skilled individual who uses computer technology to break into and misuse a system or network.",
|
||||
"synonyms": ["дезориентированный", "манипулятор", "прокурор"],
|
||||
"examples":
|
||||
[
|
||||
"I need to avoid getting involved with hackers.",
|
||||
"They were caught hacking into the company's confidential database."
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const router = require("express").Router();
|
||||
|
||||
module.exports = router;
|
||||
@ -11,59 +9,6 @@ router.get("/", (req, res) => {
|
||||
res.send(data);
|
||||
});
|
||||
|
||||
// Put new dictionary to the array of dictionaries
|
||||
router.put('/new', (req, res) => {
|
||||
if (!data || !Array.isArray(data)) {
|
||||
return res.status(400).send('No array of dictionaries found`');
|
||||
}
|
||||
|
||||
const updatedData = req.body;
|
||||
|
||||
if (!updatedData) {
|
||||
return res.status(400).send('No data to update'); // Bad request
|
||||
}
|
||||
|
||||
if (!data) {
|
||||
return res.status(500).send('No data to update'); // Internal server error
|
||||
}
|
||||
|
||||
indexedUpdatedData = { id: data.length, ...updatedData }; // Add the new dictionary to the array
|
||||
|
||||
data.push(indexedUpdatedData); // Add the new dictionary to the array
|
||||
|
||||
fs.writeFile(path.join(__dirname, 'data/dictionaries.json'), JSON.stringify(data), (err) => {
|
||||
if (err) {
|
||||
console.error(err); // Log the error
|
||||
return res.status(500).send('Error saving data');
|
||||
}
|
||||
res.status(200).json(data); // Send back the updated data
|
||||
});
|
||||
});
|
||||
|
||||
router.delete('/:id', (req, res) => {
|
||||
const id = parseInt(req.params.id); // Get the dictionary id from the URL
|
||||
|
||||
if (!id || isNaN(id)) {
|
||||
return res.status(400).send('Invalid ID'); // Bad request
|
||||
}
|
||||
|
||||
const index = data.findIndex((dictionary) => dictionary.id === id);
|
||||
|
||||
if (index < 0) {
|
||||
return res.status(404).send('Not found'); // Not found
|
||||
}
|
||||
|
||||
data.splice(index, 1); // Remove the dictionary from the array
|
||||
|
||||
fs.writeFile(path.join(__dirname, 'data/dictionaries.json'), JSON.stringify(data), (err) => {
|
||||
if (err) {
|
||||
console.error(err); // Log the error
|
||||
return res.status(500).send('Error saving data');
|
||||
}
|
||||
res.send({ message: `Dictionary with id ${id} deleted` });
|
||||
});
|
||||
});
|
||||
|
||||
router.get("/:id", (req, res) => {
|
||||
const id = parseInt(req.params.id);
|
||||
const words = wordsData.find((word) => word.id === id);
|
||||
|
||||
@ -1,15 +1,13 @@
|
||||
const router = require("express").Router();
|
||||
|
||||
const dictionariesRouter = require("./dictionaries");
|
||||
const unitsRouter = require('./units');
|
||||
module.exports = router;
|
||||
|
||||
const delay =
|
||||
(ms = 250) =>
|
||||
(ms = 1000) =>
|
||||
(req, res, next) => {
|
||||
setTimeout(next, ms);
|
||||
};
|
||||
|
||||
router.use(delay());
|
||||
router.use("/dictionaries", dictionariesRouter);
|
||||
router.use('/units', unitsRouter);
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
# Unit 1. Multifunctional Verbs: Be, Have, and Do
|
||||
|
||||
## Overview
|
||||
|
||||
This unit focuses on the use of multifunctional verbs in English. These verbs are able to express multiple meanings depending on their use in a sentence.
|
||||
|
||||
## Learning Objectives
|
||||
|
||||
By the end of this unit, you will be able to:
|
||||
|
||||
- Identify the different forms of the main multifunctional verb.
|
||||
- Explain how these forms can be used interchangeably in sentences.
|
||||
- Demonstrate the correct usage of the three forms of the multifunctional verb by providing sentences and examples.
|
||||
|
||||
## Vocabulary Review
|
||||
|
||||
| Term | Definition |
|
||||
| ---- | -------------------------------------------------------- |
|
||||
| Be | To express a present or ongoing state of being. |
|
||||
| Have | To express ownership or possession. |
|
||||
| Do | To express an action to be done, future action or habit. |
|
||||
|
||||
## Activities
|
||||
|
||||
### Activity 1: Identify the Different Forms of the Main Multifunctional Verb
|
||||
|
||||
- Read through each sentence and identify if the verb is used in its present tense (is), past tense (was/were), or future tense (will, would).
|
||||
- Discuss how this usage can vary depending on context.
|
||||
- Write down sentences that use different forms to illustrate your points.
|
||||
|
||||
1. **Sentence 1**: "The cat is sleeping."
|
||||
|
||||
- Present tense: The cat is sleeping.
|
||||
- Past tense: The cat slept.
|
||||
- Future tense: The cat will sleep.
|
||||
|
||||
2. **Sentence 2**: "I have a dog at home."
|
||||
|
||||
- Present tense: I have a dog.
|
||||
- Past tense: I had a dog.
|
||||
- Future tense: I will have a dog.
|
||||
|
||||
3. **Sentence 3**: "We are going on a hike tomorrow."
|
||||
|
||||
- Present tense: We are going on a hike.
|
||||
- Past tense: We went on a hike.
|
||||
- Future tense: We will go on a hike.
|
||||
|
||||
4. **Sentence 4**: "He has been studying all day."
|
||||
|
||||
- Present tense: He is studying.
|
||||
- Past tense: He studied.
|
||||
- Future tense: He will study.
|
||||
|
||||
5. **Sentence 5**: "We are going to buy some groceries later today."
|
||||
- Present tense: We are going to buy some groceries.
|
||||
- Past tense: We bought some groceries.
|
||||
- Future tense: We will buy some groceries.
|
||||
|
||||
### Activity 2: Explain How These Forms Can Be Used Interchangeably in Sentences
|
||||
|
||||
- Read through a sentence and identify the present, past, and future tense uses.
|
||||
- In pairs, explain why these forms are used interchangeably.
|
||||
- Provide examples of sentences that demonstrate this usage.
|
||||
- Highlight how the context changes the meaning.
|
||||
|
||||
### Activity 3: Correct Usage of the Three Forms of the Multifunctional Verb
|
||||
|
||||
- Read through a sentence and identify which form is being used.
|
||||
- In pairs, discuss why these forms are used in certain situations.
|
||||
- Provide sentences that demonstrate the correct usage of the three forms.
|
||||
@ -1 +0,0 @@
|
||||
[{"id":0,"filename":"unit-1","name":"Unit 1: Multifunctional Verbs: Be, Have, and Do"}]
|
||||
@ -1,58 +0,0 @@
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const router = require('express').Router();
|
||||
|
||||
module.exports = router;
|
||||
|
||||
const data = require('./data/units.json');
|
||||
router.get('/', (req, res) => {
|
||||
res.send(data);
|
||||
});
|
||||
|
||||
router.put('/', (req, res) => {
|
||||
const newUnit = req.body
|
||||
|
||||
if (!newUnit) {
|
||||
return res.status(400).send('No new unit to be added')
|
||||
}
|
||||
|
||||
if (!data) {
|
||||
return res.status(500).send('No data to be updated')
|
||||
}
|
||||
|
||||
data.push({ "id": data.length, ...newUnit })
|
||||
|
||||
fs.writeFileSync(path.join(__dirname, 'data', 'units.json'), JSON.stringify(data));
|
||||
res.status(200).send(data);
|
||||
});
|
||||
|
||||
router.delete('/:id', (req, res) => {
|
||||
const id = parseInt(req.params.id);
|
||||
const index = data.findIndex((unit) => unit.id === id);
|
||||
|
||||
if (index < 0) {
|
||||
return res.status(404).send('Not found');
|
||||
}
|
||||
|
||||
data.splice(index, 1);
|
||||
fs.writeFileSync(path.join(__dirname, 'data', 'units.json'), JSON.stringify(data));
|
||||
res.send({ message: `Unit with ID ${id} deleted` });
|
||||
});
|
||||
|
||||
router.get('/:id', (req, res) => {
|
||||
const id = parseInt(req.params.id);
|
||||
const unit = data.find((unit) => unit.id === id);
|
||||
|
||||
if (!unit) {
|
||||
return res.status(404).send('Not found');
|
||||
}
|
||||
|
||||
const unitFilepath = path.join(__dirname, 'data', `${unit.filename}.md`);
|
||||
const unitContent = fs.readFileSync(unitFilepath, 'utf-8');
|
||||
|
||||
if (!unitContent) {
|
||||
return res.status(404).send('Not found');
|
||||
}
|
||||
|
||||
res.send({ ...unit, content: unitContent });
|
||||
});
|
||||
@ -2,7 +2,6 @@ const { Router } = require('express')
|
||||
const router = Router()
|
||||
|
||||
router.use('/eng-it-lean', require('./eng-it-lean/index'))
|
||||
router.use('/sberhubproject', require('./sberhubproject/index'))
|
||||
|
||||
module.exports = router
|
||||
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
const router = require('express').Router();
|
||||
const interestsRouter = require('./interests');
|
||||
const usersRouter = require('./users');
|
||||
module.exports = router;
|
||||
|
||||
|
||||
const delay =
|
||||
(ms = 1000) =>
|
||||
(req, res, next) => {
|
||||
setTimeout(next, ms);
|
||||
};
|
||||
|
||||
|
||||
router.use(delay());
|
||||
router.use('/interests', interestsRouter);
|
||||
router.use('/users', usersRouter);
|
||||
router.use('/users/:id', usersRouter);
|
||||
@ -1,19 +0,0 @@
|
||||
[
|
||||
{"value":"Стартапы, поиск команды и нетворкинг", "label":"Стартапы, поиск команды и нетворкинг"},
|
||||
{"value":"Искусство, фотография и дизайн", "label":"Искусство, фотография и дизайн"},
|
||||
{"value":"Музыка", "label":"Музыка"},
|
||||
{"value":"Хореография", "label":"Хореография"},
|
||||
{"value":"Спорт, фитнес и ЗОЖ", "label":"Спорт, фитнес и ЗОЖ"},
|
||||
{"value":"Литература и история", "label":"Литература и история"},
|
||||
{"value":"Политика, социология, активизм и дебаты", "label":"Политика, социология, активизм и дебаты"},
|
||||
{"value":"Кино и другое многомодальное искусство", "label":"Кино и другое многомодальное искусство"},
|
||||
{"value":"Психология и психическое здоровье", "label":"Психология и психическое здоровье"},
|
||||
{"value":"Соревновательные видеоигры", "label":"Соревновательные видеоигры"},
|
||||
{"value":"Новые технологии, ИИ, техника", "label":"Новые технологии, ИИ, техника"},
|
||||
{"value":"Математика, физика и информатика", "label":"Математика, физика и информатика"},
|
||||
{"value" :"Волонтерство и благотворительность", "label": "Волонтерство и благотворительность"},
|
||||
{"value" :"Настольные игры", "label": "Настольные игры"},
|
||||
{"value" :"Путешествия и туризм", "label": "Путешествия и туризм"},
|
||||
{"value" :"Английский (иностранные языки)", "label": "Английский (иностранные языки)"},
|
||||
{"value" :"Цифровые кафедры", "label": "Цифровые кафедры"}
|
||||
]
|
||||
@ -1,12 +0,0 @@
|
||||
const router = require('express').Router();
|
||||
|
||||
module.exports = router;
|
||||
|
||||
const data = require('./data/interest.json');
|
||||
|
||||
router.get('/', (req, res) => {
|
||||
//res.status(500).send({
|
||||
// message: 'Internal server error'
|
||||
//});
|
||||
res.json(data)
|
||||
});
|
||||
@ -1,113 +0,0 @@
|
||||
[
|
||||
{
|
||||
"id": 1252744945,
|
||||
"username": "Иван Иванов",
|
||||
"photo": "https://example.com/photos/1.jpg",
|
||||
"about": "Разработчик с 10-летним стажем, увлекаюсь новыми технологиями.",
|
||||
"email": "ivan.ivanov@example.com",
|
||||
"interests": [
|
||||
{ "value": "Новые технологии, ИИ, техника", "label": "Новые технологии, ИИ, техника" },
|
||||
{ "value": "Музыка", "label": "Музыка" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"username": "Мария Смирнова",
|
||||
"photo": "https://example.com/photos/2.jpg",
|
||||
"about": "Люблю путешествия и фотографию, обожаю изучать новые культуры.",
|
||||
"email": "maria.smirnova@example.com",
|
||||
"interests": [
|
||||
{ "value": "Путешествия и туризм", "label": "Путешествия и туризм" },
|
||||
{ "value": "Искусство, фотография и дизайн", "label": "Искусство, фотография и дизайн" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"username": "Алексей Кузнецов",
|
||||
"photo": "https://example.com/photos/3.jpg",
|
||||
"about": "Финансовый аналитик, интересуюсь инвестициями и рынками.",
|
||||
"email": "aleksey.kuznetsov@example.com",
|
||||
"interests": [
|
||||
{ "value": "Политика, социология, активизм и дебаты", "label": "Политика, социология, активизм и дебаты" },
|
||||
{ "value": "Математика, физика и информатика", "label": "Математика, физика и информатика" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"username": "Ольга Петрова",
|
||||
"photo": "https://example.com/photos/4.jpg",
|
||||
"about": "Дизайнер интерьеров, люблю создавать уютные и стильные пространства.",
|
||||
"email": "olga.petrovna@example.com",
|
||||
"interests": [
|
||||
{ "value": "Искусство, фотография и дизайн", "label": "Искусство, фотография и дизайн" },
|
||||
{ "value": "Кино и другое многомодальное искусство", "label": "Кино и другое многомодальное искусство" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"username": "Дмитрий Сидоров",
|
||||
"photo": "https://example.com/photos/5.jpg",
|
||||
"about": "Тренер по фитнесу, придерживаюсь здорового образа жизни.",
|
||||
"email": "dmitriy.sidorov@example.com",
|
||||
"interests": [
|
||||
{ "value": "Спорт, фитнес и ЗОЖ", "label": "Спорт, фитнес и ЗОЖ" },
|
||||
{ "value": "Волонтерство и благотворительность", "label": "Волонтерство и благотворительность" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"username": "Елена Волкова",
|
||||
"photo": "https://example.com/photos/6.jpg",
|
||||
"about": "Психолог, занимаюсь личностным ростом и развитием.",
|
||||
"email": "elena.volkova@example.com",
|
||||
"interests": [
|
||||
{ "value": "Психология и психическое здоровье", "label": "Психология и психическое здоровье" },
|
||||
{ "value": "Литература и история", "label": "Литература и история" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"username": "Артем Морозов",
|
||||
"photo": "https://example.com/photos/7.jpg",
|
||||
"about": "Ведущий мероприятий и организатор, люблю работать с людьми.",
|
||||
"email": "artem.morozov@example.com",
|
||||
"interests": [
|
||||
{ "value": "Настольные игры", "label": "Настольные игры" },
|
||||
{ "value": "Кино и другое многомодальное искусство", "label": "Кино и другое многомодальное искусство" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"username": "Ирина Фёдорова",
|
||||
"photo": "https://example.com/photos/8.jpg",
|
||||
"about": "Веду блог о моде и стиле, увлекаюсь новыми трендами.",
|
||||
"email": "irina.fedorova@example.com",
|
||||
"interests": [
|
||||
{ "value": "Мода", "label": "Мода" },
|
||||
{ "value": "Путешествия и туризм", "label": "Путешествия и туризм" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"username": "Сергей Чернов",
|
||||
"photo": "https://example.com/photos/9.jpg",
|
||||
"about": "Разработчик мобильных приложений, увлекаюсь игровыми технологиями.",
|
||||
"email": "sergey.chernov@example.com",
|
||||
"interests": [
|
||||
{ "value": "Соревновательные видеоигры", "label": "Соревновательные видеоигры" },
|
||||
{ "value": "Новые технологии, ИИ, техника", "label": "Новые технологии, ИИ, техника" }
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
"username": "Татьяна Лебедева",
|
||||
"photo": "https://example.com/photos/10.jpg",
|
||||
"about": "Работаю в области маркетинга, увлекаюсь продвижением брендов.",
|
||||
"email": "tatyana.lebedeva@example.com",
|
||||
"interests": [
|
||||
{ "value": "Маркетинг", "label": "Маркетинг" },
|
||||
{ "value": "Литература и история", "label": "Литература и история" }
|
||||
]
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
const router = require('express').Router();
|
||||
|
||||
module.exports = router;
|
||||
|
||||
const data = require('./data/users.json');
|
||||
|
||||
router.get('/', (req, res) => {
|
||||
//res.status(500).send({
|
||||
// message: 'Internal server error'
|
||||
//});
|
||||
res.json(data)
|
||||
});
|
||||
|
||||
router.get('/:id', (req, res) => {
|
||||
//res.status(500).send({
|
||||
// message: 'Internal server error'
|
||||
//});
|
||||
const userId = parseInt(req.params.id);
|
||||
res.json(data.find(item => item.id = userId));
|
||||
});
|
||||
|
||||
router.post('/', (req, res) => {
|
||||
//res.status(500).send({
|
||||
// message: 'Internal server error'
|
||||
//});
|
||||
const data = req.body;
|
||||
|
||||
|
||||
res.status(200).send();
|
||||
});
|
||||
|
||||
router.put('/:id', (req, res) => {
|
||||
//res.status(500).send({
|
||||
// message: 'Internal server error'
|
||||
//});
|
||||
const userId = parseInt(req.params.id);
|
||||
const data = req.body;
|
||||
res.status(200).send();
|
||||
});
|
||||
Loading…
Reference in New Issue
Block a user