unknown 3 weeks ago
parent
commit
1dd6dd2c87

+ 45 - 17
.obsidian/workspace.json

@@ -27,12 +27,26 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "hardcore web development/11. SQL/Задание.md",
+                "file": "todo/Разное.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Задание"
+              "title": "Разное"
+            }
+          },
+          {
+            "id": "7e2b94b9ef2fd4f4",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "English/homework 2.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "homework 2"
             }
           },
           {
@@ -55,16 +69,30 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Комментарии.md",
+                "file": "Python/venv.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "venv"
+            }
+          },
+          {
+            "id": "ccf77d68d102e591",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Python/telegram bot/aiogram.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Комментарии"
+              "title": "aiogram"
             }
           }
         ],
-        "currentTab": 3
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -194,17 +222,22 @@
       "markdown-importer:Open format converter": false
     }
   },
-  "active": "b535845df52ceaee",
+  "active": "c7584343712d3d31",
   "lastOpenFiles": [
+    "todo/Задачи по направлениям.md",
+    "todo/Разное.md",
     "hardcore web development/11. SQL/Типы данных.md",
-    "Комментарии.md",
+    "Кодинг.md",
+    "Python/telegram bot/aiogram.md",
     "hardcore web development/11. SQL/Задание.md",
-    "hardcore web development/11. SQL/Сортировка данных.md",
+    "Python/venv.md",
+    "Python/telegram bot",
+    "proGit.md",
+    "English/homework 2.md",
     "English/words.md",
+    "Комментарии.md",
+    "hardcore web development/11. SQL/Сортировка данных.md",
     "hardcore web development/11. SQL/Создание таблиц.md",
-    "English/homework 2.md",
-    "Python/venv.md",
-    "todo/Разное.md",
     "English/img/16-7.JPEG",
     "English/img/16-6.JPEG",
     "English/img/16-5.JPEG",
@@ -213,13 +246,11 @@
     "English/img/16-2.JPEG",
     "English/img/16-1.JPEG",
     "ROTEK/BT_6714.md",
-    "proGit.md",
     "hardcore web development/11. SQL/SQL настройка.md",
     "hardcore web development/11. SQL/NULL, coalecse.md",
     "todo/Тренировки и занятия.md",
     "English/Text 6.md",
     "link.md",
-    "todo/Задачи по направлениям.md",
     "English/Homework.md",
     "Python/function основное.md",
     "English/img/15-9.JPEG",
@@ -230,8 +261,6 @@
     "todo/Счета.md",
     "hardcore web development/4. Linux.md",
     "hardcore web development/5-6-7 Internet.md",
-    "linux/linux common.md",
-    "hardcore web development/Список литературы.md",
     "English/img/13-5.JPEG.~tmp",
     "English/img/13-4.JPEG.~tmp",
     "docs/sniffers_texto.pdf",
@@ -240,7 +269,6 @@
     "English/img/9-8.jpg.~tmp",
     "English/img/9-7.jpg.~tmp",
     "English/img/9-6.jpg.~tmp",
-    "English/img/9-5.jpg.~tmp",
-    "English/img/9-3.jpg.~tmp"
+    "English/img/9-5.jpg.~tmp"
   ]
 }

BIN
Database.kdbx


+ 143 - 9
English/homework 2.md

@@ -226,7 +226,7 @@
 
 ---
 
-187 Подчеркни правильный вариант.
+~={green}187 Подчеркни правильный вариант.=~
 1. He will go to the country tommorow if the weather is fine.
 2. We won't discuss the plan until our teacher arrives.
 3. You'll understand this rule after your theacher explains it to you.
@@ -238,7 +238,7 @@
 9. If you see him, ask him to ring me up.
 10. If you promise not to be late, I will let you go for a walk.
 
-188 Раскрой скобки, употребляя Present Simple иди Future Simple.
+~={green}188 Раскрой скобки, употребляя Present Simple иди Future Simple.=~
 1. I will stay here till my friend comes.
 2. If Mike goes to Australia he will stay at (остановиться где-то) a hotel.
 3. When he returns from his journey he will call me.
@@ -250,7 +250,7 @@
 9. My friend will wait for you if you are late.
 10. Don't worry if I am late tonight.
 
-189 Напиши, что ты будешь делать, если:
+~={green}189 Напиши, что ты будешь делать, если:=~
 1. If your brother is ell. If my brother is ill, I will call in a doctor (вызвать врача).
 2. If you have your birthday next week. If I have my birthday next week, I will invite my friends.
 3. If it is raining. If it is raining, I will take an umbrella.
