Василь Свідрик / k2root

1	msgid "title_menu_items"	File was deleted
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"

components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.mo

View file @ fa42ef1

No preview for this file type

components/k2adm/k2adm/languages/uk/LC_MESSAGES/messages.po

View file @ fa42ef1

1	msgid "title_menu_items"	File was deleted
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 "Доступ до меню"

components/k2adm/k2adm/models.py

View file @ fa42ef1

1	import uuid		File was deleted
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
99		1	import uuid

components/k2adm/k2adm/views.py

View file @ fa42ef1

1	import hashlib		File was deleted
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
104		1	import hashlib
105		2	import uuid

components/k2adm/requirements.txt

View file @ fa42ef1

1	alembic==1.11.1	File was deleted
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

components/k2adm/setup.py

View file @ fa42ef1

1	from setuptools import setup		File was deleted
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	)
16		1	from setuptools import setup

components/k2auth/.gitignore

View file @ fa42ef1

1	idea		File was deleted
2	__pycache__/
3	*/__pycache__/
4	*.py[cod]
5	.pyc
6	.idea/
7	venv
8		1	idea
9		2	__pycache__/

components/k2auth/README.md

View file @ fa42ef1

1	# main.py	File was deleted
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	}

components/k2auth/k2auth/models.py

View file @ fa42ef1

1			File was deleted
2	import uuid
3	from sqlalchemy import Column, Integer, String
4	from sqlalchemy.ext.declarative import declarative_base
5	from flask_jwt_extended import create_access_token
6	from datetime import timedelta
7	import hashlib
8	from flask import current_app as k2
9
10	Base = declarative_base()
11
12
13	class k2users(Base):
14	__tablename__ = 'k2users'
15	user_id = Column(Integer, primary_key=True)
16	login = Column(String(70), nullable=False)
17	name = Column(String(50), nullable=False)
18	email = Column(String(150), nullable=False)
19	password = Column(String(150), nullable=False)
20	phone = Column(String(20))
21	roleid = Column(String(150), nullable=False)
22
23	def __init__(self, **kwargs):
24	self.user_id = hashlib.md5(str(uuid.uuid4()).encode()).hexdigest()
25	self.login = kwargs.get('login')
26	self.password = hashlib.md5(kwargs.get('password').encode()).hexdigest()
27	self.name = kwargs.get('name')
28	self.email = kwargs.get('email')
29	self.phone = kwargs.get('phone')
30	self.roleid = kwargs.get('roleid')
31
32	def get_token(self, expire_time=24):
33	expires_delta = timedelta(expire_time)
34	# token = create_access_token(identity=self.user_id, expires_delta=expires_delta)
35	token = create_access_token(identity={
36	'user_id': self.user_id,
37	'user_role': self.roleid
38	}, expires_delta=expires_delta)
39
40	db = k2.extensions['sqlalchemy'].db
41	connection = db.engine.connect()
42	result = connection.execute(
43	db.text(f"SELECT rolename FROM k2roles where roleid = '{self.roleid}'")).fetchone()
44
45	rolename = result[0] if result else None
46
47	userData = {
48	"avatar": "/src/assets/images/avatars/avatar-4.png",
49	"email": self.email,
50	"fullName": self.name,
51	"id": self.user_id,
52	"role": rolename,
53	"username": self.login
54	}
55
56	userAbilities = []
57	from k2.k2comp import Component
58	components = Component.query.filter(Component.installed == 1).all()
59	components_names = [component.name for component in components]
60
61
62
63	abilities_query = f"""
64	SELECT menus.namemenu,
65	prava.r, prava.w, prava.i, prava.d, prava.c, prava.exp, prava.imp, prava.settable, prava.cutpast,
66	prava.enable, prava.del
67	FROM k2admin_menus menus
68	JOIN k2admin_menus_prava prava ON menus.menuid = prava.menuid
69	WHERE prava.roleid = {self.roleid} AND menus.namemenu IN {tuple(components_names)}
70	"""
71	abilities_list = connection.execute(db.text(abilities_query)).fetchall()
72
73	for ability in abilities_list:
74	abilities_dict = {
75	"subject": ability[0],
76	"read": ability[1],
77	"write": ability[2],
78	"insert": ability[3],
79	"delete": ability[4],
80	"copy": ability[5],
81	"export": ability[6],
82	"import": ability[7],
83	"settable": ability[8],
84	"cutpast": ability[9],
85	"enable": ability[10],
86	"del": ability[11]
87	}
88
89	abilities_dict_copy = abilities_dict.copy()
90	for key, value in abilities_dict_copy.items():
91	if value == 0:
92	del abilities_dict[key]
93	userAbilities.append(abilities_dict)
94
95	return (token, userData, userAbilities)
96
97
98	@classmethod
99	def authenticate(cls, login, password):
100	session = k2.extensions['sqlalchemy'].db.session
101	user = ''
102	try:
103	user = session.query(cls).filter(cls.login == login).filter(cls.password == hashlib.md5(password.encode()).hexdigest()).one()
104	except:
105	user = None
106	return user
107
108	@classmethod
109	def user_by_login(cls, login):
110	session = k2.extensions['sqlalchemy'].db.session
111	user = session.query(cls).filter(cls.login == login).first()
112	return user
113		1

