tmp

.obsidian/appearance.json

@@ -2,7 +2,7 @@
   "baseFontSize": 16,
   "accentColor": "",
   "theme": "obsidian",
-  "cssTheme": "dev",
+  "cssTheme": "",
   "enabledCssSnippets": [
     "custom"
   ]

.obsidian/plugins/fast-text-color/data.json

@@ -61,7 +61,7 @@
           "className": "ftc-color-default-blue"
         },
         {
-          "color": "#3cb371",
+          "color": "#57c341",
           "id": "green",
           "keybind": "\u001a",
           "italic": false,
@@ -148,7 +148,7 @@
           "className": "ftc-color-default-magenta"
         },
         {
-          "color": "#ffff00",
+          "color": "#c2b419",
           "id": "yellow",
           "keybind": "Y",
           "italic": false,

.obsidian/themes/Wasp/manifest.json

@@ -0,0 +1,6 @@
+{
+    "name": "Wasp",
+    "version": "0.0.0",
+    "minAppVersion": "0.16.0",
+    "author": "Santi Younger"
+}

.obsidian/themes/Wasp/theme.css

@@ -0,0 +1,322 @@
+/* This Theme is called "Wasp" and Obsidian Theme created by Santi Younger */
+
+:root
+{
+--font-monospace: "Source Code Pro", monospace;
+}
+
+.theme-dark
+      {
+--button-hover-bg-color: #DAA520; /* Darker Yellow Background for Hover */
+--button-hover-text-color: #ffffff; /* White Text for Hover */
+      --button-bg-color: #D49335; /* Gray-Black Background */
+      --button-text-color: #242424; /* Light Gray Text */   
+      --background-primary:         #242424;
+      --background-primary-alt:     #242424;
+      --background-secondary:       #191919;
+      --background-secondary-alt:   #3D3D3D;
+      --text-normal:                #faf2d6;
+      --text-faint:                 #bdae93;
+      --text-title-h1:              #E0E0E0;
+      --text-title-h2:              #E0E0E0;
+      --text-title-h3:              #E0E0E0;
+      --text-title-h4:              #E0E0E0;
+      --text-title-h5:              #E0E0E0;
+      --text-title-h6:              #E0E0E0;
+      --text-highlight-bg:          #640211;
+      --text-link:                  #83a598; 
+      --text-a-hover:               #83a598; 
+          --text-accent-hover:      #D49335;
+ /* ^^^ added for hover over bracket internal links */
+      --inline-code:                #83a598; 
+      --code-block:                 #83a598; 
+      --text-a:                     #f8c537; 
+      --interactive-accent:         #f8c537;
+      --text-accent:                #f8c537; 
+      --text-on-accent:             #fff;
+      --interactive-accent-rgb:     #f8c537; 
+      --vim-cursor:                 #f8c537; 
+      /*  --text-mark:                  add text-mark if needed, this should work together with 'mark' */
+      --pre-code:                   #;
+      --interactive-before:         #7c6f64;
+      --background-modifier-border: #f8c537;
+      --text-selection:            #f8c537;
+      }
+
+.theme-dark .cm-s-obsidian span.obsidian-search-match-highlight {
+color: var(--text-normal);
+background-color: #483699;
+}
+
+.theme-light
+     {
+         --background-primary:         #EDEDED;
+         --background-secondary:       #C4C4C4;
+          /* thick menu border */
+         --background-primary-alt:     #;
+         --background-secondary-alt:   #707070; /* ← ↓  corner */
+         --text-normal:                #1A2023;
+         --text-faint:                 #DEDEDE;
+         --text-title-h1:              #D49335;
+         --text-title-h2:              #D49335;
+         --text-title-h3:              #D49335;
+         --text-title-h4:              #D49335;
+         --text-title-h5:              #D49335;
+         --text-link:                  #D49335;
+         --text-a-hover:               #D49335;
+         --text-accent-hover:          #D49335;
+/* ^^^ added for hover over bracket internal links */
+         --inline-code:                #458588;
+         /*  --text-mark:                  add if needed */
+         --pre-code:                   #bebebe;
+         /*  --text-highlight-bg:          add if needed */
+         --interactive-before:         #a89984;
+         --background-modifier-border: #D49335;
+         --text-a:                     #961327;
+         --interactive-accent:         #f8c537;
+         --text-accent:                #961327;
+         --interactive-accent-rgb:     #961327;
+         --vim-cursor:                 #961327;
+         --text-selection:             #EDC180;
+         --text-white:                 #ffffff;
+     }
+
+.nav-file-title, .nav-folder-title {
+    color: var(--text-normal);
+}
+
+.nav-file-title.is-active, .nav-folder-title.is-active, body:not(.is-grabbing) .nav-file-title:hover, body:not(.is-grabbing) .nav-folder-title:hover {
+    background-color: var(--background-modifier-border);
+    color: white;
+}
+
+.cm-s-obsidian span.cm-formatting-link {
+    color: var(--text-normal);
+}
+
+.CodeMirror-guttermarker-subtle {
+    color: var(--text-normal) !important;
+}
+
+button.mod-cta {
+    background-color: var(--interactive-accent);
+    color: var(--text-normal);
+}
+
+.vertical-tab-header-group-title {
+    color: var(--text-white);
+}
+
+.cm-header-1 {
+font-size: 18px;
+color: var(--text-title-h1) !important;
+}
+
+.cm-header-2 {
+font-size: 18px;
+color: var(--text-title-h2) !important;
+}
+
+.cm-header-3 {
+font-size: 18px;
+color: var(--text-title-h3) !important;
+}
+
+.cm-header-4 {
+font-size: 18px;
+color: var(--text-title-h4) !important;
+}
+
+.cm-header-5 {
+font-size: 18px;
+color: var(--text-title-h5) !important;
+}
+
+.cm-header-6 {
+font-size: 18px;
+color: --text-normal;
+color: var(--text-title-h6) !important;
+}
+
+.markdown-preview-view h1 {
+font-size: 20px;
+line-height: 24px;
+color: var(--text-title-h1) !important;
+}
+
+.markdown-preview-view h2 {
+font-size: 20px;
+line-height: 24px;
+color: var(--text-title-h2) !important;
+}
+
+.markdown-preview-view h3 {
+font-size: 20px;
+line-height: 24px;
+color: var(--text-title-h3) !important;
+}
+
+.markdown-preview-view h4 {
+font-size: 20px;
+line-height: 24px;
+color: var(--text-title-h4) !important;
+}
+
+.markdown-preview-view h5 {
+font-size: 20px;
+line-height: 24px;
+color: var(--text-title-h5) !important;
+}
+
+.markdown-preview-view h6 {
+font-size: 20px;
+line-height: 24px;
+color: --text-normal;
+color: var(--text-title-h6) !important;
+}
+
+/*-----------------------------------------*/
+/* End of main theme, extra functionality can be added below */
+
+.markdown-source-view { font-family: var(--font-monospace)
+}
+
+.cm-fat-cursor .CodeMirror-cursor {
+background-color: #f8c537 !important;
+opacity: 80% !important;
+width: 9px !important; 
+visibility: visible !important
+}
+
+.plugin-tabs .stayopen .view-header {
+border-bottom: 2px solid var(--interactive-accent)!important;
+}
+
+.plugin-tabs .mod-root.workspace-split.mod-vertical div.workspace-leaf:not(.stayopen) > .workspace-leaf-content > .view-header .view-header-title::before{
+background-color:transparent!important
+}
+
+.plugin-tabs .mod-root.workspace-split.mod-vertical .workspace-split.mod-vertical > div.workspace-leaf:not(.stayopen),
+.plugin-tabs .mod-root.workspace-split.mod-vertical > div.workspace-leaf:not(.stayopen){
+border-radius: 5px 5px 0px 0px!important;
+}
+
+.plugin-tabs .mod-root.workspace-split.mod-vertical div.workspace-leaf{
+border-color: var(--background-secondary-alt)!important;
+border-bottom-width: 0px!important;
+border-right-width: 0px!important
+}
+
+.theme-light.plugin-tabs  .mod-root.workspace-split.mod-vertical div.workspace-leaf{
+border-color: var(--background-secondary-alt)!important;
+border-left-width:3px!important;
+border-bottom-width: 0px!important;
+border-right-width: 0px!important
+}
+
+.plugin-tabs .mod-root.workspace-split.mod-vertical > div.workspace-leaf hr.workspace-leaf-resize-handle,
+.plugin-tabs .mod-root.workspace-split.mod-vertical > .mod-vertical hr.workspace-leaf-resize-handle{
+display: none;
+}
+
+
+.plugin-tabs .mod-root.workspace-split.mod-vertical div.workspace-leaf .view-header{
+border-left-color: transparent!important
+}
+
+.plugin-tabs .workspace-split.mod-root > .workspace-leaf:last-of-type .workspace-leaf-content,
+.plugin-tabs .workspace-split.mod-root > .workspace-leaf:first-of-type .workspace-leaf-content {
+    border-radius: 0px!important;
+}
+
+.plugin-tabs .theme-dark .mod-root.workspace-split.mod-vertical .workspace-split.mod-vertical > div.workspace-leaf.mod-active,
+.plugin-tabs .theme-dark .mod-root.workspace-split.mod-vertical > div.workspace-leaf.mod-active {
+border: 0!important;
+border-radius: 0px 0px 0px 0px!important;
+}
+
+button.mod-cta {
+        background-color: var(--button-bg-color); /* Uses variable for background color */
+        color: var(--button-text-color); /* Uses variable for text color */
+        font-weight: 600; /* Makes text bold but less than standard bold */
+
+    }
+
+    button.mod-cta:hover, button.mod-cta:focus {
+        background-color: var(--button-hover-bg-color); /* Darker Yellow Background for Hover */
+        color: var(--button-text-color); /* Keeps the default light gray text color on hover */
+        font-weight: 600; /* Makes text bold but less than standard bold */
+    }
+
+    .vertical-tab-nav-item.is-active {
+        background-color: var(--button-bg-color); /* Gray-Black Background */
+        color: var(--button-text-color); /* Light Gray Text */
+        font-weight: bold; /* Makes text bold */
+        font-weight: 600; /* Makes text bold but less than standard bold */
+    }
+
+    .vertical-tab-nav-item.is-active:hover, .vertical-tab-nav-item.is-active:focus {
+        background-color: var(--button-hover-bg-color); /* Darker Yellow Background for Hover */
+        color: var(--button-text-color); /* Keeps the default light gray text color on hover */
+        font-weight: 600; /* Makes text bold but less than standard bold */
+    }
+
+    body:not(.is-phone) .vertical-tab-nav-item.is-active {
+      --background-modifier-hover: var(--button-hover-bg-color); /* More specific variable for hover */
+      --icon-color: var(--button-text-color);
+      background-color: var(--button-bg-color);
+      color: var(--button-text-color);
+        font-weight: 600; /* Makes text bold but less than standard bold */
+    }
+
+    body:not(.is-phone) .vertical-tab-nav-item.is-active:hover,
+    body:not(.is-phone) .vertical-tab-nav-item.is-active:focus {
+      background-color: var(--button-hover-bg-color);
+      color: var(--button-text-color);
+        font-weight: 600; /* Makes text bold but less than standard bold */
+    }
+    .checkbox-container.is-enabled {
+      background-color: var(--button-bg-color); /* Gray-Black Background */
+      color: var(--button-text-color); /* Light Gray Text */
+  }
+
+  .checkbox-container.is-enabled:hover, .checkbox-container.is-enabled:focus {
+      background-color: var(--button-hover-bg-color); /* Darker Yellow Background for Hover */
+      color: var(--button-text-color); /* Keeps the default light gray text color on hover */
+  }
+
+  .flair.mod-pop {
+    background-color: var(--button-bg-color); /* Gray-Black Background */
+    color: var(--button-text-color); /* Light Gray Text */
+}
+
+.flair.mod-pop:hover, .flair.mod-pop:focus {
+    background-color: var(--button-hover-bg-color); /* Darker Yellow Background for Hover */
+    color: var(--button-text-color); /* Keeps the default light gray text color on hover */
+}
+
+/** hr styles -- PREVIEW MODE */
+.cm-line hr,
+.markdown-preview-view hr {
+  margin-block-start: 4em;
+  margin-block-end: 4em;
+  border: none;
+  height: 0;
+  border-bottom: 1px solid;
+  border-image-slice: 1;
+  border-width: 1px;
+  border-image-source: linear-gradient(to right, transparent, var(--text-accent), transparent);
+}
+
+.cm-line hr::after,
+.markdown-preview-view hr::after {
+  /* content: '\1f41d'; */
+  display: inline-block;
+  position: absolute;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  transform-origin: 50% 50%;
+  padding: 0.5rem;
+  color: var(--text-sub-accent);
+  background-color: var(--background-primary);
+}

.obsidian/workspace.json

@@ -13,12 +13,12 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "todo/Задачи по направлениям.md",
+                "file": "Python/Docstring. Аннотации..md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Задачи по направлениям"
+              "title": "Docstring. Аннотации."
             }
           },
           {
@@ -41,12 +41,12 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "todo/Задачи по направлениям.md",
+                "file": "Python/function основное.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Задачи по направлениям"
+              "title": "function основное"
             }
           }
         ],
