From 06d48162d079f89b43a207075672a80603a13a69 Mon Sep 17 00:00:00 2001
From: Diogo Pereira <diogo.pereira@swirldslabs.com>
Date: Wed, 30 Apr 2025 22:08:02 -0700
Subject: [PATCH 1/6] Added github JSON loader

Signed-off-by: Diogo Pereira <diogo.pereira@swirldslabs.com>
---
 src/static_site_generator.py | 104 ++++------------------------
 templates/kaban_board.html   | 130 ++++++++++++++++++-----------------
 2 files changed, 80 insertions(+), 154 deletions(-)

diff --git a/src/static_site_generator.py b/src/static_site_generator.py
index c2ee73a..99eb855 100644
--- a/src/static_site_generator.py
+++ b/src/static_site_generator.py
@@ -1,108 +1,28 @@
 from jinja2 import Environment, FileSystemLoader
+import json 
 
 # Example data
-dummy_data = {
+seed_data = {
     'title': 'Version Two',
     'github_user': 'octocat',
     'team': 'Platform Engineering',
-    'tasks': [
-        {
-            "assignees": ["coolAssignee"],
-            "content": {
-                "body": "https://dummy_url/test#L42\n\nRename from `X` to `Y`",
-                "number": 241,
-                "repository": "pandas/coolrepo",
-                "title": "cool title",
-                "type": "Issue",
-                "url": "https://github.com/pandas/coolrepo/issues/241"
-            },
-            "id": "PVTI_lADOBgkjhkjhjjh",
-            "labels": ["Bug"],
-            "linked pull requests": ["https://github.com/pandas/coolrepo/pull/242"],
-            "repository": "https://github.com/pandas/coolrepo",
-            "status": "New",
-            "title": "Cool Pandas Task 1"
-        },
-        {
-            "assignees": ["coolAssignee"],
-            "content": {
-                "body": "https://dummy_url/test#L42\n\nRename from `X` to `Y`",
-                "number": 241,
-                "repository": "pandas/coolrepo",
-                "title": "cool title",
-                "type": "Issue",
-                "url": "https://github.com/pandas/coolrepo/issues/241"
-            },
-            "id": "PVTI_lADOBgkjhkjhjjh",
-            "labels": ["Bug"],
-            "linked pull requests": ["https://github.com/pandas/coolrepo/pull/242"],
-            "repository": "https://github.com/pandas/coolrepo",
-            "status": "Backlog",
-            "title": "Cool Pandas Task 2"
-        },
-        {
-            "assignees": ["coolAssignee"],
-            "content": {
-                "body": "https://dummy_url/test#L42\n\nRename from `X` to `Y`",
-                "number": 241,
-                "repository": "pandas/coolrepo",
-                "title": "cool title",
-                "type": "Issue",
-                "url": "https://github.com/pandas/coolrepo/issues/241"
-            },
-            "id": "PVTI_lADOBgkjhkjhjjh",
-            "labels": ["Bug"],
-            "linked pull requests": ["https://github.com/pandas/coolrepo/pull/242"],
-            "repository": "https://github.com/pandas/coolrepo",
-            "status": "In Progress",
-            "title": "Cool Pandas Task 3"
-        },
-        {
-            "assignees": ["coolAssignee"],
-            "content": {
-                "body": "https://dummy_url/test#L42\n\nRename from `X` to `Y`",
-                "number": 241,
-                "repository": "pandas/coolrepo",
-                "title": "cool title",
-                "type": "Issue",
-                "url": "https://github.com/pandas/coolrepo/issues/241"
-            },
-            "id": "PVTI_lADOBgkjhkjhjjh",
-            "labels": ["Bug"],
-            "linked pull requests": ["https://github.com/pandas/coolrepo/pull/242"],
-            "repository": "https://github.com/pandas/coolrepo",
-            "status": "Blocked",
-            "title": "Cool Pandas Task 4"
-        },
-        {
-            "assignees": ["coolAssignee"],
-            "content": {
-                "body": "https://dummy_url/test#L42\n\nRename from `X` to `Y`",
-                "number": 241,
-                "repository": "pandas/coolrepo",
-                "title": "cool title",
-                "type": "Issue",
-                "url": "https://github.com/pandas/coolrepo/issues/241"
-            },
-            "id": "PVTI_lADOBgkjhkjhjjh",
-            "labels": ["Bug"],
-            "linked pull requests": ["https://github.com/pandas/coolrepo/pull/242"],
-            "repository": "https://github.com/pandas/coolrepo",
-            "status": "Done",
-            "title": "Cool Pandas Task 5"
-        }
-    ]
+    'tasks': []
 }
 
-def generate_site(data=dummy_data, output_file='./_site/index.html'):
+def generate_site(output_file='./_site/index.html'):
     env = Environment(loader=FileSystemLoader('templates'))
     template = env.get_template('kaban_board.html')
-    
+    with open('output.items.json', 'r') as file:
+        gh_json = json.load(file)
+
+
+    seed_data["tasks"] = gh_json
+
     # Extract unique statuses from the tasks list
-    unique_statuses = sorted({task["status"] for task in data["tasks"]})
+    unique_statuses = sorted({task["status"] for task in seed_data["tasks"]})
     
     # Add statuses to the data dictionary
-    data_with_statuses = {**data, "statuses": unique_statuses}
+    data_with_statuses = {**seed_data, "statuses": unique_statuses}
     
     # Render template with updated data
     output = template.render(data_with_statuses)
diff --git a/templates/kaban_board.html b/templates/kaban_board.html
index d55f0b3..2a7759c 100644
--- a/templates/kaban_board.html
+++ b/templates/kaban_board.html
@@ -41,88 +41,94 @@ <h1 class="mb-3 text-center">{{ title }}</h1>
             <!-- <div class="col-md-4">
                 <p><strong>Team:</strong> {{ team }}</p>
             </div> -->
-            <div class="col-md-4">
-                <input type="text" id="searchBox" class="form-control" placeholder="Search tasks...">
+            <div class="search-bar col-md-4">
+                <input type="text" id="search-input" class="form-control" placeholder="Search tasks..." />
             </div>
+            
         </div>
     </div>
 
     <div class="container-fluid py-4">
         <!-- Kanban Board -->
         <div class="row row-cols-1 row-cols-md-5 g-3">
-            {% set counter = 0 %}
             {% for status in statuses %}
-            <div class="col">
-                <div class="kanban-column">
-                    <div class="kanban-header text-primary text-center">{{ status }}</div>
-                    {% for task in tasks if task.status == status %}
-                    
-                    <div class="kanban-card">
-                        {% set card_id = "card-" ~ status | lower | replace(" ", "-") ~ "-" ~ counter %}
-                        {% set counter = counter + 1 %}
-                        <div class="d-flex align-items-start gap-2">
-                            <a 
-                                href="{{ task.content.url }}" 
-                                target="_blank" 
-                                class="text-primary text-decoration-none fw-bold"
-                            >
-                            🟢 #{{ task.content.number }}
-                            </a>
-                            <a 
-                                class="text-dark text-decoration-none fw-bold flex-grow-1" 
-                                data-bs-toggle="collapse" 
-                                href="#{{ card_id }}" 
-                                role="button" 
-                                aria-expanded="false" 
-                                aria-controls="{{ card_id }}"
-                            >
-                                {{ task.title }}
-                            </a>
+        <div class="col">
+            <div class="kanban-column">
+                <div class="kanban-header text-primary text-center">{{ status }}</div>
+
+                {% for task in tasks if task.status == status %}
+                {% set card_id = "card-" ~ status | lower | replace(" ", "-") ~ "-" ~ loop.index0 %}
+
+                <div class="kanban-card">
+                    <div class="d-flex flex-column align-items-start gap-2">
+                        <a 
+                            class="text-dark text-decoration-none fw-bold flex-grow-1"  
+                            data-bs-toggle="collapse" 
+                            href="#{{ card_id }}" 
+                            role="button" 
+                            aria-expanded="false" 
+                            aria-controls="{{ card_id }}"
+                        >
+                        🟢 {{ task.title }}<a 
+                        href="{{ task.content.url }}" 
+                        target="_blank" 
+                        class="fs-8 text-primary text-decoration-none">
+                            (#{{ task.content.number }})</a>
+                        </a>
+                    </div>
+                    <div class="collapse mt-2" id="{{ card_id }}">
+                        <div>
+                            <small>
+                                <strong>📦 Repository:</strong>
+                                <a href="{{ task.repository }}" target="_blank">
+                                    {{ task.content.repository }}
+                                </a>
+                            </small>
                         </div>
-                        <div class="collapse mt-2" id="{{ card_id }}">
-                            <!-- <div><small><strong>Issue #:</strong> {{ task.content.number }}</small></div> -->
-                            <div>
-                                <small>
-                                    <strong>📦 Repository:</strong>
-                                    <a href="{{ task.repository }}" target="_blank">
-                                        {{ task.content.repository }}
-                                    </a>
-                                </small>
-                            </div>
-                            <div><small><strong>👤 Assignee:</strong> {{ task.assignees | join(', ') }}</small></div>
-                            <div><small><strong>🏷️ Labels:</strong> {{ task.labels | join(', ') }}</small></div>
-                            <div><small><strong>📌 Status:</strong> {{ task.status }}</small></div>
-                            <div class="text-center">
-                                <a href="{{ task.content.url }}" target="_blank" class="btn btn-sm btn-outline-primary mt-2">View Issue</a>
-                            </div>
+                        <div><small><strong>👤 Assignee:</strong> {{ task.assignees | join(', ') }}</small></div>
+                        <div><small><strong>🏷️ Labels:</strong> {{ task.labels | join(', ') }}</small></div>
+                        <div><small><strong>📌 Status:</strong> {{ task.status }}</small></div>
+                        <div class="text-center">
+                            <a href="{{ task.content.url }}" target="_blank" class="btn btn-sm btn-outline-primary mt-2">View Issue</a>
                         </div>
                     </div>
-                    {% endfor %}
                 </div>
+                {% endfor %}
             </div>
-            {% endfor %}
+        </div>
+        {% endfor %}
         </div>
     </div>
 
 
 
 
-    <script>
-        document.addEventListener("DOMContentLoaded", function () {
-            const searchInput = document.querySelector("#searchBox");
-    
-            searchInput.addEventListener("input", function () {
-                const searchTerm = this.value.toLowerCase();
-                const cards = document.querySelectorAll(".kanban-card");
-    
-                cards.forEach(card => {
-                    const title = card.querySelector("strong").textContent.toLowerCase();
-                    const description = card.querySelector("small").textContent.toLowerCase();
-    
-                    if (title.includes(searchTerm) || description.includes(searchTerm)) {
-                        card.style.display = "block";
+<script>
+        document.addEventListener("DOMContentLoaded", function() {
+            // Get the search input and all Kanban cards
+            const searchInput = document.getElementById('search-input');
+            const kanbanCards = document.querySelectorAll('.kanban-card');
+            
+            // Add an event listener for the search input
+            searchInput.addEventListener('input', function() {
+                const query = searchInput.value.toLowerCase(); // Get the lowercase version of the query
+                
+                // Iterate over all the cards
+                kanbanCards.forEach(function(card) {
+                    // Get the card's title, issue number, and other text content to check if it matches the query
+                    const title = card.querySelector('.d-flex .text-dark').textContent.toLowerCase();
+                    const issueNumber = card.querySelector('.d-flex .text-primary').textContent.toLowerCase();
+                    const repository = card.querySelector('.text-muted') ? card.querySelector('.text-muted').textContent.toLowerCase() : '';
+                    const assignee = card.querySelector('.d-flex .assignee') ? card.querySelector('.d-flex .assignee').textContent.toLowerCase() : '';
+
+                    // Check if the query matches any part of the task (title, issue number, repository, assignee)
+                    const matches = title.includes(query) || issueNumber.includes(query) || repository.includes(query) || assignee.includes(query);
+                    
+                    // Show or hide the card based on the search query match
+                    if (matches) {
+                        card.style.display = 'block'; // Show the card
                     } else {
-                        card.style.display = "none";
+                        card.style.display = 'none'; // Hide the card
                     }
                 });
             });

From 2d62d132e6c509c9541c9d6542f7c3df5ce1c3f6 Mon Sep 17 00:00:00 2001
From: dpswirld <diogo.pereira@swirldslabs.com>
Date: Thu, 1 May 2025 09:05:25 -0700
Subject: [PATCH 2/6] Update src/static_site_generator.py

Co-authored-by: Roger Barker <roger.barker@swirldslabs.com>
Signed-off-by: dpswirld <diogo.pereira@swirldslabs.com>
---
 src/static_site_generator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/static_site_generator.py b/src/static_site_generator.py
index 99eb855..38d3bb6 100644
--- a/src/static_site_generator.py
+++ b/src/static_site_generator.py
@@ -3,7 +3,7 @@
 
 # Example data
 seed_data = {
-    'title': 'Version Two',
+    'title': 'Version2',
     'github_user': 'octocat',
     'team': 'Platform Engineering',
     'tasks': []

From 9cf8ff89fa9db458132fd58541540b36d3953bb0 Mon Sep 17 00:00:00 2001
From: Roger Barker <roger.barker@swirldslabs.com>
Date: Wed, 30 Apr 2025 22:15:38 -0700
Subject: [PATCH 3/6] feat: Refactor to include as a version2query class (#46)

Signed-off-by: Roger Barker <roger.barker@swirldslabs.com>
---
 src/version2query.py | 341 ++++++++++++++++++++++---------------------
 1 file changed, 172 insertions(+), 169 deletions(-)

diff --git a/src/version2query.py b/src/version2query.py
index 1cff48b..c4ebed0 100644
--- a/src/version2query.py
+++ b/src/version2query.py
@@ -8,187 +8,190 @@
 from ghapi.all import GhApi
 from rich import print
 
-TEMP_DIR = Path(f"tmp.dir")
-OUTPUT_FILE = f"output.items.json"
-
-def get_github_token():
-  """Get GitHub token from environment variable."""
-  token = os.getenv("GITHUB_TOKEN")
-  if not token:
-    raise ValueError("GITHUB_TOKEN environment variable is not set.")
-  return token
-
-def get_github_orgs():
-  """Create a list of github orgs based on the authenticated user."""
-
-  # Create the Github API
-  api:GhApi = GhApi()
-
-  # Grab the orgs:
-  orgs:list[str] = [org["login"] for org in api.orgs.list_for_authenticated_user()]
-
-  return orgs
-
-def get_all_projects(orgs:list[str]) -> list[dict]:
-  """Get all projects for each org in orgs."""
-
-  # Query projects for each org
-  all_projects:list[dict] = []
-  for org in orgs:
-    print(f"[bold blue]Fetching projects for org: {org}[/bold blue]")
-
-    # the graphql query needed to pull in all the data from gh api
-    query:str = """
-    query($login: String!) {
-      organization(login: $login) {
-        projectsV2(first: 100) {
-          nodes {
-            id
-            number
-            title
+class Version2Query:
+  def __init__(self, temp_dir:str = "tmp.dir", output_file:str="output.items.json"):
+    self.temp_dir:Path = Path(temp_dir)
+    self.output_file:str = output_file
+    self.api:GhApi = GhApi()
+    self._validate_token()
+
+  def _validate_token(self) -> None:
+    """Validate Github token exists in the environment."""
+    if not os.getenv("GITHUB_TOKEN"):
+      raise ValueError("GITHUB_TOKEN environment variable is not set.")
+
+  def get_github_token(self) -> str:
+    return os.getenv("GITHUB_TOKEN")
+
+  def get_github_orgs(self) -> list[str]:
+    """Create a list of github orgs based on the authenticated user."""
+    return [org["login"] for org in self.api.orgs.list_for_authenticated_user()]
+
+  def get_all_projects(self, orgs:list[str]) -> list[dict]:
+    """Get all projects for each org in orgs."""
+
+    # Query projects for each org
+    all_projects:list[dict] = []
+    for org in orgs:
+      print(f"[bold blue]Fetching projects for org: {org}[/bold blue]")
+
+      # the graphql query needed to pull in all the data from gh api
+      query:str = """
+      query($login: String!) {
+        organization(login: $login) {
+          projectsV2(first: 100) {
+            nodes {
+              id
+              number
+              title
+            }
           }
         }
       }
-    }
-    """
-
-    headers:dict = {"Authorization": f"Bearer {get_github_token()}"}
-    response = requests.post(
-      "https://api.github.com/graphql",
-      json={"query": query, "variables": {"login": org}},
-      headers=headers
-    )
-
-    result = response.json()
-    projects:list[dict] = [
-      {
-        "org": org,
-        "number": project["number"],
-        "title": project["title"]
-      }
-      for project in result.get("data", {}).get("organization", {}).get("projectsV2", {}).get("nodes", [])
-    ]
-
-    all_projects.extend(projects)
-  return all_projects
-
-def projects_filtered_by_team(project_list:list[dict], teams:list[str]) -> list[dict]:
-  """Filter the project list by team names."""
-
-  filtered_projects:list[dict] = []
-  for team in teams:
-    matching_projects:list[dict] = [
-      p for p in project_list if team.lower() in p["title"].lower()
-    ]
-
-    filtered_projects.extend(matching_projects)
-    print(f"[green]Found {len(matching_projects)} matching projects for team '{team}'[/green]")
-  return filtered_projects
-
-def get_items_for_projects(projects:list[dict]) -> bool:
-  """Fetch all items on each project."""
-   
-  rv:bool = True
-  TEMP_DIR.mkdir(exist_ok=True)
-  for project in projects:
-    org    = project["org"]
-    number = project["number"]
-    title  = project["title"]
-    print(f"[cyan]Fetching items from: {title} (Org: {org}, Project: {number})[/cyan]")
-
-    # Set the output path
-    out_path:Path = Path(TEMP_DIR,f"{org}-{number}.items.json")
-
-    # use os.system instead of subprocess.run or subprocess.popen to avoid creating a new
-    # process space where we would need to copy environment variables into it (possibly
-    # exposing things like GH_TOKEN or other environment variables)
-    os.system( f'gh project item-list --owner "{org}" {number} --format json > "{out_path}"')
-
-    if not out_path.exists():
-        print(f"[red]Failed to fetch items for project: {title} (Org: {org}, Project: {number})[/red]")
-        rv = False
-        continue
-    
-  return rv
+      """
+
+      headers:dict = {"Authorization": f"Bearer {self.get_github_token()}"}
+      response = requests.post(
+        "https://api.github.com/graphql",
+        json={"query": query, "variables": {"login": org}},
+        headers=headers
+      )
+
+      result = response.json()
+      projects:list[dict] = [
+        {
+          "org": org,
+          "number": project["number"],
+          "title": project["title"]
+        }
+        for project in result.get("data", {}).get("organization", {}).get("projectsV2", {}).get("nodes", [])
+      ]
 
-def consolidate_items() -> bool:
-  """Consolidate all items into a single JSON file."""
-  
-  rv:bool = True
-  all_items = []
-  try:
-    [print(f) for f in TEMP_DIR.glob("*.items.json")]
-    for file in TEMP_DIR.glob("*.items.json"):
-      with open(file) as f:
-        data = json.load(f)
-        items = data.get("items", [])
-        all_items.extend(items)
-  except Exception as e:
-    print(f"[red]Error consolidating items: {e}[/red]")
-    rv = False
-
-  try:
-    with open(OUTPUT_FILE, "w") as f:
-      json.dump(all_items, f, indent=2)
-  except Exception as e:
-    print(f"[red]Error writing consolidated items to {OUTPUT_FILE}: {e}[/red]")
-    rv = False
-
-  if Path(OUTPUT_FILE).exists():
-    print(f"[bold green]Saved all items to {OUTPUT_FILE}[/bold green]")
-  return rv
-
-def cleanup() -> bool:
-  """Cleanup temporary files."""
-  rv = True
-  if TEMP_DIR.exists():
+      all_projects.extend(projects)
+    return all_projects
+
+  def filter_projects_by_team(self, project_list:list[dict], teams:list[str]) -> list[dict]:
+    """Filter the project list by team names."""
+
+    filtered_projects:list[dict] = []
+    for team in teams:
+      matching_projects:list[dict] = [p for p in project_list if team.lower() in p["title"].lower()]
+
+      filtered_projects.extend(matching_projects)
+      print(f"[green]Found {len(matching_projects)} matching projects for team '{team}'[/green]")
+    return filtered_projects
+
+  def fetch_project_items(self, projects:list[dict]) -> bool:
+    """Fetch all items on each project."""
+
+    rv:bool = True
+    self.temp_dir.mkdir(exist_ok=True)
+    for project in projects:
+      org    = project["org"]
+      number = project["number"]
+      title  = project["title"]
+      print(f"[cyan]Fetching items from: {title} (Org: {org}, Project: {number})[/cyan]")
+
+      # Set the output path
+      out_path:Path = Path(self.temp_dir,f"{org}-{number}.items.json")
+
+      # use os.system instead of subprocess.run or subprocess.popen to avoid creating a new
+      # process space where we would need to copy environment variables into it (possibly
+      # exposing things like GH_TOKEN or other environment variables)
+      os.system( f'gh project item-list --owner "{org}" {number} --format json > "{out_path}"')
+
+      if not out_path.exists():
+          print(f"[red]Failed to fetch items for project: {title} (Org: {org}, Project: {number})[/red]")
+          rv = False
+
+    return rv
+
+  def consolidate_items(self) -> bool:
+    """Consolidate all items into a single JSON file."""
+
+    rv:bool = True
+    all_items = []
     try:
-      shutil.rmtree(TEMP_DIR)
-      print(f"[bold red]Cleaned up temporary files in {TEMP_DIR}[/bold red]")
+      for file in self.temp_dir.glob("*.items.json"):
+        with open(file) as f:
+          data = json.load(f)
+          items = data.get("items", [])
+          all_items.extend(items)
     except Exception as e:
-      print(f"[red]Error cleaning up temporary files: {e}[/red]")
+      print(f"[red]Error consolidating items: {e}[/red]")
       rv = False
-  else:
-    print(f"[bold green]No temporary files to clean up.[/bold green]")
-  
-  return rv
+
+    try:
+      with open(self.output_file, "w") as f:
+        json.dump(all_items, f, indent=2)
+    except Exception as e:
+      print(f"[red]Error writing consolidated items to {self.output_file}: {e}[/red]")
+      rv = False
+
+    if Path(self.output_file).exists():
+      print(f"[bold green]Saved all items to {self.output_file}[/bold green]")
+    return rv
+
+  def cleanup(self) -> bool:
+    """Cleanup temporary files."""
+    rv = True
+    if self.temp_dir.exists():
+      try:
+        shutil.rmtree(self.temp_dir)
+        print(f"[bold red]Cleaned up temporary files in {self.temp_dir}[/bold red]")
+      except Exception as e:
+        print(f"[red]Error cleaning up temporary files: {e}[/red]")
+        rv = False
+    else:
+      print(f"[bold green]No temporary files to clean up.[/bold green]")
+
+    return rv
+
+  def process(self, teams:list[str] = None) -> bool:
+    """Main processing method for the Version2Query class."""
+    if not teams:
+      print("[red]No team names provided. Exiting...[/red]")
+      return False
+
+    if self.temp_dir.exists():
+      cleanup()
+
+    orgs = self.get_github_orgs()
+    if not orgs:
+      print("[red]No organizations found. Exiting...[/red]")
+      return False
+
+    all_projects = self.get_all_projects(orgs)
+    if not all_projects:
+      print("[red]No projects found. Exiting...[/red]")
+      return False
+
+    filtered_projects = self.filter_projects_by_team(all_projects, teams)
+    if not filtered_projects:
+      print("[red]No projects found matching the team names. Exiting...[/red]")
+      return False
+
+    if not self.fetch_project_items(filtered_projects):
+      print("[red]Failed to fetch project items. Exiting...[/red]")
+      return False
+
+    if not self.consolidate_items():
+      print("[red]Failed to consolidate items. Exiting...[/red]")
+      return False
+
+    return self.cleanup()
+
 
 def main():
   """The primary method for the version2query.py script."""
-  teams:list = input("Enter team name(s) to filter projects: ").split(" ")
-  
-  if TEMP_DIR.exists():
-    cleanup()
-
-  if not teams:
-    print("[red]No team names provided. Exiting...[/red]")
-    return
-  
-  orgs = get_github_orgs()
-  if not orgs:
-    print("[red]No organizations found. Exiting...[/red]")
-    return
+  teams:list = input("Enter team name(s) to filter projects: ").split(",")
+  test_temp_dir:Path = Path(f"tmp.dir")
+  test_output_file:str = f"output.items.json"
   
-  all_projects = get_all_projects(orgs)
-  if not all_projects:
-    print("[red]No projects found. Exiting...[/red]")
+  query = Version2Query(temp_dir=test_temp_dir, output_file=test_output_file)
+  if not query.process(teams):
+    print("[red]Processing failed.[/red]")
     return
-  
-  filtered_projects = projects_filtered_by_team(all_projects, teams)
-  if not filtered_projects:
-    print("[red]No projects found for the specified teams. Exiting...[/red]")
-    return
-  
-  if not get_items_for_projects(filtered_projects):
-    print("[red]Failed to fetch items for projects. Exiting...[/red]")
-    return
-  
-  if not consolidate_items():
-    print("[red]Failed to consolidate items. Exiting...[/red]")
-    return
-  
-  cleanup()
-
 
 if __name__ == "__main__":
   main()

From 92f197b10d675e53e46e0eeb47a2998ca6a35794 Mon Sep 17 00:00:00 2001
From: Roger Barker <roger.barker@swirldslabs.com>
Date: Thu, 1 May 2025 08:41:10 -0700
Subject: [PATCH 4/6] feat: MVP complete -- Update filters to include teams and
 generate the site with real data (#49)

Signed-off-by: Roger Barker <roger.barker@swirldslabs.com>
Co-authored-by: Andrew Brandt <andrew.brandt@hashgraph.com>
---
 current-implemented-CLI.md   |  3 ++-
 src/static_site_generator.py | 15 +++++------
 src/version2config.py        | 51 +++++++++++++++++++++++++++++-------
 version2.py                  | 23 +++++++++++++---
 4 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/current-implemented-CLI.md b/current-implemented-CLI.md
index 8c8e1f4..5efd36b 100644
--- a/current-implemented-CLI.md
+++ b/current-implemented-CLI.md
@@ -2,7 +2,8 @@
 
 ## Currently Implemented
 
-- None
+- `include-team` - Include a team to the query
+- `output-file` - Define the filename and location of the output file
 
 ## To Be Implemented
 
diff --git a/src/static_site_generator.py b/src/static_site_generator.py
index 38d3bb6..11229e6 100644
--- a/src/static_site_generator.py
+++ b/src/static_site_generator.py
@@ -2,27 +2,24 @@
 import json 
 
 # Example data
-seed_data = {
-    'title': 'Version2',
+GENERATOR_DATA = {
+    'title': 'Version Two',
     'github_user': 'octocat',
     'team': 'Platform Engineering',
     'tasks': []
 }
 
-def generate_site(output_file='./_site/index.html'):
+def generate_site(data=None, output_file='./_site/index.html'):
     env = Environment(loader=FileSystemLoader('templates'))
     template = env.get_template('kaban_board.html')
-    with open('output.items.json', 'r') as file:
-        gh_json = json.load(file)
 
-
-    seed_data["tasks"] = gh_json
+    GENERATOR_DATA["tasks"] = data if data is not None else []
 
     # Extract unique statuses from the tasks list
-    unique_statuses = sorted({task["status"] for task in seed_data["tasks"]})
+    unique_statuses = sorted({task["status"] for task in GENERATOR_DATA["tasks"]})
     
     # Add statuses to the data dictionary
-    data_with_statuses = {**seed_data, "statuses": unique_statuses}
+    data_with_statuses = {**GENERATOR_DATA, "statuses": unique_statuses}
     
     # Render template with updated data
     output = template.render(data_with_statuses)
diff --git a/src/version2config.py b/src/version2config.py
index 9b7f5a6..972e675 100644
--- a/src/version2config.py
+++ b/src/version2config.py
@@ -19,6 +19,24 @@ def init_parser(self):
             description="Render an HTML page from a collection of GitHub Issues and Pull Requests"
         )
 
+        parser.add_argument(
+            "--output-file",
+            dest="output_file",
+            action="store",
+            type=str,
+            default="output.projects.json",
+            help="The output file to write the json data to"
+        )
+
+        parser.add_argument(
+          "--temp-dir",
+          dest="temp_dir",
+          action="store",
+          type=str,
+          default="tmp.dir",
+          help="The temporary directory to store the json data files",
+        )
+
         parser.add_argument(
             "--include-user",
             dest="include_user",
@@ -27,12 +45,27 @@ def init_parser(self):
             nargs="+",
             help="Include all issues and PRs for the provided user [Required Parameter]",)
 
+        parser.add_argument(
+          "--include-team",
+          dest="include_team",
+          action="append",
+          type=str,
+          help="Include provided teams in the output"
+        )
+
+        parser.add_argument(
+          "--exclude-team",
+          dest="exclude_team",
+          action="append",
+          type=str,
+          help="Exclude provided teams in the output"
+        )
+
         parser.add_argument(
             "--include-repository",
             dest="include_repository",
             action="append",
             type=str,
-            nargs="+",
             help="Include all issues and PRs from the specified repository",)
 
         parser.add_argument(
@@ -40,7 +73,6 @@ def init_parser(self):
             dest="include_organization_repository",
             action="append",
             type=str,
-            nargs="+",
             help="Include all issues and PRs from the specified organization/repository",)
 
         parser.add_argument(
@@ -48,7 +80,6 @@ def init_parser(self):
             dest="include_label",
             action="append",
             type=str,
-            nargs="+",
             help="Include all issues and PRs with the specified label",)
 
         parser.add_argument(
@@ -56,7 +87,6 @@ def init_parser(self):
             dest="exclude_organization",
             action="append",
             type=str,
-            nargs="+",
             help="Exclude all issues and PRs from the specified organization",)
 
         parser.add_argument(
@@ -64,7 +94,6 @@ def init_parser(self):
             dest="exclude_repository",
             action="append",
             type=str,
-            nargs="+",
             help="Exclude all issues and PRs from the specified repository",)
 
         parser.add_argument(
@@ -72,7 +101,6 @@ def init_parser(self):
             dest="exclude_organization_repository",
             action="append",
             type=str,
-            nargs="+",
             help="Exclude all issues and PRs from the specified "
                  "organization/repository",)
 
@@ -81,7 +109,6 @@ def init_parser(self):
             dest="exclude_user",
             action="append",
             type=str,
-            nargs="+",
             help="Exclude all issues and PRs for the provided user",)
 
         parser.add_argument(
@@ -89,7 +116,6 @@ def init_parser(self):
             dest="exclude_label",
             action="append",
             type=str,
-            nargs="+",
             help="Exclude all issues and PRs with the specified label",)
 
         parser.add_argument(
@@ -101,6 +127,7 @@ def init_parser(self):
         parsed_args = parser.parse_args()
 
         self.include_user = parsed_args.include_user
+        self.include_team = parsed_args.include_team
         self.include_repository = parsed_args.include_repository
         self.include_organization_repository = parsed_args.include_organization_repository
         self.include_label = parsed_args.include_label
@@ -109,8 +136,10 @@ def init_parser(self):
         self.exclude_organization_repository = parsed_args.exclude_organization_repository
         self.exclude_user = parsed_args.exclude_user
         self.exclude_label = parsed_args.exclude_label
+        self.exclude_team = parsed_args.exclude_team
         self.publish_board = parsed_args.publish_board
-
+        self.output_file = parsed_args.output_file
+        self.temp_dir = parsed_args.temp_dir
 
     def init_logger(self):
         logging.basicConfig(level=self.LOG_LEVEL, format=self.LOG_FORMAT)
@@ -120,13 +149,17 @@ def load_env(self):
 
     def display_config(self):
         logging.info("Configuration:")
+        logging.info(f"Output File: {self.output_file}")
+        logging.info(f"Temporary Directory: {self.temp_dir}")
         logging.info(f"Include User: {self.include_user}")
         logging.info(f"Include Repository: {self.include_repository}")
         logging.info(f"Include Organization/Repository: {self.include_organization_repository}")
         logging.info(f"Include Label: {self.include_label}")
+        logging.info(f"Include Team: {self.include_team}")
         logging.info(f"Exclude Organization: {self.exclude_organization}")
         logging.info(f"Exclude Repository: {self.exclude_repository}")
         logging.info(f"Exclude Organization/Repository: {self.exclude_organization_repository}")
         logging.info(f"Exclude User: {self.exclude_user}")
         logging.info(f"Exclude Label: {self.exclude_label}")
+        logging.info(f"Exclude Team: {self.exclude_team}")
         logging.info(f"Publish Board: {self.publish_board}")
diff --git a/version2.py b/version2.py
index c73d975..364f171 100644
--- a/version2.py
+++ b/version2.py
@@ -1,12 +1,29 @@
 from src.version2config import VersionTwoConfig
+from src.version2query import Version2Query
 from src.static_site_generator import generate_site
-
+from pathlib import Path
+import json
 
 def main():
-    config = VersionTwoConfig()
+    config:VersionTwoConfig = VersionTwoConfig()
     config.display_config()
+    temp_dir:Path = Path(config.temp_dir)
+    output_file:str = config.output_file
+    teams:list[str] = config.include_team
+
+    query:VersionTwoQuery = Version2Query(temp_dir=temp_dir, output_file=output_file)
+
+    # Generate output_file or die
+    if not query.process(teams):
+      print("Failed to process query.")
+      return
+
+    # Get json object
+    data = None
+    with open(output_file, 'r') as f:
+      data = json.load(f)
 
-    generate_site()
+    generate_site(data=data)
 
 if __name__ == "__main__":
     main()

From 919dea4424db6c0b0b8024708079019255dcb052 Mon Sep 17 00:00:00 2001
From: Diogo Pereira <diogo.pereira@swirldslabs.com>
Date: Thu, 1 May 2025 09:07:14 -0700
Subject: [PATCH 5/6] Restructure and linked proj organization

Signed-off-by: Diogo Pereira <diogo.pereira@swirldslabs.com>
---
 src/static_site_generator.py | 50 +++++++++++++++++++-----------------
 version2.py                  |  9 ++++---
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/static_site_generator.py b/src/static_site_generator.py
index 11229e6..0bb324d 100644
--- a/src/static_site_generator.py
+++ b/src/static_site_generator.py
@@ -1,29 +1,33 @@
 from jinja2 import Environment, FileSystemLoader
-import json 
+import logging 
 
-# Example data
-GENERATOR_DATA = {
-    'title': 'Version Two',
-    'github_user': 'octocat',
-    'team': 'Platform Engineering',
-    'tasks': []
-}
+class StaticSiteGenerator():
 
-def generate_site(data=None, output_file='./_site/index.html'):
-    env = Environment(loader=FileSystemLoader('templates'))
-    template = env.get_template('kaban_board.html')
+    def __init__(self):
+        self.GENERATOR_DATA = {
+            'title': 'Version Two',
+            'github_user': 'octocat',
+            'team': 'Platform Engineering',
+            'tasks': []
+        }
 
-    GENERATOR_DATA["tasks"] = data if data is not None else []
+    def generate_site(self, data=None, output_file='./_site/index.html'):
+        logging.info("Generating Static Site")
+        env = Environment(loader=FileSystemLoader('templates'))
+        template = env.get_template('kaban_board.html')
 
-    # Extract unique statuses from the tasks list
-    unique_statuses = sorted({task["status"] for task in GENERATOR_DATA["tasks"]})
-    
-    # Add statuses to the data dictionary
-    data_with_statuses = {**GENERATOR_DATA, "statuses": unique_statuses}
-    
-    # Render template with updated data
-    output = template.render(data_with_statuses)
-    
-    with open(output_file, 'w') as f:
-        f.write(output)
+        self.GENERATOR_DATA["tasks"] = data if data is not None else []
 
+        # Extract unique statuses from the tasks list
+        unique_statuses = sorted({task["status"] for task in self.GENERATOR_DATA["tasks"]})
+        
+        # Add statuses to the data dictionary
+        data_with_statuses = {**self.GENERATOR_DATA, "statuses": unique_statuses}
+        
+        # Render template with updated data
+        output = template.render(data_with_statuses)
+        
+        with open(output_file, 'w') as f:
+            f.write(output)
+
+        logging.info("Static Site Generated @ ./_site/index.html")
diff --git a/version2.py b/version2.py
index 364f171..cc89f47 100644
--- a/version2.py
+++ b/version2.py
@@ -1,8 +1,9 @@
 from src.version2config import VersionTwoConfig
 from src.version2query import Version2Query
-from src.static_site_generator import generate_site
+from src.static_site_generator import StaticSiteGenerator
 from pathlib import Path
 import json
+import logging
 
 def main():
     config:VersionTwoConfig = VersionTwoConfig()
@@ -12,10 +13,12 @@ def main():
     teams:list[str] = config.include_team
 
     query:VersionTwoQuery = Version2Query(temp_dir=temp_dir, output_file=output_file)
+    ss_gen = StaticSiteGenerator()
 
     # Generate output_file or die
+    logging.info("Querying GitHub API...")
     if not query.process(teams):
-      print("Failed to process query.")
+      logging.error("Failed to process query.")
       return
 
     # Get json object
@@ -23,7 +26,7 @@ def main():
     with open(output_file, 'r') as f:
       data = json.load(f)
 
-    generate_site(data=data)
+    ss_gen.generate_site(data=data)
 
 if __name__ == "__main__":
     main()

From cc412807c65fbc12ec7e4d6343d7b3ccd798e345 Mon Sep 17 00:00:00 2001
From: dpswirld <diogo.pereira@swirldslabs.com>
Date: Thu, 1 May 2025 09:41:04 -0700
Subject: [PATCH 6/6] Apply suggestions from code review

Co-authored-by: Andrew Brandt <andrew.brandt@hashgraph.com>
Signed-off-by: dpswirld <diogo.pereira@swirldslabs.com>
---
 current-implemented-CLI.md |  4 +---
 src/version2config.py      | 19 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/current-implemented-CLI.md b/current-implemented-CLI.md
index 9f9b793..b46f914 100644
--- a/current-implemented-CLI.md
+++ b/current-implemented-CLI.md
@@ -2,11 +2,9 @@
 
 ## Currently Implemented
 
-
-- `include-team` - Include a team to the query
-- `output-file` - Define the filename and location of the output file
 - `output-file` - Define the filename and location of the output file
 - `temp-dir` - The temporary directory to write JSON response files
+
 - `include-team` - Include a team to the query
 
 
diff --git a/src/version2config.py b/src/version2config.py
index 17d4721..051aec0 100644
--- a/src/version2config.py
+++ b/src/version2config.py
@@ -54,22 +54,6 @@ def init_parser(self):
             help="Include all issues and PRs for the provided user [Required Parameter]"
         )
 
-        parser.add_argument(
-          "--include-team",
-          dest="include_team",
-          action="append",
-          type=str,
-          help="Include provided teams in the output"
-        )
-
-        parser.add_argument(
-          "--exclude-team",
-          dest="exclude_team",
-          action="append",
-          type=str,
-          help="Exclude provided teams in the output"
-        )
-
         parser.add_argument(
             "--include-repository",
             dest="include_repository",
@@ -164,7 +148,6 @@ def init_parser(self):
         self.temp_dir = parsed_args.temp_dir
         self.include_team = parsed_args.include_team
         self.include_user = parsed_args.include_user
-        self.include_team = parsed_args.include_team
         self.include_repository = parsed_args.include_repository
         self.include_organization = parsed_args.include_organization
         self.include_organization_repository = parsed_args.include_organization_repository
@@ -175,7 +158,6 @@ def init_parser(self):
         self.exclude_organization = parsed_args.exclude_organization
         self.exclude_organization_repository = parsed_args.exclude_organization_repository
         self.exclude_label = parsed_args.exclude_label
-        self.exclude_team = parsed_args.exclude_team
         self.publish_board = parsed_args.publish_board
 
     def init_logger(self):
@@ -200,5 +182,4 @@ def display_config(self):
         logging.info(f"Exclude Organization: {self.exclude_organization}")
         logging.info(f"Exclude Organization/Repository: {self.exclude_organization_repository}")
         logging.info(f"Exclude Label: {self.exclude_label}")
-        logging.info(f"Exclude Team: {self.exclude_team}")
         logging.info(f"Publish Board: {self.publish_board}")