components/k2auth/k2auth/views.py

View file @ fa42ef1

1	# import hashlib		File was deleted
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)
67		1	# import hashlib

components/k2auth/requirements.txt

View file @ fa42ef1

1	alembic==1.11.1		File was deleted
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
48		1	alembic==1.11.1

components/k2auth/setup.py

View file @ fa42ef1

1	from setuptools import setup		File was deleted
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	)
16		1	from setuptools import setup

components/k2test/__pycache__/__init__.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

components/k2test/k2test/__pycache__/__init__.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

components/k2test/k2test/__pycache__/views.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

db/database.db

Diff comments View file @ fa42ef1

No preview for this file type

k2/__pycache__/__init__.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

k2/__pycache__/k2admmenu.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

k2/__pycache__/k2cfg.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

k2/__pycache__/k2comp.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

k2/__pycache__/k2obj.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

k2/__pycache__/k2rout.cpython-310.pyc

Diff comments View file @ fa42ef1

No preview for this file type

k2/k2cfg.py

Diff comments View file @ fa42ef1

 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy import text
 from .k2obj import k2obj
 import yaml
 import os
 import requests
 import pytz
 import os
 import sys
 from flask import session
 class k2(k2obj):
     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')
     secret_key = 'JH&INH987gFDHdsagh&8dwbjdw8ckw'
     default_language = 'en'
     current_language = ''
     babel_translation_directories = ''
     components =  ''
     def __init__(self):
         super().__init__()
     @classmethod
     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
     def get_locale(cls):
         if 'lang' in session:
             # Отримати обрану мову з сеансу користувача
             return session['lang']
         else:
             # Повернути мову за замовчуванням з налаштувань додатку
             return cls.default_language #app.config['DEFAULT_LANGUAGE']
     @classmethod
     def search_babel_translation_directories(cls):
         response = requests.get(f'{cls.domain}api/languages')
         if response.status_code == 200:
             cls.babel_translation_directories = response.text
             data = {'babel_translation_directories': response.text}
         else:
             cls.babel_translation_directories = 'languages'
             data = {'babel_translation_directories': 'languages'}
         with open('languages/babel_translation_directories.yml', 'w') as f:
             yaml.dump(data, f)
     # load database settings from yml file
     def init_db_uri(self):
         with open('db/db.yml', 'r') as f:
             db_config = yaml.load(f, Loader=yaml.FullLoader)
         return db_config
     # creating a connection
     def init_db(self, app):
         db_config = self.init_db_uri()
         db_uri = f"mysql+{db_config['driver']}://{db_config['user']}:{db_config['password']}@{db_config['host']}/{db_config['dbname']}"
         app.config['SQLALCHEMY_DATABASE_URI'] = db_uri
         db_path = '../db/database.db'
         app.config['SQLALCHEMY_BINDS'] = {'db2': f'sqlite:///{db_path}'}
         self.db.init_app(app)

k2/k2rout.py

Diff comments View file @ fa42ef1

 import zipfile
 from flask import Flask, Blueprint, jsonify, render_template, redirect, url_for, session, jsonify
 import os
 import shutil
 from flask import request
 from .k2cfg import k2
 from .k2comp import Component
 from flask_migrate import Migrate
 import requests
 import subprocess
 from flask import current_app
 import yaml
 from functools import wraps
 import os
 import sys
 from .k2admmenu import K2admin_menus,  K2admin_Menus_Prava
 from sqlalchemy import text
 from flask_jwt_extended import get_jwt_identity, jwt_required
 # initialize db
 # migrate = Migrate(app, db)
 components_bp = Blueprint('components', __name__, template_folder='templates')
 config = yaml.safe_load(open("db/first-login.yml"))
 db = k2.db
 def first_login_required(view_func):
     @wraps(view_func)
     def decorated_view(*args, **kwargs):
         if 'username' not in session:
             return redirect(url_for('components.first_login'))
         return view_func(*args, **kwargs)
     return decorated_view
 # def append_to_yaml_file(file_path, data):
 #    with open(file_path, 'r') as f:
 #        existing_data = yaml.safe_load(f) or []
 #
 #    if not existing_data:
 #        start_id = 1
 #    else:
 #        start_id = max(item.get('id', 0) for item in existing_data) + 1
 #
 #    for i, item in enumerate(data, start=start_id):
 #        item['id'] = i
 #        existing_data.append(item)
 #
 #    with open(file_path, 'w') as f:
 #        yaml.dump(existing_data, f, default_flow_style=False)
 def remove_from_yaml_file(file_path, component_name):
     with open(file_path, 'r') as f:
         existing_data = yaml.safe_load(f) or []
     updated_data = [item for item in existing_data if item.get('component_name') != component_name]
     with open(file_path, 'w') as f:
         yaml.dump(updated_data, f, default_flow_style=False)
 @components_bp.route('/api/languages', methods=['GET'])
 def find_language():
     components = Component.query.all()
     languages_paths = []
     # Додаємо головну директорію languages
     languages_paths.append('languages')
     # Знаходимо шляхи до директорій languages всередині папки components
     for component in components:
         component_languages_directory = 'components/' + component.name + '/' + component.name + '/languages'
         languages_paths.append(component_languages_directory)
     result = ';'.join(languages_paths)
     print(result)
     return result
