Skip to content

Commit 2a89a0c

Browse files
rbarker-devrbarker-dev
authored
Merge branch 'main' into 69-dynamically-load-user-name
2 parents 1d4cd13 + ee29900 commit 2a89a0c

2 files changed

Lines changed: 65 additions & 44 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,4 @@ cython_debug/
178178
**/**.DS_Store
179179
_site/*
180180
!_site/.gitkeep
181-
181+
output.projects.json

‎templates/kaban_board.html‎

Lines changed: 64 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -59,56 +59,65 @@ <h1 class="mb-3 text-center">{{ title }}</h1>
5959
<!-- Kanban Board -->
6060
<div class="kanban-scroll-wrapper">
6161
<div class="d-flex flex-nowrap gap-3">
62-
<!-- <div class="row row-cols-1 row-cols-md-5 g-3"> -->
62+
<!-- <div class="row row-cols-1 row-cols-md-5 g-3"> -->
6363
{% for status in statuses %}
64-
<div class="col">
65-
<div class="kanban-column">
66-
<div class="kanban-header text-primary text-center">{{ status }}</div>
64+
<div class="col">
65+
<div class="kanban-column">
66+
<div class="kanban-header text-primary text-center">{{ status }}</div>
6767

68-
{% for task in tasks if task.status == status %}
69-
{% set card_id = "card-" ~ status | lower | replace(" ", "-") ~ "-" ~ loop.index0 %}
68+
{% for task in tasks if task.status == status %}
69+
{% set card_id = "card-" ~ status | lower | replace(" ", "-") ~ "-" ~ loop.index0 %}
7070

71-
<div class="kanban-card">
72-
<div class="d-flex flex-column align-items-start gap-2">
73-
<a
74-
class="text-dark text-decoration-none fw-bold flex-grow-1"
75-
data-bs-toggle="collapse"
76-
href="#{{ card_id }}"
77-
role="button"
78-
aria-expanded="false"
79-
aria-controls="{{ card_id }}"
80-
>
81-
🟢 {{ task.title }}<a
82-
href="{{ task.content.url }}"
83-
target="_blank"
84-
class="fs-8 text-primary text-decoration-none">
85-
(#{{ task.content.number }})</a>
86-
</a>
87-
</div>
88-
<div class="collapse mt-2" id="{{ card_id }}">
89-
<div>
90-
<small>
91-
<strong>📦 Repository:</strong>
92-
<a href="{{ task.repository }}" target="_blank">
93-
{{ task.content.repository }}
94-
</a>
95-
</small>
71+
<div class="kanban-card">
72+
<div class="d-flex flex-column align-items-start gap-2">
73+
<a
74+
href="{{ task.content.url }}"
75+
target="_blank"
76+
class="fs-8 text-primary text-decoration-none"
77+
>
78+
🟢 #{{ task.content.number }}
79+
</a>
80+
<a
81+
class="text-dark text-decoration-none fw-bold flex-grow-1"
82+
data-bs-toggle="collapse"
83+
href="#{{ card_id }}"
84+
role="button"
85+
aria-expanded="false"
86+
aria-controls="{{ card_id }}"
87+
>
88+
{{ task.title }}
89+
</a>
9690
</div>
97-
<div><small><strong>👤 Assignee:</strong> {{ task.assignees | join(', ') }}</small></div>
98-
<div><small><strong>🏷️ Labels:</strong> {{ task.labels | join(', ') }}</small></div>
99-
<div><small><strong>📌 Status:</strong> {{ task.status }}</small></div>
100-
<div class="text-center">
101-
<a href="{{ task.content.url }}" target="_blank" class="btn btn-sm btn-outline-primary mt-2">View Issue</a>
91+
<div class="collapse mt-2" id="{{ card_id }}">
92+
<div>
93+
<small>
94+
<strong>📦 Repository:</strong>
95+
<a href="{{ task.repository }}" target="_blank" class="repo-name">
96+
{{ task.content.repository }}
97+
</a>
98+
</small>
99+
</div>
100+
<div>
101+
<small>
102+
<strong>👤 Assignee:</strong>
103+
<span class="assignee">{{ task.assignees | join(', ') }}</span>
104+
</small>
105+
</div>
106+
<div>
107+
<small>
108+
<strong>🏷️ Labels:</strong>
109+
<span class="labels">{{ task.labels | join(', ') }}</span>
110+
</small>
111+
</div>
102112
</div>
103113
</div>
114+
{% endfor %}
104115
</div>
105-
{% endfor %}
106116
</div>
107-
</div>
108117
{% endfor %}
109118
</div>
110-
</div>
111119
</div>
120+
</div>
112121

113122

114123

@@ -126,10 +135,22 @@ <h1 class="mb-3 text-center">{{ title }}</h1>
126135
// Iterate over all the cards
127136
kanbanCards.forEach(function(card) {
128137
// Get the card's title, issue number, and other text content to check if it matches the query
129-
const title = card.querySelector('.d-flex .text-dark').textContent.toLowerCase();
130-
const issueNumber = card.querySelector('.d-flex .text-primary').textContent.toLowerCase();
131-
const repository = card.querySelector('.text-muted') ? card.querySelector('.text-muted').textContent.toLowerCase() : '';
132-
const assignee = card.querySelector('.d-flex .assignee') ? card.querySelector('.d-flex .assignee').textContent.toLowerCase() : '';
138+
const titleElement = card.querySelector('.text-dark');
139+
const issueNumberElement = card.querySelector('.text-primary');
140+
const repositoryElement = card.querySelector('.repo-name');
141+
const assigneeElement = card.querySelector('.assignee');
142+
const labelsElement = card.querySelector('.labels');
143+
144+
const title = titleElement ? titleElement.textContent.toLowerCase() : '';
145+
const issueNumber = issueNumberElement ? issueNumberElement.textContent.toLowerCase() : '';
146+
const repository = repositoryElement ? repositoryElement.textContent.toLowerCase() : '';
147+
const assignee = assigneeElement ? assigneeElement.textContent.toLowerCase() : '';
148+
const labels = labelsElement ? labelsElement.textContent.toLowerCase() : '';
149+
150+
// console.log("Title: " + title)
151+
// console.log("Issue: " + issueNumber)
152+
// console.log("Repository: " + repository)
153+
// console.log("Assignee: " + assignee)
133154

134155
// Check if the query matches any part of the task (title, issue number, repository, assignee)
135156
const matches = title.includes(query) || issueNumber.includes(query) || repository.includes(query) || assignee.includes(query);

0 commit comments

Comments
 (0)