From a2bb956ac6582cd5509f97c59deded1cfd8cfad7 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?= <svidryk@corp2.eu>
Date: Thu, 15 Jun 2023 10:48:35 +0300
Subject: [PATCH] change get menu

---
 __pycache__/routes.cpython-310.pyc                 | Bin 411 -> 411 bytes
 .../k2test/__pycache__/__init__.cpython-310.pyc    | Bin 169 -> 169 bytes
 .../k2test/__pycache__/__init__.cpython-310.pyc    | Bin 176 -> 176 bytes
 .../k2test/__pycache__/views.cpython-310.pyc       | Bin 2006 -> 1959 bytes
 components/k2test/k2test/views.py                  |  27 ++++-------
 components/menu.yml                                |  53 ++++-----------------
 db/database.db                                     | Bin 36864 -> 36864 bytes
 k2/__pycache__/k2cfg.cpython-310.pyc               | Bin 3012 -> 3012 bytes
 k2/__pycache__/k2inst.cpython-310.pyc              | Bin 13560 -> 13729 bytes
 k2/__pycache__/k2obj.cpython-310.pyc               | Bin 369 -> 487 bytes
 k2/k2cfg.py                                        |   3 --
 k2/k2inst.py                                       |   8 +++-
 12 files changed, 26 insertions(+), 65 deletions(-)

diff --git a/__pycache__/routes.cpython-310.pyc b/__pycache__/routes.cpython-310.pyc
index 3f8386dc597756e78f853a748ae6d83ea8f9b04e..c288ce97c93d36474c055deea2f40f02c475b59a 100644
GIT binary patch
delta 20
acmbQuJe!$2pO=@50SF2Xc5URIzz6^?*aYJM

delta 20
acmbQuJe!$2pO=@50SI(kJ2!GqU<3dwmIPw}

diff --git a/components/k2test/__pycache__/__init__.cpython-310.pyc b/components/k2test/__pycache__/__init__.cpython-310.pyc
index b75bcdcded11f1a7acf655f86604f77342db13e0..690848d0fb396ea8ef972e75d28f628a8a8a04bd 100644
GIT binary patch
delta 19
ZcmZ3<xRQ}OpO=@50SF2Xc1`4-2LLNq1n2+&

delta 19
ZcmZ3<xRQ}OpO=@50SI(kJ126_0{|$M1ZV&N

diff --git a/components/k2test/k2test/__pycache__/__init__.cpython-310.pyc b/components/k2test/k2test/__pycache__/__init__.cpython-310.pyc
index ab86297db727b0a2ce742708fcc199b0c0613965..3d13590b6235ecc4e6b23753f0a0a5a96513c876 100644
GIT binary patch
delta 19
ZcmdnMxPg&7pO=@50SF2Xc1`473IHrx1pNR2