@@ -262,7 +262,7 @@
 9. If the weather is fine on Sunday. If the weather is fine on Sunday I will go for a walk.
 10. If your friend invites you to his birthday party. If my friend invites me to his birthday party I will buy him a present.
 
-190 Соедини два предложения, используя when или if.
+~={green}190 Соедини два предложения, используя when или if.=~
 1. If the weather is fine tomorrow. We will go to the country.
 2. When Sash comes, we will play computer games.
 3. If I finish a school year with good marks, my parents will buy me a bicycle.
@@ -274,7 +274,7 @@
 9. If I buy some seeds of the flowers on Sunday, I will plant them.
 10. When Jim has holidays, he will got to Italy.
 
-191 Отметь предложения, где мы не должны ставить will после if и when.
+~={green}191 Отметь предложения, где мы не должны ставить will после if и when.=~
 1. When will you come home from school? (OK)
 2. When you come home, it will be late. (ERROR)
 3. Tell me when you will come home. (OK)
@@ -287,7 +287,7 @@
 8. I will do it if I have time. (ERROR)
 9. My friend will ask me if I go to the seaside next summer.
 
-193 Переведи
+~={green}193 Переведи=~
 1. Если ты приедешь в Минск, ты увидишь Национальную библиотеку. If you come to Minsk, you will see the National Library.
 2. Когда ты захочешь увидеть редкие виды рыб, поезжай на Браславские озера. When you want to see rare species of fish, go to the Braslav Lakes.
 3. Если туристы захотят узнать секреты разных ремесел, они посетят Дудутки. If tourists want to learn secrets of different crafts, they will visit Dudutki.
@@ -299,7 +299,7 @@
 9. Когда ты поедешь на север Австралии, не забудь о крокодилах. When you go to the north of Australia, do not forget about crocodiles.
 10. Когда мы будем делать проект про Австралию, я расскажу много интересных фактов. When we do the project about Australia, I will tell you a lot of interesting facts.
 
-194 Употреби Present Simple, Present Continuous, Future Simple.
+~={green}194 Употреби Present Simple, Present Continuous, Future Simple.=~
 1. If I don't feel well tomorrow, I will stay at home.
 2. I am visiting my dentist on Tuesday.
 3. They are opening a new exhibition next month.
@@ -309,7 +309,7 @@
 7. I think I will make dinner today. (после I think - Future simple)
 8. The football match starts at 7 o'clock.
 
-195 Исправь ошибку.
+~={green}195 Исправь ошибку.=~
 1. When I get home this evening, I will have a bath.
 2. Please close the window before you go out.
 3. I will wait until you come.
@@ -317,4 +317,138 @@
 5. If you speak slowly, I can understand you.
 6. If the weather in't good tomorrow, I will stay at home.
 7. What time does the next plane take off?
