fix update server

Василь Свідрик
1 parent a22c466d91
Showing 22 changed files with 3 additions and 104 deletions Side-by-side Diff
__pycache__/routes.cpython-310.pyc
components/k2test/README.md
components/k2test/__pycache__/__init__.cpython-310.pyc
components/k2test/history.txt
components/k2test/k2test/__pycache__/__init__.cpython-310.pyc
components/k2test/k2test/__pycache__/views.cpython-310.pyc
components/k2test/k2test/languages/en/LC_MESSAGES/messages.mo
components/k2test/k2test/languages/en/LC_MESSAGES/messages.po
components/k2test/k2test/languages/uk/LC_MESSAGES/messages.mo
components/k2test/k2test/languages/uk/LC_MESSAGES/messages.po
components/k2test/k2test/templates/new2.html
components/k2test/k2test/views.py
components/k2test/reguirments-components.txt
components/k2test/requirements.txt
components/k2test/setup.py
db/database.db
k2/__pycache__/k2rout.cpython-310.pyc
k2/k2rout.py
languages/babel_translation_directories.yml
requirements.txt
-Base k2 component
-
-language - .mo, .po files with translates
-
-static - css, js, mediafiles 
-
-templates - components templates
-
-views.py - routes
-
-history.txt - 
-
-reguirments-components.txt - 
-
-requirements.txt -
-
-setup.py - 
-1.0.0.0 base component
-1.0.0.1 add some routes
-msgid "New 2 page"
-msgstr "Нова сторінка 2"
-msgid "title_menu_items"
-msgstr "Test menu items"
-msgid "New 2 page"
-msgstr "Нова сторінка 2"
-msgid "title_menu_items"
-msgstr "Тестова компонента"
-
-
-<h2>{{ _('New 2 page') }}</h2>
-from flask import render_template, redirect, request, jsonify
-from flask_babel import gettext
-from flask_login import login_user, current_user,  logout_user, login_required
-from flask import current_app as k2
-from flask import Blueprint, json
-from flask_sqlalchemy import SQLAlchemy
-
-
-#bliueprint
-k2test = Blueprint('k2test', __name__, template_folder='templates', static_folder='static')
-
-#component routes
-@k2test.route('/new')
-def new_component():    
-    db = k2.extensions['sqlalchemy'].db
-    connection = db.engine.connect()
-    query = db.text("SELECT email, login FROM k2users")
-    result = connection.execute(query).fetchall()
-    rows = [dict(email=row.email, login=row.login) for row in result]
-    # Перетворення результату на JSON
-    json_result = json.dumps(rows)
-    return json_result
-
-@k2test.route('/new2')
-def new_component2():
-    return render_template('new2.html')
-    
-@k2test.route('/new3')
-def new_component3():
-    return jsonify({'data': 'page new3'})
-   
-@k2test.route('/new4')
-def new_component4():
-    return jsonify({'data': 'page new4'})
-
-# menu items for admin
-@k2test.route('/menu-admin-items')
-def menu_items():
-    data = [
-        {
-            'title': f"{gettext('title_menu_items')}",
-            'icon': {'icon': 'mdi-chart-timeline-variant'},
-            'children': [
-                {'title': 'Тест 3', 'to': 'k2test-new3'},
-                {'title': 'Тест 3', 'to': 'k2test-new4'},
-            ],
-        }
-
-    ]
-    return data
-grid==1.0.1
-Flask-Login==0.6.2
-from setuptools import setup, find_packages
-
-setup(
-    name='k2test',
-    version='1.0.0.8',
-    description='Description of my project version 1.0.0.8',
-    author='k2 cloud',
-    author_email='rs@corp2.net',
-    keywords="k2test, k2",
-    python_requires=">=3.7, <=3.11.2",
-    packages=['k2test'],
-    package_data={  # Optional
-        },
-    install_requires=[""],
-)
@@ -84,7 +84,7 @@
     components = Component.query.all()
     components_names = [component.name for component in components]
     if 'k2site' in components_names:
-        return redirect(url_for('components.component_add_dasb')) #змінити на ендпоінт головної k2site
+        return redirect(url_for('k2site.main_page')) #змінити на ендпоінт головної k2site
     else:
         return redirect('/dashboard')
  
-babel_translation_directories: languages;components/k2site/k2site/languages;components/k2test/k2test/languages
+babel_translation_directories: languages;components/k2test/k2test/languages;components/k2site/k2site/languages
@@ -21,6 +21,7 @@
 flask-staticdirs==1.0.1
 Flask-WTF==1.1.1
 greenlet==2.0.2
+gunicorn==20.1.0
 idna==3.4
 itsdangerous==2.1.2
 Jinja2==3.1.2
@@ -42,7 +43,7 @@
 six==1.16.0
 SQLAlchemy==2.0.15
 typing_extensions==4.6.2
-urllib3==2.0.2
+urllib3==2.0.3
 Werkzeug==2.3.4
 WTForms==3.0.1
 
@@ -4,6 +4,4 @@
 from k2.k2cfg import k2
 app.register_blueprint(components_bp)
 #k2grid_base