delta 19
ZcmdnMxPg&7pO=@50SI(kJ12541pq0S1bqMi

diff --git a/components/k2test/k2test/__pycache__/views.cpython-310.pyc b/components/k2test/k2test/__pycache__/views.cpython-310.pyc
index 6837062cc37b04f372ff1a59eb41af5e80d71162..1c9cafdbcec0b4a80d0662460703a56bf81a61e5 100644
GIT binary patch
delta 203
zcmcb{znq^hpO=@50SF2XcBRZ=-N-kKRbK<hO<_!7N?}f6$z)7nO<_x6pTh*CIY4we
zQwrxCmUPBih8l)o22C!%$*OD`!lfKQO&1nj*m|+?V$&^_%;fyM$-h{&JdCTjvyDnp
zi%WF#Qp=4snQpO`WR~Ql-eM}rN0u?sWGT`InsAFFIk6-)J-?{3NDsoz$jnJ8O3j<R
im`ztq2q?tF%EZXV$ic+H$n=lpH_Lw(-pSwC9smHNZ94w|

delta 232
zcmZ3^e~q6npO=@50SI(kJ5!FZZRDH98e{?FrZA>3WiqBPr?8~3rm)Rn0rJ_wd=5CD
z6U^s=@Y9)V8EP1U88o^5Zn5Mg=B8G0XB(BI7MJMfrIs5_7Gl$4G@5*!RYO~o<rZ^k
zQO+%v%;fyMTdXCSB{`|LIFb`fQq%K`Dv@;=Pu61-7Xj%vDFr$4!lDaXFE(CmQZSj^
f!ltXH1QcRpVPXV9mOpIlm@JmhEFzPSvpoO+DPBJK

diff --git a/components/k2test/k2test/views.py b/components/k2test/k2test/views.py
index b6e5052..ad0318f 100644
--- a/components/k2test/k2test/views.py
+++ b/components/k2test/k2test/views.py
@@ -38,22 +38,15 @@ def new_component4():
 def menu_items():
     data = [
         {
-            'url': {'name': 'k2test/new2'},
-            'icon': 'mdi-chart-timeline-variant',
-            'title': 'Тест 2',
-            'category': 'Тестова компонента',
-        },
-        {
-            'url': {'name': 'k2test/new3'},
-            'icon': 'mdi-chart-timeline-variant',
-            'title': 'Тест 3',
-            'category': 'Тестова компонента',
-        },
-        {
-            'url': {'name': 'k2test/new4'},
-            'icon': 'mdi-chart-timeline-variant',
-            'title': 'Тест 4',
-            'category': 'Тестова компонента',
-        },
+
+            'title': 'Тестова компонента',
+            'category': 'Тест',
+            'icon': {'icon': 'mdi-chart-timeline-variant'},
+            'children': [
+                {'title': 'Тест 3', 'to': 'k2test-new3'},
+                {'title': 'Тест 3', 'to': 'k2test-new4'},
+            ],
+        }
+
     ]
     return data
\ No newline at end of file
diff --git a/components/menu.yml b/components/menu.yml
index 845191d..5405c29 100644
--- a/components/menu.yml
+++ b/components/menu.yml
@@ -1,45 +1,12 @@
-- category: dashboards
-  component_name: main
-  icon: mdi-chart-timeline-variant
-  id: 1
-  title: Analytics Dashboard
-  url:
-    name: dashboards-
-- category: dashboards
-  component_name: main
-  icon: mdi-cart-outline
+- category: "\u0422\u0435\u0441\u0442"
+  children:
+  - title: "\u0422\u0435\u0441\u0442 3"
+    to: k2test-new3
+  - title: "\u0422\u0435\u0441\u0442 3"
+    to: k2test-new4
+  component_name: k2test
+  icon:
+    icon: mdi-chart-timeline-variant
   id: 2
-  title: CRM Dashboard
-  url:
-    name: dashboards-crm
-- category: error
-  component_name: k2test
-  icon: error
-  id: 3
-  title: k2test--error
-  url:
-    name: error
-- category: "\u0422\u0435\u0441\u0442\u043E\u0432\u0430 \u043A\u043E\u043C\u043F\u043E\
-    \u043D\u0435\u043D\u0442\u0430"
-  component_name: k2test
-  icon: mdi-chart-timeline-variant
-  id: 4
-  title: "\u0422\u0435\u0441\u0442 2"
-  url:
-    name: k2test/new2
-- category: "\u0422\u0435\u0441\u0442\u043E\u0432\u0430 \u043A\u043E\u043C\u043F\u043E\
+  title: "\u0422\u0435\u0441\u0442\u043E\u0432\u0430 \u043A\u043E\u043C\u043F\u043E\
     \u043D\u0435\u043D\u0442\u0430"
-  component_name: k2test
-  icon: mdi-chart-timeline-variant
-  id: 5
-  title: "\u0422\u0435\u0441\u0442 3"
-  url:
-    name: k2test/new3
-- category: "\u0422\u0435\u0441\u0442\u043E\u0432\u0430 \u043A\u043E\u043C\u043F\u043E\
-    \u043D\u0435\u043D\u0442\u0430"
-  component_name: k2test
-  icon: mdi-chart-timeline-variant
-  id: 6
-  title: "\u0422\u0435\u0441\u0442 4"
-  url:
-    name: k2test/new4
diff --git a/db/database.db b/db/database.db
index 23e77cce3baeb28a9254398b60b7e2e0ac83fcb5..98d429997ba506f28760c6e89b3402f6c9f15c5f 100644
GIT binary patch
delta 133
zcmZozz|^pSX@WGP%|sbzMw^WZ-}GG45|fiG(^Ab6EiDa9lG2haQ_@Tf5)Dl)jSZ4h
z4AV@qjY?9BOAPf4%!~|-jCBpnbPY`v49u-eOsq^S^ehZ4O^ggD*XfFF-k@*bpg_p9
HMFk1~Vu2>b

delta 132
zcmZozz|^pSX@WGP(nJ|&Mx~7j-}Ic5ER77)j7=?!jEyWzEYmD3jLppql2c5L%u_53
zQ__sGjY?9BOAPf4%!~|-jCBpnbPY`u3@oh-O|6Vf^$aWw3@j(t>WXjPpl{%yK*+E~
G1quLXTO)M<

diff --git a/k2/__pycache__/k2cfg.cpython-310.pyc b/k2/__pycache__/k2cfg.cpython-310.pyc
index 1cc904d7dde1254811d930f0fc5cc7cbda7a69c3..73fd2a789fda4babbce97ea7d74a5b3011f15dce 100644
GIT binary patch
delta 81
zcmX>iengx%pO=@50SH<rb*8-D$h(S(QF8MRCM`xrnaPit*E1?@p3G9h$f&)UgH4l>
l(R{KI`%^~y%@Q2b85vzSZ{YM}WMrKDpG%#QeX=_DTmY$<7GwYb

delta 81
zcmX>iengx%pO=@50SJC<>qz;yk#`jnqtxadOj?YLvXdV(uV+-=Jej40kx^$e2b(4%
lqs3$+_NR<an<Y4=GctN?-oWX{$jCJLKbJZq=VW#6xd7Bd7Y+ab

diff --git a/k2/__pycache__/k2inst.cpython-310.pyc b/k2/__pycache__/k2inst.cpython-310.pyc
index c56d7e1643bba81b32abf8728fb5bd9385a8d27f..019923307024d87f2993ea1e7c5a698aa0b976dc 100644
GIT binary patch
delta 389
zcmey7xiFhApO=@50SNpLcBP01PUMqe^xLRy%_Na3zd$X;Wg%mVYl>S7Lo;KPX$oU7
zgQol9941-DmdUyDVT}JaACW)7=uskH!jz@Z%*e=)B3Hwb!Y#=#n;}KMh7Cw60A&<`
zv?5$wX)b3tLofpiLy6J^#!5#<hFX3`hAQ3^<r3x1rxfd$7*!_sN=i;nQaR0ER0VX_
zEw+^W+{DbhTe6b{ROKf7s_taWo6N43D8$7m#mL6Q^-q9Bijkv%>3`9=%@t}@Osqwx
zfVwvS(wM=*eHq9qS_UE_CkOC|Y~HBL$I5tS@&Th#=PG{v#DYwHkjc8asd=UP$v|Z&
zfDy=Z2I68iAW_1Q1@wH84v?wIRKx?Mie^kM<P=x9#Zyp}pOu<i5)U%v7*JC&6Hu0o
rspu_8t=VRCV?jp7bCW$yWEtOrbWE-^;b$zE+-Z`_#>L1X!N&*yU;<<c

delta 221
zcmV<303!dPYxrpnZw(C!00000gnx--tWc2-905GBD?0)PWC2qEDMX`w0v!Q*lYbvp
z0r|7mAIJd~WFCA3WD6Mpn*d}Vd<L5UWFT|`Y9EunAr~1SkO6r-0RVju0RVapWFvGT
zd=G;Gn*f~xli(W}vj-ww0s$hEpBWjGek98R+8vWDB^{G>CAtA@lQ1S>5E=po0t)^R
z1R4PdfCB$=&9kE>dIAXA24rt-VQFr&A}N>z0n)R(Ei45A%aiCbbpk0hv)3~b0RhdE
X=`<aaq%#zgA2kjEY?CfEZ2}Gf=?6lU

diff --git a/k2/__pycache__/k2obj.cpython-310.pyc b/k2/__pycache__/k2obj.cpython-310.pyc
index 427186a3cba840d8040d580efd6ffd84c215804d..1a877a65f17a3a322fac1b998628e0351af9c5d9 100644
GIT binary patch
delta 264
zcmey!^qiS5pO=@50SI>Vb*4l!PULgt;s){@fVkLdVyt3v3KIrop2HQzk-`$ppviiR
zHQOjZDeD%)Ek*-Pu3L;nw;0QBF=pOkOu5CFe2Y1?qTm*DW^O?gM{#ONNn%n?Y7~2N
zX-Pq1amg*V)I5-YpC;$TK3ADrEV-$9rBU1ksYSV&#l@NVdBrOkibR0UC=!|Y$TLO>
z$l_pNVT3^@CMHI7$n~v=5va^hlMzfqb%Tun5u!li7Kcr4eoARhsvSsWF%yswVgLZS
Cd_ML7

delta 127
zcmaFP{E>+-pO=@50SLT`J5tgZCi1y*F#>rGKwPXaF;-C^m_d{I7HhUqep1#g20u-X
zi4R@*qgZlN^Ga7T6oGUWaZPq&^wi@4GC3Gn7$J~@u?S?0pC*KcDg>(r5!{o{GfDse
DxL6m!

diff --git a/k2/k2cfg.py b/k2/k2cfg.py
index 9907a70..7c7fdf6 100644
--- a/k2/k2cfg.py
+++ b/k2/k2cfg.py
@@ -10,7 +10,6 @@ import sys
 from flask import session
 
 class k2(k2obj):
-
     version = '2.5.1.27'
     db = SQLAlchemy()
     domain = 'http://127.0.0.1:5000/'
@@ -60,8 +59,6 @@ class k2(k2obj):
         cls.menu = yaml_data
 
 
-
-
     # load database settings from yml file
     def init_db_uri(self):
         with open('db/db.yml', 'r') as f:
diff --git a/k2/k2inst.py b/k2/k2inst.py
index 4e31ca0..ec6e911 100644
--- a/k2/k2inst.py
+++ b/k2/k2inst.py
@@ -323,7 +323,7 @@ def install_component_from_archive(component_id):
 
         #add language folders
         k2.search_babel_translation_directories()
-
+        print(k2.domain)
         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"]}" />'''
@@ -334,7 +334,7 @@ def install_component_from_archive(component_id):
 @components_bp.route('/install-requirments/<string:selected_component_name>', methods=['GET'])
 def install_requirments(selected_component_name):
     #menu items api
-    response =  requests.get(f"{k2.domain}{selected_component_name}/menu-items")
+    response = requests.get(f"{k2.domain}{selected_component_name}/menu-items")
     if response.status_code == 200:
         data = response.json()
         print(data)
@@ -450,3 +450,7 @@ def remove_component(component_id):
     except Exception as e:
         # Повертаємо повідомлення про помилку видалення
         return 'Error removing component: ' + str(e)
+
+@components_bp.route('/api/main-menu/')
+def project_menu():
+    return k2.menu
-- 
1.9.1