diff --git a/src/components/ProjectCard.svelte b/src/components/ProjectCard.svelte
new file mode 100644
index 000000000..af885bb66
--- /dev/null
+++ b/src/components/ProjectCard.svelte
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+ {name}
+
+
{description}
+
+ {#if compact}
+ {formatCommit(head)}
+ {:else}
+ {head}
+ {/if}
+
+ {#if compact}
+
+ {/if}
+
+
+ {#if !compact}
+
+ {/if}
+
diff --git a/src/lib/commit.ts b/src/lib/commit.ts
index c0563d8d6..1ce80fbb2 100644
--- a/src/lib/commit.ts
+++ b/src/lib/commit.ts
@@ -1,6 +1,7 @@
-import type { CommitHeader } from "@httpd-client";
+import type { BaseUrl, CommitHeader } from "@httpd-client";
import { getDaysPassed } from "@app/lib/utils";
+import { HttpdClient } from "@httpd-client";
// A set of commits grouped by time.
interface CommitGroup {
@@ -70,7 +71,7 @@ export function groupCommits(commits: CommitHeader[]): CommitGroup[] {
}
}
-export function groupCommitsByWeek(commits: number[]): WeeklyActivity[] {
+function groupCommitsByWeek(commits: number[]): WeeklyActivity[] {
const groupedCommits: WeeklyActivity[] = [];
let groupDate: Date | undefined = undefined;
@@ -114,3 +115,10 @@ export function groupCommitsByWeek(commits: number[]): WeeklyActivity[] {
return groupedCommits;
}
+
+export async function loadProjectActivity(id: string, baseUrl: BaseUrl) {
+ const api = new HttpdClient(baseUrl);
+ const commits = await api.project.getActivity(id);
+
+ return groupCommitsByWeek(commits.activity);
+}
diff --git a/src/views/home/Index.svelte b/src/views/home/Index.svelte
index bd69145cf..14d5714b0 100644
--- a/src/views/home/Index.svelte
+++ b/src/views/home/Index.svelte
@@ -4,11 +4,12 @@
import * as router from "@app/lib/router";
import { config } from "@app/lib/config";
import { getProjectsFromSeeds } from "@app/lib/search";
+ import { loadProjectActivity } from "@app/lib/commit";
import { twemoji } from "@app/lib/utils";
import Loading from "@app/components/Loading.svelte";
import Message from "@app/components/Message.svelte";
- import Widget from "@app/views/projects/Widget.svelte";
+ import ProjectCard from "@app/components/ProjectCard.svelte";
function goToProject(project: Project, baseUrl: BaseUrl) {
router.push({
@@ -94,13 +95,18 @@
{#each results as result}
-
- goToProject(result.project, result.baseUrl)} />
-
+ {#await loadProjectActivity(result.project.id, result.baseUrl) then activity}
+
+
goToProject(result.project, result.baseUrl)} />
+
+ {/await}
{/each}
{/if}
diff --git a/src/views/projects/Diagram.svelte b/src/views/projects/ActivityDiagram.svelte
similarity index 83%
rename from src/views/projects/Diagram.svelte
rename to src/views/projects/ActivityDiagram.svelte
index 33dac3448..629a16853 100644
--- a/src/views/projects/Diagram.svelte
+++ b/src/views/projects/ActivityDiagram.svelte
@@ -1,33 +1,36 @@
-
-
-
-
-
-
-
- {project.name}
-
- {#if project.description}
-
{project.description}
- {:else}
-
No description
- {/if}
-
- {#if project.head}
- {#if compact}
- {formatCommit(project.head)}
- {:else}
- {project.head}
- {/if}
- {:else}
- ✗ No head
- {/if}
-
- {#if compact}
- {#await loadCommits() then points}
-
-
-
- {/await}
- {/if}
-
-
- {#if !compact}
-
-
- {project.id}
-
- {#await loadCommits() then points}
-
-
-
- {/await}
-
- {/if}
-
diff --git a/src/views/seeds/View/Projects.svelte b/src/views/seeds/View/Projects.svelte
index 4387df4ad..1d2bcb384 100644
--- a/src/views/seeds/View/Projects.svelte
+++ b/src/views/seeds/View/Projects.svelte
@@ -2,10 +2,12 @@
import type { BaseUrl, Project, NodeStats } from "@httpd-client";
import * as router from "@app/lib/router";
- import List from "@app/components/List.svelte";
- import Widget from "@app/views/projects/Widget.svelte";
import { HttpdClient } from "@httpd-client";
import { config } from "@app/lib/config";
+ import { loadProjectActivity } from "@app/lib/commit";
+
+ import List from "@app/components/List.svelte";
+ import ProjectCard from "@app/components/ProjectCard.svelte";
export let baseUrl: BaseUrl;
export let projects: Project[];
@@ -69,11 +71,17 @@
query={fetchMoreProjects}>
{#each items as project}
- {#if project.head}
+ {#await loadProjectActivity(project.id, baseUrl) then activity}
-
onClick(project)} />
+ onClick(project)} />
- {/if}
+ {/await}
{/each}