From b3266e1593a5cc2d36606e8ef018f0eba7298281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D1=8C=20=D0=A1=D0=B2=D1=96?=
 =?UTF-8?q?=D0=B4=D1=80=D1=96=D0=BA?= <svidryk@corp2.eu>
Date: Wed, 21 Jun 2023 16:09:48 +0300
Subject: [PATCH] add menu for roleid

---
 .gitignore                                         |   1 -
 README.md                                          |   1 +
 __pycache__/main.cpython-310.pyc                   | Bin 814 -> 807 bytes
 __pycache__/routes.cpython-310.pyc                 | Bin 371 -> 532 bytes
 components/__pycache__/__init__.cpython-310.pyc    | Bin 173 -> 166 bytes
 components/k2adm/.gitignore                        |   5 +
 components/k2adm/__init__.py                       |   0
 components/k2adm/k2adm/__init__.py                 |   0
 .../k2adm/languages/en/LC_MESSAGES/messages.mo     | Bin 0 -> 409 bytes
 .../k2adm/languages/en/LC_MESSAGES/messages.po     |  23 ++++
 .../k2adm/languages/uk/LC_MESSAGES/messages.mo     | Bin 0 -> 510 bytes
 .../k2adm/languages/uk/LC_MESSAGES/messages.po     |  24 ++++
 components/k2adm/k2adm/models.py                   |  98 ++++++++++++++
 components/k2adm/k2adm/views.py                    | 143 +++++++++++++++++++++
 components/k2adm/reguirments-components.txt        |   0
 components/k2adm/requirements.txt                  |  47 +++++++
 components/k2adm/setup.py                          |  15 +++
 components/k2auth/.gitignore                       |   8 ++
 components/k2auth/README.md                        |  45 +++++++
 components/k2auth/__init__.py                      |   0
 components/k2auth/k2auth/__init__.py               |   0
 components/k2auth/k2auth/models.py                 | 129 +++++++++++++++++++
 components/k2auth/k2auth/views.py                  |  63 +++++++++
 components/k2auth/reguirments-components.txt       |   0
 components/k2auth/requirements.txt                 |  47 +++++++
 components/k2auth/setup.py                         |  15 +++
 .../k2test/__pycache__/__init__.cpython-310.pyc    | Bin 180 -> 173 bytes
 .../k2test/__pycache__/__init__.cpython-310.pyc    | Bin 187 -> 180 bytes
 .../k2test/__pycache__/views.cpython-310.pyc       | Bin 2084 -> 2065 bytes
 .../k2test/languages/en/LC_MESSAGES/messages.mo    | Bin 549 -> 549 bytes
 .../k2test/languages/uk/LC_MESSAGES/messages.mo    | Bin 643 -> 643 bytes
 components/k2test/k2test/views.py                  |   2 +-
 db/database.db                                     | Bin 36864 -> 36864 bytes
 k2/__pycache__/__init__.cpython-310.pyc            | Bin 165 -> 158 bytes
 k2/__pycache__/k2admmenu.cpython-310.pyc           | Bin 2404 -> 3221 bytes
 k2/__pycache__/k2cfg.cpython-310.pyc               | Bin 2764 -> 2757 bytes
 k2/__pycache__/k2comp.cpython-310.pyc              | Bin 1985 -> 1978 bytes
 k2/__pycache__/k2obj.cpython-310.pyc               | Bin 516 -> 509 bytes
 k2/__pycache__/k2rout.cpython-310.pyc              | Bin 13905 -> 14294 bytes
 k2/k2admmenu.py                                    |  19 ++-
 k2/k2rout.py                                       |  25 +++-
 languages/babel_translation_directories.yml        |   2 +-
 routes.py                                          |   4 +
 43 files changed, 707 insertions(+), 9 deletions(-)
 create mode 100644 components/k2adm/.gitignore
 create mode 100644 components/k2adm/__init__.py
 create mode 100644 components/k2adm/k2adm/__init__.py
 create mode 100644 components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.mo
 create mode 100644 components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.po
 create mode 100644 components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.mo
 create mode 100644 components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.po
 create mode 100644 components/k2adm/k2adm/models.py
 create mode 100644 components/k2adm/k2adm/views.py
 create mode 100644 components/k2adm/reguirments-components.txt
 create mode 100644 components/k2adm/requirements.txt
 create mode 100644 components/k2adm/setup.py
 create mode 100644 components/k2auth/.gitignore
 create mode 100644 components/k2auth/README.md
 create mode 100644 components/k2auth/__init__.py
 create mode 100644 components/k2auth/k2auth/__init__.py
 create mode 100644 components/k2auth/k2auth/models.py
 create mode 100644 components/k2auth/k2auth/views.py
 create mode 100644 components/k2auth/reguirments-components.txt
 create mode 100644 components/k2auth/requirements.txt
 create mode 100644 components/k2auth/setup.py

diff --git a/.gitignore b/.gitignore
index 2da5d63..0340f63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/components/adm/
 /components/grid/
 /components/vue/
diff --git a/README.md b/README.md
index e69de29..53935b8 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1 @@
+open http://127.0.0.1:5000/dashboard 
\ No newline at end of file
diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc
index f2bf289dc07ac04f7b3277f5df5cf8d94a25fadf..6e824b9f3d9fa325138547f36d78314ca86668a9 100644
GIT binary patch
delta 41
vcmZ3-ww#SSpO=@50SH_UPTI)5f{D>;@)jmVu56>C{QQ#mywvi^&zL*_<5UcJ

delta 48
zcmZ3^wvLTEpO=@50SK0Sn7EO91rwv=<Sk5!f+eZNCAul8IjJS7x+VE3iItP@GkE|2
DSFjJV