@@ -106,7 +106,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 234.5
+    "width": 220.5
   },
   "right": {
     "id": "cf92ccf43e96a53d",
@@ -167,11 +167,32 @@
   },
   "active": "8c6a613404b59e32",
   "lastOpenFiles": [
-    "Python/function основное.md",
-    "Python/venv.md",
     "Django/common.md",
+    "Python/Docstring. Аннотации..md",
+    "Python/common.md",
+    "Python/Архитектура.md",
+    "Greenstar/ethernet stm32.md",
+    "Greenstar/stm32l476VG-usb спектрометр.md",
+    "Greenstar/usb stm32.md",
+    "Golang/common.md",
+    "Python/venv.md",
+    "English/Text 4.md",
+    "English/img/dialogue/8.JPEG",
+    "English/img/dialogue/9.JPEG",
+    "English/img/dialogue/4.jpg",
+    "English/img/dialogue/Dialogue_4.jpg",
+    "English/img/dialogue",
+    "English/img/Новая папка",
+    "English/Homework.md",
+    "English/Women in Japan.md",
+    "English/Text 1.md",
+    "English/Text 2.md",
+    "English/Text 3.md",
     "todo/Задачи по направлениям.md",
-    "Text 4.md",
+    "English/img/words/2.jpeg",
+    "English/img/words/1.jpeg",
+    "English/img/words",
+    "Python/function основное.md",
     "proGit.md",
     "ROTEK/universal IO/universal IO.md",
     "ROTEK/universal IO/Test HV.md",
@@ -181,20 +202,12 @@
     "ROTEK/metrolog/readme.md",
     "linux/server.md",
     "todo/Счета.md",
-    "todo/Тренировки и занятия.md",
-    "Python/common.md",
-    "Python/Архитектура.md",
-    "Python/sort.md",
     "configs/tab_wg.conf",
     "configs/tab_wg.conf.txt",
     "configs/phone_wg.conf",
     "configs/phone_wg.conf.txt",
     "configs/wg0_new.conf",
     "configs/wg0_new.conf.txt",
-    "English/Text 3.md",
-    "English/Homework.md",
-    "English/Text 2.md",
-    "ROTEK/bt6714.md",
     "English/img/Dialogue_4.jpg"
   ]
 }

