From 4cd28255f43bce2244dbcba7a0322c139dcbf4ef 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: Thu, 8 Jun 2023 09:57:22 +0300 Subject: [PATCH] edit remove/add depencies --- __pycache__/main.cpython-310.pyc | Bin 0 -> 623 bytes __pycache__/routes.cpython-310.pyc | Bin 0 -> 216 bytes components/__pycache__/__init__.cpython-310.pyc | Bin 0 -> 162 bytes components/k2test/.idea/.gitignore | 3 --- components/k2test/.idea/gittest.iml | 10 ------- .../.idea/inspectionProfiles/profiles_settings.xml | 6 ----- components/k2test/.idea/misc.xml | 7 ----- components/k2test/.idea/modules.xml | 8 ------ components/k2test/.idea/vcs.xml | 6 ----- components/k2test/__init__.py | 1 - components/k2test/k2test/__init__.py | 0 components/k2test/k2test/static/default.css | 1 - components/k2test/k2test/static/style.css | 1 - components/k2test/k2test/templates/index.html | 1 - components/k2test/k2test/templates/login.html | 1 - components/k2test/k2test/views.py | 29 --------------------- components/k2test/requirements.txt | 1 - components/k2test/setup.py | 15 ----------- db/__pycache__/database.cpython-310.pyc | Bin 0 -> 1013 bytes db/database.db | Bin 36864 -> 36864 bytes k2/__pycache__/root.cpython-310.pyc | Bin 0 -> 12437 bytes k2/root.py | 4 +-- routes.py | 2 -- 23 files changed, 2 insertions(+), 94 deletions(-) create mode 100644 __pycache__/main.cpython-310.pyc create mode 100644 __pycache__/routes.cpython-310.pyc create mode 100644 components/__pycache__/__init__.cpython-310.pyc delete mode 100644 components/k2test/.idea/.gitignore delete mode 100644 components/k2test/.idea/gittest.iml delete mode 100644 components/k2test/.idea/inspectionProfiles/profiles_settings.xml delete mode 100644 components/k2test/.idea/misc.xml delete mode 100644 components/k2test/.idea/modules.xml delete mode 100644 components/k2test/.idea/vcs.xml delete mode 100644 components/k2test/__init__.py delete mode 100644 components/k2test/k2test/__init__.py delete mode 100644 components/k2test/k2test/static/default.css delete mode 100644 components/k2test/k2test/static/style.css delete mode 100644 components/k2test/k2test/templates/index.html delete mode 100644 components/k2test/k2test/templates/login.html delete mode 100644 components/k2test/k2test/views.py delete mode 100644 components/k2test/requirements.txt delete mode 100644 components/k2test/setup.py create mode 100644 db/__pycache__/database.cpython-310.pyc create mode 100644 k2/__pycache__/root.cpython-310.pyc diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..afe25d48f19177825b1a67df734283587b803d7a GIT binary patch literal 623 zcmYjOOOMkq5Vq4K^`;M&MM9hqr>wm&H1mC9&3qoqv{o~Ku&?YBexU&HLl*y=DvEa^(tD9G zz%T@kL?wig;wVt^Qdo*qM=iJ-YLV{f5DjOZ*y@AW$U{Rw1z()l$ z1gjLRDtdH+?x2`f|DsT@g_XIyr50A_fRu4PP?#n9Yxn^^#t*;99iUxA(Tibr`~#V+QYl$7VmniV8;#H9L~%_U7VVZQ-5%t9HB7 z;`;gY>itCS1D|u`x{>F{t~>WXKLVhka1E1XzUFE|S=Oiv+-C=_-N?FY}gON|^i`sTz9`aa~^Wl7#Ck8sGS9jxs+Y2O1Mz4!TW7X~uO%^Nggt z#Paw%U{Az!k$$}%_7@+7Ub;wcU+yRi7T5dL#$(Ynqg%4d(nZjf3jaX9qM7VD8blQ5 gA$bdhRQgOL1gcOvQVnao0Xbx)%m4rY literal 0 HcmV?d00001 diff --git a/__pycache__/routes.cpython-310.pyc b/__pycache__/routes.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bda22c4d5b3db6e4d29bb6e8edec52175cad8b4b GIT binary patch literal 216 zcmd1j<>g`kg6itV6n7x~7{oyaOhAqU5Esh;i4=wu#vF!R#wbQc5SuB7DVI5l8OUZ1 zX3%7L2~@$L$#{#^Ehn)!8^~ZzEGY2PWVywf1`;R&8Fh;#H!(A>h#AOS$xy@wq`<^4 z3umjC(Bjmh;+Wzx-SYgR?3jScC|tkmR^;+SlsqWt_47*&*CT9R6g`k0<|BNDIoeWh(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6w&*(xTqIJKxa zrnpSEJijPACZIAoBe5tqpeR2pHMyiXCfleeKfeS - - - - - - - - - \ No newline at end of file diff --git a/components/k2test/.idea/inspectionProfiles/profiles_settings.xml b/components/k2test/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2d..0000000 --- a/components/k2test/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/components/k2test/.idea/misc.xml b/components/k2test/.idea/misc.xml deleted file mode 100644 index c72cfa7..0000000 --- a/components/k2test/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/components/k2test/.idea/modules.xml b/components/k2test/.idea/modules.xml deleted file mode 100644 index 49cd08a..0000000 --- a/components/k2test/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/components/k2test/.idea/vcs.xml b/components/k2test/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/components/k2test/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ 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/k2test/__init__.py b/components/k2test/k2test/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/components/k2test/k2test/static/default.css b/components/k2test/k2test/static/default.css deleted file mode 100644 index 8b13789..0000000 --- a/components/k2test/k2test/static/default.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/k2test/k2test/static/style.css b/components/k2test/k2test/static/style.css deleted file mode 100644 index 8b13789..0000000 --- a/components/k2test/k2test/static/style.css +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/k2test/k2test/templates/index.html b/components/k2test/k2test/templates/index.html deleted file mode 100644 index 8b13789..0000000 --- a/components/k2test/k2test/templates/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/components/k2test/k2test/templates/login.html b/components/k2test/k2test/templates/login.html deleted file mode 100644 index a46884d..0000000 --- a/components/k2test/k2test/templates/login.html +++ /dev/null @@ -1 +0,0 @@ -login diff --git a/components/k2test/k2test/views.py b/components/k2test/k2test/views.py deleted file mode 100644 index 87b9bd4..0000000 --- a/components/k2test/k2test/views.py +++ /dev/null @@ -1,29 +0,0 @@ -from flask import render_template, redirect, request -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 -k2test = Blueprint('k2test', __name__) - -@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 'сторінка 2' - -@k2test.route('/new3') -def new_component3(): - return 'сторінка 3' - -@k2test.route('/new4') -def new_component4(): - return 'сторінка 4' 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 dcbe3d6..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', - description='Description of my project', - author='Your Name', - author_email='yourname@example.com', - keywords="k2test, k2", - python_requires=">=3.7, <=3.11.2", - packages=['k2test'], - package_data={ # Optional - "k2test": ["static/style.css", "static/default.css", "templates/index.html", "templates/login.html"] }, - install_requires=[""], -) diff --git a/db/__pycache__/database.cpython-310.pyc b/db/__pycache__/database.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..88aca9e4843bf37f0df08c3229ae992d5e96e394 GIT binary patch literal 1013 zcmYjQOK;Oa5Z;#`agvgv3RDS+bA)I_4;-q3nm!PfN>m6Hsujtyvkq};$6?oLNtAF2 zSKtRAq~^$9+AAmiLJq*J)1dBZKYu&xdF;$=S}r>XM*GPpUZ4p5(wp0Zz-AAY+y~%@ z;}|8_#aMF^lZ3i7=QL(60~w7C*WipBpOI^Zc!peyo7{q(&1n-=?cZPrRk3oKuTSc6 zyBj7W*s(19m^Iq^Y&EoJ8`c3Vxd)JecTQ&H+xiq`xJM=$DW_k^6u*Ob7|a<&Gr>*t z1j)@Sh*HmUSXx$Pjd6hoH6Cn@l2~B@e$A8A=b@-F#nM68S8U|N5sN|UIxmKCd~;3| z?kG_9+G)QNz5j_s5h7YVJJ@NR$xz6aynK9>ii_6isNMBNaw^hZ*v@3@Vq2tXw)*g( z#r@0=d>L*HMyeR~qs#-VLlK$!nk9e|zKfl|j8y(GBFZ3WV}R8#fN0lwR=xts&%J>?;Ghv`hBAjbhK-0c1Owc^<2*~kzV{9fP`5}Jfnp{Mep%~MhT1~Mbq-lY7 zls)jJgjDeb-czib%4~sa@NdxflhD1dyW-^F<wiG6wD!A1P#TM)YKU465afPz3+8t!S(2E_vn+Qcolx+_HP+ulu5 VK8(ZXx^Z&nCFm+!PhuJ+@(=YW`E>vQ literal 0 HcmV?d00001 diff --git a/db/database.db b/db/database.db index ae896a279270a93c0e25c55a09dc02c3552c1889..1cedd176ada27de9e6b94f52feb8aa4f94850c26 100644 GIT binary patch delta 176 zcmZozz|^pSX@WH4@rg3djK?=7ERpA75MW^7Zvet3o|Mgk0wFw`Q*>mQwHX)~8YC4( z!yP#U%?uKaO^lK(OwG;BOw5dvEYgh9Oe~Tt%}kRmjS~&iCa>0a60}e-FtakTurf8# uGqW% delta 144 zcmZozz|^pSX@WH4p@}lijE6QRERpA7mQx$BrYeI*q| z!yP#VCr`^)n7mrwNzh!u(9Fu%$jZb}&&0^m(!_l8KYeBcPX6r-jQo=r_$O`VO6cHc tQDOFF1Zwe?Pfjs5H8DytN=pG!#%UH7#)(GB2FB)QW~SyAiOGu!6aYy@CkX%m diff --git a/k2/__pycache__/root.cpython-310.pyc b/k2/__pycache__/root.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..eff3bc6f073e05a672e9a620b9ad8ae2293113f2 GIT binary patch literal 12437 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 TraQTAm}p`YF>U-G`0xJ(l91@y literal 0 HcmV?d00001 diff --git a/k2/root.py b/k2/root.py index fc2c438..7010c8c 100644 --- a/k2/root.py +++ b/k2/root.py @@ -327,14 +327,14 @@ with app.app_context(): description=selected_component['description'], version=version, git_link=selected_component['git_link'], - dependencies=selected_component['dependencies'], + dependencies=code, installed=True ) db.session.add(component) else: component.version = version component.git_link = selected_component['git_link'] - component.dependencies = selected_component['dependencies'] + component.dependencies = code component.installed = True db.session.commit() diff --git a/routes.py b/routes.py index 830784a..61ab836 100644 --- a/routes.py +++ b/routes.py @@ -1,5 +1,3 @@ from flask import Flask #app = Flask(__name__) from main import app -from components.k2test.k2test.views import k2test -app.register_blueprint(k2test, url_prefix='/k2test') -- 1.9.1