Bio complete

Author: intendednull

res/template/profile

@@ -31,7 +31,7 @@ def __del__(self):
     def __get(self, url, **kwargs):
         try:
             return requests.get(url, **kwargs)
-        except ConnectionError as e:
+        except requests.ConnectionError as e:
             return e
 
     def __parse_image(self, data: List[dict]) -> dict:
@@ -56,7 +56,7 @@ def __parse_info(self, data: dict):
 
     def get_profile(self):
         response = {k: self.__get(v) for k, v in self.api.items() if self.api_cache.get(k) is None}
-        if ConnectionError not in response:  # TODO Record connection errors
+        if requests.ConnectionError not in response:  # TODO Record connection errors
             if 'info' in response:
                 self.api_cache['info'] = response['info'].json()
             if 'hobbies' in response:

src/cache.py

@@ -56,19 +56,19 @@ def init(self):
         self.btn_dislike = widget.PrimaryButton(
             self.commandbar, text='Nope', bg='red', command=self.cmd_dislike
         )
-        self.btn_bio = widget.PrimaryButton(
+        self.btn_bio = widget.SecondaryButton(
             self.commandbar, text='Bio', command=self.cmd_bio
         )
         self.btn_like = widget.PrimaryButton(
             self.commandbar, text='Yep', bg='green', command=self.cmd_like
         )
         self.title.pack(fill='x', expand=True)
         self.window.pack(fill='both', expand=True)
-        self.commandbar.pack(side='bottom', fill='x', expand=True)
+        self.commandbar.pack(side='bottom', fill='both', expand=True)
 
         self.btn_dislike.pack(side='left')
-        self.btn_bio.pack(side='left')
-        self.btn_like.pack(side='left')
+        self.btn_like.pack(side='right')
+        self.btn_bio.pack()
 
         self.cache = ImageCache(self.cachesize)
         self.cache.start()
@@ -98,19 +98,32 @@ def init(self):
         self.config(height=height, width=width)
         self.pack_propagate(0)
 
-    def __make_item(self, name, value):
-        item = widget.SecondaryFrame(self)
-        name = widget.SecondaryLabel(item, text=name)
-        value = widget.SecondaryLabel(item, text=value)
-        name.pack(side='left')
-        value.pack(side='left')
+    def __build_info(self, info: dict):
+        item = widget.PrimaryFrame(self)
+        info = [
+            f"Age: {info['age']}",
+            info['gender'].capitalize(),
+            f'{"She" if info["gender"].startswith("f") else "He"} is {info["location"]}.'
+        ]
+        for val in info:
+            name = widget.PrimaryLabel(item, text=val, font=('sys', 15), fg='gray')
+            name.pack(fill='both')
         return item
 
+    def __build_hobbies(self, hobbies):
+        frame = widget.PrimaryFrame(self)
+        title = widget.PrimaryLabel(frame, text='Hobbies', font=('sys', 15), justify='left')
+        title.pack(fill='both')
+        for hobby in hobbies:
+            val = widget.SecondaryLabel(frame, text=hobby)
+            val.pack(fill='both')
+        return frame
+
     def load(self, data: dict):
-        # print(data)
-        for name, val in data.items():
-            item = self.__make_item(name, val)
-            item.pack(expand=True, fill='x')
+        info = self.__build_info(data['info'])
+        hobbies = self.__build_hobbies(data['hobbies'])
+        info.pack(expand=True, fill='both')
+        hobbies.pack(expand=True, fill='both')
 
 
 class Splash(widget.PrimaryFrame):

src/front.py

@@ -7,7 +7,9 @@
 
 
 class SecondaryFrame(tk.Frame):
-    DEFAULT = {}
+    DEFAULT = {
+        'bg': 'gray'
+    }
 
     def __init__(self, *args, **kwds):
         super().__init__(*args, **{**self.DEFAULT, **kwds})
@@ -30,7 +32,8 @@ def __init__(self, *args, **kwds):
 class SecondaryLabel(tk.Label):
     DEFAULT = {
         'justify': 'left',
-        'width': 10
+        'width': 10,
+        'bg': 'gray'
     }
 
     def __init__(self, *args, **kwds):
@@ -62,7 +65,7 @@ def __init__(self, *args, **kwds):
 class PrimaryButton(tk.Button):
     DEFAULT = {
         'height': 3,
-        'width': 15
+        'width': 10
     }
 
     def __init__(self, *args, **kwds):
@@ -75,7 +78,7 @@ class PrimaryLabel(tk.Label):
     DEFAULT = {
         'font': ('Courier', 25),
         'bg': 'black',
-        'fg': 'gray'
+        'fg': 'blue'
     }
 
     def __init__(self, *args, **kwds):