-from components.k2test.k2test.views import k2test
-app.register_blueprint(k2test, url_prefix='/k2test')
@@ -54,7 +54,7 @@
                 {% for component_upd_ver in components_version %}
                     {% for key, value in component_upd_ver.items() %}
                         {% if key == component.name   and value < component.latest_version %}
-                                <p class="update_avaible"> Update avaible</p>
+                                <p class="text-warning"> Update avaible</p>
                         {% endif %}
                     {% endfor %}
                 {% endfor %}
1		-Base k2 component
2		-
3		-language - .mo, .po files with translates
4		-
5		-static - css, js, mediafiles
6		-
7		-templates - components templates
8		-
9		-views.py - routes
10		-
11		-history.txt -
12		-
13		-reguirments-components.txt -
14		-
15		-requirements.txt -
16		-
17		-setup.py -
1		-msgid "New 2 page"
2		-msgstr "Нова сторінка 2"
3		-msgid "title_menu_items"
4		-msgstr "Test menu items"
1		-from flask import render_template, redirect, request, jsonify
2		-from flask_babel import gettext
3		-from flask_login import login_user, current_user, logout_user, login_required
4		-from flask import current_app as k2
5		-from flask import Blueprint, json
6		-from flask_sqlalchemy import SQLAlchemy
7		-
8		-
9		-#bliueprint
10		-k2test = Blueprint('k2test', __name__, template_folder='templates', static_folder='static')
11		-
12		-#component routes
13		-@k2test.route('/new')
14		-def new_component():
15		- db = k2.extensions['sqlalchemy'].db
16		- connection = db.engine.connect()
17		- query = db.text("SELECT email, login FROM k2users")
18		- result = connection.execute(query).fetchall()
19		- rows = [dict(email=row.email, login=row.login) for row in result]
20		- # Перетворення результату на JSON
21		- json_result = json.dumps(rows)
22		- return json_result
23		-
24		-@k2test.route('/new2')
25		-def new_component2():
26		- return render_template('new2.html')
27		-
28		-@k2test.route('/new3')
29		-def new_component3():
30		- return jsonify({'data': 'page new3'})
31		-
32		-@k2test.route('/new4')
33		-def new_component4():
34		- return jsonify({'data': 'page new4'})
35		-
36		-# menu items for admin
37		-@k2test.route('/menu-admin-items')
38		-def menu_items():
39		- data = [
40		- {
41		- 'title': f"{gettext('title_menu_items')}",
42		- 'icon': {'icon': 'mdi-chart-timeline-variant'},
43		- 'children': [
44		- {'title': 'Тест 3', 'to': 'k2test-new3'},
45		- {'title': 'Тест 3', 'to': 'k2test-new4'},
46		- ],
47		- }
48		-
49		- ]
50		- return data
1		-from setuptools import setup, find_packages
2		-
3		-setup(
4		- name='k2test',
5		- version='1.0.0.8',
6		- description='Description of my project version 1.0.0.8',
7		- author='k2 cloud',
8		- author_email='rs@corp2.net',
9		- keywords="k2test, k2",
10		- python_requires=">=3.7, <=3.11.2",
11		- packages=['k2test'],
12		- package_data={ # Optional
13		- },
14		- install_requires=[""],
15		-)
...	...	@@ -84,7 +84,7 @@
84	84	components = Component.query.all()
85	85	components_names = [component.name for component in components]
86	86	if 'k2site' in components_names:
87		- return redirect(url_for('components.component_add_dasb')) #змінити на ендпоінт головної k2site
	87	+ return redirect(url_for('k2site.main_page')) #змінити на ендпоінт головної k2site
88	88	else:
89	89	return redirect('/dashboard')
90	90
1		-babel_translation_directories: languages;components/k2site/k2site/languages;components/k2test/k2test/languages
	1	+babel_translation_directories: languages;components/k2test/k2test/languages;components/k2site/k2site/languages
...	...	@@ -21,6 +21,7 @@
21	21	flask-staticdirs==1.0.1
22	22	Flask-WTF==1.1.1
23	23	greenlet==2.0.2
	24	+gunicorn==20.1.0
24	25	idna==3.4
25	26	itsdangerous==2.1.2
26	27	Jinja2==3.1.2
...	...	@@ -42,7 +43,7 @@
42	43	six==1.16.0
43	44	SQLAlchemy==2.0.15
44	45	typing_extensions==4.6.2
45		-urllib3==2.0.2
	46	+urllib3==2.0.3
46	47	Werkzeug==2.3.4
47	48	WTForms==3.0.1
48	49
...	...	@@ -4,6 +4,4 @@
4	4	from k2.k2cfg import k2
5	5	app.register_blueprint(components_bp)
6	6	#k2grid_base
7		-from components.k2test.k2test.views import k2test
8		-app.register_blueprint(k2test, url_prefix='/k2test')
...	...	@@ -54,7 +54,7 @@
54	54	{% for component_upd_ver in components_version %}
55	55	{% for key, value in component_upd_ver.items() %}
56	56	{% if key == component.name and value < component.latest_version %}
57		- <p class="update_avaible"> Update avaible</p>
	57	+ <p class="text-warning"> Update avaible</p>
58	58	{% endif %}
59	59	{% endfor %}
60	60	{% endfor %}