Text 4.md → English/Text 4.md

@@ -1,14 +1,30 @@
 #### MY IDEAL SCHOOL
-				
+
 My ideal secondary school is a save haven. It shouldn't be a place you hate going to, but a place you enjoy attending. I believe it should always have a soul... there should always be laughter ringing through the corridors.
 
 My ideal school is a school quite unlike any school we've heard of. This school consists of a large library and basic recreational facilities. There are no classrooms. The school is built on the idea of active learning. No student is forced to learn.
 
 School is the mould, which shapes our future. It's where we spend most of our valuable time - childhood. Yet I know from firsthand experience that many aspects should be changed: the impersonal attitude of some teachers who do everything only for results, instead of creating happy moments and valuable life experience for young people. These young people are far from being an 'empty pot' who are ready to be filled with knowledge. They are simply locked boxes full of potential which should be discovered by caring and encouraging teachers.
 
-Schools may be getting good results but they are not helping the students as individuals. It seems to me that it's the learner wo should ask questions. Give us the freedom to ask questions and do help us find answers. Don't you see we lear more from our experience and
-when people trust adn respect us? We learn from our mistakes as well.
+Schools may be getting good results but they are not helping the students as individuals. It seems to me that it's the learner who should ask questions. Give us the freedom to ask questions and do help us find answers. Don't you see we learn more from our experience and when people trust and respect us? We learn from our mistakes as well.
 
 I think defferences make the world go around. Good teachers know it more than Maths rules. I think school must teach differences. And at the moment some schools are doing the opposite, trying to make everyone normal.
 
