Init

Author: mslaursen

fastapi_forge/frontend/components/model_row.py

@@ -12,13 +12,24 @@ def __init__(
     ):
         super().__init__(wrap=False)
         self.model = model
-        self.is_editing = False
+        self.is_selected_row = model == state.selected_model
         self.color = color
+        self.is_editing = False
         self._build()
 
     def _build(self) -> None:
-        with self.classes("w-full flex items-center justify-between cursor-pointer"):
-            self.name_label = ui.label(text=self.model.name).classes("self-center")
+        base_classes = "w-full flex items-center justify-between cursor-pointer p-2 rounded transition-all"
+        if self.is_selected_row:
+            base_classes += " bg-blue-100 dark:bg-blue-900 border-l-4 border-blue-500"
+        else:
+            base_classes += " hover:bg-gray-100 dark:hover:bg-gray-800"
+
+        with self.classes(base_classes):
+            self.name_label = (
+                ui.label(text=self.model.name)
+                .classes("self-center")
+                .on("click", lambda: state.select_model(self.model))
+            )
             if self.color:
                 self.name_label.classes(add=self.color)
             self.name_input = (
@@ -28,7 +39,7 @@ def _build(self) -> None:
             )
             self.name_label.bind_visibility_from(self, "is_editing", lambda x: not x)
 
-            self.on("click", lambda: state.select_model(self.model))
+            # self.on("click", lambda: state.select_model(self.model))
 
             with ui.row().classes("gap-2"):
                 self.edit_button = ui.button(
@@ -39,16 +50,16 @@ def _build(self) -> None:
                     icon="save",
                     on_click=self._save_model,
                 ).bind_visibility_from(self, "is_editing")
-                ui.button(icon="delete", on_click=self._delete_model)
+                ui.button(
+                    icon="delete", on_click=lambda _: state.delete_model(self.model)
+                )
 
     def _toggle_edit(self) -> None:
+        print("editing")
         self.is_editing = not self.is_editing
 
     def _save_model(self) -> None:
         new_name = self.name_input.value.strip()
         if new_name:
             state.update_model_name(self.model, new_name)
             self.is_editing = False
-
-    def _delete_model(self) -> None:
-        state.delete_model(self.model)

fastapi_forge/frontend/constants.py

@@ -1,5 +1,7 @@
 from typing import Any
 
