Skip to content

Commit 2494a81

Browse files
authored
Merge branch 'codecrafters-io:main' into main
2 parents e438ceb + 803a7fe commit 2494a81

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/components/course-page/comment-list.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div data-test-comment-list {{did-update this.loadComments @courseStage}}>
22
<CoursePage::CommentTimelineItem @author={{this.currentUser}}>
3-
<div class="shadow-sm rounded border border-gray-300 dark:border-white/10 w-full mb-4">
3+
<div class="shadow-sm rounded border border-gray-300 dark:border-white/10 w-full min-w-0 mb-4">
44
{{! TODO: Pass in language here so that users can choose whether their comment is language-specific }}
55
<CommentForm @target={{@courseStage}} @commentModelType="course-stage-comment" class="rounded" />
66
</div>
@@ -14,7 +14,7 @@
1414
{{else}}
1515
{{#each this.sortedComments key="id" as |comment|}}
1616
<CoursePage::CommentTimelineItem @author={{comment.user}}>
17-
<div class="shadow-sm rounded border border-gray-300 dark:border-white/10 w-full mb-4">
17+
<div class="shadow-sm rounded border border-gray-300 dark:border-white/10 w-full min-w-0 mb-4">
1818
{{! @glint-expect-error Not ts-ified yet }}
1919
<CommentCard @comment={{comment}} />
2020
</div>
@@ -42,7 +42,7 @@
4242
{{#if this.rejectedCommentsAreExpanded}}
4343
{{#each this.rejectedComments key="id" as |comment|}}
4444
<CoursePage::CommentTimelineItem @author={{comment.user}}>
45-
<div class="shadow-sm rounded border border-gray-300 dark:border-white/10 w-full mb-4">
45+
<div class="shadow-sm rounded border border-gray-300 dark:border-white/10 w-full min-w-0 mb-4">
4646
{{! @glint-expect-error Not ts-ified yet }}
4747
<CommentCard @comment={{comment}} />
4848
</div>

app/services/meta-data.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default class HeadDataService extends Service {
77
@service declare router: RouterService;
88

99
get shouldRenderNoIndexTag() {
10-
const routeMeta = this.router.currentRoute.metadata;
10+
const routeMeta = this.router.currentRoute?.metadata;
1111
const allowsAnonymousAccess = routeMeta instanceof RouteInfoMetadata && routeMeta.allowsAnonymousAccess;
1212

1313
return !allowsAnonymousAccess;

0 commit comments

Comments
 (0)