Merge pull request #770 from nick-leung/fix/rename-title-to-task

[PR] Avoid 'title' kwarg collision in examples and demo: rename column to 'task'

Author: johnowhitaker

demo/main.py

@@ -3,18 +3,18 @@
 def render(item:'Todo'):
     id = f'todo-{item.id}'
     dellink = AX('Delete', hx_delete=f'/todo/{item.id}', target_id=id, hx_swap='delete')
-    return Li(item.title, dellink, id=id)
+    return Li(item.task, dellink, id=id)
 
 auth = user_pwd_auth(user='s3kret', skip=[r'/favicon\.ico', r'/static/.*', r'.*\.css'])
 app,rt,todos,Todo = fast_app(
     'data/tbl.db', middleware=[auth], render=render,
-    id=int, title=str, pk='id')
+    id=int, task=str, pk='id')
 
 @rt("/")
 async def get(request):
     new_frm = Form(hx_post='/', target_id='todo-list', hx_swap='beforeend')(
         Group(
-            Input(name='title', placeholder='Title'),
+            Input(name='task', placeholder='Task'),
             Button('Add')
         )
     )

examples/todos1.py

@@ -1,10 +1,10 @@
 from fasthtml.common import *
 
-app,rt,todos,Todo = fast_app('data/todos.db', id=int, title=str, done=bool, pk='id')
+app,rt,todos,Todo = fast_app('data/todos.db', id=int, task=str, done=bool, pk='id')
 
 def TodoRow(todo):
     return Li(
-        A(todo.title, href=f'/todos/{todo.id}'),
+        A(todo.task, href=f'/todos/{todo.id}'),
         (' (done)' if todo.done else '') + ' | ',
         A('edit',     href=f'/edit/{todo.id}'),
         id=f'todo-{todo.id}'
@@ -13,7 +13,7 @@ def TodoRow(todo):
 def home():
     add = Form(
             Group(
-                Input(name="title", placeholder="New Todo"),
+                Input(name="task", placeholder="New Todo"),
                 Button("Add")
             ), action="/", method='post'
         )
@@ -46,7 +46,7 @@ def get(id:int):
 def get(id:int):
     res = Form(
             Group(
-                Input(id="title"),
+                Input(id="task"),
                 Button("Save")
             ),
             Hidden(id="id"),
@@ -60,7 +60,7 @@ def get(id:int):
 @rt("/todos/{id}")
 def get(id:int):
     contents = Div(
-        Div(todos[id].title),
+        Div(todos[id].task),
         A('Delete', href=f'/remove?id={id}', role="button"),
         A('Back', href='/', role="button")
     )

examples/todos3.py

@@ -2,27 +2,27 @@
 from fasthtml.common import *
 
 def render(todo):
-    show = AX(todo.title, f'/todos/{todo.id}', 'current-todo')
+    show = AX(todo.task, f'/todos/{todo.id}', 'current-todo')
     edit = AX('edit',     f'/edit/{todo.id}' , 'current-todo')
     dt = ' (done)' if todo.done else ''
     return Li(show, dt, ' | ', edit, id=f'todo-{todo.id}')
 
-app,rt,todos,Todo = fast_app('data/todos.db', render, id=int, title=str, done=bool, pk='id')
+app,rt,todos,Todo = fast_app('data/todos.db', render, id=int, task=str, done=bool, pk='id')
 
 @rt("/")
 def get():
-    inp = Input(id="new-title", name="title", placeholder="New Todo")
+    inp = Input(id="new-task", name="task", placeholder="New Todo")
     add = Form(Group(inp, Button("Add")), hx_post="/", target_id='todo-list', hx_swap="beforeend")
     card = Card(Ul(*todos(), id='todo-list'), header=add, footer=Div(id='current-todo')),
     return Titled('Todo list', card)
 
 @rt("/")
 def post(todo:Todo):
-    return todos.insert(todo), Input(id="new-title", name="title", placeholder="New Todo", hx_swap_oob='true')
+    return todos.insert(todo), Input(id="new-task", name="task", placeholder="New Todo", hx_swap_oob='true')
 
 @rt("/edit/{id}")
 def get(id:int):
-    res = Form(Group(Input(id="title"), Button("Save")),
+    res = Form(Group(Input(id="task"), Button("Save")),
         Hidden(id="id"), CheckboxX(id="done", label='Done'),
         hx_put="/", target_id=f'todo-{id}', id="edit")
     return fill_form(res, todos[id])
@@ -34,7 +34,7 @@ def put(todo: Todo): return todos.update(todo), clear('current-todo')
 def get(id:int):
     todo = todos[id]
     btn = Button('delete', hx_delete=f'/todos/{todo.id}', target_id=f'todo-{id}', hx_swap="outerHTML")
-    return Div(Div(todo.title), btn)
+    return Div(Div(todo.task), btn)
 
 @rt("/todos/{id}")
 def delete(id:int):

examples/todos4.py

@@ -2,7 +2,7 @@
 
 db = database('data/todos.db')
 todos = db.t.todos
-if todos not in db.t: todos.create(id=int, title=str, done=bool, pk='id')
+if todos not in db.t: todos.create(id=int, task=str, done=bool, pk='id')
 Todo = todos.dataclass()
 
 id_curr = 'current-todo'
@@ -18,12 +18,12 @@ def get(fname:str, ext:str): return FileResponse(f'{fname}.{ext}')
 
 @patch
 def __ft__(self:Todo):
-    show = AX(self.title, f'/todos/{self.id}', id_curr)
+    show = AX(self.task, f'/todos/{self.id}', id_curr)
     edit = AX('edit',     f'/edit/{self.id}' , id_curr)
     dt = ' (done)' if self.done else ''
     return Li(show, dt, ' | ', edit, id=tid(self.id))
 
-def mk_input(**kw): return Input(id="new-title", name="title", placeholder="New Todo", **kw)
+def mk_input(**kw): return Input(id="new-task", name="task", placeholder="New Todo", **kw)
 def clr_details(): return Div(hx_swap_oob='innerHTML', id=id_curr)
 
 @rt("/")
@@ -44,7 +44,7 @@ def post(todo:Todo): return todos.insert(todo), mk_input(hx_swap_oob='true')
 
 @rt("/edit/{id}")
 def get(id:int):
-    res = Form(Group(Input(id="title"), Button("Save")),
+    res = Form(Group(Input(id="task"), Button("Save")),
         Hidden(id="id"), CheckboxX(id="done", label='Done'),
         hx_put="/", target_id=tid(id), id="edit")
     return fill_form(res, todos[id])
@@ -57,7 +57,7 @@ def get(id:int):
     todo = todos[id]
     btn = Button('delete', hx_delete=f'/todos/{todo.id}',
                  target_id=tid(todo.id), hx_swap="outerHTML")
-    return Div(Div(todo.title), btn)
+    return Div(Div(todo.task), btn)
 
 serve()