-8. Don't wait for me if I am late.
+8. Don't wait for me if I am late.
+
+---
+~={green}197 Переведи.=~
+1. Sue can speak English well. Сью хорошо говорит по-английски.
+2. Can your sister help me? Твоя сестра может мне помочь?
+3. My friend connont come in time. Мой друг не может приходить вовремя.
+4. I could run very fast when I was a boy. Я мог бегать очень быстро, когда был мальчиком.
+5. I can sing, but I can't dance. Я могу петь, но я не могу танцевать.
+6. My Grandmother could dance well when she was young. Моя бабушка могла хорошо танцевать, когда была молодой.
+7. I can read Italian but I can't speak it. Я могу читать по-итальянски, но не умею на нем говорить.
+8. John could draw well when he was younger. Джон мог хорошо рисовать, когда был молодым.
+
+~={green}198 Подчеркни правильный вариант.=~
+1. When I was young I could run very fast.
+2. Bill and John can't come to the party next week.
+3. Could you do sums (считать) when you were there?
+4. She can't read the story. It is too dificult.
+5. The box was so heavy, that I couldn't lift it yesterday.
+6. What things could Mrs. Smith cook when she was a teenager?
+7. What could your brother so when he was 2 years old?
+8. I can meet him tomorrow.
+
+~={green}199 Закончи предложение.=~
+1. I couldn't skate last winter, but now I can skate.
+2. I couldn't cook dishes of fish 3 years ago, but now I can cook dishes weel.
+3. Yesterday I couldn't go to the library with you but now I can go.
+4. When I was a small boy I couldn't play the guitar but now I can play the guitar well.
+5. My father couldn't drive a car some years ago but now he can drive a car.
+6. Before she came to Britain she couldn't speak English, but now she can speak well.
+7. I couldn't do sums before school but now I can sums.
+8. The children couldn't swim when they were little but now they can swim.
+
+~={green}200 Вставь can/can't или could/couldn't.=~
+1. You are speaking very quietly. I can't hear you.
+2. I was tired last night but I couldn't sleep.
+3. I can answer the questions. They are very easy.
+4. Jane can't speak to the teacher today because he is at the conference.
+5. He couldn't come to the concert last Sunday. He was ill.
+6. I cat recite (декламировать) a poem very well because I had learnt it at home.
+7. What can you do better, read or write English?
+8. Her eyes are not very good. She can't see very well.
+9. When my parents were yound they could dance well.
+10. Have you seen my dictionary? I can't find it.
+
+~={green}201 Переведи.=~
+1. Мой брат не умел читать, когда ему было 4 года. My brother couldn't read when he was 4.
+2. Она может говорить на двух иностранных языках. She can speak two foreign languages.
+3. Я не смог выучить стихотворение. I couldn' learn the poem.
+4. Я не могу нести эту тяжелую сумку. I can't carry this heavy bag.
+5. Моя бабушка не может (не умеет) пользоваться компьютером. My grandmother can't user a computer.
+6. Когда Боб был ребенком, он мог играть на пианино. When Bob was a child, he could play the piano.
+
+~={green}202 Найди правильную пару.=~
+1. Never put off till tomotrrow what you can do today. - c
+2. You can take a hourse to the water but you caoont make him drink. - f
+3. What is done cannot be undone. - b
+4. You cannot judge (судить) a tree by its bark (кора). - e
+5. Can the leopard change his spots (пятна). - d
+6. Man can die but once. - a
+
+~={green}203 Исправь ошибку.=~
+1. The milk was so hot, that I coudn't drink it.
+2. Your Granny can't read withour glasses, can she?
+3. He can't wear the trousers. They are very long.
+4. When I was 2, I couldn't draw animals well.
+5. We could to go to the mountains last year. (не понял)
+6. Can you hear music? 
+7. When I was little, I could climb a tree.
+8. Nobody can do this work.
+
+~={green}205 Переведи.=~
+1. Rose is able to work hard at her pronunciation every evening. Роуз может усердно работать над своим произношением каждый вечер.
+2. I will be able to watch the new film in English tomorrow evening. Я смогу посмотреть новый фильм на английском завтра вечером.
+3. We were able to buy a lot of food at the supermarket yesterday. Вчера он смогли купить много еды в супермаркете.
+4. He is able to win a lot of games. Он может выиграть много игр.
+5. Denis will be able to finish the work. Денис может закончить работу.
+6. My friend will be able to come back to school in a week. Мой друг сможет вернуться в школу через неделю.
+7. Was he able to talk to his boss yesterday? Он вчера смог поговорить со своим боссом?
+8. One day people will be able to go to the Moon on holiday. Однажды люди смогут отправиться на Луну в отпуск.
+
+~={green}206 Составь предложения из указанных слов.=~
+1. Alex will be able to come back to school next Monday.
+2. Howard wasn't able to prepare for exam last Tuesday.
+3. The pupils will be able to discuss their compositions at the next lesson.
+4. We will be able to go at the theatre to the ballet.
+5. Why weren't they able to move in a new flat last week?
+6. Will they be able to sail across the ocean in a boat?
+
+~={green}207 Раскрой скобки и составь вопросительные предложения.=~
+1. Is Kate able to count quickly at the lessons?
+2. When will I able to meet her next time?
+3. How often does John able to visit hes Granny?
+4. Why wouldn't Ann able to join us for a walk in the park tomorrow?
+5. When will you able to finish your report, Harry?
+6. Do you able to take part in sport competitions?
+
+~={green}208 Подчеркни правильный вариант.=~
+1. I'm sorry, but I won't be able to come to your party next week.
+2. She could understand everything.
+3. I think will be able to speak English quite well in a few month.
+4. After a few month on the course she was able speak French well.
+5. We could to stay with Bob in London last June.
+6. The chief will be able to see you on Tuesday.
+
+~={green}209 Вставь can/could или to be able to в правильной форме.=~
+1. We were not able to take the books from the library because it was closed.
+2. I cannot finish my work today. I am tired.
+3. She could dance quite nicely when she was a girl.
+4. I will able to see you when you return.
+5. She couldn't write a ficration well yesterday and got a bad mark.
+6. I will able to help you with English tonight.
+7. I could get tickets yesterday.
+8. He is able to explain us anything.
+9. If you have spare time we will able to go on an excursion.
+
+~={green}210 Переведи.=~
+1. Мальчик не сможет решить эту задачу. The boy won't be able to solve this task.
+2. Вы сможете это сделать сейчас? Will you be able to do it now?
+3. Я не смог купить билеты в театр вчера. I couldn't buy tickets to the theatre yesterday.
+4. Завтра я буду свободен и смогу помочь тебе. I will be free tomorrow and will be able to help you.
+5. Вчера я не смог встретиться со своими друзьями, я был занят. I couldn't meet my friends yesterday, I was busy.
+6. Если мы возьмем такси, мы сможем успеть на поезд. If we take a taxi, we will be able to catch the train.
+7. Я надеюсь, я смогу говорить по-английски хорошо через несколько лет. I hope I will be able to speak English well in a few years..
+8. Майкл не мог прийти к шести часам вчера, так как он был болен. Michael couldn't come at six o'clock yesterday because he was ill.
+
+~={green}211 Исправь ошибку.=~
+1. She well able to give you her book tomorrow.
+2. She could swim when she was a little girl.
+3. I am afraid I will able to translate this article tonight.
+4. I think you will able to play tennis better after practice.
+5. She wasn't able to visit us yesterday, because she was busy.
+6. If she doesn't buy a ticket, she won't be able to go to the theatre tomorrow.
+7. Tom can ride a horse very well.
+8. We were not able to say anything because we were surprised.