-Schools should develop creativity and dreams. When schools teach people not to seek knowledg on their own, people become passive. Everybody has the right to be free and choose what to be and what not to be, schools do not give that option, they have a 'well organised' systematic life for you, in which you have to fit.
+Schools should develop creativity and dreams. When schools teach people not to seek knowledge on their own, people become passive. Everybody has the right to be free and choose what to be and what not to be, schools do not give that option, they have a 'well organised' systematic life for you, in which you have to fit.
+
+save haven - убежище
+attending - учиться
+through - через
+quite - совершенно
+recreational facilities - рекреационные помещения
+mould - форма
+shape - формировать
+valuable - драгоценный
+firsthand experience - личный опыт
+impersonal attitude - безразличное отношение
+instead of - вместо
+caring and encouraging teachers заботливые и вдохновляющие учителя
+doing the opposite - делают наоборот
+seek knowledge - искать знания
+on their own - самостоятельно
+in which you have to fit - в которую вы должны вписаться

Python/function основное.md

@@ -309,4 +309,47 @@ while True:
         break
 ```
 ~={magenta}Итератор=~ - это не сама коллекция, а механизм обхода элементов или способ получения следующего элемента в коллекции. Поэтому итераторы намного эффективнее расходуют память в отличие от итерируемых объектов.
-Функции ~={magenta}map, filter, zip, enumerate, open=~ возвращают ~={magenta}итератор=~.
+Функции ~={magenta}map, filter, zip, enumerate, open=~ возвращают ~={magenta}итератор=~.
+
+~={green}Функции all и any=~
+Любое непустое значение преобразуется к значению ~={magenta}True=~, пустые значения - к ~={magenta}False=~.
+```python
+print(bool(0))  # False
+print(bool(''))  # False
+print(bool([]))  # False
+print(bool({}))  # False
+print(bool(None))  # False
+print(bool(False))  # False
+
+print(bool(67))  # True
+print(bool(-45))  # True
+print(bool('.'))  # True
+print(bool(' '))  # True
+print(bool('qwerty'))  # True
+print(bool([0]))  # True
+print(bool(True))  # True
+```
+~={magenta}Функция all()=~ принимает итерируемую последовательность и возвращает `True` , когда все элементы в этой последовательности правдивы. Если хотя бы один элемент пустой, вернется `False`.
+~={magenta}Функция any()=~ принимает на вход итерируемую последовательность и возвращает `True`, _если хотя бы один_ из элементов коллекции будет правдивым (непустым). Если все элементы последовательности ложные (пустые), вернется `False`.
+```python
+value = 100
+condition_1 = value % 2 != 0
+condition_2 = value > 50
+condition_3 = value < 1000
+
+print(all((condition_1, condition_2, condition_3)))  # False
+print(any([condition_1, condition_2, condition_3]))  # True
+```
+
+```python
+words = ['notice', 'deter', 'west', 'brush', 'stadium',
+         'package', 'price', 'clothes', 'sword', 'apology']
+
+check = [len(word) >= 4 for word in words]
+print(all(check))  # Все ли слова больше или равны 4х символов
+
+print(all([len(word) > 4 for word in words]))  # Все ли слова больше 4х символов
+
+print(any([len(word) > 7 for word in words]))  # Хотя бы одно слово больше 7х символов
+print(any([len(word) >= 7 for word in words]))  # Хотя бы одно слово больше или равно 7 символов
+```

Python/venv.md

@@ -1,3 +1,8 @@
+~={green}Создать виртуальное окружение=~
+- python -m venv <venv_name>
+
+
+
 Windows
 ```powershell
 $ python -m venv <name> # создать окружение

