diff --git a/src/components/blog.tsx b/src/components/blog.tsx index 974a951..e44dc84 100644 --- a/src/components/blog.tsx +++ b/src/components/blog.tsx @@ -43,7 +43,7 @@ export default function SpannerBlog({ staticPosts }: any) {

Created at {new Date(post.created_at).toLocaleString()} by{" "} - {post.author.first_name} {post.author.last_name} + {post.author}

diff --git a/src/spanner/api.ts b/src/spanner/api.ts index 5faaa92..caab471 100644 --- a/src/spanner/api.ts +++ b/src/spanner/api.ts @@ -27,7 +27,7 @@ function wrapWithBase( } export const spannerApiFetch = wrapWithBase>( - "https://spanner.wwlrc.co.uk", + "https://spanner.wwlrc.co.uk/api/public/v1", async (path) => { let response = await fetch(path); // TODO: probably worth putting some more fancy error handling here diff --git a/src/spanner/blog.ts b/src/spanner/blog.ts index d017cdb..b3fb24f 100644 --- a/src/spanner/blog.ts +++ b/src/spanner/blog.ts @@ -1,13 +1,10 @@ -import { spannerApiFetch, spannerPathCat } from "./api"; +import { spannerApiFetch } from "./api"; import { wwlrcClubId } from "./wwlrc"; export async function getPosts(): Promise { - let data = await spannerApiFetch("api/clubs/c/:clubId/blog_posts", { - clubId: wwlrcClubId, - size: 10, - page: 0, - "sorts[created_at]": "desc", + let data = await spannerApiFetch("news", { + clubs: wwlrcClubId, }); - return data.rows == null ? [] : data.rows; + return data.posts == null ? [] : data.posts; } diff --git a/src/spanner/events.ts b/src/spanner/events.ts index 63fc862..9e9cc4f 100644 --- a/src/spanner/events.ts +++ b/src/spanner/events.ts @@ -2,14 +2,14 @@ import { spannerApiFetch } from "./api"; import { wwlrcClubId } from "./wwlrc"; export async function getEvents() { - let data = await spannerApiFetch("api/clubs/c/:clubId/rallies", { + let data = await spannerApiFetch("/rallies", { clubId: wwlrcClubId, size: 25, page: 0, "sorts[start_date]": "desc", }); - let events = data.rows == null ? [] : data.rows; + let events = data.rallies == null ? [] : data.rallies; events.sort(function (a: any, b: any): number { let aStartDate = new Date(a.start_date); let bStartDate = new Date(b.start_date);