-@components_bp.route('/home', methods=['GET', 'POST'])
+@components_bp.route('/', methods=['GET', 'POST'])
-@first_login_required
 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":
         username = request.form.get("username")
         password = request.form.get("password")
         for user in config["users"]:
             if user["username"] == username and user["password"] == password:
                 session['username'] = username  # Збереження ім'я користувача в сесії
                 return redirect(url_for('components.dashboard'))
         return "Невірне ім'я користувача або пароль."
     return render_template('first-login.html')
 @components_bp.route('/change_language/<lang>')
 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
+    if 'k2site' in components_names:
-    search_query = request.args.get('search_query')
+        return redirect(url_for('components_bp.component_list_dasb'))  # змінити на ендпоінт головної k2site
-    # 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
+            # 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,
+        components = Component.query.all()
-                           search_query=search_query, language=k2.menu)
+        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')
     json_data = response.json()
     selected_component = next((component for component in json_data if component['id'] == component_id), None)
     return render_template('component-info.html', selected_component=selected_component)
 @components_bp.route('/install_components_git/<string:component_id>')
 def install_components_git(component_id):
     # Шлях до головної папки проекту
     project_folder = 'components'
     # component = Component.get_repository_by_id(component_id)
     response = requests.get(f'{k2.update_domain}api/components')
     json_data = response.json()
     selected_component = next((component for component in json_data if component['id'] == component_id), None)
     # Назва репозиторія
     repository_name = selected_component['name']
     # Шлях до папки репозиторія в межах проекту
     repository_folder = os.path.join(project_folder, repository_name)
     # URL репозиторія
     git_repo_url = selected_component['git_link']
     try:
         # Перевірка наявності папки репозиторія
         if not os.path.exists(repository_folder):
             # Створення папки репозиторія
             os.makedirs(repository_folder)
         # Шлях до файлу __init__.py
         init_file = os.path.join(repository_folder, '__init__.py')
         # Перевірка наявності файлу __init__.py
         if not os.path.exists(init_file):
             # Створення пустого файлу __init__.py
             open(init_file, 'a').close()
         # підключення до приватного репозиторію
         # os.environ['GITLAB_PRIVATE_TOKEN'] = '8xxTpxrKVDGoXD5ynjiW'
         # git_repo_url_with_token = git_repo_url.replace('https://',
         #                                               f'https://oauth2:{os.environ["GITLAB_PRIVATE_TOKEN"]}@')
         # Команда для встановлення з використанням git_repo_url і повного шляху до папки репозиторія
         command = ['venv/Scripts/python.exe', '-m', 'pip', 'install', '--use-pep517', 'git+' + git_repo_url,
                    '--target=' + repository_folder]
         # Виконуємо команду встановлення
         subprocess.check_call(command)
         # Шлях до файлу, до якого потрібно додати код
         file_path = 'routes.py'
         # Код, який потрібно додати
         code = selected_component['dependencies']
         # Відкриття файлу у режимі дозапису
         with open(file_path, 'a') as file:
             # Запис нового коду у файл
             file.write('\n')
             file.write(code)
             file.write('\n')
         component = Component.query.filter_by(name=selected_component['name']).first()
         if not component:
             new_component = Component(
                 name=selected_component['name'],
                 description=selected_component['description'],
                 version=selected_component['version'],
                 git_link=selected_component['git_link'],
                 dependencies=selected_component['dependencies'],
                 installed=True
             )
             # Add the new component to the database
             db.session.add(new_component)
             db.session.commit()
         # Повертаємо повідомлення про успішне встановлення
         return f'Installed successfully <meta http-equiv="refresh" content="1;url=/dashboard" />'
     except subprocess.CalledProcessError as e:
         return 'Error installing : ' + str(e)
 @components_bp.route('/install_components/<string:component_id>')
 def install_component_from_archive(component_id):
     # Шлях до головної папки проекту
     project_folder = 'components'
     # Отримати відповідну компоненту зі списку компонент
     response = requests.get(f'{k2.update_domain}api/components')
     json_data = response.json()
     selected_component = next((component for component in json_data if component['id'] == component_id), None)
     if selected_component is None:
         return 'Component not found'
     # Отримати посилання на архів компоненти та версію
     archive_url = selected_component['latest_component_data']
     version = selected_component['latest_version']
     try:
         # Створити шлях до папки компоненти згідно назви та версії
         component_folder = os.path.join(project_folder)
         os.makedirs(component_folder, exist_ok=True)
         # Завантажити архів компоненти
         response = requests.get(archive_url, stream=True)
         response.raise_for_status()
         # Шлях до завантаженого архіву
         archive_path = os.path.join(component_folder, f"{selected_component['name']}.zip")
         # Зберегти архів на диск
         with open(archive_path, "wb") as file:
             for chunk in response.iter_content(chunk_size=8192):
                 file.write(chunk)
         # Розпакувати архів
         with zipfile.ZipFile(archive_path, "r") as zip_ref:
             zip_ref.extractall(component_folder)
         # Видалити архів
         os.remove(archive_path)
         #перейменувати якщо git
         component_name = selected_component['name']
         old_folder_path = os.path.join(component_folder, component_name + ".git")
         new_folder_path = os.path.join(component_folder, component_name)
         # Перевірка наявності папки зі старою назвою
         if os.path.exists(old_folder_path) and os.path.isdir(old_folder_path):
             # Перейменування папки зі старою назвою на нову назву
             os.rename(old_folder_path, new_folder_path)
         # Шлях до файлу, до якого потрібно додати  роути
         file_path = 'routes.py'
         # Код, який потрібно додати
         code = f'''from components.{selected_component['name']}.{selected_component['name']}.views import {selected_component['name']}\napp.register_blueprint({selected_component['name']}, url_prefix='/{selected_component['name']}')'''
         # selected_component['dependencies']
         # Відкриття файлу у режимі дозапису
         with open(file_path, 'a') as file:
             # Запис нового коду у файл
             file.write('\n')
             file.write(code)
             file.write('\n')
         # Update database with the installed component
         component = Component.query.filter_by(name=selected_component['name']).first()
         if not component:
             component = Component(
                 name=selected_component['name'],
                 description=selected_component['description'],
                 version=version,
                 git_link=selected_component['git_link'],
                 dependencies=code,
                 installed=True
             )
             db.session.add(component)
         else:
             component.version = version
             component.git_link = selected_component['git_link']
             component.dependencies = code
             component.installed = True
         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...
                 <meta http-equiv="refresh" content="0;url=/install-requirments/{selected_component["name"]}" />'''
     except Exception as e:
         return f'Error installing component: {str(e)}'
 @components_bp.route('/install-requirments/<string:selected_component_name>', methods=['GET'])
 def install_requirments(selected_component_name):
     # menu items
     get_admin_menu()
     # install requirements
     requirements_file = os.path.join('components', selected_component_name, "requirements.txt")
     if os.path.isfile(requirements_file):
         pip_command = f"{k2.venv_bin_path}/python -m pip install -r {requirements_file}"
         subprocess.run(pip_command, shell=True, check=True)
     return f'''Requirements installed successfully
      \n \n please wait installing requirments components...
      <meta http-equiv="refresh" content="1;url=/install-requirments-components" />'''
 @components_bp.route('/install-requirments-components')
 def install_requirements_components():
     # Откриття файлу requirements_components.txt
     requirements_file = 'requirements_components.txt'
     component_ids = None
     if os.path.isfile(requirements_file):
         with open('requirements_components.txt', 'r') as file:
             component_ids = file.read().splitlines()
     if component_ids:
         for component_id in component_ids:
             # Виклик роуту '/install_components/<string:component_name>' для кожної назви компоненти
             response = requests.get(
                 f'/install_components/{component_id}')
         return f'Requirements  components  installed successfully <meta http-equiv="refresh" content="1;url=/dashboard" />'
     else:
         return f'<meta http-equiv="refresh" content="1;url=/dashboard" />'
         # Опрацювання відповіді (за потреби)
 @components_bp.route('/remove_dependencies/<string:component_id>', methods=['GET'])
 def remove_dependencies(component_id):
     # Знаходимо компоненту за її ID
     component = Component.query.get(component_id)
     if not component:
         return 'Component not found <meta http-equiv="refresh" content="1;url=/dashboard" />'
     # remove menu items
     component_name = component.name
     # file_path = "components/menu.yml"
     # remove_from_yaml_file(file_path, component_name)
     requests.get(f"{k2.domain}api/add-to-menu")
     # remove routes
     file_path = 'routes.py'
     with open(file_path, 'r') as file:
         lines = file.readlines()
     updated_lines = [line for line in lines if line.strip() not in component.dependencies]
     with open(file_path, 'w') as file:
         file.writelines(updated_lines)
     component.installed = False
     db.session.commit()
     return 'Component successfully turn off <meta http-equiv="refresh" content="1;url=/dashboard" />'
 @components_bp.route('/add_dependencies/<string:component_id>', methods=['GET'])
 def add_dependencies(component_id):
     # Знаходимо компоненту за її ID
     component = Component.query.get(component_id)
     if not component:
         return 'Component not found <meta http-equiv="refresh" content="1;url=/dashboard" />'
     file_path = 'routes.py'
     code = component.dependencies
     # Відкриття файлу у режимі дозапису
     with open(file_path, 'a') as file:
         # Запис нового коду у файл
         file.write(code)
     # Оновлюємо статус компоненти
     component.installed = True
     db.session.commit()
     return 'Dependencies added successfully <meta http-equiv="refresh" content="1;url=/dashboard" />'
 @components_bp.route('/remove-component/<string:component_id>')
 def remove_component(component_id):
     # Шлях до головної папки проекту
     project_folder = 'components'
     component = Component.query.get(component_id)
     # Назва репозиторія
     repository_name = component.name
     # Шлях до папки репозиторія в межах проекту
     repository_folder = os.path.join(project_folder, repository_name)
     try:
         # Перевірка наявності папки репозиторія
         if os.path.exists(repository_folder):
             # Видалення папки репозиторія
             shutil.rmtree(repository_folder)
         # Видаляємо компоненту з бази
         if component:
             db.session.delete(component)
             db.session.commit()
         # Повертаємо повідомлення про успішне видалення
         return 'Component removed successfully <meta http-equiv="refresh" content="1;url=/dashboard" />'
     except Exception as e:
         # Повертаємо повідомлення про помилку видалення
         return 'Error removing component: ' + str(e)
-@components_bp.route('/component/add')
+# @components_bp.route('/component/add')
-def component_add():
+# def component_add():
-    # components for install
+#     # components for install
-    try:
+#     try:
-        # GET-requests to API
+#         # GET-requests to API
-        response = requests.get(f'{k2.update_domain}api/components')
+#         response = requests.get(f'{k2.update_domain}api/components')
-        json_data = response.json()
+#         json_data = response.json()
-        for item in json_data:
+#         for item in json_data:
-            item['button'] = f"{k2.domain}/install_components/{item['id']}"
+#             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():
     data = []
     response = requests.get(f"{k2.domain}/menu-admin-items")
     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()
     components_names = [component.name for component in components]
     for components_names in components_names:
         response = requests.get(f"{k2.domain}{components_names}/menu-admin-items")
         if response.status_code == 200:
             data.append(response.json()[0])
             #prev_menu =
             prev_menu = response.json()[0]['title']
             for item in response.json()[0]['children']:
                 name_menu = item['to']
                 caption_menu = item['title']
                 add_menu_with_permissions_db(name_menu, prev_menu, caption_menu)
         else:
             data
         # add component_name key for menu items
         for item in data:
             item['component_name'] = components_names
     k2.menu = data
     return k2.menu
 @components_bp.route('/api/main-menu/')
 @jwt_required()
 def get_admin_menu():
     current_user = get_jwt_identity()
     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):
     # Створення об'єкта k2admin_menus
     menu = text('SELECT COUNT(*) FROM k2admin_menus WHERE namemenu = :name_menu')
     result = db.session.execute(menu, {'name_menu': name_menu}).fetchone()
     count = result[0]
     if count == 0:
         new_menu_element = K2admin_menus(
             namemenu=name_menu,
             prevmenu=prev_menu,
             caption=caption_menu,
             module_name=name_menu
         )
-        # Додавання об'єкта k2admin_menus до сесії
         db.session.add(new_menu_element)
         db.session.commit()
         # Створення об'єкта k2admin_menus_prava
         new_prava = K2admin_Menus_Prava(
             menuid=new_menu_element.menuid,  # Зв'язуємо зовнішній ключ з menuid нового меню
             username=None,
             r=0,
             w=0,
             i=0,
             d=0,
             c=0,
             exp=0,
             imp=0,
             settable=0,
             cutpast=0,
             enable=0,
             roleid=-1
         )
         # Додавання об'єкта k2admin_menus_prava до сесії
         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

languages/en/LC_MESSAGES/messages.mo

Diff comments View file @ fa42ef1

No preview for this file type

languages/en/LC_MESSAGES/messages.po

Diff comments View file @ fa42ef1

1	msgid "Installed components"	1	msgid "t_installed_components"
2	msgstr "Installed components"	2	msgstr "Installed components"
3		3
4	msgid "Name"	4	msgid "t_name"
5	msgstr "Name"	5	msgstr "Name"
6		6
7	msgid "Description"	7	msgid "t_description"
8	msgstr "Description"	8	msgstr "Description"
9		9
10	msgid "Version"	10	msgid "t_version"
11	msgstr "Version"	11	msgstr "Version"
12		12
13	msgid "Dependencies"	13	msgid "t_dependencies"
14	msgstr "Dependencies"	14	msgstr "Dependencies"
15		15
16	msgid "Git Link"	16	msgid "t_git_link"
17	msgstr "Git Link"	17	msgstr "Git Link"
18		18
19	msgid "Install At"	19	msgid "t_install_at"
20	msgstr "Install At"	20	msgstr "Install At"
21		21
22	msgid "Status"	22	msgid "t_status"
23	msgstr "Status"	23	msgstr "Status"
24		24
25	msgid "Action"	25	msgid "t_action"
26	msgstr "Action"	26	msgstr "Action"
27		27
28	msgid "Components Shop"	28	msgid "t_components_shop"
29	msgstr "Components Shop"	29	msgstr "Add component"
30
31

languages/pl/LC_MESSAGES/messages.mo

Diff comments View file @ fa42ef1

No preview for this file type

languages/pl/LC_MESSAGES/messages.po

Diff comments View file @ fa42ef1

File was created	1	msgid ""
	2	msgstr ""
	3	"Content-Type: text/plain; charset=UTF-8\n"
	4	"Content-Transfer-Encoding: 8bit\n"
	5
	6	msgid "t_installed_components"
	7	msgstr "Zainstalowane komponenty"
	8
	9	msgid "t_name"
	10	msgstr "Nazwa"
	11
	12	msgid "t_description"
	13	msgstr "Opis"
	14
	15	msgid "t_version"
	16	msgstr "Wersja"
	17
	18	msgid "t_dependencies"
	19	msgstr "Zależności"
	20
	21	msgid "t_git_link"
	22	msgstr "Link do Git"
	23
	24	msgid "t_install_at"
	25	msgstr "Zainstalowano"
	26
	27	msgid "t_status"
	28	msgstr "Status"
	29
	30	msgid "t_action"
	31	msgstr "Akcja"
	32
	33	msgid "t_components_shop"
	34	msgstr "Dodaj komponent"

languages/uk/LC_MESSAGES/messages.mo

Diff comments View file @ fa42ef1

No preview for this file type

languages/uk/LC_MESSAGES/messages.po

Diff comments View file @ fa42ef1

1	msgid "Installed components"	1	msgid ""
2	msgstr "Встановлені компоненти"	2	msgstr ""
		3	"Content-Type: text/plain; charset=UTF-8\n"
		4	"Content-Transfer-Encoding: 8bit\n"
3		5
4	msgid "Installed components"	6	msgid "t_installed_components"
5	msgstr "Встановлені компоненти"	7	msgstr "Встановлені компоненти"
6		8
7	msgid "Name"	9	msgid "t_name"
8	msgstr "Назва"	10	msgstr "Назва"
9		11
10	msgid "Description"	12	msgid "t_description"
11	msgstr "Опис"	13	msgstr "Опис"
12		14
13	msgid "Version"	15	msgid "t_version"
14	msgstr "Версія"	16	msgstr "Версія"
15		17
16	msgid "Dependencies"	18	msgid "t_dependencies"
17	msgstr "Залежності"	19	msgstr "Залежності"
18		20
19	msgid "Git Link"	21	msgid "t_git_link"
20	msgstr "Посилання на Git"	22	msgstr "Посилання на Git"
21		23
22	msgid "Install At"	24	msgid "t_install_at"
23	msgstr "Встановлено"	25	msgstr "Встановлено"
24		26
25	msgid "Status"	27	msgid "t_status"
26	msgstr "Статус"	28	msgstr "Статус"
27		29
28	msgid "Action"	30	msgid "t_action"
29	msgstr "Дія"	31	msgstr "Дія"
30		32
31	msgid "Components Shop"	33	msgid "t_components_shop"
32	msgstr "Магазин компонент"	34	msgstr "Додати компоненту"

main.py

Diff comments View file @ fa42ef1

 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)
 jwt = JWTManager(app)
 #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)
 # flask routing
 from routes import *
 if __name__ == '__main__':
     app.run(debug=True, port=5000)

routes.py

Diff comments View file @ fa42ef1

1	#app = Flask(__name__)	1	#app = Flask(__name__)
2	from main import app	2	from main import app
3	from k2.k2rout import components_bp	3	from k2.k2rout import components_bp
4	app.register_blueprint(components_bp)	4	app.register_blueprint(components_bp)
5	from components.k2test.k2test.views import k2test	5	from components.k2test.k2test.views import k2test
6	app.register_blueprint(k2test, url_prefix='/k2test')	6	app.register_blueprint(k2test, url_prefix='/k2test')
7
8	from components.k2auth.k2auth.views import k2auth
9	app.register_blueprint(k2auth, url_prefix='/k2auth')
10
11	from components.k2adm.k2adm.views import k2adm
12	app.register_blueprint(k2adm, url_prefix='/k2adm')
13

templates/base.html

Diff comments View file @ fa42ef1

1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<html>	2	<html>
3	<head>	3	<head>
4	<title>{% block title %}{% endblock %}</title>	4	<title>{% block title %}{% endblock %}</title>
5	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">	5	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
6	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">	6	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
7	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">	7	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
8	<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>	8	<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>
9	<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>	9	<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>
10		10
11		11
12		12
13	{% block styles %}	13	{% block styles %}
14	<!-- Підключення CSS-стилів -->	14	<!-- Підключення CSS-стилів -->
15	{% endblock %}	15	{% endblock %}
16	</head>	16	</head>
17	<body>	17	<body>
18		18	########################
19	<div class="content">	19	<div class="content">
20	{% block content %}dashboard{% endblock %}	20	{% block content %}dashboard{% endblock %}
21	</div>	21	</div>
22	<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>	22	<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
23	<footer>	23	<footer>
24	© 2023 Корпорація k2	24	© 2023 Корпорація k2
25	</footer>	25	</footer>
26		26
27		27
28	{% block scripts %}	28	{% block scripts %}
29	<!-- Підключення скриптів JavaScript -->	29	<!-- Підключення скриптів JavaScript -->
30	{% endblock %}	30	{% endblock %}
31	</body>	31	</body>
32	</html>	32	</html>

templates/component-info.html

Diff comments View file @ fa42ef1

-{% 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">
      <style>
       .bd-placeholder-img {
         font-size: 1.125rem;
         text-anchor: top;
         -webkit-user-select: none;
         -moz-user-select: none;
         user-select: none;
       }
       @media (min-width: 768px) {
         .bd-placeholder-img-lg {
           font-size: 3.5rem;
         }
       }
       .b-example-divider {
         height: 3rem;
         background-color: rgba(0, 0, 0, .1);
         border: solid rgba(0, 0, 0, .15);
         border-width: 1px 0;
         box-shadow: inset 0 .5em 1.5em rgba(0, 0, 0, .1), inset 0 .125em .5em rgba(0, 0, 0, .15);
       }
       @media (min-width: 992px) {
         .rounded-lg-3 { border-radius: .3rem; }
       }
     </style>
 {% endblock %}
 {% block content %}
 <div id="popupBackdrop">
   <div class="loader">
       Встановлення компоненти... <i class="fa-solid fa-cog fa-spin fa-xl"></i>
   </div>
 </div>
  {% if selected_component %}
 <div class="text-center border-bottom">
     <img class="d-block mx-auto mb-4" src="{{ url_for('static', filename='img/logo-k2.png')}}" alt="" width="200">
     <h3 class="display-4 fw-bold">K2CloudERP-2.5.1.27</h3>
     <h1 class="display-4 fw-bold">{{selected_component.name|title}}</h1>
     <div class="col-lg-6 mx-auto">
       <p class="lead mb-4">{{selected_component.description|title}} -
       quickly design and customize responsive mobile-first components with Python and Bootstrap.
       </p>
         <p class="lead mb-4">Посилання на репозиторій: {{selected_component.git_link}}</p>
         <p class="lead mb-4">Версія: {{selected_component.version}}</p>
         <p class="lead mb-4">Розробка: K2 Cloud</p>
       <div class="d-grid gap-2 d-sm-flex justify-content-sm-center mb-5">
      <a href="/install_components/{{ selected_component.id }}"  id="installBtn" class="btn btn-primary btn-lg px-4 me-sm-3" onclick="showLoader()">Встановити компоненту</a>
       </div>
     </div>
     <div class="overflow-hidden" style="max-height: 30vh;">
       <div class="container px-5">
         <img src="https://corp2.eu/media/assets/images/service/k2cloud.jpg" class="img-fluid border rounded-3 shadow-lg mb-4" alt="Example image" width="700" height="500" loading="lazy">
       </div>
     </div>
   </div>
     {% else %}
     Помилка завантаження компоненти з сервера
     {% endif %}
 <script>
 function showLoader() {
   document.getElementById("popupBackdrop").style.display = "block";
 }
 function hideLoader() {
   document.getElementById("popupBackdrop").style.display = "none";
 }
 window.onload = function() {
   hideLoader();
 };
 </script>
 {% endblock %}

templates/dashboard-add.html

Diff comments View file @ fa42ef1

File was created	1	{% extends 'base.html' %}
	2
	3
	4	{% block styles %}
	5	<style>
	6	.table {
	7	border-collapse: collapse;
	8	width: 100%;
	9	}
	10
	11	.table th, .table td {
	12	text-align: left;
	13	padding: 8px;
	14	border-bottom: 1px solid #ddd;
	15	}
	16
	17	.table tr:hover {
	18	background-color: #f5f5f5;
	19	}
	20
	21	.search-form {
	22	margin-bottom: 20px;
	23	}
	24
	25	.search-form .input-group {
	26	width: 300px;
	27	}
	28	</style>
	29	{% endblock %}
	30	<!DOCTYPE html>
	31	<html>
	32	<head>
	33	<title>{% block title %}{% endblock %}</title>
	34	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
	35	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
	36	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
	37	<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>
	38	<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>
	39
	40
	41	</head>
	42	<body>
	43
	44	<div class="content">
	45	{% block content %}
	46
	47	<div class="container px-4 py-5" id="hanging-icons">
	48	<h2 class="pb-2 border-bottom">{{gettext('t_components_shop')}}</h2>
	49	<form action="{{ url_for('components.dashboard') }}" method="GET" class="search-form">
	50	<div class="input-group">
	51	<input type="text" name="search_query" class="form-control" placeholder="Search components">
	52	<button type="submit" class="btn btn-primary">Search</button>
	53	</div>
	54	</form>
	55
	56
	57	<div class="row g-4 py-5 row-cols-1 row-cols-lg-3">
	58	{% if component_server %}
	59	{% for component in component_server %}
	60	<div class="col d-flex align-items-start">
	61	<div class="icon-square bg-light text-dark flex-shrink-0 me-3">
	62	<img class="d-block mx-auto mb-4" src="/static/img/logo-k2.png" alt="" width="60">
	63	</div>
	64	<div>
	65	<h2>{{ component.name\|title }}</h2>
	66	<p>{{ component.description }}</p>
	67	<p>ВЕРСІЯ {{ component.latest_version }}</p>
	68	{% if component.name in components_names %}
	69	<button type="button" class="btn btn-success">Installed</button>
	70	{% else %}
	71	<a href="" class="btn btn-primary">Install</a>
	72	{% endif %}
	73	</div>
	74	</div>
	75	{% endfor %}
	76	{% else %}
	77	<div class="col">
	78	<p>No components available.</p>
	79	</div>
	80	{% endif %}
	81	</div>
	82	</div>
	83
	84	{% endblock %}
	85
	86
	87	</div>
	88
	89	</body>
	90	</html>

templates/dashboard-list.html

Diff comments View file @ fa42ef1

File was created	1	{% extends 'base.html' %}
	2
	3	{% block styles %}
	4	<style>
	5	.table {
	6	border-collapse: collapse;
	7	width: 100%;
	8	}
	9
	10	.table th, .table td {
	11	text-align: left;
	12	padding: 8px;
	13	border-bottom: 1px solid #ddd;
	14	}
	15
	16	.table tr:hover {
	17	background-color: #f5f5f5;
	18	}
	19
	20	.search-form {
	21	margin-bottom: 20px;
	22	}
	23
	24	.search-form .input-group {
	25	width: 300px;
	26	}
	27	</style>
	28	{% endblock %}
	29	<!DOCTYPE html>
	30	<html>
	31	<head>
	32	<title>{% block title %}{% endblock %}</title>
	33	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/style.css') }}">
	34	<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
	35	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
	36	<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>
	37	<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>
	38
	39
	40	</head>
	41	<body>
	42
	43	<div class="content">
	44	{% block content %}
	45
	46	<h2>{{ gettext('t_installed_components') }}</h2>
	47
	48	<table class="table">
	49	<thead>
	50	<tr>
	51	<th>{{gettext('t_name')}}</th>
	52	<th>{{gettext('t_description')}}</th>
	53	<th>{{gettext('t_version')}}</th>
	54	<th>{{gettext('t_dependencies')}}</th>
	55	<th>{{gettext('t_git_link')}}</th>
	56	<th>{{gettext('t_install_at')}}</th>
	57	<th>{{gettext('t_status')}}</th>
	58	<th>{{gettext('t_action')}}</th>
	59	</tr>
	60	</thead>
	61
	62	<tbody>
	63	<tr>
	64	<td>k2root</td>
	65	<td>main component</td>
	66	<td colspan="6">2.5.1.27</td></tr>
	67
	68	{% for component in components %}
	69	<tr>
	70	<td>{{ component.name }}</td>
	71	<td>{{ component.description }}</td>
	72	<td>{{ component.version }}</td>
	73	<td>{{ component.dependencies }}</td>
	74	<td>{{ component.git_link }}</td>
	75	<td>{{ component.date_installed }}</td>
	76	<td>
	77	{% if component.installed %}
	78	Yes
	79	{% else %}
	80	No
	81	{% endif %}
	82	</td>
	83	<td>
	84	{% if component.installed %}
	85	<a href="/remove_dependencies/{{ component.id }}" class="btn btn-primary">Вимкнути</a>
	86	{% else %}
	87	<a href="/add_dependencies/{{ component.id }}" class="btn btn-primary">Увімкнути</a>
	88	<!-- Button trigger modal -->
	89	<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#components-{{ component.id }}">
	90	Видалити
	91	</button>
	92
	93	<!-- Modal -->
	94	<div class="modal fade" id="components-{{ component.id }}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
	95	<div class="modal-dialog">
	96	<div class="modal-content">
	97	<div class="modal-header">
	98	<h1 class="modal-title fs-5" id="exampleModalLabel">Modal title</h1>
	99	<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
	100	</div>
	101	<div class="modal-body">
	102	Видалити компоненту?
	103	</div>
	104	<div class="modal-footer">
	105	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
	106	<a href="/remove-component/{{ component.id }}" class="btn btn-danger">Видалити</a>
	107	</div>
	108	</div>
	109	</div>
	110	</div>
	111	{% endif %}
	112	</td>
	113	</tr>
	114	{% endfor %}
	115	</tbody>
	116	</table>
	117
	118
	119
	120
	121	{% endblock %}
	122
	123
	124	</div>
	125
	126	</body>
	127	</html>

templates/dashboard.html

Diff comments View file @ fa42ef1

-{% 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 %}
 <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='pl') }}">pl</a> | <a href="">uk</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>
 {{language}}
-{{lang_d}}
-<h2>{{ _('Installed components') }}</h2>
+<h2>{{ gettext('t_installed_components') }}</h2>
 <table class="table">
     <thead>
         <tr>
-            <th>{{_('Name')}}</th>
+            <th>{{gettext('t_name')}}</th>
-            <th>{{_('Description')}}</th>
+            <th>{{gettext('t_description')}}</th>
-            <th>{{_('Version')}}</th>
+            <th>{{gettext('t_version')}}</th>
-            <th>{{_('Dependencies')}}</th>
+            <th>{{gettext('t_dependencies')}}</th>
-            <th>{{_('Git Link')}}</th>
+            <th>{{gettext('t_git_link')}}</th>
-            <th>{{_('Install At')}}</th>
+            <th>{{gettext('t_install_at')}}</th>
-            <th>{{_('Status')}}</th>
+            <th>{{gettext('t_status')}}</th>
-            <th>{{_('Action')}}</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>
 <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">
         <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="/show_components/{{ component.id }}" class="btn btn-primary">Install</a>
                 {% endif %}
             </div>
         </div>
         {% endfor %}
         {% else %}
         <div class="col">
             <p>No components available.</p>
         </div>
         {% endif %}
     </div>
 </div>
 {% endblock %}
+<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
+    <footer>
+        &copy; 2023 Корпорація k2
+    </footer>