proGit.md

@@ -59,10 +59,16 @@ git push origin branch_name
 Теги
 ```bash
 # Сделать тег
-$ git tag tag namme
+$ git tag <tagnamme>
 
 # Отправка тега на сервер
-$ git push origin tagname
+$ git push origin <tagname>
+
+# Удалить тег локально
+$ git tag -d <tagname>
+
+# Удалить таг на сервере
+$ git push origin --delete <tagname>
 ```
 #### <font color = "MediumSeaGreen">Pro SVN</font>
 https://svnbook.red-bean.com/ru/1.4/svn.tour.cycle.html

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

@@ -1,15 +1,13 @@
 <h6>Срочные дела</h6>
 - [x] Ликвидировать течь стояка у туалете.
-- [ ] Связаться со стоматологом
+- [x] Связаться со стоматологом
 - [x] Подкрутить пластины
+- [ ] Оплатить счета
 
 <h6>Работа и образование</h6>
 - [ ] Пройти на 100% курс по Python OOP.
-- [x] Пройти раздел 5.10 в Python Function 29 декабря.
-- [x] Пройти раздел 5.11 в Python Function до 10 января
-- [x] Пройти раздел 5.12 в Python Function до 13 января
-- [x] Пройти раздел 6.1 в Python Function
-- [ ] Пройти раздел 6.2 до 14 января
+- [ ] Пройти раздел 6.3 до 18 января в Python Function
+- [ ] Пройти разделы 1.6, 1.7, 1.8 до 18 января в курсе Kind Django
 <h6>Финансы:</h6>
 - [x] Разобраться со вкладом в ПСБ
 - [ ] Открыть новый вклад 16 января