diff --git a/__pycache__/routes.cpython-310.pyc b/__pycache__/routes.cpython-310.pyc
index ae3bfe7aaef3ea7858f312fd576371529c5b13cc..1e81df27e6a1e7c9df4844b8530a68e747eb80f9 100644
GIT binary patch
delta 260
zcmey&G=+sPpO=@50SL6dO-fnEIFV0=v1FpQgC#=>TMm0JM-&GmLn>nyODabSdkSkW
z6C*<kLkdR@XD(M17gUBTg%c{n70jT?J+Z(}U6b(^TeeYRX-P&EyFP>g6k-LkQgW-<
zKq4u*en6!gL&BoulJj#5^7B&jN{aO$N?}x4W@>qH5gX8LQ8K8CQgT6RfFwi-J5b3=
uh9ZzRz{D?`$-<0^T-ioN`S~UBd8y@-T^SX`gn-gKj6957K+FflLW}^6SVCL?

delta 100
zcmbQj@|lS*pO=@50SGF0OiFpoFp*D&(P5&t11noFgC_gLC3ehyn(UJ~8AJG1G8AzD
vm4S(0&XYGYDhigQ7MJLzq~@fSr0SOBrzBQRzQ?G*2QrO^k%y5Bh=mvd?~xax

diff --git a/components/__pycache__/__init__.cpython-310.pyc b/components/__pycache__/__init__.cpython-310.pyc
index 1ddedf0c4726d35adcb45315086c2b7fdeef6df4..2c6022b0f8981b580235efa8fedbbaa4c843dd0b 100644
GIT binary patch
delta 38
scmZ3>xQvlIpO=@50SH_UPMXMV!{|BDLy;@ns3<?bBt9>-d}5U`0JpXZ`2YX_

delta 45
zcmZ3+xR#MSpO=@50SK0Sm^hK!hB08GhoWFfYH^8fN@`AONvdv1eoA8H#A0IrAlVKw

diff --git a/components/k2adm/.gitignore b/components/k2adm/.gitignore
new file mode 100644
index 0000000..04cda04
--- /dev/null
+++ b/components/k2adm/.gitignore
@@ -0,0 +1,5 @@
+ idea
+__pycache__/
+*/__pycache__/
+*.py[cod]
+.pyc
diff --git a/components/k2adm/__init__.py b/components/k2adm/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/components/k2adm/k2adm/__init__.py b/components/k2adm/k2adm/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.mo b/components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..54827c7cb4840029cbf751cf499f2be860d9d3fe
GIT binary patch
literal 409
zcmZXPJx&8L5Jo3t1Cb~~LXn2THC;%cp`u1Y2$F_oWqC(gOJ1+!ag-C#(Q+5=z#Vc2
zZop^75=b8T&67X*_b{tI33Udpz#5!`4=@8?+27fR?4Rsva9lTsFOXfs6Zjq;!;kO?
zUc*!PEzcdC&JXY<{0?K#2^fM3q<yC#ReIn5>e%mU8@ZF(wAMBCf{N&-jFx4zDx=#n
zx}#{L<NEIsde$QQJ~Ya-+HaYjc&~QCfi`Gz>`Dh####1J=%sfo^k58&sMxF6vP$RC
RD?Xxh(^+pN1|4nh=@+^jT^0ZU

literal 0
HcmV?d00001

diff --git a/components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.po b/components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.po
new file mode 100644
index 0000000..207f11b
--- /dev/null
+++ b/components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.po
@@ -0,0 +1,23 @@
+msgid "title_menu_items"
+msgstr "Site administration"
+
+msgid "menu_items_child_1"
+msgstr "Password change"
+
+msgid "menu_items_child_2"
+msgstr "New user"
+
+msgid "menu_items_child_3"
+msgstr "Users"
+
+
+msgid "menu_items_child_4"
+msgstr "Users are clients"
+
+
+msgid "menu_items_child_5"
+msgstr "Roles"
+
+
+msgid "menu_items_child_6"
+msgstr "Access to the menu"
\ No newline at end of file
diff --git a/components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.mo b/components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..0272e33ca3ff8f5de9e63fc604d398233613b8b6
GIT binary patch
literal 510
zcmZ{eyGjF55QaxxFJL1n42a-qEVT35_!!!6p$je~Hd*^57J`Uc=n8`1BOF9w*JL*j
zkmesqop<mJ{PzM12Z#Om&i)KDGi`WJ!dfKj<b*7fThbs&?Q!jC?eE&&Ox4$<SD0<n
zP5Ox5ppWTQx<hZ$H}n#1=`}i~x9ADYPiDy+@yI+`AVn4T{jGLzap{Lq(C+xB=V9y2
z-w`L;b)!8u+IOP^H#(Fkj9P*JyF~Dep~lEy4MwoqMUH{q310blM}pMg3pw*dd)n74
zhE}fyFK(#uKXEZ)z%8H1w2wsaR&HVYBd1hjM+P6r4TfbG4|w2zd78#$OSjt1Q!~9c
K+Ji+}93(%4gTZY8

literal 0
HcmV?d00001

diff --git a/components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.po b/components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.po
new file mode 100644
index 0000000..3d8a7db
--- /dev/null
+++ b/components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.po
@@ -0,0 +1,24 @@
+msgid "title_menu_items"
+msgstr "Адміністрування сайту"
+
+
+msgid "menu_items_child_1"
+msgstr "Зміна паролю"
+
+msgid "menu_items_child_2"
+msgstr "Новий користувач"
+
+msgid "menu_items_child_3"
+msgstr "Користувачі"
+
+
+msgid "menu_items_child_4"
+msgstr "Користувачі кліенти"
+
+
+msgid "menu_items_child_5"
+msgstr "Ролі"
+
+
+msgid "menu_items_child_6"
+msgstr "Доступ до меню"
\ No newline at end of file
diff --git a/components/k2adm/k2adm/models.py b/components/k2adm/k2adm/models.py
new file mode 100644
index 0000000..8f7c0c5
--- /dev/null
+++ b/components/k2adm/k2adm/models.py
@@ -0,0 +1,98 @@
+import uuid
+from sqlalchemy import Column, Integer, String
+from sqlalchemy.ext.declarative import declarative_base
+from flask_jwt_extended import create_access_token
+from datetime import timedelta
+import hashlib
+from flask import current_app as k2
+
+Base = declarative_base()
+
+
+class k2users(Base):
+    __tablename__ = 'k2users'
+    user_id = Column(Integer, primary_key=True)
+    login = Column(String(70),  nullable=False)
+    name = Column(String(50),  nullable=False)
+    email = Column(String(150),  nullable=False)
+    password = Column(String(150),  nullable=False)
+    phone = Column(String(20))
+    roleid = Column(String(150),  nullable=False)
+
+    def __init__(self, **kwargs):
+        self.user_id = hashlib.md5(str(uuid.uuid4()).encode()).hexdigest()
+        self.login = kwargs.get('login')
+        self.password = hashlib.md5(kwargs.get('password').encode()).hexdigest()
+        self.name = kwargs.get('name')
+        self.email = kwargs.get('email')
+        self.phone = kwargs.get('phone')
+        self.roleid = kwargs.get('roleid')
+
+    def get_token(self, expire_time=24):
+        expires_delta = timedelta(expire_time)
+        token = create_access_token(identity=self.user_id, expires_delta=expires_delta)
+
+        db = k2.extensions['sqlalchemy'].db
+        connection = db.engine.connect()
+        result = connection.execute(
+            db.text(f"SELECT rolename FROM k2roles where roleid = '{self.roleid}'")).fetchone()
+        rolename = result[0] if result else None
+
+        userData = {
+            "avatar": "/src/assets/images/avatars/avatar-4.png",
+            "email": self.email,
+            "fullName": self.name,
+            "id": self.user_id,
+            "role": rolename,
+            "username": self.login
+        }
+
+        userAbilities = []
+        query = f"""
+        SELECT menus.namemenu, prava.r, prava.w, prava.i, prava.d, prava.c, 
+               prava.exp,  prava.imp, prava.settable, prava.cutpast, prava.enable, prava.del
+        FROM k2admin_menus menus
+        JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
+        WHERE prava.roleid = {self.roleid}
+        """
+        menus = connection.execute(db.text(query)).fetchall()
+
+        for menu in menus:
+            abilities_dict = {
+             "subject": menu[0],
+             "read": menu[1],
+             "write": menu[2],
+             "insert": menu[3],
+             "delete": menu[4],
+             "copy": menu[5],
+             "export": menu[6],
+             "import": menu[7],
+             "settable": menu[8],
+             "cutpast": menu[9],
+             "enable": menu[10],
+             "del": menu[11],
+             }
+
+            abilities_dict_copy = abilities_dict.copy()
+            for key, value in abilities_dict_copy.items():
+                if value == 0:
+                    del abilities_dict[key]
+            userAbilities.append(abilities_dict)
+
+        return (token, userData, userAbilities)
+
+    @classmethod
+    def authenticate(cls, login, password):
+        session = k2.extensions['sqlalchemy'].db.session
+        user = ''
+        try:
+            user = session.query(cls).filter(cls.login == login).filter(cls.password == hashlib.md5(password.encode()).hexdigest()).one()
+        except:
+            user = None
+        return user
+
+    @classmethod
+    def user_by_login(cls, login):
+        session = k2.extensions['sqlalchemy'].db.session
+        user = session.query(cls).filter(cls.login == login).first()
+        return user
diff --git a/components/k2adm/k2adm/views.py b/components/k2adm/k2adm/views.py
new file mode 100644
index 0000000..6a2630f
--- /dev/null
+++ b/components/k2adm/k2adm/views.py
@@ -0,0 +1,143 @@
+import hashlib
+import uuid
+from flask import Blueprint, request, jsonify
+from flask import current_app as k2
+from flask_jwt_extended import jwt_required, get_jwt_identity
+from flask_babel import gettext
+
+from .models import k2users
+
+
+k2adm = Blueprint('k2adm', __name__)
+
+
+@k2adm.route('/usersclients', methods=["GET"])
+@jwt_required()
+def users_clients():
+    return jsonify({"data": "user roles"})
+
+
+@k2adm.route('/users', methods=["GET"])
+@jwt_required()
+def grid_users():
+    return jsonify({"data": "users"})
+
+
+@k2adm.route('/roles', methods=["GET"])
+@jwt_required()
+def grid_roles():
+    return jsonify({"data": "roles"})
+
+
+
+@k2adm.route('/api_get_roles', methods=["GET"])
+@jwt_required()
+def roles():
+    db = k2.extensions['sqlalchemy'].db
+    connection = db.engine.connect()
+    query = db.text("SELECT roleid, rolename  FROM k2roles")
+    result = connection.execute(query).fetchall()
+    roles = [dict(id=res.roleid, role=res.rolename) for res in result]
+    return {'data': roles}
+
+
+@k2adm.route('/newUser', methods=["GET", "POST"])
+@jwt_required()
+def newUser():
+    session = k2.extensions['sqlalchemy'].db.session
+    exist = k2users.user_by_login(request.json['login'])
+    if not exist:
+        res = k2users(
+            user_id=hashlib.md5(str(uuid.uuid4()).encode()).hexdigest(),
+            login=request.json['login'],
+            name=request.json['name'],
+            email=request.json['email'],
+            password=request.json['password'],
+            phone=request.json['phone'],
+            roleid=request.json['role']
+        )
+
+        if res:
+            session.add(res)
+            session.commit()
+            return jsonify({'status': '200', 'message': 'New user created'})
+    else:
+        return jsonify({'status': '409', 'message': 'Such user exist'}), 409
+
+
+
+@k2adm.route('/changePassword', methods=["POST"])
+@jwt_required()
+def changePassword():
+    session = k2.extensions['sqlalchemy'].db.session
+    current_user = get_jwt_identity()
+    user = session.query(k2users).filter_by(user_id=current_user).first()
+    if user.password == hashlib.md5(request.json['old_password'].encode()).hexdigest():
+        if request.json['new_password'] == request.json['re_new_password']:
+            user.password = hashlib.md5(request.json['new_password'].encode()).hexdigest()
+            session.commit()
+        else:
+            return jsonify({'status': '400', 'message': 'Пароли не совпвдает'}), 400
+    else:
+        jsonify({'status': '404', 'message': "Пароль не найден в базе"}), 404
+    return jsonify({'status': 'ok'})
+
+
+@k2adm.route('/menu-admin-items')
+def menu_items():
+    data = [
+    {
+        # "title": 'Site administration',
+        "title": f"{gettext('title_menu_items')}",
+        "icon": {"icon": 'mdi-account-circle-outline'},
+        "children": [
+            {'title': f"{gettext('menu_items_child_1')}", 'to': 'adm-changePassword'},
+            {'title': f"{gettext('menu_items_child_2')}", 'to': 'adm-newUser'},
+            {'title': f"{gettext('menu_items_child_3')}", 'to': 'adm-users'},
+            {'title': f"{gettext('menu_items_child_4')}", 'to': 'adm-usersclients'},
+            {'title': f"{gettext('menu_items_child_5')}", 'to': 'adm-roles'},
+            {'title': f"{gettext('menu_items_child_6')}", 'to': 'adm-menuaaccess'},
+        ],
+    }]
+    return data
+
+
+
+
+
+
+# @adm.route('/register', methods=["POST"])
+# def register():
+#     params = request.json
+#     session = k2.extensions['sqlalchemy'].db.session
+#     exist = k2users.user_by_login(request.json['login'])
+#     if not exist:
+#         user = k2users(**params)
+#         session.add(user)
+#         session.commit()
+#         token, userData, userAbilities = user.get_token()
+#         return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
+#     else:
+#         return jsonify({'error': 'User exist'}), 401
+
+
+# @adm.route('/login', methods=["POST"])
+# def login():
+#     params = request.json
+#     user = k2users.authenticate(**params)
+#     if user:
+#         token, userData, userAbilities = user.get_token()
+#         return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
+#     else:
+#         return jsonify({'error': 'Unauthorized'}), 401
+
+
+# @adm.route('/logout', methods=["GET"])
+# @jwt_required()
+# def logout():
+#
+#     response = {
+#         'message': 'Logged out successfully'
+#     }
+
+    # return jsonify(response)
diff --git a/components/k2adm/reguirments-components.txt b/components/k2adm/reguirments-components.txt
new file mode 100644
index 0000000..e69de29
diff --git a/components/k2adm/requirements.txt b/components/k2adm/requirements.txt
new file mode 100644
index 0000000..4807af4
--- /dev/null
+++ b/components/k2adm/requirements.txt
@@ -0,0 +1,47 @@
+alembic==1.11.1
+Babel==2.12.1
+bcrypt==4.0.1
+bidict==0.22.1
+blinker==1.6.2
+certifi==2023.5.7
+charset-normalizer==3.1.0
+click==8.1.3
+colorama==0.4.6
+dnspython==2.3.0
+email-validator==2.0.0.post2
+Flask==2.3.2
+flask-babel==3.1.0
+Flask-Bcrypt==1.0.1
+Flask-Cors==3.0.10
+Flask-JWT-Extended==4.5.2
+Flask-Login==0.6.2
+Flask-Migrate==4.0.4
+Flask-MySQLdb==1.0.1
+Flask-SQLAlchemy==3.0.3
+flask-staticdirs==1.0.1
+Flask-WTF==1.1.1
+greenlet==2.0.2
+idna==3.4
+itsdangerous==2.1.2
+Jinja2==3.1.2
+jsonify==0.5
+Mako==1.2.4
+MarkupSafe==2.1.2
+mysql==0.0.3
+mysql-connector==2.2.9
+mysql-connector-python==8.0.33
+mysqlclient==2.1.1
+peppercorn==0.6
+protobuf==3.20.3
+PyJWT==2.7.0
+python-engineio==4.4.1
+python-socketio==5.8.0
+pytz==2023.3
+PyYAML==6.0
+requests==2.31.0
+six==1.16.0
+SQLAlchemy==2.0.15
+typing_extensions==4.6.2
+urllib3==2.0.2
+Werkzeug==2.3.4
+WTForms==3.0.1
\ No newline at end of file
diff --git a/components/k2adm/setup.py b/components/k2adm/setup.py
new file mode 100644
index 0000000..9a8c037
--- /dev/null
+++ b/components/k2adm/setup.py
@@ -0,0 +1,15 @@
+from setuptools import setup
+
+setup(
+    name='k2adm',
+    version='1.0.0',
+    description='Description of my project',
+    author='k2 cloud',
+    author_email='ys@corp2.eu',
+    keywords="adm, k2",
+    python_requires=">=3.7, <=3.11.2",
+    packages=['adm'],
+    package_data={  # Optional
+        },
+    install_requires=[""],
+)
\ No newline at end of file
diff --git a/components/k2auth/.gitignore b/components/k2auth/.gitignore
new file mode 100644
index 0000000..408f575
--- /dev/null
+++ b/components/k2auth/.gitignore
@@ -0,0 +1,8 @@
+ idea
+__pycache__/
+*/__pycache__/
+*.py[cod]
+.pyc
+.idea/
+venv
+
diff --git a/components/k2auth/README.md b/components/k2auth/README.md
new file mode 100644
index 0000000..b6e0be0
--- /dev/null
+++ b/components/k2auth/README.md
@@ -0,0 +1,45 @@
+# main.py
+
+from components.adm.adm.views import adm
+from components.test.test.views import test
+
+app.register_blueprint(adm, url_prefix='/adm')
+
+cd components/adm
+pip install -r requirements.txt
+
+
+endpoint "http://127.0.0.1:5000/adm/register"
+dictionary to register in such way 
+{
+    "login": "xxx",
+    "password": "xxx",
+    "name": "xxx",
+    "email": "xxx"
+}
+
+
+endpoint "http://127.0.0.1:5000/adm/login"
+dictionary to login in such way 
+{
+    "login":"xxx",
+    "password":"xxx"
+}
+
+endpoint http://127.0.0.1:5000/adm/changePassword
+dictionary to changePassword in such way 
+{
+    "old_password":"xxx",
+    "new_password": "xxx",
+    "re_new_password": "xxx"
+}
+endpoint http://127.0.0.1:5000/adm/newUser
+{
+    "login": "xxx",
+    "password": "xxx",
+    "name": "xxx",
+    "email": "xxx",
+    "phone": "xxx",
+    "repassword": "xxx"
+    
+}
\ No newline at end of file
diff --git a/components/k2auth/__init__.py b/components/k2auth/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/components/k2auth/k2auth/__init__.py b/components/k2auth/k2auth/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/components/k2auth/k2auth/models.py b/components/k2auth/k2auth/models.py
new file mode 100644
index 0000000..7880dbe
--- /dev/null
+++ b/components/k2auth/k2auth/models.py
@@ -0,0 +1,129 @@
+import uuid
+from sqlalchemy import Column, Integer, String
+from sqlalchemy.ext.declarative import declarative_base
+from flask_jwt_extended import create_access_token
+from datetime import timedelta
+import hashlib
+from flask import current_app as k2
+
+Base = declarative_base()
+
+
+class k2users(Base):
+    __tablename__ = 'k2users'
+    user_id = Column(Integer, primary_key=True)
+    login = Column(String(70),  nullable=False)
+    name = Column(String(50),  nullable=False)
+    email = Column(String(150),  nullable=False)
+    password = Column(String(150),  nullable=False)
+    phone = Column(String(20))
+    roleid = Column(String(150),  nullable=False)
+
+    def __init__(self, **kwargs):
+        self.user_id = hashlib.md5(str(uuid.uuid4()).encode()).hexdigest()
+        self.login = kwargs.get('login')
+        self.password = hashlib.md5(kwargs.get('password').encode()).hexdigest()
+        self.name = kwargs.get('name')
+        self.email = kwargs.get('email')
+        self.phone = kwargs.get('phone')
+        self.roleid = kwargs.get('roleid')
+
+    def get_token(self, expire_time=24):
+        expires_delta = timedelta(expire_time)
+        token = create_access_token(identity=self.user_id, expires_delta=expires_delta)
+
+        db = k2.extensions['sqlalchemy'].db
+        connection = db.engine.connect()
+        result = connection.execute(
+            db.text(f"SELECT rolename FROM k2roles where roleid = '{self.roleid}'")).fetchone()
+        rolename = result[0] if result else None
+
+        userData = {
+            "avatar": "/src/assets/images/avatars/avatar-4.png",
+            "email": self.email,
+            "fullName": self.name,
+            "id": self.user_id,
+            "role": rolename,
+            "username": self.login
+        }
+
+        userAbilities = []
+
+        abilities_query = f"""
+        SELECT menus.namemenu,
+            prava.r, prava.w, prava.i, prava.d, prava.c, prava.exp,  prava.imp, prava.settable, prava.cutpast, 
+            prava.enable, prava.del
+        FROM k2admin_menus menus
+        JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
+        WHERE prava.roleid = {self.roleid}
+        """
+        abilities_list = connection.execute(db.text(abilities_query)).fetchall()
+
+        for ability in abilities_list:
+            abilities_dict = {
+             "subject": ability[0],
+             "read": ability[1],
+             "write": ability[2],
+             "insert": ability[3],
+             "delete": ability[4],
+             "copy": ability[5],
+             "export": ability[6],
+             "import": ability[7],
+             "settable": ability[8],
+             "cutpast": ability[9],
+             "enable": ability[10],
+             "del": ability[11],
+             }
+
+            abilities_dict_copy = abilities_dict.copy()
+            for key, value in abilities_dict_copy.items():
+                if value == 0:
+                    del abilities_dict[key]
+            userAbilities.append(abilities_dict)
+        #________________________________________________________________________________________
+
+        menu_query = f"""
+                               SELECT menus.prevmenu, menus.namemenu, menus.caption, menus.url
+                               FROM k2admin_menus menus
+                               JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
+                               WHERE prava.roleid = '{self.roleid}'
+                               """
+        menus = connection.execute(db.text(menu_query)).fetchall()
+
+        menus_dict = {}
+        for menu in menus:
+            menus_dict[menu[0]] = []
+
+        for key in menus_dict:
+            for el in menus:
+                if key == el[0]:
+                    menus_dict[key].append(
+                        {
+                            "namemenu": el[1],
+                            "caption": el[2],
+                            "url": el[3]
+                        })
+
+        print(menus_dict)
+
+
+        #________________________________________________________________________________________
+
+        return (token, userData, userAbilities)
+
+
+    @classmethod
+    def authenticate(cls, login, password):
+        session = k2.extensions['sqlalchemy'].db.session
+        user = ''
+        try:
+            user = session.query(cls).filter(cls.login == login).filter(cls.password == hashlib.md5(password.encode()).hexdigest()).one()
+        except:
+            user = None
+        return user
+
+    @classmethod
+    def user_by_login(cls, login):
+        session = k2.extensions['sqlalchemy'].db.session
+        user = session.query(cls).filter(cls.login == login).first()
+        return user
diff --git a/components/k2auth/k2auth/views.py b/components/k2auth/k2auth/views.py
new file mode 100644
index 0000000..6b9aa61
--- /dev/null
+++ b/components/k2auth/k2auth/views.py
@@ -0,0 +1,63 @@
+# import hashlib
+# import uuid
+from flask import Blueprint, request, jsonify
+from flask import current_app as k2
+from flask_jwt_extended import jwt_required
+import re
+from .models import k2users
+
+k2auth = Blueprint('k2auth', __name__, template_folder='templates', static_folder='static', static_url_path='/vue2')
+
+
+class Auth():
+    def __init__(self):
+        pass
+
+    def register(self):
+        params = request.json
+        session = k2.extensions['sqlalchemy'].db.session
+        password = params.get('password')
+        login = params.get('login')
+        user_exist = k2users.user_by_login(login)
+        if user_exist:
+            return jsonify({'status': '409', 'message': 'Such user exist'}), 409
+
+        if len(password) < 6:
+            return jsonify({'status': '400', 'message': 'password has not 6 simbols'}), 400
+        if re.search(r'[a-zA-Z]', password) is None or re.search(r'\d', password) is None:
+            return jsonify({'status': '400', 'message': 'Password must contain both letters and numbers'}), 400
+
+        try:
+            user = k2users(**params)
+            session.add(user)
+            session.commit()
+            token, userData, userAbilities = user.get_token()
+            return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
+        except:
+            return jsonify({'status': '400', 'message': "Missing required fields"}), 400
+
+
+    def login(self):
+        params = request.json
+        user = k2users.authenticate(**params)
+        if user:
+            token, userData, userAbilities = user.get_token()
+            return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
+        else:
+            # k2.logger.error(('%s failed to log in ', params.get('login'), params.get('password')))
+            return jsonify({'status': '401', 'message': 'Unauthorized'}), 401
+
+
+    @jwt_required()
+    def logout(self):
+        response = {
+            'message': 'Logged out successfully'
+        }
+        return jsonify(response)
+
+
+
+auth = Auth()
+k2auth.add_url_rule('/login', methods=['POST'], view_func=auth.login)
+k2auth.add_url_rule('/logout', methods=['GET'], view_func=auth.logout)
+k2auth.add_url_rule('/register', methods=['POST'], view_func=auth.register)
diff --git a/components/k2auth/reguirments-components.txt b/components/k2auth/reguirments-components.txt
new file mode 100644
index 0000000..e69de29
diff --git a/components/k2auth/requirements.txt b/components/k2auth/requirements.txt
new file mode 100644
index 0000000..85526b6
--- /dev/null
+++ b/components/k2auth/requirements.txt
@@ -0,0 +1,47 @@
+alembic==1.11.1
+Babel==2.12.1
+bcrypt==4.0.1
+bidict==0.22.1
+blinker==1.6.2
+certifi==2023.5.7
+charset-normalizer==3.1.0
+click==8.1.3
+colorama==0.4.6
+dnspython==2.3.0
+email-validator==2.0.0.post2
+Flask==2.3.2
+flask-babel==3.1.0
+Flask-Bcrypt==1.0.1
+Flask-Cors==3.0.10
+Flask-JWT-Extended==4.5.2
+Flask-Login==0.6.2
+Flask-Migrate==4.0.4
+Flask-MySQLdb==1.0.1
+Flask-SQLAlchemy==3.0.3
+flask-staticdirs==1.0.1
+Flask-WTF==1.1.1
+greenlet==2.0.2
+idna==3.4
+itsdangerous==2.1.2
+Jinja2==3.1.2
+jsonify==0.5
+Mako==1.2.4
+MarkupSafe==2.1.2
+mysql==0.0.3
+mysql-connector==2.2.9
+mysql-connector-python==8.0.33
+mysqlclient==2.1.1
+peppercorn==0.6
+protobuf==3.20.3
+PyJWT==2.7.0
+python-engineio==4.4.1
+python-socketio==5.8.0
+pytz==2023.3
+PyYAML==6.0
+requests==2.31.0
+six==1.16.0
+SQLAlchemy==2.0.15
+typing_extensions==4.6.2
+urllib3==2.0.2
+Werkzeug==2.3.4
+WTForms==3.0.1
diff --git a/components/k2auth/setup.py b/components/k2auth/setup.py
new file mode 100644
index 0000000..b3e384e
--- /dev/null
+++ b/components/k2auth/setup.py
@@ -0,0 +1,15 @@
+from setuptools import setup
+
+setup(
+    name='k2auth',
+    version='1.0.0',
+    description='Description of my project',
+    author='k2 cloud',
+    author_email='ys@corp2.eu',
+    keywords="k2auth, k2",
+    python_requires=">=3.7, <=3.11.2",
+    packages=['k2auth'],
+    package_data={  # Optional
+        },
+    install_requires=[""],
+)
\ No newline at end of file
diff --git a/components/k2test/__pycache__/__init__.cpython-310.pyc b/components/k2test/__pycache__/__init__.cpython-310.pyc
index b17a8cfd1d550c03bde5dbe7c7493c15e86df857..4f5f025e0a396517e158a5bd40bad3b24b488701 100644
GIT binary patch
delta 38
scmdnOxR#MSpO=@50SH_UPMXMV!x%8pLy;@ns3<?bBt9>-d}5Uq0J=d76#xJL

delta 45
zcmZ3>xP_5BpO=@50SK0Sm^hK!hB17ihoWFfYH^8fN@`AONvdv1eoA8H#9}J|BliwY

diff --git a/components/k2test/k2test/__pycache__/__init__.cpython-310.pyc b/components/k2test/k2test/__pycache__/__init__.cpython-310.pyc
index 04a70d01aee477c99040089912fa43ed4af335b2..d22ac90da52074b0a15633ba5a76ca2268b9ef81 100644
GIT binary patch
delta 38
scmdnZxP_5BpO=@50SH_UPMXMV!x%o%Ly;@ns3<?bBt9>-d}5U&0KCi#F#rGn

delta 45
zcmdnOxSNqXpO=@50SK0Sm^hK!hB0oUhoWFfYH^8fN@`AONvdv1eoA8H#9~JPClwBA

diff --git a/components/k2test/k2test/__pycache__/views.cpython-310.pyc b/components/k2test/k2test/__pycache__/views.cpython-310.pyc
index ecfef4d5877b0d235cef5eb64b2124ed7b049187..bf1b147fd30ca3ddb8a5a628deb30aa36e1b4722 100644
GIT binary patch
delta 485
zcmZXQze~eF6vw^%Zfn{&D5asaf=g2SD@qjvopcn3PA(xdu`NxLdTA+kad36f8(kc_
z=pcxr|4G2r$;nBSqW98b1@GW<@7~WZZ>(G?vM<Z=1$r*tukD9NSwl#B+CpQLU8YXF
zLZLAsQ>uh4_J?;1I72<3b@IWi#ybY~{l4irL!z_eluRQbZx6b?Kof9|ys$<BvZE5L
zk_@LKo$PZ5%G?`SD!Jius6d{%qyHh5&!IBe;n#}mpoKleMf#3nJ*(;D>F7;d`kgWF
ztCCATEmR;<CHH(q*rle8$Sc1mj^cGE=;w(c+!i(<!=MPIMyu`G*zqE{8j8kDrO!l8
zgmjwW1SByMnqKCMn{eM;64yvkET0Rs&vD|!wStc6`pve7MQASpVgOh)P5`oiML@JQ
zWm*)Rx|Z8$Io&gyq_I#kP0#8&rioMV<*`5LJ6MOZ0-y}20%{aXf7H$-zlqyFUu<Xg

delta 560
zcma)(KTE?v7{+_~)5O}e5wVI^t*Aq^)z}v5q)TxT#94=<n6no1r(CWST^#%bdZUYA
zmyV*7qaQ*rU&BQd(f87!4h|;pyZ3!~p1d!YE3;=BfnlT)@W@Zs&hx!tA=H1Up&pve
zfk-C-mJ~^Ab|llF+fUFLP(BX%yR<OINXSYKaS0<O7C4PFz9{#y88Aeu)A8D&m81p!
zB9})+C{EHmA6Hh;D&JCe?4cT0c@fO`q>GONuO0ZrXXPo-LJ6Qtw8$To{eOfi;zMsD
zl$NN?tLoBj2^ve@qib-UkF*<2Qh+&Cx(@wdui-9#tWhlp--bY$->G)G4kb%C=n~x|
z_^Y~Y9GI-dT!KB~cQBt%-X2zky8?*xqm!2FP~y`hv=)lD_%$^in2M7vM!awtT%ovq
zT}dKc($V0RK9w)!TglKGpVrpLG%y^D9=nb36uUvQ<#Vh}m}yYyoPZ&a;TKx2o`o{f
kG4>lC!I+w&RcX*+gsuu#QNR``3)BRL_c8c4{8iih0a=EAV*mgE

diff --git a/components/k2test/k2test/languages/en/LC_MESSAGES/messages.mo b/components/k2test/k2test/languages/en/LC_MESSAGES/messages.mo
index edaecf87f18eff792777f2a358e0343c1c6145cc..fcfa15300724b032eda7f1719eb6d968c1eee2c2 100644
GIT binary patch
delta 19
acmZ3=vXo`Q84e>u1w&IS6O)Zs0vQ25m<AaD

delta 19
acmZ3=vXo`Q84g1;1w&&i6XT6n0vQ25t_B(a

diff --git a/components/k2test/k2test/languages/uk/LC_MESSAGES/messages.mo b/components/k2test/k2test/languages/uk/LC_MESSAGES/messages.mo
index e8acc2ec1399025fd89b8a958e2e07e64fde3c80..b53babf9752fa2d1c1bdc8a9d9da23cee1f87b29 100644
GIT binary patch
delta 19
acmZo>ZDyTthQr8E!O+yo#AM@@^^5>It_C##

delta 19
acmZo>ZDyTthQrWI!O+;s#CYSC^^5>I#0EA1

diff --git a/components/k2test/k2test/views.py b/components/k2test/k2test/views.py
index 04ac4b5..9cad8a6 100644
--- a/components/k2test/k2test/views.py
+++ b/components/k2test/k2test/views.py
@@ -38,7 +38,7 @@ def new_component4():
 def menu_items():
     data = [
         {
-            'title': f"{gettext('title_menu_items')}",
+            'title': 'Test items',
             'icon': {'icon': 'mdi-chart-timeline-variant'},
             'children': [
                 {'title': 'Test 3', 'to': 'k2test-new3'},
diff --git a/db/database.db b/db/database.db
index 84bc56352e28e81e92db0ac84fa385bfcd2ac641..4b1e95354da149713d3cec02bc62da2dda4c3338 100644
GIT binary patch
delta 405
zcmZozz|^pSX@WFk(L@<%#-fc0OXPW&dD9vAJ^8|T)4AVm78H2Ez4?Q7Iip)+4l|dp
zxU0CoBWI((Sz4l@iCLmSs#%JmNm^Q}g`uITk)@HTfw7TMQmRQxwozhAu1jiha#3bM
zNoIbYLVlV8SZuPHj)r$iu3ma(iIIVkv95ucu92aFp@Eg5sg<dvo}r<op`}?`QGTvM
za(-?>eqL%`NwFSSCzLG9Of4@~$OOt2l>m*LJW*HL4=k^vP+F7|Ur>~qmRVt|t`8Pd
z*K90c;_{WW7Y_uwI?^~PE!o1t&@weKCDp{l&?3>)*w_rnFiuNMH8oB%1nMa*$(X!L
zPj0faj<z7!T?VE=r|Fqmn3xzDOs>~S+w7^o+kk_ae-Z=#cK%75c@o<Ay;PWe83~05
QGe{932QY2Eldqxx0APuBlK=n!

delta 535
zcmajb%}T>C00;1P^Dt4VB11vZ90XCfEZ=P=BBCM__6)8csnof3bkliLFM>B^FW|uk
zP<j?$WCx!>d<0W(8;XR4<R1dR{BNFeH&3~TCA0asyl*yN8_%oLrd2bn+SF$@(z)4>
zsq|~BZ*DRvq#Y)43;1!X6Sq~n*M)A-`k9xJ>UTk;^P~p`04`nYn-aK4&QCgt3Ztu?
z^@>i`Hw?qPs~7hdX7&oVhXHY@<UYe5_Za4mBPCT-C|@6aBJgPv1qZ6@CsC&t#cdFW
zAd5gJiO-bZ!w^A45TRux%2)s-svK1*f}GgUMsysTy@fx^2scXxFQvs=wiz>LQHD0&
z>+`!BJ$bv0WuUEY=wqpv<kDr-qlgHCTt!3M*54f5!<F4p7{gUUAZJM1#$A7wSp2ob
z^r-TN3Z^wQtf4hbryF<Hu@)Zx*Jge#UpKvg2%Ecp;JP*wTzWi2fuk_99Tf_PPo%?m
G4SWNQdZTCn

diff --git a/k2/__pycache__/__init__.cpython-310.pyc b/k2/__pycache__/__init__.cpython-310.pyc
index c71cfe4e41a08ac9a7d4840f88f973f290a67906..4be86d8e1ba9cf73f1c9f41dce32de14b2af7650 100644
GIT binary patch
delta 38
scmZ3=IFFG#pO=@50SH_UPMXMV!{|8CLy;@ns3<?bBt9>-d}5V00JP2u*#H0l

delta 45
zcmbQoxRjAQpO=@50SK0Sm^hK!hS6i9hoWFfYH^8fN@`AONvdv1eoA8H#A0m#9Z3!n

diff --git a/k2/__pycache__/k2admmenu.cpython-310.pyc b/k2/__pycache__/k2admmenu.cpython-310.pyc
index f666096b092511aed6bfd4fb752e33a450546b9f..54a30233e15665d135d9dfe94d142cc7198395e5 100644
GIT binary patch
delta 1111
zcma)*&rcIU6vt;~ciW{%O*quhR9FlIs<cAUSmcL^v_ugh0gVZXHp}h+m2DSxwhB#a
zV<hq71t#jjn6!U_;o=|Q&4U*clRbMd@lVi$^Safb39&Dk&(2Kdec!zIX1{j7><Qal
zT_Ggw)3-x&r}H5E8ZYoC%HX??5geg0v&#(cqi1;a>~kce)!r2pKYjEaM=`$615$rz
zE9Ka>n=8`CJT1j=jNg@>;(q=`I#)9Y$hJ%oUl_AuuuB3auHZMwByXiEanVCu7pzMa
z(!dQ|mm8=mnUX2*ql%Of;j3~*7NM0zJ%$kqX>C|d(^j$z+1Wc<ffh?FS=0*@W^FlZ
z+T8NeZEY*1n}vKa*HrLz+H{{^s@+`t+dsGM=#O;G=h9;9S|FV_wP}Ap=`Y(1a_>fV
zIoon{Y>PH^hRVZ3;4kw3uNk74e+=3MEm{$SMFloc1>Ntcibk2J2h~N(8u)<h5YY(Y
zfM;1Lx$B8^9D4zi8n#K}#3RX3PtLovP;*X+BR*nc=7pxLJaY}ZusxFyYX<S6s627&
zc#)GE)NPhK2O2E5wwHs<SaQm;4c%fhV)9!hu6V>;^MZ^rmbZ&uknU2W<Wf&|>8@Mz
z)OG3_o4RF*gOXt}FW?txH3U`8?UbmqC-x{SS+3{rHG}?p@iQmfX#lc-Bnct1`ZE#;
zV;PqRTlr}It2rs5cpv{EjVlg_@Ra;H+-X=kV+HDN+NP7>M7a=9A;1V9SB8U<st~Cg
zA3ad65S-z!g8g`&zYoR-lH!bW5iklE1AwNJ0*nLZxT5yq%Y0BxkECH^0&o>D377&*
v17-l%0Otkx3pLscKkTuBz`JmuolZtzlz&hsaptfiA?}py7*nKf5*hvlRqO}b

delta 316
zcmbO#`9z2>pO=@50SNfFOiB^qoX9tw(P85<Yeuei1{Q`WnP3J@-p$_`r5KGpovmU*
zi&Kk=V~Wdk%kzt}V*)CZGZKq(1B&vqQj<%HV@gtsOLS9Gb5cuEbxZP75-TU$GRrVZ
zO^#x2WR#tJhgpe9Q+BchyD`fxrj(?~0qj>Mn{lYKu><Wc)|i~kp~1`~z`S`9hdC3Y
z+2m7Pii|ds-*9QFC;;V)6hVX%h)@O*Dj-4?M5uuXi^-PU@{AgjBe^Z~wLt<pAVL>J
z=z$1*5Mcl!3_*kukhsNGl%JEDnKF4Vx0IYINR$UoNP$=~Ai@ktC{6y#Z4GphA&)MQ
OjOQ_AWfEc%lLi26$VaIF

diff --git a/k2/__pycache__/k2cfg.cpython-310.pyc b/k2/__pycache__/k2cfg.cpython-310.pyc
index b73e145bbc53e74bab5e52f1e96468dc2e21b61d..ab9106e190b5edcb86e7b1c250fcda23631d6493 100644
GIT binary patch
delta 42
wcmX>jdQ_A<pO=@50SH_UPTI(w!o+AdxqwNLE8D0jKffeCFSUI0A|@>k0P<Z76#xJL

delta 49
zcmX>qdPbBxpO=@50SK0Sn7ENUg^AI1asiW~U`c9miEc`2PHIW2Zb^PhV&&%9Oj;ZO
DXv_~z

diff --git a/k2/__pycache__/k2comp.cpython-310.pyc b/k2/__pycache__/k2comp.cpython-310.pyc
index 95db396c58ffd31887842980f91c03e7e8ed23c1..9199e9a7150246aa64e5a15acc6dfb8392c4a711 100644
GIT binary patch
delta 70
zcmX@ezl)zcpO=@50SH_UPTI)r#;9ZOY!wq)oLW>IQ(UH7o?nz56Hu9)kyw-)P?VpQ
Ynp{#GlWkO#pI;K6ms-BLh0&G`00IsdxBvhE

delta 77
zcmdnRe~_O$pO=@50SK0Sn7EPKjnUZ6*(xTqIJKxarnpSEJijPACZIAoBe5tqpeR2p
fHMyiXrX;nvL^mZhC$%J1w<JF$v2t@Qqb(Z%+kYDI

diff --git a/k2/__pycache__/k2obj.cpython-310.pyc b/k2/__pycache__/k2obj.cpython-310.pyc
index 84aa45822cf2ad4f394fe5697e1a14b7affcb716..f2c786d3575948598f6beae6061252efc9c80472 100644
GIT binary patch
delta 41
vcmZo+`OD0m&&$ij00b@vCvD{RW@NOR9L}i7m2Fg%pI;K6ms&o#ld&2A*-#6;

delta 48
zcmey%+`_`0&&$ij00c`uOx(!r&B*9FIh;{Zuq3s(L^mZhC$%J1w<JF$v2t<~V>JLu
CvkvwE

diff --git a/k2/__pycache__/k2rout.cpython-310.pyc b/k2/__pycache__/k2rout.cpython-310.pyc
index 3afa439518d51aec65606fe5dcc71177689d71a6..d901934e6e21cb5474667617f3ca5bb301972726 100644
GIT binary patch
delta 3787
zcmbVPdu)@}75BA2KkzGt#3^|>b{>wMhZCHH0tt@*AwYq`f(9}LV{*SF4vrnJKPQDc
zBwE<ku~i+r|7_|INw-#|lQvCZ5~TxCja8aDb<b|-+ob(9O_REAe@)t2x}9?z*#>R<
zV?q3KzTY|b+;h%7-}!ESk@`)>opHJB2KX`k{cHT#scY_f_SI`0KU?4i?o9cn8)J>k
zpqjW#^>a6`c*ztCsNUr!wV8XC*b0lasIIBjSSw%8H(W8qg1nMf!S6OTFcsonUOmD1
zQ!g3$MqYEpu*70v;%j*|ubVKUMh)_M-hevLwv*OJ+67YcM((GD9co}X!~-jgH}Pg-
zI*DmnVc?>b2iIJ55!(iKAs!~X2r=!zbns4Mx{2umCc?Xk>7k8#is5eJ(FIa$BGX<l
z?c@E#M9Fk>(e!D)h4^0Lw-)(re1P~q@-PS<w(}jt^b@lam|c8`n9aoO24)Z6OU%>i
z0W9Ef(cL~iLW(V9x*tpr@Pou`<<Ia#Q1Wf0ISiU3{8`cra5icPAC<R^KdA~c-7}$T
z@u@j2p5$s;OKKNa=S?ogcFHd+0sHx=$Yiv5TAh=3m87>G`av`zG$7O=_~d{&%>1jW
zxso}WiaMWMvV4U#OOLh1LB^!=$(`0Hi%Mbr2lL95ZKR+h1E0KSi?ChtFSf%$B1+%`
zx4JT!nO2X1lr;j_Ok$5byY7Z%2)EoQ&Gv7w7J0+oRJRd{y#TtB%c`Of>e>#!w@27P
z>2RE3!*a?I@jQdJW&6lC94(f^NbZ)ubUbP-sal_~#K(~Q$ayA&HaD3Vz+XlYM8yt-
z(pn53j5XKGy=b*hcW^a3CXzE+GLwcQFsCwe5Gdvbjz)`%*Vb)zZ-rvbxI^`*(ru|k
zdLoyYP{S_WCe#Z#HLGPsi@fD-_HMzoTM^bF)F2#^AG(8%lPG!-PRNFe8qXmVDa6mB
z<dgd<1|4TXycF!tPG;uh{pyH(yJD0bkrkc;ezGhCs5{3p(=(YgbPM!M!G}*i@0lKs
zp{EuE2f`_Y=Kypitv;^_Gl*eDs7Rkdh$BoQkb91jPqwcQvZ>W$>;J|q6fXu)9}x-E
zo+}z-EP__hS}N5zaNk6JLSC!vW&`q_$}1g5kvI;ZTW3{~g^C})X`$01R$M^+d4!Cd
zshSJ_w<JUoeHb%YU71N}lVVVMyw$8zwt2hR7J0%u;>W~v_l(F)sbgAvJd@&ZsAY-D
zd)|Y+J!qtiWw@#<<H?jty%KZ58x}8?RcGpB6&a|WV^>#Kt7}dFPeuNKxlPE1+N)5J
zH);dU01%gy$V5^TY576z$=VcJ%peqtRj7!NBXxf|`9CWnG+dWM7(|!@&^;oN%&JfV
z5zlG~EteIYNIR37Dj?0Y2E8L*kYA{8XS4GA^&5MsZ}Yf*9^o>A4PgPH?1=C&i?Ap^
zsXre19Ejn{LQ5?nT~=;*j5!iwY%)2k#&aSiF38IbE!8gqubamvbLsOj>!svOT&Uxs
zS>A34HsaZcFCy$f_!2^SXFh897P~H2e6KR^>fS~tbCl&SPx<}qqRjjEJ~q<c^GDcg
z@}K@+v4DI(@Q$anVg<c-${S79+lmDao5i<*j=74h0B=}UV8~^!4TV(bdimF;{p{xI
zmgW?*q|quM-)z}6fXc8@H)k~%G9p7yG?{cIl}xKJWGKOc4_p=kh%*qvvbD8~wad}g
z@g_PHdYy4<35pV5Y~8{$(}`pnqW@iMU678WbYhEO5w;Y<ZN_y})fZ)bu(nW{?;`1w
zL&4o_RbC0+a=eKIMW2#;+Qvsq`(otOI^qSC{?kt8!cLS=>HMf-<#qa`t)JbJ(U1<4
z)D>P_DD6SHm5zm)coufkE!oMOmQ3juF|7$zEj1<NuclOJ<wXqY6$I+TwWO&JDV{5+
z`aD9ZmDbM9*}k3KmIvFfojij2*Ad15VwQ6`O@pt3wNP&=|KrnCd=HHkfUv2o-`kKa
zPr0|FhrK0v$NL^i5xuWXJh{7bx=;c7R6MChL)wxy+J=v`o1(i*eVIx^bJ2XpRAXft
zo*dK41Htuo0A7dw%GQFQnC#3ZBVE<(&gwASx4NE16AGQ?4~_P+Oi+sr`T!gBGqSR~
zJ%EiBc0O66QoPT}Gu>_dbjX;Z?kJ2Qm_0C)Pvc^nuJDAGpaSaaW`sH$pH|a3(I)S7
zH+TylO0X+WM1I(PguN>VdIAeJP~qon5B$%59Y8ZI8RiWd%fpqG8S)0sY7Fyi!Z2^t
zjLRlXnKHj(;Ku956*h0uEX&qBT$1ONylL6CV%Tdq9hx_TttD^frW$;9&0F(UuGARv
z%B(^3<t@wW^41mbe4#CG5hDwEG95JJji4~20wr$dmLxa^vqsIHH!k5t&w3=b4(~y6
zk%6zxcOX`A7vUa&Zk<#UJei)j<QzJBbkra89~~MQ9t}H06`E{Epx3_ChE(H)^`MD8
zg*QhmS{&y3bT)qOBJGi-Z@wt?jSX%LIU(@AfPuuU7zqrvm;*k5_(h<?pFx)uW$viM
zu&ZP13wA1x!!S>Aq3%z|jLGTpv%yH00UlzLVYC*bjoFyOHZVJL8WrY*e|BbERDiWJ
zH%K<4Se8HU`ItSBKi$+<_ve4X4_v7%7y{gDHloV_Lc6Ss4zbJfbTrUG-=jrjHz2$R
z5Vna2DE|oI#|YS9VyC<r4OKOuNZ>>1KEOxvkI`WZO5$zV)BCFBhbZ2Y4|_XLkoa4C
zzKehh!>r)%aZkFvRH;h14`)4KYBXDz4e~aAsytFYRUG0Wt{)Uqp6ZKOXvY0OzTCIj
zLuYyscW@(g$q)K=dN+)x64~?grvTj6)HGMQsFI%khJ^?k;TK%&N4SjOM~DLGW|7Ik
zDegi7-v@CJfiBT!QJO-yif|p_HH4c8s|dFcZX>*fa0lUCgk^;L2q8?P?69d4SWewG
hIGy3Sl)3{>-H^@8U-!2vPUg1CkNc0Ay|z|2`!_n9bmag5

delta 3569
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

diff --git a/k2/k2admmenu.py b/k2/k2admmenu.py
index 682b05c..a1cd578 100644
--- a/k2/k2admmenu.py
+++ b/k2/k2admmenu.py
@@ -2,6 +2,7 @@ import hashlib
 import uuid
 from .k2cfg import k2
 
+
 db = k2.db
 
 class K2admin_menus(db.Model):
@@ -23,13 +24,26 @@ class K2admin_menus(db.Model):
     caption = db.Column(db.String(1024))
     url = db.Column(db.String(2048))
 
+
     def __init__(self, **kwargs):
         self.menuid = hashlib.md5(str(uuid.uuid4()).encode()).hexdigest()
         super(K2admin_menus, self).__init__(**kwargs)
+
+
     def __repr__(self):
         return f"{self.namemenu}')"
 
-
+    @classmethod
+    def get_menu_items_by_roles(cls, roleid):
+        menu_query = f"""
+                                      SELECT menus.namemenu
+                                      FROM k2admin_menus menus
+                                      JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
+                                      WHERE prava.roleid = '{roleid}'
+                                      """
+        result = db.session.execute(db.text(menu_query)).fetchall()
+        menu_items = [item[0].decode('utf-8') for item in result]
+        return menu_items
 
 class K2admin_Menus_Prava(db.Model):
     __tablename__ = 'k2admin_menus_prava'
@@ -59,4 +73,5 @@ class K2admin_Menus_Prava(db.Model):
 
     def __init__(self, **kwargs):
         self.pravrepid = hashlib.md5(str(uuid.uuid4()).encode()).hexdigest()
-        super(K2admin_Menus_Prava, self).__init__(**kwargs)
\ No newline at end of file
+        super(K2admin_Menus_Prava, self).__init__(**kwargs)
+
diff --git a/k2/k2rout.py b/k2/k2rout.py
index 1ce3771..f085ae6 100644
--- a/k2/k2rout.py
+++ b/k2/k2rout.py
@@ -15,7 +15,7 @@ import os
 import sys
 from .k2admmenu import K2admin_menus,  K2admin_Menus_Prava
 from sqlalchemy import text
-
+from flask_jwt_extended import get_jwt_identity
 
 
 
@@ -471,8 +471,24 @@ def add_to_menu():
 
 @components_bp.route('/api/main-menu/')
 def get_admin_menu():
-    requests.get(f"{k2.domain}api/add-to-menu")
-    return k2.menu
+    current_user = get_jwt_identity()
+    print(current_user)
+    role_id = current_user['user_role']
+    filter_menu = []
+    response = requests.get(f"{k2.domain}api/add-to-menu")
+    menu_items_list = K2admin_menus.get_menu_items_by_roles(role_id)
+
+    for item in response.json():
+        filtered_children = []
+        for im in item['children']:
+            if im['to'] in menu_items_list:
+                filtered_children.append(im)
+        if filtered_children:
+            item['children'] = filtered_children
+            filter_menu.append(item)
+            filter_menu.append({"heading": 'APPS & PAGES'})
+
+    return jsonify(filter_menu)
 
 
 def add_menu_with_permissions_db(name_menu, prev_menu, caption_menu):
@@ -505,7 +521,7 @@ def add_menu_with_permissions_db(name_menu, prev_menu, caption_menu):
             settable=0,
             cutpast=0,
             enable=0,
-            roleid=1
+            roleid=-1
         )
         # Додавання об'єкта k2admin_menus_prava до сесії
         db.session.add(new_prava)
@@ -515,6 +531,7 @@ def add_menu_with_permissions_db(name_menu, prev_menu, caption_menu):
 @components_bp.route('/menu-admin-items')
 def menu_items():
     menu = [
+
         {
             "title": 'Add components',
             "icon": {"icon": 'mdi-account-circle-outline'},
diff --git a/languages/babel_translation_directories.yml b/languages/babel_translation_directories.yml
index d603fa0..03e7ce4 100644
--- a/languages/babel_translation_directories.yml
+++ b/languages/babel_translation_directories.yml
@@ -1 +1 @@
-babel_translation_directories: languages;components/k2test/k2test/languages;components/grid/grid/languages;components/adm/adm/languages;components/k2auth/k2auth/languages
+babel_translation_directories: languages;components/k2test/k2test/languages;components/k2auth/k2auth/languages;components/k2adm/k2adm/languages
diff --git a/routes.py b/routes.py
index 9fbc182..a3ac1c1 100644
--- a/routes.py
+++ b/routes.py
@@ -4,3 +4,7 @@ from k2.k2rout import components_bp
 app.register_blueprint(components_bp)
 from components.k2test.k2test.views import k2test
 app.register_blueprint(k2test, url_prefix='/k2test')
+from components.k2auth.k2auth.views import k2auth
+app.register_blueprint(k2auth, url_prefix='/k2auth')
+from components.k2adm.k2adm.views import k2adm
+app.register_blueprint(k2adm, url_prefix='/k2adm')
\ No newline at end of file
-- 
1.9.1