From d14335128f17054bcfb5f1c621befa60ed8ead6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sun, 5 Jun 2022 18:22:16 +0300
Subject: [PATCH 01/14] [#H15].(Added 1 task)

---
 Shops/beauty_saloon/homeworks/clinic_queries.sql | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Shops/beauty_saloon/homeworks/clinic_queries.sql b/Shops/beauty_saloon/homeworks/clinic_queries.sql
index 38fb8d3..178888f 100644
--- a/Shops/beauty_saloon/homeworks/clinic_queries.sql
+++ b/Shops/beauty_saloon/homeworks/clinic_queries.sql
@@ -136,4 +136,6 @@ SELECT * FROM honey_card
 -- 9. количество пациентов, name для каждого доктора
 SELECT name, COUNT(DISTINCT patient_uuid) FROM doctors 
 JOIN anamnesis ON anamnesis.doctor_uuid = doctors.uuid
-GROUP BY name
\ No newline at end of file
+GROUP BY name
+
+

From df5c7feaeb248b99bb27cbcc2290962133704b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Mon, 6 Jun 2022 21:40:54 +0300
Subject: [PATCH 02/14] [#H15].(Added 1 task)

---
 Shops/beauty_saloon/homeworks/animals.py | 28 ++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Shops/beauty_saloon/homeworks/animals.py

diff --git a/Shops/beauty_saloon/homeworks/animals.py b/Shops/beauty_saloon/homeworks/animals.py
new file mode 100644
index 0000000..7dadde6
--- /dev/null
+++ b/Shops/beauty_saloon/homeworks/animals.py
@@ -0,0 +1,28 @@
+class Animal:
+
+    def __init__(self, name: str, age: int):
+        self.name = name
+        self.age = age
+
+    def presentate(self):
+        print(f'My name is {self.name}, my age is {self.age}')
+
+
+class Dog(Animal):
+
+    def __init__(self, name: str, age: int, fav_command: str):
+        self.fav_command = fav_command
+        super().__init__(name, age)
+
+    def make_sound(self):
+        print(f"Hello, I'm {self.name}, and I'm woofing! My favorite command is {self.fav_command}!")
+
+
+class Cat(Animal):
+
+    def __init__(self, name: str, age: int, fav_place: str):
+        self.fav_place = fav_place
+        super().__init__(name, age)
+
+    def make_sound(self):
+        print(f"Hello, I'm {self.name}, and I'm meowing! My favorite place is {self.fav_place}!")

From f21ab4da62d6b0c26584e81ed9a58f00b1db2789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sat, 11 Jun 2022 11:33:34 +0300
Subject: [PATCH 03/14] =?UTF-8?q?=D0=B2=D1=8B=D0=BD=D1=83=D0=B6=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Shops/beauty_saloon/homeworks/animals.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Shops/beauty_saloon/homeworks/animals.py b/Shops/beauty_saloon/homeworks/animals.py
index 7dadde6..5e3261b 100644
--- a/Shops/beauty_saloon/homeworks/animals.py
+++ b/Shops/beauty_saloon/homeworks/animals.py
@@ -26,3 +26,10 @@ def __init__(self, name: str, age: int, fav_place: str):
 
     def make_sound(self):
         print(f"Hello, I'm {self.name}, and I'm meowing! My favorite place is {self.fav_place}!")
+
+
+cat = Cat('barsik', 15, 'kjhyh')
+cat.make_sound()
+
+
+ROUND((SUM(price*amount)*(18/100))/1+(18/100),2)
\ No newline at end of file

From 6bdbf3e1a649d9a33f582073c3f19f4da3173584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sun, 12 Jun 2022 18:46:45 +0300
Subject: [PATCH 04/14] [#H12].(Added the first task)

---
 Shops/beauty_saloon/app/main.py               |  87 -----------
 Shops/beauty_saloon/homeworks/animals.py      |  35 -----
 .../homeworks/clinic_queries.sql              | 141 ------------------
 Shops/beauty_saloon/main_flask.py             |  17 +++
 4 files changed, 17 insertions(+), 263 deletions(-)
 delete mode 100644 Shops/beauty_saloon/app/main.py
 delete mode 100644 Shops/beauty_saloon/homeworks/animals.py
 delete mode 100644 Shops/beauty_saloon/homeworks/clinic_queries.sql
 create mode 100644 Shops/beauty_saloon/main_flask.py

diff --git a/Shops/beauty_saloon/app/main.py b/Shops/beauty_saloon/app/main.py
deleted file mode 100644
index 9763cb2..0000000
--- a/Shops/beauty_saloon/app/main.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""Программа для салона красоты - Armovir.
-Возможности:
-- просмотреть все услуги
-- добавить услугу в корзину
-- посмотреть сумму выбранных услуг
-"""
-
-import json
-
-def list_of_services():
-    with open("app\list_services.json", encoding='utf-8') as file:
-        data  = json.load(file)
-    return data["list_of_services"]
-
-
-def edited_list_of_services(data):
-    result = ''
-    for service_info in data:
-        result += (f"{service_info['service_number']}. {service_info['name_of_services']} - {service_info['price_of_service']}р.\n")
-    return result    
-    
-
-def basket_of_services():
-    with open("app\services_basket.json", encoding='utf-8') as file:
-        data  = json.load(file)
-    return data["list_of_services"]
-
-
-def summa(data):
-    counter = 0
-    for service_info in data:
-       counter += service_info['price_of_service']
-    return f'Сумма всех услуг = {counter}р.'   
-
-
-def format_basket(data):
-    return edited_list_of_services(data) + summa(data)
-
-
-def adding_service():
-    print(edited_list_of_services(list_of_services()))
-    choice = int(input("Выберите услугу:"))
-    services = list_of_services()
-    basket = basket_of_services()
-    basket.append(services[choice -1 ])
-    basket = {"list_of_services":basket}
-    with open("app\services_basket.json", "w") as file:
-        json.dump(basket, file)
-    return ("Услуга успешно добавлена")
-
-
-def make_main_choice(choice):
-    result = ""
-    if choice == 1:
-        articles = list_of_services()
-        message = edited_list_of_services(articles)
-        result = message
-    elif choice == 2:
-        result = adding_service()
-    elif choice == 3:
-        articles = basket_of_services()
-        message = format_basket((articles))
-        result = message
-    elif choice != 4:
-        result = 'Неверный выбор'
-    return result
-
-
-def menu():
-    message = """
-        1 - Посмотреть услуги
-        2 - Выбор услуг
-        3 - Посмотреть список и стоимость выбранных услуг
-        4 - Выход
-    """ + "\n"
-    return message
-    
-
-def run() -> None:
-    choice = None
-    while choice != 4:
-        print(menu())
-        choice = int(input("Введите пункт меню: "))
-        message = make_main_choice(choice)
-        print(message)
-
-run()
\ No newline at end of file
diff --git a/Shops/beauty_saloon/homeworks/animals.py b/Shops/beauty_saloon/homeworks/animals.py
deleted file mode 100644
index 5e3261b..0000000
--- a/Shops/beauty_saloon/homeworks/animals.py
+++ /dev/null
@@ -1,35 +0,0 @@
-class Animal:
-
-    def __init__(self, name: str, age: int):
-        self.name = name
-        self.age = age
-
-    def presentate(self):
-        print(f'My name is {self.name}, my age is {self.age}')
-
-
-class Dog(Animal):
-
-    def __init__(self, name: str, age: int, fav_command: str):
-        self.fav_command = fav_command
-        super().__init__(name, age)
-
-    def make_sound(self):
-        print(f"Hello, I'm {self.name}, and I'm woofing! My favorite command is {self.fav_command}!")
-
-
-class Cat(Animal):
-
-    def __init__(self, name: str, age: int, fav_place: str):
-        self.fav_place = fav_place
-        super().__init__(name, age)
-
-    def make_sound(self):
-        print(f"Hello, I'm {self.name}, and I'm meowing! My favorite place is {self.fav_place}!")
-
-
-cat = Cat('barsik', 15, 'kjhyh')
-cat.make_sound()
-
-
-ROUND((SUM(price*amount)*(18/100))/1+(18/100),2)
\ No newline at end of file
diff --git a/Shops/beauty_saloon/homeworks/clinic_queries.sql b/Shops/beauty_saloon/homeworks/clinic_queries.sql
deleted file mode 100644
index 178888f..0000000
--- a/Shops/beauty_saloon/homeworks/clinic_queries.sql
+++ /dev/null
@@ -1,141 +0,0 @@
-
--- подгружаем uuid
-CREATE EXTENSION "uuid-ossp";
-
--- создаем таблицу doctors(uuid, name, category, position)
-CREATE TABLE doctors(
-    uuid uuid UNIQUE DEFAULT uuid_generate_v4(),
-    name CHARACTER VARYING(256), category VARCHAR(256), position TEXT);
-
--- cоздаем таблицу patients(uuid, name, birth_date, weight, height, sex)
-CREATE TABLE patients(
-    uuid uuid UNIQUE DEFAULT uuid_generate_v4(),
-    name CHARACTER VARYING(256), 
-    birth_date DATE, 
-    weight INT NOT NULL CHECK (weight > 10 AND weight < 300),
-    height INT NOT NULL CHECK (height > 50 AND height < 220),
-    sex VARCHAR(7)
-);
-
--- создаем таблицу anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-CREATE TABLE anamnesis(
-    patient_uuid uuid NOT NULL REFERENCES patients (uuid),
-    doctor_uuid uuid NOT NULL REFERENCES doctors (uuid),
-    diagnosis TEXT,
-    treatment TEXT
-);
-
--- заполняем таблицу doctors
-INSERT INTO doctors (name, category, position) 
-VALUES ('Bob', 'первая', 'дежурный врач'), ('Alice', 'вторая', 'глава отделения' ), ('Alex', 'высшая', 'главврач');
-
--- заполняем таблицу patients
-INSERT INTO patients (name, birth_date, weight, height, sex) 
-VALUES ('Robert', '1996-07-01', 85, 177, 'мужской' ), 
-('Den', '1988-10-15', 76, 180, 'мужской' ), 
-('Anna', '1969-12-26', 70, 164, 'женский'),
-('Katerina', '1999-06-18', 56, 175, 'женский');
-
--- заполняем таблицу anamnesis
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '4f14e356-7412-400f-bfaa-ed49954e06d5', 'ОРВИ', 'Теплое питьё'
-FROM patients WHERE name='Robert';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '4f14e356-7412-400f-bfaa-ed49954e06d5', 'Радикулит', 'гимнастика для спины, умеренные физические нагрузки'
-FROM patients WHERE name='Robert';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '54ff4ce0-0091-4b25-901c-ddad87495a60', 'Межпозвоночная грыжа', 'медикаментозные блокады, лечебная физкультура, физиотерапия'
-FROM patients WHERE name='Robert';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '54ff4ce0-0091-4b25-901c-ddad87495a60', 'Перелом ноги', 'пункция, блокада места перелома'
-FROM patients WHERE name='Den';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '54ff4ce0-0091-4b25-901c-ddad87495a60', 'Язва', 'снижение кислотности желудка, защита слизистой оболочки, коррекция состояния нервной системы и психической сферы.'
-FROM patients WHERE name='Den';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '81aa9fe1-0edb-4dee-88ac-70b920818a43', 'Бронхит', 'антибиотики, муколитики, противокашлевые препараты'
-FROM patients WHERE name='Anna';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '81aa9fe1-0edb-4dee-88ac-70b920818a43', 'Гастрит', 'Н2-гистаминоблокаторы, ингибиторы протонной помпы, антациды'
-FROM patients WHERE name='Anna';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '81aa9fe1-0edb-4dee-88ac-70b920818a43', 'Гастрит', 'Н2-гистаминоблокаторы, ингибиторы протонной помпы, антациды'
-FROM patients WHERE name='Katerina';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '4f14e356-7412-400f-bfaa-ed49954e06d5', 'ОРВИ', 'Теплое питьё'
-FROM patients WHERE name='Katerina';
-
-INSERT INTO anamnesis(patient_uuid, doctor_uuid, diagnosis, treatment)
-SELECT uuid, '4f14e356-7412-400f-bfaa-ed49954e06d5', 'ОРВИ', 'Теплое питьё'
-FROM patients WHERE name='Den';
-
--- 1. name, category всех докторов
-select name, category from doctors
-
--- 2. количество всех пациентов
-SELECT COUNT(*) as patient FROM patients
-
--- 3. кол-во пациентов женского пола
-SELECT COUNT(*) as patient FROM patients WHERE sex = 'женский'
-
--- 4. отсортировать всех пользователей по birth_date
-SELECT name, birth_date, weight, height, sex  FROM patients  ORDER BY birth_date
-
--- 5. name пациента и name лечащего доктора
-SELECT patients.name AS name_patients, doctors.name AS name_doctors FROM anamnesis
-JOIN patients 
-ON patients.uuid = anamnesis.patient_uuid     
-JOIN doctors 
-ON doctors.uuid = anamnesis.doctor_uuid
-ORDER BY name_patients
-
--- 6. name, диагноз пациентов с максимальным ростом (доп: сделать VIEW)
-CREATE VIEW patients_diagnosis AS
-SELECT name, diagnosis, height, weight, treatment
-FROM anamnesis JOIN patients
-ON anamnesis.patient_uuid = patients.uuid;
-
--- запрос к VIEW
-SELECT name, diagnosis
-  FROM patients_diagnosis
- WHERE height = (SELECT MAX(height) FROM patients_diagnosis)
-
- -- 7. вывести treatment, имт пользователя, 
- --    среднее имт по больнице для всех пользователей, 
- --     у которых имт выше среднего в больнице
-
-Select ROUND (weight / (height * 0.01 * height * 0.01),2) AS IMT, treatment,
-(SELECT SUM(weight / (height * 0.01 * height * 0.01))FROM patients_diagnosis) / 
-(SELECT COUNT(treatment)
- FROM patients_diagnosis) AS Среднее_IMT 
- FROM patients_diagnosis 
- WHERE (Select ROUND (weight / (height * 0.01 * height * 0.01),2)) > 
- (SELECT SUM(weight / (height * 0.01 * height * 0.01))FROM patients_diagnosis) / 
-(SELECT COUNT(treatment)
- FROM patients_diagnosis)
-
- -- 8. сделайте представление, которое возвращает name пациента, name доктора, diagnosis, treatment
-CREATE VIEW honey_card AS
-SELECT patients.name AS name_patient, doctors.name AS name_doctors, diagnosis, treatment
-FROM anamnesis 
-JOIN patients 
-ON anamnesis.patient_uuid = patients.uuid 
-JOIN doctors 
-ON anamnesis.doctor_uuid = doctors.uuid 
-
-SELECT * FROM honey_card
-
--- 9. количество пациентов, name для каждого доктора
-SELECT name, COUNT(DISTINCT patient_uuid) FROM doctors 
-JOIN anamnesis ON anamnesis.doctor_uuid = doctors.uuid
-GROUP BY name
-
-
diff --git a/Shops/beauty_saloon/main_flask.py b/Shops/beauty_saloon/main_flask.py
new file mode 100644
index 0000000..eb2a22f
--- /dev/null
+++ b/Shops/beauty_saloon/main_flask.py
@@ -0,0 +1,17 @@
+from flask import Flask
+
+
+app = Flask(__name__)
+
+@app.route("/")
+@app.route("/hello")
+def index():
+    return f"Hello world"
+
+
+@app.route("/hello/<string:name>/age/<int:age>")
+def user(name: str, age: int):
+    return f"Hello {name.capitalize()}! Your age is {age}!"
+
+ 
+app.run(port=5000, debug=True)
\ No newline at end of file

From 7360eb79d0a6520c59dcbaff94f86e67cd943be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sun, 12 Jun 2022 18:59:02 +0300
Subject: [PATCH 05/14] [#H17].(Added the first task)

---
 Shops/beauty_saloon/main_flask.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Shops/beauty_saloon/main_flask.py b/Shops/beauty_saloon/main_flask.py
index eb2a22f..6e34f70 100644
--- a/Shops/beauty_saloon/main_flask.py
+++ b/Shops/beauty_saloon/main_flask.py
@@ -14,4 +14,5 @@ def user(name: str, age: int):
     return f"Hello {name.capitalize()}! Your age is {age}!"
 
  
-app.run(port=5000, debug=True)
\ No newline at end of file
+app.run(port=5000, debug=True)
+

From 1e6afd906422bd4f4b132af194eea03a33a9cb4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <103532025+z70pozitiv4ik@users.noreply.github.com>
Date: Sun, 12 Jun 2022 19:03:03 +0300
Subject: [PATCH 06/14] Delete main_flask.py

---
 Shops/beauty_saloon/main_flask.py | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 Shops/beauty_saloon/main_flask.py

diff --git a/Shops/beauty_saloon/main_flask.py b/Shops/beauty_saloon/main_flask.py
deleted file mode 100644
index 6e34f70..0000000
--- a/Shops/beauty_saloon/main_flask.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from flask import Flask
-
-
-app = Flask(__name__)
-
-@app.route("/")
-@app.route("/hello")
-def index():
-    return f"Hello world"
-
-
-@app.route("/hello/<string:name>/age/<int:age>")
-def user(name: str, age: int):
-    return f"Hello {name.capitalize()}! Your age is {age}!"
-
- 
-app.run(port=5000, debug=True)
-

From b6c20786fe9d78561a690a6d2d5f79edd34a43b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sun, 12 Jun 2022 19:04:19 +0300
Subject: [PATCH 07/14] [#H17].(Added the first task)

---
 Shops/beauty_saloon/main_flask.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Shops/beauty_saloon/main_flask.py b/Shops/beauty_saloon/main_flask.py
index 6e34f70..eb2a22f 100644
--- a/Shops/beauty_saloon/main_flask.py
+++ b/Shops/beauty_saloon/main_flask.py
@@ -14,5 +14,4 @@ def user(name: str, age: int):
     return f"Hello {name.capitalize()}! Your age is {age}!"
 
  
-app.run(port=5000, debug=True)
-
+app.run(port=5000, debug=True)
\ No newline at end of file

From ca8e39b140ef9a1010a2f45aa6fa3da276b3d5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sun, 12 Jun 2022 19:05:30 +0300
Subject: [PATCH 08/14] [#H17].(Added the first task)

---
 Shops/beauty_saloon/{main_flask.py => hm_flask.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename Shops/beauty_saloon/{main_flask.py => hm_flask.py} (100%)

diff --git a/Shops/beauty_saloon/main_flask.py b/Shops/beauty_saloon/hm_flask.py
similarity index 100%
rename from Shops/beauty_saloon/main_flask.py
rename to Shops/beauty_saloon/hm_flask.py

From fbefaf44269c1745ba49b3bed9ac06a26c2918ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <103532025+z70pozitiv4ik@users.noreply.github.com>
Date: Sun, 12 Jun 2022 19:07:03 +0300
Subject: [PATCH 09/14] Delete Shops/beauty_saloon directory

---
 Shops/beauty_saloon/README.md | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 Shops/beauty_saloon/README.md

diff --git a/Shops/beauty_saloon/README.md b/Shops/beauty_saloon/README.md
deleted file mode 100644
index cccd816..0000000
--- a/Shops/beauty_saloon/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-`list_services.json - список услуг салона`   
-`services_basket.json - список услуг в корзине`
-
-# Салон красоты - Armavir #   
-## Возможности меню:
-1. Просмотр списка всех услуг
-2. Переход к выбору услуг   
-   - Определённые условия  
-3. Посмотреть список выбранных услуг и их общую стоимость  
-4. Удалить лишнюю услугу
-5. Выход   
-
-### Определённые условия:  
-1. Услуги нужно разделить на 2 блока:
-   - Услуги Лешмейкера (можно выбрать не больше 1 услуги, без повторений)
-   - Услуги Бровиста (можно выбрать не больше 1 услуги, без повторений)
-   - `Одновременно можно выбрать из 1 и из 2 блока`
-2. Возможность записаться на определенную дату и время 
-3. Возможность отменить запись за 24 часа до процедуры.
-
-### Телеграмм:
-1. Рассылка расписания 1 раз в месяц
-2. Рассылка свободных мест по требованию **!Мастера!**

From fb8aeb540a6e78072f194aba90b6b818cfc4ffb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sun, 12 Jun 2022 19:28:18 +0300
Subject: [PATCH 10/14] [#H17].(delete)

---
 Shops/beauty_saloon/hm_flask.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/Shops/beauty_saloon/hm_flask.py b/Shops/beauty_saloon/hm_flask.py
index eb2a22f..e69de29 100644
--- a/Shops/beauty_saloon/hm_flask.py
+++ b/Shops/beauty_saloon/hm_flask.py
@@ -1,17 +0,0 @@
-from flask import Flask
-
-
-app = Flask(__name__)
-
-@app.route("/")
-@app.route("/hello")
-def index():
-    return f"Hello world"
-
-
-@app.route("/hello/<string:name>/age/<int:age>")
-def user(name: str, age: int):
-    return f"Hello {name.capitalize()}! Your age is {age}!"
-
- 
-app.run(port=5000, debug=True)
\ No newline at end of file

From a5ac75356fd82891e41ad8cb22f892e7b62eede2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Sun, 12 Jun 2022 19:29:03 +0300
Subject: [PATCH 11/14] [#H17].(Added the first task)

---
 Shops/beauty_saloon/hm_flask.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Shops/beauty_saloon/hm_flask.py b/Shops/beauty_saloon/hm_flask.py
index e69de29..a55383f 100644
--- a/Shops/beauty_saloon/hm_flask.py
+++ b/Shops/beauty_saloon/hm_flask.py
@@ -0,0 +1,17 @@
+from flask import Flask
+
+
+app = Flask(name)
+
+@app.route("/")
+@app.route("/hello")
+def index():
+    return f"Hello world"
+
+
+@app.route("/hello/<string:name>/age/<int:age>")
+def user(name: str, age: int):
+    return f"Hello {name.capitalize()}! Your age is {age}!"
+
+ 
+app.run(port=5000, debug=True)
\ No newline at end of file

From 9b79568823889bc36e819d31de8236786f5a6f05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <103532025+z70pozitiv4ik@users.noreply.github.com>
Date: Tue, 21 Jun 2022 10:13:13 +0300
Subject: [PATCH 12/14] Update hm_flask.py

---
 Shops/beauty_saloon/hm_flask.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shops/beauty_saloon/hm_flask.py b/Shops/beauty_saloon/hm_flask.py
index a55383f..1515655 100644
--- a/Shops/beauty_saloon/hm_flask.py
+++ b/Shops/beauty_saloon/hm_flask.py
@@ -1,7 +1,7 @@
 from flask import Flask
 
 
-app = Flask(name)
+app = Flask(__name__)
 
 @app.route("/")
 @app.route("/hello")
@@ -14,4 +14,4 @@ def user(name: str, age: int):
     return f"Hello {name.capitalize()}! Your age is {age}!"
 
  
-app.run(port=5000, debug=True)
\ No newline at end of file
+app.run(port=5000, debug=True)

From 7862ba508bd4daf51543c82095acfdc49b375857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Tue, 21 Jun 2022 12:47:13 +0300
Subject: [PATCH 13/14] [#H17].(Added a second task)

---
 Shops/beauty_saloon/hm_flask2.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 Shops/beauty_saloon/hm_flask2.py

diff --git a/Shops/beauty_saloon/hm_flask2.py b/Shops/beauty_saloon/hm_flask2.py
new file mode 100644
index 0000000..4dd812c
--- /dev/null
+++ b/Shops/beauty_saloon/hm_flask2.py
@@ -0,0 +1,21 @@
+import json
+from flask import Flask
+from flask import jsonify
+
+
+app = Flask(__name__)
+
+
+def get_cars():
+    with open("2_task_storage.json") as file:
+        data = json.load(file)
+    return data
+
+
+@app.route("/")
+@app.route("/cars")
+def get_cars_view():
+    cars = get_cars()
+    return jsonify(cars)
+
+app.run(port=5000, debug=True)
\ No newline at end of file

From 6c5b2c84b545402614e610b31ee3d55ee1dfbca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?=
 <z70.Python@gmail.com>
Date: Tue, 21 Jun 2022 12:56:51 +0300
Subject: [PATCH 14/14] [#H17].(Added a second task)

---
 Shops/beauty_saloon/hm_flask.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Shops/beauty_saloon/hm_flask.py b/Shops/beauty_saloon/hm_flask.py
index a55383f..88e2fde 100644
--- a/Shops/beauty_saloon/hm_flask.py
+++ b/Shops/beauty_saloon/hm_flask.py
@@ -1,7 +1,7 @@
 from flask import Flask
 
 
-app = Flask(name)
+app = Flask(__name__)
 
 @app.route("/")
 @app.route("/hello")
@@ -13,5 +13,5 @@ def index():
 def user(name: str, age: int):
     return f"Hello {name.capitalize()}! Your age is {age}!"
 
- 
+
 app.run(port=5000, debug=True)
\ No newline at end of file