add k2site compatibility

Василь Свідрик
1 parent 834b86d05b
Showing 43 changed files with 437 additions and 724 deletions Side-by-side Diff
__pycache__/main.cpython-310.pyc
__pycache__/routes.cpython-310.pyc
components/__pycache__/__init__.cpython-310.pyc
components/k2adm/.gitignore
components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.mo
components/k2adm/k2adm/languages/en/LC_MESSAGES/messages.po
components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.mo
components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.po
components/k2adm/k2adm/models.py
components/k2adm/k2adm/views.py
components/k2adm/requirements.txt
components/k2adm/setup.py
components/k2auth/.gitignore
components/k2auth/README.md
components/k2auth/k2auth/models.py
components/k2auth/k2auth/views.py
components/k2auth/requirements.txt
components/k2auth/setup.py
components/k2test/__pycache__/__init__.cpython-310.pyc
components/k2test/k2test/__pycache__/__init__.cpython-310.pyc
- idea
-__pycache__/
-*/__pycache__/
-*.py[cod]
-.pyc
-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"
-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 "Доступ до меню"
-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
-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['user_id']).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
-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
-from setuptools import setup
-
-setup(
-    name='k2adm',
-    version='1.0.1',
-    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=[""],
-)
- idea
-__pycache__/
-*/__pycache__/
-*.py[cod]
-.pyc
-.idea/
-venv
-# 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"
-    
-}
-
-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)
-        token = create_access_token(identity={
-            'user_id': self.user_id,
-            'user_role': self.roleid
-        }, 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 = []
-        from k2.k2comp import Component
-        components = Component.query.filter(Component.installed == 1).all()
-        components_names = [component.name for component in components]
-
-
-
-        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} AND menus.namemenu IN {tuple(components_names)}
-        """
-        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)
-
-        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
-# 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()
-            print(userAbilities)
-
-            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)
-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
-from setuptools import setup
-
-setup(
-    name='k2auth',
-    version='1.0.1',
-    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=[""],
-)
@@ -15,7 +15,7 @@
     version = '2.5.1.27'
     db = SQLAlchemy()
     domain = 'http://127.0.0.1:5000/'
-    update_domain ='http://127.0.0.1:8002/'
+    update_domain ='http://185.174.172.137/'
     venv_bin_path = os.path.join(os.path.dirname(sys.prefix), 'venv/Scripts')
     json_sort_keys = False
     timezone = pytz.timezone('Europe/Kiev')
@@ -34,6 +34,7 @@
     def load_babel_translation_directories(cls):
         with open('languages/babel_translation_directories.yml', 'r') as f:
             data = yaml.safe_load(f)
+            print(data['babel_translation_directories'])
         cls.babel_translation_directories = data['babel_translation_directories']
  
     @classmethod
@@ -78,12 +78,17 @@
     return result
  
  
-@components_bp.route('/home', methods=['GET', 'POST'])
-@first_login_required
+@components_bp.route('/', methods=['GET', 'POST'])
 def home():
-    return redirect('/dashboard')
+    components = Component.query.all()
+    components_names = [component.name for component in components]
+    if 'k2site' in components_names:
+        return redirect(url_for('k2test.new_component2')) #змінити на ендпоінт головної k2site
+    else:
+        return redirect('/dashboard')
  
  
+
 @components_bp.route('/first-login', methods=['GET', 'POST'])
 def first_login():
     if request.method == "POST":
  
  
  
  
  
  
  
@@ -101,43 +106,47 @@
 def change_language(lang):
     session['lang'] = lang
     k2.current_language = lang
-    return redirect(url_for('components.dashboard'))
+    return redirect(request.referrer)
  
  
 @components_bp.route('/dashboard')
-@first_login_required
 def dashboard():
-    # Компоненти доступні для встановлення
-        # GET-запит до API
-    try:
-        response = requests.get(f'{k2.update_domain}api/components')
-        json_data = response.json()
-        # Перетворення JSON-об'єкту на масив
-        component_server = [item for item in json_data]
-    except:
-        component_server = None
-
-    # Встановлені компоненти
     components = Component.query.all()
     components_names = [component.name for component in components]
-    # Отримання значення пошукового запиту з параметрів URL
-    search_query = request.args.get('search_query')
-    # print(search_query)
-    filtered_components = []
-    if search_query:
-        filtered_components = [component for component in component_server if
-                               (search_query.lower() in component['name'].lower() if component['name'] else False) or
-                               (search_query.lower() in component['description'].lower() if component[
-                                   'description'] else False)]
+    if 'k2site' in components_names:
+        return redirect(url_for('components_bp.component_list_dasb'))  # змінити на ендпоінт головної k2site
     else:
-        filtered_components = component_server
-    current_language = k2.current_language
+        # Компоненти доступні для встановлення
+            # GET-запит до API
+        try:
+            response = requests.get(f'{k2.update_domain}api/components')
+            json_data = response.json()
+            # Перетворення JSON-об'єкту на масив
+            component_server = [item for item in json_data]
+        except:
+            component_server = None
  
-    return render_template('dashboard.html', components=components,
-                           components_names=components_names, component_server=filtered_components,
-                           search_query=search_query, language=k2.menu)
+        # Встановлені компоненти
+        components = Component.query.all()
+        components_names = [component.name for component in components]
+        # Отримання значення пошукового запиту з параметрів URL
+        search_query = request.args.get('search_query')
+        # print(search_query)
+        filtered_components = []
+        if search_query:
+            filtered_components = [component for component in component_server if
+                                   (search_query.lower() in component['name'].lower() if component['name'] else False) or
+                                   (search_query.lower() in component['description'].lower() if component[
+                                       'description'] else False)]
+        else:
+            filtered_components = component_server
+        current_language = k2.current_language
  
+        return render_template('dashboard.html', components=components,
+                               components_names=components_names, component_server=filtered_components,
+                               search_query=search_query, language=current_language)
  
+
 @components_bp.route('/show_components/<string:component_id>')
 def show_components(component_id):
     response = requests.get(f'{k2.update_domain}api/components')
@@ -287,7 +296,6 @@
         db.session.commit()
  
         # add language folders
-
         k2.search_babel_translation_directories()
         return f'''Component installed successfully: {selected_component["name"]} v{version} {k2.babel_translation_directories},
                 \n \n please wait installing requirments...     
  
  
@@ -404,39 +412,39 @@
         return 'Error removing component: ' + str(e)
  
  
-@components_bp.route('/component/add')
-def component_add():
-    # components for install
-    try:
-        # GET-requests to API
-        response = requests.get(f'{k2.update_domain}api/components')
-        json_data = response.json()
-        for item in json_data:
-            item['button'] = f"{k2.domain}/install_components/{item['id']}"
+# @components_bp.route('/component/add')
+# def component_add():
+#     # components for install
+#     try:
+#         # GET-requests to API
+#         response = requests.get(f'{k2.update_domain}api/components')
+#         json_data = response.json()
+#         for item in json_data:
+#             item['button'] = f"{k2.domain}/install_components/{item['id']}"
+#
+#     except:
+#         json_data = None
+#     return jsonify(json_data)
+#
+#
+# @components_bp.route('/component/list')
+# def component_list():
+#     # Встановлені компоненти
+#     component_list = []
+#     components = Component.query.all()
+#     for component in components:
+#         component_dict = {}
+#         component_dict['name'] = component.name
+#         component_dict['id'] = component.id
+#         component_dict['description'] = component.description
+#         component_dict['version'] = component.version
+#         component_dict['button_off'] =f"{k2.domain}/remove_dependencies/{component.id}"
+#         component_dict['button_on'] = f"{k2.domain}/add_dependencies/{component.id}"
+#         component_dict['button_del'] = f"{k2.domain}/remove-component/{component.id}"
+#         component_list.append(component_dict)
+#     return jsonify(component_list)
  
-    except:
-        json_data = None
-    return jsonify(json_data)
  
-
-@components_bp.route('/component/list')
-def component_list():
-    # Встановлені компоненти
-    component_list = []
-    components = Component.query.all()
-    for component in components:
-        component_dict = {}
-        component_dict['name'] = component.name
-        component_dict['id'] = component.id
-        component_dict['description'] = component.description
-        component_dict['version'] = component.version
-        component_dict['button_off'] =f"{k2.domain}/remove_dependencies/{component.id}"
-        component_dict['button_on'] = f"{k2.domain}/add_dependencies/{component.id}"
-        component_dict['button_del'] = f"{k2.domain}/remove-component/{component.id}"
-        component_list.append(component_dict)
-    return jsonify(component_list)
-
-
 # menu
 @components_bp.route('/api/add-to-menu', methods=['GET'])
 def add_to_menu():
@@ -445,7 +453,7 @@
     data.append(response.json()[0])
     prev_menu = response.json()[0]['title']
     for item in response.json()[0]['children']:
-        name_menu = item['to']
+        name_menu = str(item['to']).replace('/','-')
         caption_menu = item['title']
         add_menu_with_permissions_db(name_menu, prev_menu, caption_menu)
     components = Component.query.all()
@@ -505,7 +513,6 @@
             caption=caption_menu,
             module_name=name_menu
         )
-        # Додавання об'єкта k2admin_menus до сесії
         db.session.add(new_menu_element)
         db.session.commit()
         # Створення об'єкта k2admin_menus_prava
  
  
@@ -528,11 +535,42 @@
         db.session.add(new_prava)
         db.session.commit()
  
+@components_bp.route('/component-add')
+def component_add_dasb():
+    try:
+        response = requests.get(f'{k2.update_domain}api/components')
+        json_data = response.json()
+        # Перетворення JSON-об'єкту на масив
+        component_server = [item for item in json_data]
+    except:
+        component_server = None
+    # Отримання значення пошукового запиту з параметрів URL
+    search_query = request.args.get('search_query')
+    # print(search_query)
+    filtered_components = []
+    if search_query:
+        filtered_components = [component for component in component_server if
+                               (search_query.lower() in component['name'].lower() if component[
+                                   'name'] else False) or
+                               (search_query.lower() in component['description'].lower() if component[
+                                   'description'] else False)]
+    else:
+        filtered_components = component_server
  
+    return render_template('dashboard-add.html',
+                           component_server=filtered_components,
+                          )
+
+@components_bp.route('/component-list')
+def component_list_dasb():
+    components = Component.query.all()
+    return render_template('dashboard-list.html', components=components)
+
+
+
 @components_bp.route('/menu-admin-items')
 def menu_items():
     menu = [
-
         {
             "title": 'Add components',
             "icon": {"icon": 'mdi-account-circle-outline'},
-msgid "Installed components"
+msgid "t_installed_components"
 msgstr "Installed components"
  
-msgid "Name"
+msgid "t_name"
 msgstr "Name"
  
-msgid "Description"
+msgid "t_description"
 msgstr "Description"
  
-msgid "Version"
+msgid "t_version"
 msgstr "Version"
  
-msgid "Dependencies"
+msgid "t_dependencies"
 msgstr "Dependencies"
  
-msgid "Git Link"
+msgid "t_git_link"
 msgstr "Git Link"
  
-msgid "Install At"
+msgid "t_install_at"
 msgstr "Install At"
  
-msgid "Status"
+msgid "t_status"
 msgstr "Status"
  
-msgid "Action"
+msgid "t_action"
 msgstr "Action"
  
-msgid "Components Shop"
-msgstr "Components Shop"
+msgid "t_components_shop"
+msgstr "Add component"
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "t_installed_components"
+msgstr "Zainstalowane komponenty"
+
+msgid "t_name"
+msgstr "Nazwa"
+
+msgid "t_description"
+msgstr "Opis"
+
+msgid "t_version"
+msgstr "Wersja"
+
+msgid "t_dependencies"
+msgstr "Zależności"
+
+msgid "t_git_link"
+msgstr "Link do Git"
+
+msgid "t_install_at"
+msgstr "Zainstalowano"
+
+msgid "t_status"
+msgstr "Status"
+
+msgid "t_action"
+msgstr "Akcja"
+
+msgid "t_components_shop"
+msgstr "Dodaj komponent"
-msgid "Installed components"
-msgstr "Встановлені компоненти"
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
  
-msgid "Installed components"
+msgid "t_installed_components"
 msgstr "Встановлені компоненти"
  
-msgid "Name"
+msgid "t_name"
 msgstr "Назва"
  
-msgid "Description"
+msgid "t_description"
 msgstr "Опис"
  
-msgid "Version"
+msgid "t_version"
 msgstr "Версія"
  
-msgid "Dependencies"
+msgid "t_dependencies"
 msgstr "Залежності"
  
-msgid "Git Link"
+msgid "t_git_link"
 msgstr "Посилання на Git"
  
-msgid "Install At"
+msgid "t_install_at"
 msgstr "Встановлено"
  
-msgid "Status"
+msgid "t_status"
 msgstr "Статус"
  
-msgid "Action"
+msgid "t_action"
 msgstr "Дія"
  
-msgid "Components Shop"
-msgstr "Магазин компонент"
+msgid "t_components_shop"
+msgstr "Додати компоненту"
 from flask_cors import CORS
 from flask_babel import Babel
 from flask_jwt_extended import JWTManager
-#from k2.k2inst import *
+#from k2.k2rout import *
 from flask import Flask
 from k2.k2cfg import k2
  
+
+
 # configure flask app
 app = Flask(__name__)
 app.config['SECRET_KEY'] = k2.secret_key
 app.json.sort_keys = k2.json_sort_keys
 #app.config.from_object(k2)
  
+
 # init db
 k2().init_db(app)
 CORS(app)
@@ -19,6 +22,13 @@
 #translate
 k2.load_babel_translation_directories()
 app.config['BABEL_TRANSLATION_DIRECTORIES'] = k2.babel_translation_directories
+app.config['BABEL_DEFAULT_LOCALE'] = k2.default_language
+app.config['BABEL_LANGUAGES'] = {
+    'en': 'English',
+    'uk': 'Українська',
+    'pl': 'Polski'
+}
+app.config['BABEL_DEFAULT_TIMEZONE'] = k2.timezone
 babel = Babel(app)
 babel.init_app(app, locale_selector=k2.get_locale)
  
@@ -4,10 +4,4 @@
 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')
@@ -15,7 +15,7 @@
     {% endblock %}
 </head>
 <body>
-
+########################
     <div class="content">
         {% block content %}dashboard{% endblock %}
     </div>
-{% extends "base.html" %}
+{% if 'base.html' in template_list %}
+    {% extends 'base.html' %}
+{% else %}
+
+{% endif %}
+
 {% block styles %}
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
  
+{% extends 'base.html' %}
+
+
+{% block styles %}
+<style>
+    .table {
+        border-collapse: collapse;
+        width: 100%;
+    }
+
+    .table th, .table td {
+        text-align: left;
+        padding: 8px;
+        border-bottom: 1px solid #ddd;
+    }
+
+    .table tr:hover {
+        background-color: #f5f5f5;
+    }
+
+    .search-form {
+        margin-bottom: 20px;
+    }
+
+    .search-form .input-group {
+        width: 300px;
+    }
+</style>
+{% endblock %}
+<!DOCTYPE html>
+<html>
+<head>
+    <title>{% block title %}{% endblock %}</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+
+
+</head>
+<body>
+
+    <div class="content">
+{% block content %}
+
+<div class="container px-4 py-5" id="hanging-icons">
+    <h2 class="pb-2 border-bottom">{{gettext('t_components_shop')}}</h2>
+    <form action="{{ url_for('components.dashboard') }}" method="GET" class="search-form">
+    <div class="input-group">
+        <input type="text" name="search_query" class="form-control" placeholder="Search components">
+        <button type="submit" class="btn btn-primary">Search</button>
+    </div>
+</form>
+
+
+    <div class="row g-4 py-5 row-cols-1 row-cols-lg-3">
+        {% if component_server %}
+        {% for component in component_server %}
+        <div class="col d-flex align-items-start">
+            <div class="icon-square bg-light text-dark flex-shrink-0 me-3">
+                <img class="d-block mx-auto mb-4" src="/static/img/logo-k2.png" alt="" width="60">
+            </div>
+            <div>
+                <h2>{{ component.name|title }}</h2>
+                <p>{{ component.description }}</p>
+                <p>ВЕРСІЯ {{ component.latest_version }}</p>
+                {% if component.name in components_names %}
+                <button type="button" class="btn btn-success">Installed</button>
+                {% else %}
+                <a href="" class="btn btn-primary">Install</a>
+                {% endif %}
+            </div>
+        </div>
+        {% endfor %}
+        {% else %}
+        <div class="col">
+            <p>No components available.</p>
+        </div>
+        {% endif %}
+    </div>
+</div>
+
+{% endblock %}
+
+
+    </div>
+
+</body>
+</html>
+ {% extends 'base.html' %}
+
+{% block styles %}
+<style>
+    .table {
+        border-collapse: collapse;
+        width: 100%;
+    }
+
+    .table th, .table td {
+        text-align: left;
+        padding: 8px;
+        border-bottom: 1px solid #ddd;
+    }
+
+    .table tr:hover {
+        background-color: #f5f5f5;
+    }
+
+    .search-form {
+        margin-bottom: 20px;
+    }
+
+    .search-form .input-group {
+        width: 300px;
+    }
+</style>
+{% endblock %}
+<!DOCTYPE html>
+<html>
+<head>
+    <title>{% block title %}{% endblock %}</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
+
+
+</head>
+<body>
+
+    <div class="content">
+{% block content %}
+
+<h2>{{ gettext('t_installed_components') }}</h2>
+
+<table class="table">
+    <thead>
+        <tr>
+            <th>{{gettext('t_name')}}</th>
+            <th>{{gettext('t_description')}}</th>
+            <th>{{gettext('t_version')}}</th>
+            <th>{{gettext('t_dependencies')}}</th>
+            <th>{{gettext('t_git_link')}}</th>
+            <th>{{gettext('t_install_at')}}</th>
+            <th>{{gettext('t_status')}}</th>
+            <th>{{gettext('t_action')}}</th>
+        </tr>
+    </thead>
+
+    <tbody>
+    <tr>
+        <td>k2root</td>
+        <td>main component</td>
+        <td colspan="6">2.5.1.27</td></tr>
+
+        {% for component in components %}
+        <tr>
+            <td>{{ component.name }}</td>
+            <td>{{ component.description }}</td>
+            <td>{{ component.version }}</td>
+            <td>{{ component.dependencies }}</td>
+            <td>{{ component.git_link }}</td>
+            <td>{{ component.date_installed }}</td>
+            <td>
+                {% if component.installed %}
+                Yes
+                {% else %}
+                No
+                {% endif %}
+            </td>
+            <td>
+                {% if component.installed %}
+                <a href="/remove_dependencies/{{ component.id }}" class="btn btn-primary">Вимкнути</a>
+                {% else %}
+                <a href="/add_dependencies/{{ component.id }}" class="btn btn-primary">Увімкнути</a>
+                <!-- Button trigger modal -->
+<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#components-{{ component.id }}">
+ Видалити
+</button>
+
+<!-- Modal -->
+<div class="modal fade" id="components-{{ component.id }}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title fs-5" id="exampleModalLabel">Modal title</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        Видалити компоненту?
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+        <a href="/remove-component/{{ component.id }}" class="btn btn-danger">Видалити</a>
+      </div>
+    </div>
+  </div>
+</div>
+                {% endif %}
+            </td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+
+
+
+{% endblock %}
+
+
+    </div>
+
+</body>
+</html>
-{% extends "base.html" %}
  
+
 {% block styles %}
 <style>
     .table {
  
  
  
  
  
  
@@ -26,27 +26,40 @@
     }
 </style>
 {% endblock %}
+<!DOCTYPE html>
+<html>
+<head>
+    <title>{% block title %}{% endblock %}</title>
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
  
+
+</head>
+<body>
+
+    <div class="content">
 {% block content %}
 <h1>K2CloudERP-2.5.1.27</h1>
-<p> <a href="/logout">вихід</a></p>
-<p> <a href="{{ url_for('components.change_language', lang='en') }}">en</a> | <a href="{{ url_for('components.change_language', lang='uk') }}">uk</a></p>
+<p> <a href="{{ url_for('components.change_language', lang='en') }}">en</a> | <a href="{{ url_for('components.change_language', lang='pl') }}">pl</a> | <a href="">uk</a></p>
 {{language}}
-{{lang_d}}
  
-<h2>{{ _('Installed components') }}</h2>
  
+<h2>{{ gettext('t_installed_components') }}</h2>
+
 <table class="table">
     <thead>
         <tr>
-            <th>{{_('Name')}}</th>
-            <th>{{_('Description')}}</th>
-            <th>{{_('Version')}}</th>
-            <th>{{_('Dependencies')}}</th>
-            <th>{{_('Git Link')}}</th>
-            <th>{{_('Install At')}}</th>
-            <th>{{_('Status')}}</th>
-            <th>{{_('Action')}}</th>
+            <th>{{gettext('t_name')}}</th>
+            <th>{{gettext('t_description')}}</th>
+            <th>{{gettext('t_version')}}</th>
+            <th>{{gettext('t_dependencies')}}</th>
+            <th>{{gettext('t_git_link')}}</th>
+            <th>{{gettext('t_install_at')}}</th>
+            <th>{{gettext('t_status')}}</th>
+            <th>{{gettext('t_action')}}</th>
         </tr>
     </thead>
  
@@ -112,7 +125,7 @@
  
  
 <div class="container px-4 py-5" id="hanging-icons">
-    <h2 class="pb-2 border-bottom">{{_('ADD Components')}}</h2>
+    <h2 class="pb-2 border-bottom">{{gettext('t_components_shop')}}</h2>
     <form action="{{ url_for('components.dashboard') }}" method="GET" class="search-form">
     <div class="input-group">
         <input type="text" name="search_query" class="form-control" placeholder="Search components">
@@ -149,4 +162,13 @@
 </div>
  
 {% endblock %}
+<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
+    <footer>
+        &copy; 2023 Корпорація k2
+    </footer>
+
+    </div>
+
+</body>
+</html>
1		-msgid "title_menu_items"
2		-msgstr "Site administration"
3		-
4		-msgid "menu_items_child_1"
5		-msgstr "Password change"
6		-
7		-msgid "menu_items_child_2"
8		-msgstr "New user"
9		-
10		-msgid "menu_items_child_3"
11		-msgstr "Users"
12		-
13		-
14		-msgid "menu_items_child_4"
15		-msgstr "Users are clients"
16		-
17		-
18		-msgid "menu_items_child_5"
19		-msgstr "Roles"
20		-
21		-
22		-msgid "menu_items_child_6"
23		-msgstr "Access to the menu"
1		-msgid "title_menu_items"
2		-msgstr "Адміністрування сайту"
3		-
4		-
5		-msgid "menu_items_child_1"
6		-msgstr "Зміна паролю"
7		-
8		-msgid "menu_items_child_2"
9		-msgstr "Новий користувач"
10		-
11		-msgid "menu_items_child_3"
12		-msgstr "Користувачі"
13		-
14		-
15		-msgid "menu_items_child_4"
16		-msgstr "Користувачі кліенти"
17		-
18		-
19		-msgid "menu_items_child_5"
20		-msgstr "Ролі"
21		-
22		-
23		-msgid "menu_items_child_6"
24		-msgstr "Доступ до меню"
1		-import uuid
2		-from sqlalchemy import Column, Integer, String
3		-from sqlalchemy.ext.declarative import declarative_base
4		-from flask_jwt_extended import create_access_token
5		-from datetime import timedelta
6		-import hashlib
7		-from flask import current_app as k2
8		-
9		-Base = declarative_base()
10		-
11		-
12		-class k2users(Base):
13		- __tablename__ = 'k2users'
14		- user_id = Column(Integer, primary_key=True)
15		- login = Column(String(70), nullable=False)
16		- name = Column(String(50), nullable=False)
17		- email = Column(String(150), nullable=False)
18		- password = Column(String(150), nullable=False)
19		- phone = Column(String(20))
20		- roleid = Column(String(150), nullable=False)
21		-
22		- def __init__(self, **kwargs):
23		- self.user_id = hashlib.md5(str(uuid.uuid4()).encode()).hexdigest()
24		- self.login = kwargs.get('login')
25		- self.password = hashlib.md5(kwargs.get('password').encode()).hexdigest()
26		- self.name = kwargs.get('name')
27		- self.email = kwargs.get('email')
28		- self.phone = kwargs.get('phone')
29		- self.roleid = kwargs.get('roleid')
30		-
31		- def get_token(self, expire_time=24):
32		- expires_delta = timedelta(expire_time)
33		- token = create_access_token(identity=self.user_id, expires_delta=expires_delta)
34		-
35		- db = k2.extensions['sqlalchemy'].db
36		- connection = db.engine.connect()
37		- result = connection.execute(
38		- db.text(f"SELECT rolename FROM k2roles where roleid = '{self.roleid}'")).fetchone()
39		- rolename = result[0] if result else None
40		-
41		- userData = {
42		- "avatar": "/src/assets/images/avatars/avatar-4.png",
43		- "email": self.email,
44		- "fullName": self.name,
45		- "id": self.user_id,
46		- "role": rolename,
47		- "username": self.login
48		- }
49		-
50		- userAbilities = []
51		- query = f"""
52		- SELECT menus.namemenu, prava.r, prava.w, prava.i, prava.d, prava.c,
53		- prava.exp, prava.imp, prava.settable, prava.cutpast, prava.enable, prava.del
54		- FROM k2admin_menus menus
55		- JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
56		- WHERE prava.roleid = {self.roleid}
57		- """
58		- menus = connection.execute(db.text(query)).fetchall()
59		-
60		- for menu in menus:
61		- abilities_dict = {
62		- "subject": menu[0],
63		- "read": menu[1],
64		- "write": menu[2],
65		- "insert": menu[3],
66		- "delete": menu[4],
67		- "copy": menu[5],
68		- "export": menu[6],
69		- "import": menu[7],
70		- "settable": menu[8],
71		- "cutpast": menu[9],
72		- "enable": menu[10],
73		- "del": menu[11],
74		- }
75		-
76		- abilities_dict_copy = abilities_dict.copy()
77		- for key, value in abilities_dict_copy.items():
78		- if value == 0:
79		- del abilities_dict[key]
80		- userAbilities.append(abilities_dict)
81		-
82		- return (token, userData, userAbilities)
83		-
84		- @classmethod
85		- def authenticate(cls, login, password):
86		- session = k2.extensions['sqlalchemy'].db.session
87		- user = ''
88		- try:
89		- user = session.query(cls).filter(cls.login == login).filter(cls.password == hashlib.md5(password.encode()).hexdigest()).one()
90		- except:
91		- user = None
92		- return user
93		-
94		- @classmethod
95		- def user_by_login(cls, login):
96		- session = k2.extensions['sqlalchemy'].db.session
97		- user = session.query(cls).filter(cls.login == login).first()
98		- return user
1		-import hashlib
2		-import uuid
3		-from flask import Blueprint, request, jsonify
4		-from flask import current_app as k2
5		-from flask_jwt_extended import jwt_required, get_jwt_identity
6		-from flask_babel import gettext
7		-
8		-from .models import k2users
9		-
10		-
11		-k2adm = Blueprint('k2adm', __name__)
12		-
13		-
14		-@k2adm.route('/usersclients', methods=["GET"])
15		-@jwt_required()
16		-def users_clients():
17		- return jsonify({"data": "user roles"})
18		-
19		-
20		-@k2adm.route('/users', methods=["GET"])
21		-@jwt_required()
22		-def grid_users():
23		- return jsonify({"data": "users"})
24		-
25		-
26		-@k2adm.route('/roles', methods=["GET"])
27		-@jwt_required()
28		-def grid_roles():
29		- return jsonify({"data": "roles"})
30		-
31		-
32		-
33		-@k2adm.route('/api_get_roles', methods=["GET"])
34		-@jwt_required()
35		-def roles():
36		- db = k2.extensions['sqlalchemy'].db
37		- connection = db.engine.connect()
38		- query = db.text("SELECT roleid, rolename FROM k2roles")
39		- result = connection.execute(query).fetchall()
40		- roles = [dict(id=res.roleid, role=res.rolename) for res in result]
41		- return {'data': roles}
42		-
43		-
44		-@k2adm.route('/newUser', methods=["GET", "POST"])
45		-@jwt_required()
46		-def newUser():
47		- session = k2.extensions['sqlalchemy'].db.session
48		- exist = k2users.user_by_login(request.json['login'])
49		- if not exist:
50		- res = k2users(
51		- user_id=hashlib.md5(str(uuid.uuid4()).encode()).hexdigest(),
52		- login=request.json['login'],
53		- name=request.json['name'],
54		- email=request.json['email'],
55		- password=request.json['password'],
56		- phone=request.json['phone'],
57		- roleid=request.json['role']
58		- )
59		-
60		- if res:
61		- session.add(res)
62		- session.commit()
63		- return jsonify({'status': '200', 'message': 'New user created'})
64		- else:
65		- return jsonify({'status': '409', 'message': 'Such user exist'}), 409
66		-
67		-
68		-
69		-@k2adm.route('/changePassword', methods=["POST"])
70		-@jwt_required()
71		-def changePassword():
72		- session = k2.extensions['sqlalchemy'].db.session
73		- current_user = get_jwt_identity()
74		-
75		- user = session.query(k2users).filter_by(user_id=current_user['user_id']).first()
76		- if user.password == hashlib.md5(request.json['old_password'].encode()).hexdigest():
77		- if request.json['new_password'] == request.json['re_new_password']:
78		- user.password = hashlib.md5(request.json['new_password'].encode()).hexdigest()
79		- session.commit()
80		- else:
81		- return jsonify({'status': '400', 'message': 'Пароли не совпвдает'}), 400
82		- else:
83		- jsonify({'status': '404', 'message': "Пароль не найден в базе"}), 404
84		- return jsonify({'status': 'ok'})
85		-
86		-
87		-@k2adm.route('/menu-admin-items')
88		-def menu_items():
89		- data = [
90		- {
91		- # "title": 'Site administration',
92		- "title": f"{gettext('title_menu_items')}",
93		- "icon": {"icon": 'mdi-account-circle-outline'},
94		- "children": [
95		- {'title': f"{gettext('menu_items_child_1')}", 'to': 'adm-changePassword'},
96		- {'title': f"{gettext('menu_items_child_2')}", 'to': 'adm-newUser'},
97		- {'title': f"{gettext('menu_items_child_3')}", 'to': 'adm-users'},
98		- {'title': f"{gettext('menu_items_child_4')}", 'to': 'adm-usersclients'},
99		- {'title': f"{gettext('menu_items_child_5')}", 'to': 'adm-roles'},
100		- {'title': f"{gettext('menu_items_child_6')}", 'to': 'adm-menuaaccess'},
101		- ],
102		- }]
103		- return data
1		-alembic==1.11.1
2		-Babel==2.12.1
3		-bcrypt==4.0.1
4		-bidict==0.22.1
5		-blinker==1.6.2
6		-certifi==2023.5.7
7		-charset-normalizer==3.1.0
8		-click==8.1.3
9		-colorama==0.4.6
10		-dnspython==2.3.0
11		-email-validator==2.0.0.post2
12		-Flask==2.3.2
13		-flask-babel==3.1.0
14		-Flask-Bcrypt==1.0.1
15		-Flask-Cors==3.0.10
16		-Flask-JWT-Extended==4.5.2
17		-Flask-Login==0.6.2
18		-Flask-Migrate==4.0.4
19		-Flask-MySQLdb==1.0.1
20		-Flask-SQLAlchemy==3.0.3
21		-flask-staticdirs==1.0.1
22		-Flask-WTF==1.1.1
23		-greenlet==2.0.2
24		-idna==3.4
25		-itsdangerous==2.1.2
26		-Jinja2==3.1.2
27		-jsonify==0.5
28		-Mako==1.2.4
29		-MarkupSafe==2.1.2
30		-mysql==0.0.3
31		-mysql-connector==2.2.9
32		-mysql-connector-python==8.0.33
33		-mysqlclient==2.1.1
34		-peppercorn==0.6
35		-protobuf==3.20.3
36		-PyJWT==2.7.0
37		-python-engineio==4.4.1
38		-python-socketio==5.8.0
39		-pytz==2023.3
40		-PyYAML==6.0
41		-requests==2.31.0
42		-six==1.16.0
43		-SQLAlchemy==2.0.15
44		-typing_extensions==4.6.2
45		-urllib3==2.0.2
46		-Werkzeug==2.3.4
47		-WTForms==3.0.1
1		-from setuptools import setup
2		-
3		-setup(
4		- name='k2adm',
5		- version='1.0.1',
6		- description='Description of my project',
7		- author='k2 cloud',
8		- author_email='ys@corp2.eu',
9		- keywords="adm, k2",
10		- python_requires=">=3.7, <=3.11.2",
11		- packages=['adm'],
12		- package_data={ # Optional
13		- },
14		- install_requires=[""],
15		-)
1		- idea
2		-__pycache__/
3		-*/__pycache__/
4		-*.py[cod]
5		-.pyc
6		-.idea/
7		-venv
1		-# main.py
2		-
3		-from components.adm.adm.views import adm
4		-from components.test.test.views import test
5		-
6		-app.register_blueprint(adm, url_prefix='/adm')
7		-
8		-cd components/adm
9		-pip install -r requirements.txt
10		-
11		-
12		-endpoint "http://127.0.0.1:5000/adm/register"
13		-dictionary to register in such way
14		-{
15		- "login": "xxx",
16		- "password": "xxx",
17		- "name": "xxx",
18		- "email": "xxx"
19		-}
20		-
21		-
22		-endpoint "http://127.0.0.1:5000/adm/login"
23		-dictionary to login in such way
24		-{
25		- "login":"xxx",
26		- "password":"xxx"
27		-}
28		-
29		-endpoint http://127.0.0.1:5000/adm/changePassword
30		-dictionary to changePassword in such way
31		-{
32		- "old_password":"xxx",
33		- "new_password": "xxx",
34		- "re_new_password": "xxx"
35		-}
36		-endpoint http://127.0.0.1:5000/adm/newUser
37		-{
38		- "login": "xxx",
39		- "password": "xxx",
40		- "name": "xxx",
41		- "email": "xxx",
42		- "phone": "xxx",
43		- "repassword": "xxx"
44		-
45		-}
1		-# import hashlib
2		-# import uuid
3		-from flask import Blueprint, request, jsonify
4		-from flask import current_app as k2
5		-from flask_jwt_extended import jwt_required
6		-import re
7		-from .models import k2users
8		-
9		-k2auth = Blueprint('k2auth', __name__, template_folder='templates', static_folder='static', static_url_path='/vue2')
10		-
11		-
12		-class Auth():
13		- def __init__(self):
14		- pass
15		-
16		- def register(self):
17		- params = request.json
18		- session = k2.extensions['sqlalchemy'].db.session
19		- password = params.get('password')
20		- login = params.get('login')
21		- user_exist = k2users.user_by_login(login)
22		- if user_exist:
23		- return jsonify({'status': '409', 'message': 'Such user exist'}), 409
24		-
25		- if len(password) < 6:
26		- return jsonify({'status': '400', 'message': 'password has not 6 simbols'}), 400
27		- if re.search(r'[a-zA-Z]', password) is None or re.search(r'\d', password) is None:
28		- return jsonify({'status': '400', 'message': 'Password must contain both letters and numbers'}), 400
29		-
30		- try:
31		- user = k2users(**params)
32		- session.add(user)
33		- session.commit()
34		- token, userData, userAbilities = user.get_token()
35		- print(userAbilities)
36		-
37		- return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
38		- except:
39		- return jsonify({'status': '400', 'message': "Missing required fields"}), 400
40		-
41		-
42		-
43		- def login(self):
44		- params = request.json
45		- user = k2users.authenticate(**params)
46		- if user:
47		- token, userData, userAbilities = user.get_token()
48		- return {'accessToken': token, "userData": userData, "userAbilities": userAbilities}
49		- else:
50		- # k2.logger.error(('%s failed to log in ', params.get('login'), params.get('password')))
51		- return jsonify({'status': '401', 'message': 'Unauthorized'}), 401
52		-
53		-
54		- @jwt_required()
55		- def logout(self):
56		- response = {
57		- 'message': 'Logged out successfully'
58		- }
59		- return jsonify(response)
60		-
61		-
62		-
63		-auth = Auth()
64		-k2auth.add_url_rule('/login', methods=['POST'], view_func=auth.login)
65		-k2auth.add_url_rule('/logout', methods=['GET'], view_func=auth.logout)
66		-k2auth.add_url_rule('/register', methods=['POST'], view_func=auth.register)
1		-from setuptools import setup
2		-
3		-setup(
4		- name='k2auth',
5		- version='1.0.1',
6		- description='Description of my project',
7		- author='k2 cloud',
8		- author_email='ys@corp2.eu',
9		- keywords="k2auth, k2",
10		- python_requires=">=3.7, <=3.11.2",
11		- packages=['k2auth'],
12		- package_data={ # Optional
13		- },
14		- install_requires=[""],
15		-)