Finish member pages

apps/web/app/ledamot/[id]/page.tsx

@@ -11,6 +11,7 @@ import getMemberWithAbsence from "@lib/api/member/get-member-with-absence";
 import getMemberDocuments from "@lib/api/documents/get-member-documents";
 import Biography from "./biography";
 import Tabs from "./tabs";
+import getMemberTwitterFeed from "@lib/api/wikidata/get-member-twitter-feed";
 
 interface PageProps {
   params: {
@@ -40,9 +41,11 @@ export async function generateMetadata({ params: { id } }: PageProps) {
 export default async function MemberPage({ params: { id } }: PageProps) {
   const memberPromise = getMemberWithAbsence(id);
   const memberDocumentsPromise = getMemberDocuments({ id, page: 1 });
-  const [member, memberDocuments] = await Promise.all([
+  const memberTwitterPromise = getMemberTwitterFeed(id);
+  const [member, memberDocuments, memberTwitter] = await Promise.all([
     memberPromise,
     memberDocumentsPromise,
+    memberTwitterPromise,
   ]);
 
   if (!member) {
@@ -67,7 +70,11 @@ export default async function MemberPage({ params: { id } }: PageProps) {
           documentCount={memberDocuments.count}
         />
         <Biography memberInformation={member.information} />
-        <Tabs memberId={member.id} initialDocuments={memberDocuments} />
+        <Tabs
+          memberId={member.id}
+          initialDocuments={memberDocuments}
+          twitterFeed={memberTwitter.results.bindings[0]}
+        />
       </Container>
     </main>
   );

apps/web/app/ledamot/[id]/tabs.tsx

@@ -4,6 +4,8 @@ import { Card } from "@components/common/card";
 import type { MemberDocuments } from "@lib/api/member/types";
 import { useState } from "react";
 import Documents from "./documents";
+import type { TwitterResult } from "@lib/api/wikidata/types";
+import TwitterFeed from "./twitter-feed";
 
 enum Tab {
   Document = "document-tab",
@@ -13,9 +15,14 @@ enum Tab {
 interface Props {
   memberId: string;
   initialDocuments: MemberDocuments;
+  twitterFeed?: TwitterResult;
 }
 
-export default function Tabs({ memberId, initialDocuments }: Props) {
+export default function Tabs({
+  memberId,
+  initialDocuments,
+  twitterFeed,
+}: Props) {
   const [activeTab, setActiveTab] = useState(Tab.Document);
 
   function setTab(event: React.MouseEvent) {
@@ -49,6 +56,7 @@ export default function Tabs({ memberId, initialDocuments }: Props) {
       {activeTab === Tab.Document && (
         <Documents initialDocuments={initialDocuments} memberId={memberId} />
       )}
+      {activeTab === Tab.Twitter && <TwitterFeed twitterFeed={twitterFeed} />}
     </Card>
   );
 }

apps/web/app/ledamot/[id]/twitter-feed.tsx

@@ -0,0 +1,66 @@
+"use client";
+
+import Loading from "@components/common/loading";
+import type { TwitterResult } from "@lib/api/wikidata/types";
+import { useTheme } from "next-themes";
+import { useEffect, useState } from "react";
+
+declare global {
+  interface Window {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    twttr: any;
+  }
+}
+
+interface Props {
+  twitterFeed?: TwitterResult;
+}
+
+export default function TwitterFeed({ twitterFeed }: Props) {
+  const theme = useTheme();
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    const twitterHandle = twitterFeed?.twitterHandle.value;
+    if (twitterHandle) {
+      setLoading(true);
+      const container = document.getElementById("twitterContainer");
+      if (container) {
+        container.innerHTML = "";
+      }
+      window.twttr.widgets
+        .createTimeline(
+          {
+            sourceType: "profile",
+            screenName: twitterHandle,
+          },
+          container,
+          {
+            theme: theme.theme,
+            chrome: "nofooter noborders",
+          },
+        )
+        .then(() => {
+          setLoading(false);
+        });
+    } else {
+      setLoading(false);
+    }
+  }, [theme.theme, twitterFeed?.twitterHandle.value]);
+
+  const twitterHandle = twitterFeed?.twitterHandle.value;
+
+  if (!twitterHandle) {
+    return <p className="text-center text-lg">Inget Twitterkonto hittades.</p>;
+  }
+
+  return (
+    <>
+      <div
+        id="twitterContainer"
+        className="mx-auto my-4 max-w-[500px] bg-black"
+      />
+      {loading && <Loading className="mx-auto my-8" />}
+    </>
+  );
+}

apps/web/app/loading.tsx

@@ -1,23 +1,5 @@
-export default function Loading() {
-  return (
-    <div role="status" className="mx-auto mt-10">
-      <svg
-        aria-hidden="true"
-        className="fill-primary h-28 w-28 animate-spin text-slate-200 dark:text-gray-600"
-        viewBox="0 0 100 100"
-        fill="none"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-          fill="currentColor"
-        />
-        <path
-          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-          fill="currentFill"
-        />
-      </svg>
-      <span className="sr-only">Loading...</span>
-    </div>
-  );
+import Loading from "@components/common/loading";
+
+export default function LoadingPage() {
+  return <Loading containerClassName="mx-auto mt-10 " />;
 }

apps/web/components/common/loading.tsx

@@ -0,0 +1,36 @@
+import { twMerge } from "tailwind-merge";
+
+interface LoadingProps {
+  containerClassName?: string;
+  className?: string;
+}
+
+export default function Loading({
+  className,
+  containerClassName,
+}: LoadingProps) {
+  return (
+    <div role="status" className={containerClassName}>
+      <svg
+        aria-hidden="true"
+        className={twMerge(
+          "fill-primary h-28 w-28 animate-spin text-slate-200 dark:text-gray-600",
+          className,
+        )}
+        viewBox="0 0 100 100"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="currentColor"
+        />
+        <path
+          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentFill"
+        />
+      </svg>
+      <span className="sr-only">Loading...</span>
+    </div>
+  );
+}

apps/web/components/common/pagination.tsx

@@ -58,7 +58,9 @@ function generatePagination(currentPage: number, max: number) {
     pagination.push(SeparatorType.SeparatorEnd);
   }
 
-  pagination.push(lastPage);
+  if (lastPage !== firstPage) {
+    pagination.push(lastPage);
+  }
 
   return pagination;
 }
@@ -117,6 +119,7 @@ export default function Pagination({
 
       <button
         aria-label="Nästa sida"
+        disabled={current === total}
         onClick={createOnChange(current + 1)}
         className="disabled:opacity-60"
       >

apps/web/lib/api/wikidata/get-member-twitter-feed.ts

@@ -0,0 +1,32 @@
+import { WIKIDATA_QUERY_URL } from "@lib/constants";
+import type { TwitterResult, WikidataResponse } from "./types";
+
+export default async function getMemberTwitterFeed(memberId: string) {
+  const sparqlQuery = `
+  #title: Riksdagsmedlemmars twitterkonton
+  SELECT DISTINCT ?person ?twitterHandle ?twitterId WHERE {
+    ?person wdt:P31 wd:Q5;
+      p:P39 ?positionStatement.
+    ?person p:P2002 ?twitterStatement.
+    ?twitterStatement pq:P6552 ?twitterId ;
+                      ps:P2002 ?twitterHandle .
+    ?person wdt:P1214 "${memberId}".
+    SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". }
+  }
+  ORDER BY (?personLabel)
+`;
+
+  const query = new URLSearchParams({
+    query: sparqlQuery,
+  });
+
+  const response = await fetch(`${WIKIDATA_QUERY_URL}?${query}`, {
+    headers: { Accept: "application/sparql-results+json" },
+    next: {
+      // Revalidate once per week
+      revalidate: 60 * 60 * 24 * 7,
+    },
+  });
+  const data: WikidataResponse<TwitterResult> = await response.json();
+  return data;
+}

apps/web/lib/api/wikidata/types.ts

@@ -0,0 +1,23 @@
+export interface WikidataResponse<T> {
+  head: {
+    vars: keyof T[];
+  };
+  results: {
+    bindings: T[];
+  };
+}
+
+export interface TwitterResult {
+  person: {
+    type: "uri";
+    value: string;
+  };
+  twitterHandle: {
+    type: "literal";
+    value: string;
+  };
+  twitterId: {
+    type: "literal";
+    value: string;
+  };
+}

apps/web/lib/constants.ts

@@ -1,3 +1,5 @@
 export const ERROR_404_TITLE = "404 | Sidan hittades inte | Partiguiden";
 
 export const PARLIAMENT_BASE_URL = "https://data.riksdagen.se";
+
+export const WIKIDATA_QUERY_URL = "https://query.wikidata.org/sparql";