update to RIO 0.11.1

Dockerfile

@@ -8,5 +8,6 @@ RUN ./venv/bin/pip install --no-cache-dir -r requirements.txt
 COPY *.py *.txt *.toml ./
 COPY inventory ./inventory
 #ENV PYTHONPATH=/inventory
-CMD ["./venv/bin/python3", "-m", "rio", "run", "--release", "--public", "--port", "8000"]
+# CMD ["./venv/bin/python3", "-m", "rio", "run", "--release", "--public", "--port", "8000"]
+CMD ["./venv/bin/python3", "run.py"]
 EXPOSE 8000

db_classes.py

@@ -1,6 +1,5 @@
 from peewee import *
-import importlib
-importlib.import_module('meilisearch')
+
 from search import InventorySearch as ivs
 from playhouse.shortcuts import ReconnectMixin
 

inventory/__init__.py

@@ -8,7 +8,7 @@ import rio
 from . import pages
 from . import components as comps
 
-from db_classes import *
+from db_classes import init
 
 # Define a theme for Rio to use.
 #
@@ -22,7 +22,7 @@ theme = rio.Theme.from_colors(
     primary_color=rio.Color.from_hex("#84329B"),
     #neutral_color=rio.Color.from_hex("#a850f480"),
     neutral_color=rio.Color.from_hex("#D0A2F7"),
-    light=True,
+    mode='light',
 )
 
 init()

inventory/components/item.py

@@ -7,7 +7,7 @@ import rio
 
 from .. import components as comps
 
-from db_classes import *
+# from db_classes import *
 
 class Item(rio.Component):
 

inventory/components/navbar.py

@@ -29,7 +29,7 @@ class Navbar(rio.Component):
         
 
         #print(self.office)
-        await self.force_refresh()
+        self.force_refresh()
 
 
     checkpage: str = "in"

inventory/pages/add_page.py

@@ -7,7 +7,8 @@ import rio
 import datetime
 from mac_vendor_lookup import AsyncMacLookup
 
-from db_classes import *
+# from db_classes import *
+from db_classes import get_location_id, create_item
 from .. import components as comps
 
 import asyncio

inventory/pages/browse_page.py

@@ -63,7 +63,7 @@ class BrowsePage(rio.Component):
         self.items = search_item(query, self.filters)
         mid = time()
         self.loading_text = "Loading data..."
-        await self.force_refresh()
+        self.force_refresh()
         end = time()
         self.loading_text = ""
         render = str(int((end - mid) * 1000)) + "ms"
@@ -121,16 +121,16 @@ class BrowsePage(rio.Component):
     async def _close_info_popup(self):
         self.edit_show = False
         self.info_show = False
-        await self.force_refresh()
+        self.force_refresh()
 
     async def _close_edit_popup(self):
         await self._open_info_popup(self.ibarcode)
-        await self.force_refresh()
+        self.force_refresh()
 
     async def _save_edit_popup(self):
         self.edit_show = False
         self.info_show = True
-        await self.force_refresh()
+        self.force_refresh()
         await self._add_part_button()
         await asyncio.sleep(1)
         await self._open_info_popup(self.ibarcode, skip_display=True)
@@ -145,7 +145,7 @@ class BrowsePage(rio.Component):
     async def _delete_edit_popup(self):
         self.edit_show = False
         self.info_show = True
-        await self.force_refresh()
+        self.force_refresh()
         await delete_item_id(self.ibarcode)
         await self._search()
         await asyncio.sleep(1)
@@ -292,7 +292,9 @@ class BrowsePage(rio.Component):
                 #color=self.popup_color,
                 is_open=self.info_show,
                 min_width=40,
-                #position='fullscreen',
+                position='fullscreen',
+                user_closable=True,
+                modal=True,
                 #align_y = 1,
                 color=rio.Color.TRANSPARENT,
                 content=rio.Card(
@@ -327,8 +329,9 @@ class BrowsePage(rio.Component):
                 #color=self.popup_color,
                 is_open=self.edit_show,
                 min_width=40,
-                #position='fullscreen',
-                #align_y = 1,
+                position='fullscreen',
+                user_closable=False,
+                modal=True,
                 color=rio.Color.TRANSPARENT,
                 content=rio.Card(
                     rio.Column(

inventory/pages/item_page.py

@@ -20,7 +20,7 @@ class ItemPage(rio.Component):
         self.itm = find_item(self.barcode)
         #print(find_item(self.barcode))
         #print(self.itm)
-        await self.force_refresh()
+        self.force_refresh()
 
     def build(self) -> rio.Component:
         if 'barcode' in self.itm:

requirements.txt

@@ -1,6 +1,7 @@
 peewee
 pymysql
-rio-ui==0.10.4
+#rio-ui==0.10.4
+rio-ui==0.11.1
 meilisearch   #==0.31.5
 mac-vendor-lookup
 

run.py

@@ -0,0 +1,3 @@
+from inventory import app
+
+app.run_as_web_server(host='0.0.0.0',port=8000)

search.py

@@ -89,9 +89,9 @@ class InventorySearch:
         :param filters: A meilisearch compatible filter statement.
         :returns: The search results dict. Actual results are in a list under "hits", but there are other nice values that are useful in the root element."""
         if filters:
-            q = self.idxref.search(query, {"filter": filters, "limit": 1000})
+            q = self.idxref.search(query, {"filter": filters, "limit": 10000})
         else:
-            q = self.idxref.search(query)
+            q = self.idxref.search(query, {"limit": 10000})
         return q
     
     def _filter_one(self, filter: str):