+ 19 - 1
English/words.md

@@ -23,4 +23,22 @@ cattle - крупный рогатый скот
 oil - нефть
 shore - берег моря, берег озера
 beach - пляж
-minerals - минералы
+minerals - минералы
+
+~={yellow}Lesson 1=~
+a grown-up - взрослый человек
+a teenager - подросток
+to borrow - занимать, брать на время
+to return - возвращать
+by heart - наизусть
+a cover - обложка
+~={yellow}Lesson 2=~
+to use - использовать
+to recite - декламировать, выступать, читать вслух
+an age - возраст
+to be able (to do something) - быть способным, мочь, быть в состоянии делать что-то
+~={yellow}Lesson 3=~
+a dictionary - словарь
+a composition - сочинение
+aloud - вслух
+to translate - переводить с одного языка на другой

+ 10 - 0
Python/telegram bot/aiogram.md

@@ -0,0 +1,10 @@
+~={yellow}Типы данных=~
+- **Message**: Тип данных, представляющий сообщение, которое отправляется пользователем.
+- **CallbackQuery**: Данные, которые отправляются при нажатии кнопки с колбэком.
+- **User**: Представляет пользователя, который взаимодействует с ботом.
+- **Chat**: Данные о чате, в котором происходит взаимодействие с ботом.
+
+Полезные ссылки:
+1. Статья на хабре https://habr.com/ru/companies/amvera/articles/820527/
+2. Статья на хабре https://habr.com/ru/articles/732136/
+3. 

+ 2 - 0
todo/Задачи по направлениям.md

@@ -1,5 +1,7 @@
 <h6>Срочные дела</h6>
 - [ ] Разобраться со счетчиком горячей воды в Подреcково
+- [ ] Записаться к ортодонту (звонить завтра 25.03.25)
+- [ ] Передать показания счетчиков
 <h6>Работа и образование</h6>
 - [ ] Пройти на 100% курс по Python OOP.
 - [ ] Залить старую версию gnu-arm-eabi на сервер

+ 3 - 2
todo/Разное.md

@@ -1,5 +1,5 @@
 ##### ~={yellow}Обслуживание машины=~
-
+- 15.03.2025 Пробег 120_000. Замена свечей и катушки.
 - Пробег хххххх [30.10.22] Замена задних тормозных дисков и колодок. Замена рулевых тяг и наконечников (правый и левый), замена сайлентблоков задней балки (2 шт.), замена жидгости ГУР, сход-развал. 
 
 - Пробег 92500 [19.06.21] 
@@ -14,7 +14,8 @@
 Четные числа: 14 - 20
 Нечетные числа: 8 - 14
 Телефон: 8-499-202-89-59
-29 на тощак в 8-30
+29 на тощак в 8-30 
+
 
 ~={yellow}Инна=~
 2200 7013 1856 8083