+SELECTED_MODEL_TEXT_COLOR = "text-black-500 dark:text-amber-300"
+
 FIELD_COLUMNS: list[dict[str, Any]] = [
     {
         "name": "name",

fastapi_forge/frontend/main.py

@@ -38,10 +38,12 @@ def load_initial_project(path: Path) -> p.ProjectSpec:
 def create_ui_components() -> None:
     """Create all UI components"""
     with ui.column().classes("w-full h-full items-center justify-center mt-4"):
-        ModelEditorPanel().classes("no-shadow min-w-[600px]")
+        ModelEditorPanel().classes(
+            "shadow-2xl dark:shadow-none min-w-[700px] max-w-[800px]"
+        )
 
-    ModelPanel()
-    ProjectConfigPanel()
+    ModelPanel().classes("shadow-xl dark:shadow-none")
+    ProjectConfigPanel().classes("shadow-xl dark:shadow-none")
 
 
 def run_ui(reload: bool) -> None:

fastapi_forge/frontend/panels/model_editor_panel.py

@@ -23,6 +23,8 @@ def __init__(self):
         self.visible = False
 
         state.select_model_fn = self.set_selected_model
+        state.deselect_model_fn = self.deselect_model
+        state.render_model_editor_fn = self.refresh
 
         self.add_field_modal: AddFieldModal = AddFieldModal(
             on_add_field=self._handle_modal_add_field,
@@ -298,6 +300,10 @@ def _validate_field_input(
                 return False
         return True
 
+    def refresh(self) -> None:
+        self._refresh_table(state.selected_model.fields)
+        self._refresh_relationship_table(state.selected_model.relationships)
+
     def _refresh_table(self, fields: list[ModelField]) -> None:
         if state.selected_model is None:
             return
@@ -513,3 +519,6 @@ def set_selected_model(self, model: Model) -> None:
         self._refresh_table(model.fields)
         self._refresh_relationship_table(model.relationships)
         self.visible = True
+
+    def deselect_model(self) -> None:
+        self.visible = False

fastapi_forge/frontend/panels/model_panel.py

@@ -4,6 +4,7 @@
 from pydantic import ValidationError
 
 from fastapi_forge.frontend import ModelCreate, ModelRow
+from fastapi_forge.frontend.constants import SELECTED_MODEL_TEXT_COLOR
 from fastapi_forge.frontend.notifications import notify_validation_error
 from fastapi_forge.frontend.state import state
 from fastapi_forge.project_io import ProjectExporter
@@ -12,7 +13,6 @@
 class ModelPanel(ui.left_drawer):
     def __init__(self):
         super().__init__(value=True, elevated=False, bottom_corner=True)
-        self.classes("border-right[1px]")
 
         state.render_models_fn = self._render_models
 
@@ -58,9 +58,11 @@ def _render_models(self) -> None:
 
         with self.model_list:
             for model in state.models:
-                is_auth_user = model.name == "auth_user"
-                color = "text-green-500" if is_auth_user else None
                 ModelRow(
                     model,
-                    color=color,
+                    color=(
+                        SELECTED_MODEL_TEXT_COLOR
+                        if model == state.selected_model
+                        else None
+                    ),
                 )

fastapi_forge/frontend/state.py

@@ -20,7 +20,9 @@ class ProjectState(BaseModel):
     selected_relation: ModelRelationship | None = None
 
     render_models_fn: Callable | None = None
+    render_model_editor_fn: Callable | None = None
     select_model_fn: Callable | None = None
+    deselect_model_fn: Callable | None = None
 
     project_name: str = ""
     use_postgres: bool = False
@@ -70,16 +72,22 @@ def add_model(self, model_name: str) -> None:
             n.notify_validation_error(exc)
 
     def delete_model(self, model: Model) -> None:
-        if model not in self.models:
+        if (
+            model not in self.models
+            or self.deselect_model_fn is None
+            or self.render_models_fn is None
+        ):
             ui.notify("Something went wrong...", type="warning")
             return
+
         self.models.remove(model)
-        if self.selected_model == model:
-            self.selected_model = None
-        if self.render_models_fn:
-            self.render_models_fn()
+        self.deselect_model_fn()
+        self.render_models_fn()
 
     def update_model_name(self, model: Model, new_name: str) -> None:
+        if model.name == new_name:
+            return
+
         if any(m.name == new_name for m in self.models if m != model):
             n.notify_model_exists(new_name)
             return
@@ -88,16 +96,31 @@ def update_model_name(self, model: Model, new_name: str) -> None:
         model.name = new_name
         self._update_relationships_for_rename(old_name, new_name)
 
+        if self.select_model_fn and model == self.selected_model:
+            self.select_model_fn(model)
+
         if self.render_models_fn:
             self.render_models_fn()
 
+        self.render_model_editor_fn()
+
     def select_model(self, model: Model) -> None:
-        if self.select_model_fn is None:
+        print("selecting")
+        if (
+            self.select_model_fn is None
+            or self.render_models_fn is None
+            or self.deselect_model_fn is None
+        ):
             n.notify_something_went_wrong()
             return
         self.selected_model = model
         self.select_model_fn(model)
 
+        if model not in self.models:
+            self.deselect_model_fn()
+
+        self.render_models_fn()
+
     def get_project_spec(self) -> ProjectSpec:
         return ProjectSpec(
             project_name=self.project_name,

fastapi_forge/template/hooks/post_gen_project.py

@@ -55,7 +55,6 @@ def _get_delete_flagged() -> tuple[list[str], list[str]]:
 def delete_empty_init_folders(root_dir: str = "src") -> None:
     """Delete folders that only contain empty __init__.py files."""
     for dirpath, dirnames, filenames in os.walk(root_dir, topdown=False):
-        # Skip the root directory itself
         if dirpath == root_dir:
             continue
 
@@ -69,10 +68,6 @@ def delete_empty_init_folders(root_dir: str = "src") -> None:
                         line.strip() and not line.strip().startswith("#")
                         for line in content.splitlines()
                     )
-                    if "__all__ = []" in content:
-                        print(45747457745)
-                    else:
-                        print(123123123)
                 if not has_code:
                     os.remove(init_file)
                     os.rmdir(dirpath)
@@ -108,4 +103,4 @@ def cleanup():
     uv_init()
     make_env()
     lint()
-    git_init()
+    # git_init()