Skip to content

Commit 42e41dd

Browse files
committed
update suggestion
1 parent 86be65d commit 42e41dd

File tree

4 files changed

+28
-18
lines changed

4 files changed

+28
-18
lines changed

backend/apps/mentorship/api/internal/mutations/module.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""GraphQL mutations for mentorship modules in the mentorship app."""
22

3+
import datetime as dt
34
import logging
45

56
import strawberry
@@ -14,9 +15,8 @@
1415
UpdateModuleInput,
1516
)
1617
from apps.mentorship.models import Mentor, Module, Program
17-
import datetime as dt
18-
from apps.mentorship.models.task import Task
1918
from apps.mentorship.models.issue_user_interest import IssueUserInterest
19+
from apps.mentorship.models.task import Task
2020
from apps.nest.api.internal.permissions import IsAuthenticated
2121
from apps.owasp.models import Project
2222

@@ -211,6 +211,7 @@ def set_task_deadline(
211211
issue_number: int,
212212
deadline_at: dt.datetime,
213213
) -> ModuleNode:
214+
"""Set a deadline for a task. User must be a mentor and an admin of the program."""
214215
user = info.context.request.user
215216

216217
module = (
@@ -228,7 +229,8 @@ def set_task_deadline(
228229
raise PermissionDenied
229230

230231
issue = (
231-
module.issues.select_related("repository").prefetch_related("assignees")
232+
module.issues.select_related("repository")
233+
.prefetch_related("assignees")
232234
.filter(number=issue_number)
233235
.first()
234236
)

backend/manage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
from configurations.management import execute_from_command_line
1313

14-
execute_from_command_line(sys.argv)
14+
execute_from_command_line(sys.argv)

frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/issues/[issueId]/page.tsx

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,8 @@ const ModuleIssueDetailsPage = () => {
166166
{issue.organizationName}/{issue.repositoryName} • #{issue.number}
167167
</span>
168168
<span
169-
className={`rounded-full px-2 py-1 text-xs font-medium ${
170-
issue.state === 'open'
171-
? 'bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200'
172-
: 'bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200'
169+
className={`inline-flex items-center rounded-lg px-2 py-0.5 text-xs font-medium ${
170+
issue.state === 'open' ? 'bg-[#2cbe4e] text-white' : 'bg-[#cb2431] text-white'
173171
}`}
174172
>
175173
{issue.state === 'open' ? 'Open' : 'Closed'}
@@ -213,7 +211,8 @@ const ModuleIssueDetailsPage = () => {
213211
disabled={!deadlineInput || settingDeadline}
214212
onClick={async () => {
215213
if (!deadlineInput || settingDeadline || !issueId) return
216-
const iso = new Date(deadlineInput + 'T23:59:59').toISOString()
214+
const localDate = new Date(deadlineInput + 'T23:59:59')
215+
const iso = localDate.toISOString()
217216
await setTaskDeadlineMutation({
218217
variables: {
219218
programKey,
@@ -297,12 +296,12 @@ const ModuleIssueDetailsPage = () => {
297296
</h2>
298297
<div className="flex flex-wrap gap-2">
299298
{visibleLabels.map((label, index) => (
300-
<button key={index} className={labelButtonClassName}>
299+
<span key={index} className={labelButtonClassName}>
301300
{label}
302-
</button>
301+
</span>
303302
))}
304303
{remainingLabels > 0 && (
305-
<button className={labelButtonClassName}>+{remainingLabels} more</button>
304+
<span className={labelButtonClassName}>+{remainingLabels} more</span>
306305
)}
307306
</div>
308307
</div>
@@ -406,15 +405,24 @@ const ModuleIssueDetailsPage = () => {
406405
</div>
407406
<div className="flex items-center gap-2">
408407
{pr.state === 'closed' && pr.mergedAt ? (
409-
<span className="rounded-full bg-purple-100 px-2 py-1 text-xs font-medium text-purple-800 dark:bg-purple-900 dark:text-purple-200">
408+
<span
409+
className="inline-flex items-center rounded-lg px-2 py-0.5 text-xs font-medium text-white"
410+
style={{ backgroundColor: '#6f42c1' }}
411+
>
410412
Merged
411413
</span>
412414
) : pr.state === 'closed' ? (
413-
<span className="rounded-full bg-red-100 px-2 py-1 text-xs font-medium text-red-800 dark:bg-red-900 dark:text-red-200">
415+
<span
416+
className="inline-flex items-center rounded-lg px-2 py-0.5 text-xs font-medium text-white"
417+
style={{ backgroundColor: '#cb2431' }}
418+
>
414419
Closed
415420
</span>
416421
) : (
417-
<span className="rounded-full bg-green-100 px-2 py-1 text-xs font-medium text-green-800 dark:bg-green-900 dark:text-green-200">
422+
<span
423+
className="inline-flex items-center rounded-lg px-2 py-0.5 text-xs font-medium text-white"
424+
style={{ backgroundColor: '#2cbe4e' }}
425+
>
418426
Open
419427
</span>
420428
)}

frontend/src/app/my/mentorship/programs/[programKey]/modules/[moduleKey]/issues/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@ const IssuesPage = () => {
190190
</td>
191191
<td className="px-6 py-4 text-sm whitespace-nowrap">
192192
<span
193-
className={`rounded px-2 py-1 text-xs font-medium ${
193+
className={`inline-flex items-center rounded-lg px-2 py-0.5 text-xs font-medium ${
194194
issue.state === 'open'
195-
? 'bg-green-50 text-green-700 dark:bg-green-900/30 dark:text-green-300'
196-
: 'bg-red-50 text-red-700 dark:bg-red-900/30 dark:text-red-300'
195+
? 'bg-[#2cbe4e] text-white'
196+
: 'bg-[#cb2431] text-white'
197197
}`}
198198
>
199199
{issue.state === 'open' ? 'Open' : 'Closed'}

0 commit comments

Comments
 (0)