From 4d53c4ce922296ede5df394ad70dddf121bb564c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D1=8C=20=D0=A1=D0=B2=D1=96?= =?UTF-8?q?=D0=B4=D1=80=D1=96=D0=BA?= Date: Fri, 30 Jun 2023 08:11:56 +0300 Subject: [PATCH] fix update server --- __pycache__/routes.cpython-310.pyc | Bin 519 -> 519 bytes components/k2test/README.md | 17 ------- components/k2test/__init__.py | 1 - .../k2test/__pycache__/__init__.cpython-310.pyc | Bin 175 -> 0 bytes components/k2test/history.txt | 2 - components/k2test/k2test/__init__.py | 0 .../k2test/__pycache__/__init__.cpython-310.pyc | Bin 182 -> 0 bytes .../k2test/__pycache__/views.cpython-310.pyc | Bin 1985 -> 0 bytes .../k2test/languages/en/LC_MESSAGES/messages.mo | Bin 549 -> 0 bytes .../k2test/languages/en/LC_MESSAGES/messages.po | 4 -- .../k2test/languages/uk/LC_MESSAGES/messages.mo | Bin 643 -> 0 bytes .../k2test/languages/uk/LC_MESSAGES/messages.po | 4 -- components/k2test/k2test/templates/new2.html | 3 -- components/k2test/k2test/views.py | 51 --------------------- components/k2test/reguirments-components.txt | 1 - components/k2test/requirements.txt | 1 - components/k2test/setup.py | 15 ------ db/database.db | Bin 36864 -> 36864 bytes k2/__pycache__/k2rout.cpython-310.pyc | Bin 16200 -> 16187 bytes k2/k2rout.py | 2 +- languages/babel_translation_directories.yml | 2 +- requirements.txt | Bin 1778 -> 1814 bytes routes.py | 2 - templates/dashboard-add.html | 2 +- 24 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 components/k2test/README.md delete mode 100644 components/k2test/__init__.py delete mode 100644 components/k2test/__pycache__/__init__.cpython-310.pyc delete mode 100644 components/k2test/history.txt delete mode 100644 components/k2test/k2test/__init__.py delete mode 100644 components/k2test/k2test/__pycache__/__init__.cpython-310.pyc delete mode 100644 components/k2test/k2test/__pycache__/views.cpython-310.pyc delete mode 100644 components/k2test/k2test/languages/en/LC_MESSAGES/messages.mo delete mode 100644 components/k2test/k2test/languages/en/LC_MESSAGES/messages.po delete mode 100644 components/k2test/k2test/languages/uk/LC_MESSAGES/messages.mo delete mode 100644 components/k2test/k2test/languages/uk/LC_MESSAGES/messages.po delete mode 100644 components/k2test/k2test/templates/new2.html delete mode 100644 components/k2test/k2test/views.py delete mode 100644 components/k2test/reguirments-components.txt delete mode 100644 components/k2test/requirements.txt delete mode 100644 components/k2test/setup.py diff --git a/__pycache__/routes.cpython-310.pyc b/__pycache__/routes.cpython-310.pyc index 6fac0fe89d96480897f3f40d32a8cdfdffe49246..e833b95137bc24d51d5e0a132322d32122ce8335 100644 GIT binary patch delta 93 zcmZo?X=mZh=jG*M0D_l^^HQcyyCovYVGVw49F#-UA;T=%` delta 93 zcmZo?X=mZh=jG*M0D>Ra=cde@$h%LkII|?Rid{e32*l82yv0>oloMZ2l$w@V0pzh| m8STmnjFfgJ=qyZPhu=!W#nNNVgvxFa2?nH diff --git a/components/k2test/README.md b/components/k2test/README.md deleted file mode 100644 index eb343d4..0000000 --- a/components/k2test/README.md +++ /dev/null @@ -1,17 +0,0 @@ -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 - \ No newline at end of file diff --git a/components/k2test/__init__.py b/components/k2test/__init__.py deleted file mode 100644 index 8b13789..0000000 --- a/components/k2test/__init__.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/k2test/__pycache__/__init__.cpython-310.pyc b/components/k2test/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index c6a7878591b2333e9fd16cd85b30e32cd2a9dfa2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmd1j<>g`kf*;rCrZ58O#~=g`kf*;rCrhw?jAOaaM0yz#qT+9L_QW%06G#UL?G8BP?5yY=ZXRDad;?$zz znBp?s^8BLgn1IUUjKrecfTH}Y)Z~)lm~5k>{QQ#m8EM1aX mTmqB;Q}OYcd6^~g@p=W7w>WHa^HWN5Qtd!i7Bc|}76t&q4>1e? diff --git a/components/k2test/k2test/__pycache__/views.cpython-310.pyc b/components/k2test/k2test/__pycache__/views.cpython-310.pyc deleted file mode 100644 index 21c5364adc870e83645799021ec8269990f9e4e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1985 zcma)7&2Jnv6d!wLc4uclk~IBDKZF(}4lBB8*+fD@RRxrCKqV9c97aK->DWmo@yu*& zZ_}(c2WYQ7aHdEpxBLP8A1xOoUpXMoy&xn$-t%OeLBoaryMY)j`@knuL zTIooFAzjUyuu_hWCY?$RZGlE$_pSsgDze-t}J&C9eEj$ zKfk*5?%J2=c}?B#@0N0V?e1Q>naKREEVrQKYHfQU%TmXw;7M^bSxd`&SQb!ST*g{V zyZag6Rg1$t6W$P+(x`WH9{eag%N1w*IwU`SxqI=3DAPo!n=qJa_d-Lr2POnY@j_)~ zp$ujBOpO;nEpF;*SrkY`4>@P*`~go#$kBDKA#NdL2Rs>{jq;)D)npfE;n60rW_%#9 z1P)2AMgq)0E>zS+mcbzu#? zzG#6!uZ(7uXLkjNk?3UH7$zIM3+9&&iG(-rRs1huOfN9l7M0hbtNbtjuYcJGrJlPY z7g718%Vl{D=C5$z|Ja;YU#i*aKJS+Mc+;(-!HC`aRGhk2ua?h2^uum?5FhRPR2?h_Q z#NdGrn5`4pu}lb$gL)H|)hvj>tC4^Pg#PXQ<^AI|rQ*=%Lz_$2UqDEl;4s`k)dt(Cs%q0zbrTni>^O2v1zf6aGIbX@YioB6^ai{D zC%Ewrh$9kx2ImEM4{l5-qA=QTXTH&=o!OZmx2}J5$gUCY5;oW5A4@292`S+w;Thq> z6~~d}?+|`ce1rV$t8`89H3ZOz5*;gTg-1(N?UA&&G|p7lFL7>JykLi@jjR=iX`Vfa zMg<&3`7F*RZjMc@ElW))7i_;R4J&F6Q5wd{UN|1-(QM{Uvx1E@3QI4rv9QP?@Pa<` zwwS*KexGmlH@v>*k&xy1O0FyY(LImCoTV8XhwwP#X}s|wn?!CRjAexu%2dMEn!~}< zB!NkoMzHf=>0OelvZdc~K=qff0>yHjft@7Tt7Na%<*qxeS}iJeQ0t}Ppqk&*41)n& zgv0v^?hV0zFmTg2jV@>6_dIu0D~pP{I%}ww#W(h0QwgaCFh3RApdGgMgl%8y*4>|= zW|5lL3#m#D+sD$nk5Hke5z#QuIP8mKtRU$5bX=$V+?{t{yDzYMw|d{5uimacb>F*h Qln9&xjfM5@;9_^b0Etthvj6}9 diff --git a/components/k2test/k2test/languages/en/LC_MESSAGES/messages.po b/components/k2test/k2test/languages/en/LC_MESSAGES/messages.po deleted file mode 100644 index cf76e83..0000000 --- a/components/k2test/k2test/languages/en/LC_MESSAGES/messages.po +++ /dev/null @@ -1,4 +0,0 @@ -msgid "New 2 page" -msgstr "Нова сторінка 2" -msgid "title_menu_items" -msgstr "Test menu items" \ No newline at end of file diff --git a/components/k2test/k2test/languages/uk/LC_MESSAGES/messages.mo b/components/k2test/k2test/languages/uk/LC_MESSAGES/messages.mo deleted file mode 100644 index e8acc2ec1399025fd89b8a958e2e07e64fde3c80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 643 zcmY*W&2G~`5H>$2pHQ!G7=);(sts!=swyWAO%oS_>^O2l1ze(SvNfj8I$E!RN<9GY z05>i?L50){BH+(Oh!=O6LWHW2~h2I48= z#}&g!P~SwfuNuZ3)FaeJkG}>RW-R80N>s{6Q!a{8qWCm7`Z9aT$BJ|(aSctNY{@3lIe$QumIemEp;$(h0%NQWuz zfKBZxp*zId0juiNs@t?mDH2Jbe$eZbE6&+pcB71E7F(^qa2z=cwV)NE%$ae@7v&hXWWzft#RDN95h#xI!6xpE72Om;7M>ee`e8>ftIBfiuQwR3h5l_LcSh!3>f6@#6MW4g+-SWL&EZ;6a>bd@k0o%}@ Y^~E~8VqkQkzv=I|&-I0#Bmdm^1-A9Zg#Z8m diff --git a/components/k2test/k2test/languages/uk/LC_MESSAGES/messages.po b/components/k2test/k2test/languages/uk/LC_MESSAGES/messages.po deleted file mode 100644 index 397ef8f..0000000 --- a/components/k2test/k2test/languages/uk/LC_MESSAGES/messages.po +++ /dev/null @@ -1,4 +0,0 @@ -msgid "New 2 page" -msgstr "Нова сторінка 2" -msgid "title_menu_items" -msgstr "Тестова компонента" \ No newline at end of file diff --git a/components/k2test/k2test/templates/new2.html b/components/k2test/k2test/templates/new2.html deleted file mode 100644 index f3fbd57..0000000 --- a/components/k2test/k2test/templates/new2.html +++ /dev/null @@ -1,3 +0,0 @@ - - -

