- {{ relativeActivityTime() }}
- in
- {{ this.repositoryName() }} #{{ this.pullRequest()?.number }}
+
+
+ {{ relativeActivityTime() }}
+ in
+ {{ this.repositoryName() }} #{{ this.pullRequest()?.number }}
+
+
diff --git a/webapp/src/app/user/review-activity-card/review-activity-card.component.ts b/webapp/src/app/user/review-activity-card/review-activity-card.component.ts
index 436cfcb9..241e5c90 100644
--- a/webapp/src/app/user/review-activity-card/review-activity-card.component.ts
+++ b/webapp/src/app/user/review-activity-card/review-activity-card.component.ts
@@ -1,11 +1,15 @@
import { Component, computed, input } from '@angular/core';
import { PullRequestBaseInfo, PullRequestReviewInfo } from '@app/core/modules/openapi';
-import { NgIcon } from '@ng-icons/core';
+import { NgIcon, provideIcons } from '@ng-icons/core';
import { octCheck, octComment, octFileDiff, octGitPullRequest, octGitPullRequestClosed } from '@ng-icons/octicons';
import { HlmCardModule } from '@spartan-ng/ui-card-helm';
import { HlmSkeletonComponent } from '@spartan-ng/ui-skeleton-helm';
+import { HlmIconComponent } from '@spartan-ng/ui-icon-helm';
+import { HlmTooltipTriggerDirective } from '@spartan-ng/ui-tooltip-helm';
+import { HlmButtonModule } from '@spartan-ng/ui-button-helm';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';
+import { lucideAward } from '@ng-icons/lucide';
dayjs.extend(relativeTime);
@@ -20,7 +24,8 @@ type ReviewStateCases = {
@Component({
selector: 'app-review-activity-card',
templateUrl: './review-activity-card.component.html',
- imports: [NgIcon, HlmCardModule, HlmSkeletonComponent],
+ imports: [NgIcon, HlmCardModule, HlmSkeletonComponent, HlmIconComponent, HlmTooltipTriggerDirective, HlmButtonModule],
+ providers: [provideIcons({ lucideAward })],
standalone: true
})
export class ReviewActivityCardComponent {
@@ -37,6 +42,7 @@ export class ReviewActivityCardComponent {
htmlUrl = input
();
pullRequest = input();
repositoryName = input();
+ score = input();
relativeActivityTime = computed(() => dayjs(this.submittedAt()).fromNow());
displayPullRequestTitle = computed(() => (this.pullRequest()?.title ?? '').replace(/`([^`]+)`/g, '$1
'));
diff --git a/webapp/src/app/user/review-activity-card/review-activity-card.stories.ts b/webapp/src/app/user/review-activity-card/review-activity-card.stories.ts
index d6839212..93884e71 100644
--- a/webapp/src/app/user/review-activity-card/review-activity-card.stories.ts
+++ b/webapp/src/app/user/review-activity-card/review-activity-card.stories.ts
@@ -6,6 +6,7 @@ type FlatArgs = {
isLoading: boolean;
reviewActivityCreatedAt: string;
reviewActivityState: string;
+ reviewActivityScore: number;
pullRequestNumber: number;
pullRequestState: string;
pullRequestUrl: string;
@@ -18,6 +19,7 @@ function flatArgsToProps(args: FlatArgs) {
isLoading: args.isLoading,
createdAt: dayjs(args.reviewActivityCreatedAt),
state: args.reviewActivityState,
+ score: args.reviewActivityScore,
pullRequest: {
number: args.pullRequestNumber,
title: args.pullRequestTitle,
@@ -34,6 +36,7 @@ const meta: Meta = {
isLoading: false,
reviewActivityCreatedAt: dayjs().subtract(4, 'days').toISOString(),
reviewActivityState: 'CHANGES_REQUESTED',
+ reviewActivityScore: 3,
pullRequestNumber: 100,
pullRequestTitle: '`Leaderboard`: Custom Sliding Time Window',
pullRequestUrl: 'https://github.com/ls1intum/Hephaestus/pull/100',
diff --git a/webapp/src/app/user/user-profile.component.html b/webapp/src/app/user/user-profile.component.html
index 59f21ac3..74e7c1ee 100644
--- a/webapp/src/app/user/user-profile.component.html
+++ b/webapp/src/app/user/user-profile.component.html
@@ -29,6 +29,7 @@ Latest Review Activity
[htmlUrl]="activity?.htmlUrl"
[pullRequest]="activity?.pullRequest"
[repositoryName]="activity?.pullRequest?.repository?.name"
+ [score]="activity?.score"
/>
}
@if (!showSkeleton && (!query.data()?.reviewActivity || query.data()?.reviewActivity?.length === 0)) {
diff --git a/webapp/src/app/user/user-profile.component.ts b/webapp/src/app/user/user-profile.component.ts
index c039a090..658c28a9 100644
--- a/webapp/src/app/user/user-profile.component.ts
+++ b/webapp/src/app/user/user-profile.component.ts
@@ -1,13 +1,10 @@
import { Component, inject } from '@angular/core';
-import { NgIconComponent } from '@ng-icons/core';
import { PullRequestInfo, PullRequestReviewInfo, UserService } from 'app/core/modules/openapi';
import { HlmAvatarModule } from '@spartan-ng/ui-avatar-helm';
import { HlmSkeletonModule } from '@spartan-ng/ui-skeleton-helm';
import { ActivatedRoute } from '@angular/router';
import { injectQuery } from '@tanstack/angular-query-experimental';
import { HlmIconModule } from 'libs/ui/ui-icon-helm/src/index';
-import { BrnTooltipContentDirective } from '@spartan-ng/ui-tooltip-brain';
-import { HlmTooltipComponent, HlmTooltipTriggerDirective } from '@spartan-ng/ui-tooltip-helm';
import { HlmButtonModule } from '@spartan-ng/ui-button-helm';
import { HlmScrollAreaComponent } from '@spartan-ng/ui-scrollarea-helm';
import { HlmAlertModule } from '@spartan-ng/ui-alert-helm';
@@ -22,15 +19,11 @@ import { UserHeaderComponent } from './header/header.component';
standalone: true,
imports: [
LucideAngularModule,
- NgIconComponent,
ReviewActivityCardComponent,
IssueCardComponent,
HlmAvatarModule,
HlmSkeletonModule,
HlmIconModule,
- HlmTooltipComponent,
- HlmTooltipTriggerDirective,
- BrnTooltipContentDirective,
HlmButtonModule,
HlmScrollAreaComponent,
UserHeaderComponent,
diff --git a/webapp/src/environments/environment.ts b/webapp/src/environments/environment.ts
index 2ab91771..c7e2ad97 100644
--- a/webapp/src/environments/environment.ts
+++ b/webapp/src/environments/environment.ts
@@ -5,7 +5,7 @@ export const environment = {
url: 'http://localhost:8081',
realm: 'hephaestus',
clientId: 'hephaestus',
- skipLoginPage: true // If true, it will directly use github IDP for login
+ skipLoginPage: false // If true, it will directly use github IDP for login
},
umami: {
enabled: false,
diff --git a/webapp/src/libs/ui/ui-card-helm/src/lib/hlm-card-content.directive.ts b/webapp/src/libs/ui/ui-card-helm/src/lib/hlm-card-content.directive.ts
index 8d8a2342..07a2d84e 100644
--- a/webapp/src/libs/ui/ui-card-helm/src/lib/hlm-card-content.directive.ts
+++ b/webapp/src/libs/ui/ui-card-helm/src/lib/hlm-card-content.directive.ts
@@ -7,7 +7,7 @@ export const cardContentVariants = cva('pt-0', {
variants: {
variant: {
default: 'p-6',
- profile: 'flex flex-col gap-2'
+ profile: 'flex flex-col gap-1'
}
},
defaultVariants: {}