{{ _('New 2 page') }}

\ No newline at end of file diff --git a/components/k2test/k2test/views.py b/components/k2test/k2test/views.py deleted file mode 100644 index fcf569d..0000000 --- a/components/k2test/k2test/views.py +++ /dev/null @@ -1,51 +0,0 @@ -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 - diff --git a/components/k2test/reguirments-components.txt b/components/k2test/reguirments-components.txt deleted file mode 100644 index 6a2c957..0000000 --- a/components/k2test/reguirments-components.txt +++ /dev/null @@ -1 +0,0 @@ -grid==1.0.1 \ No newline at end of file diff --git a/components/k2test/requirements.txt b/components/k2test/requirements.txt deleted file mode 100644 index b1a7563..0000000 --- a/components/k2test/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -Flask-Login==0.6.2 diff --git a/components/k2test/setup.py b/components/k2test/setup.py deleted file mode 100644 index 5755e74..0000000 --- a/components/k2test/setup.py +++ /dev/null @@ -1,15 +0,0 @@ -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=[""], -) diff --git a/db/database.db b/db/database.db index 0fbb088f306a1267199dffb0a3ab9387015297f9..beaf766e8bb47f457d6c1a759788c44a2b832f24 100644 GIT binary patch delta 252 zcmZozz|^pSX@WGP-9#B@M!Ss(3+4G4fIxtOfsc{r6|V{Rzs-UI6FcLwmgptt7Zn)k<)xPBR~GAM8x?1kr0N01jSP&8bq&mPjSUnGOsx!ztc;EIObkp7 zO-(1?*H>iZnp~lu#?8RM_}^DDUOL*5V>6H5S3{rx*pd9(`6q4WNoeEODFcni^Y}B`2GhBqv!UnHZ%QCR-YqC7YU>TbdY7*3&a( zG@P8GXCP>yU}R`zXl!L< diff --git a/routes.py b/routes.py index fe12535..00bd329 100644 --- a/routes.py +++ b/routes.py @@ -4,5 +4,3 @@ from k2.k2rout import components_bp 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') diff --git a/templates/dashboard-add.html b/templates/dashboard-add.html index a81a44e..1522c8e 100644 --- a/templates/dashboard-add.html +++ b/templates/dashboard-add.html @@ -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 %} -

Update avaible

+

Update avaible

{% endif %} {% endfor %} {% endfor %} -- 1.9.1