Merge pull request wishonia#142 from mikepsinn/main

Petition Models and Relations, Civic API

Author: mikepsinn

.env.example

@@ -145,4 +145,9 @@ SEARXNG_SAFESEARCH=0 # Safe search setting: 0 (off), 1 (moderate), 2 (strict)
 #NEXT_PUBLIC_BASE_URL=http://localhost:3000
 
 DFDA_CLIENT_ID=
-DFDA_CLIENT_SECRET=
+DFDA_CLIENT_SECRET=
+
+GOOGLE_CIVIC_API_KEY=your_api_key_here
+
+# Default AI model to use for generation
+DEFAULT_AI_MODEL=gpt-4o-mini

app/api/cron/petition-summaries/route.ts

@@ -0,0 +1,22 @@
+import { NextResponse } from 'next/server'
+import { sendDailySummaries, sendWeeklySummaries } from '@/lib/notifications/petition-summary'
+
+export const runtime = 'edge'
+
+export async function GET(request: Request) {
+  try {
+    const { searchParams } = new URL(request.url)
+    const type = searchParams.get('type')
+
+    if (type === 'daily') {
+      await sendDailySummaries()
+    } else if (type === 'weekly') {
+      await sendWeeklySummaries()
+    }
+
+    return NextResponse.json({ success: true })
+  } catch (error) {
+    console.error('Cron job failed:', error)
+    return NextResponse.json({ error: 'Failed to process summaries' }, { status: 500 })
+  }
+} 

app/articles/articleActions.ts

@@ -0,0 +1,50 @@
+import { prisma } from "@/lib/prisma"
+
+export async function getAuthorByUsername(username: string) {
+  return await prisma.user.findUnique({
+    where: { username },
+    select: {
+      id: true,
+      name: true,
+      username: true,
+      image: true,
+      bio: true,
+      _count: {
+        select: { authoredArticles: true }
+      }
+    }
+  })
+}
+
+export async function getAuthors() {
+  return await prisma.user.findMany({
+    where: {
+      authoredArticles: {
+        some: {}
+      }
+    },
+    select: {
+      id: true,
+      name: true,
+      username: true,
+      image: true,
+      bio: true,
+      _count: {
+        select: { authoredArticles: true }
+      }
+    },
+    orderBy: {
+      name: 'asc'
+    }
+  })
+}
+
+export async function getAuthorForMetadata(username: string) {
+  return await prisma.user.findUnique({
+    where: { username },
+    select: {
+      name: true,
+      username: true
+    }
+  })
+} 

app/articles/author/[username]/page.tsx

@@ -1,12 +1,10 @@
-import { prisma } from "@/lib/prisma"
 import { notFound } from "next/navigation"
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar"
 import ArticleSearchAndGrid from "@/components/article/ArticleSearchAndGrid"
+import { getAuthorByUsername, getAuthorForMetadata } from "../../articleActions"
 
 export async function generateMetadata({ params }: { params: { username: string } }) {
-  const author = await prisma.user.findUnique({
-    where: { username: params.username }
-  })
+  const author = await getAuthorForMetadata(params.username)
 
   if (!author) {
     return {
@@ -21,14 +19,7 @@ export async function generateMetadata({ params }: { params: { username: string
 }
 
 export default async function AuthorPage({ params }: { params: { username: string } }) {
-  const author = await prisma.user.findUnique({
-    where: { username: params.username },
-    include: {
-      _count: {
-        select: { authoredArticles: true }
-      }
-    }
-  })
+  const author = await getAuthorByUsername(params.username)
 
   if (!author) {
     notFound()

app/articles/authors/page.tsx

@@ -1,30 +1,11 @@
-import { prisma } from "@/lib/prisma"
 import AuthorsList from "@/components/authors/AuthorsList"
+import { getAuthors } from "../articleActions"
 
 export const metadata = {
   title: 'Article Authors',
   description: 'Browse all article authors'
 }
 
-async function getAuthors() {
-  const authors = await prisma.user.findMany({
-    where: {
-      authoredArticles: {
-        some: {}
-      }
-    },
-    include: {
-      _count: {
-        select: { authoredArticles: true }
-      }
-    },
-    orderBy: {
-      name: 'asc'
-    }
-  })
-  return authors
-}
-
 export default async function AuthorsPage() {
   const authors = await getAuthors()
 

app/dfda/right-to-trial-act/components/DFDASignPetitionButton.tsx

@@ -0,0 +1,55 @@
+'use client'
+
+import { SignPetitionButton } from '@/app/petitions/components/SignPetitionButton'
+import { useEffect, useState } from 'react'
+import { useSession } from 'next-auth/react'
+import { checkPetitionSignature } from '@/app/petitions/petitionActions'
+
+const neoBrutalistStyles = {
+  button: "border-4 border-black p-4 text-lg font-bold transition-all hover:translate-x-1 hover:translate-y-1 hover:shadow-none bg-white shadow-[8px_8px_0px_0px_rgba(0,0,0,1)] text-black min-w-[200px] min-h-[60px] rounded-none",
+  signed: "border-4 border-black p-4 text-lg font-bold bg-pink-400 shadow-[4px_4px_0px_0px_rgba(0,0,0,1)] hover:bg-pink-500 text-white min-w-[200px] min-h-[60px] rounded-none"
+}
+
+export function DFDASignPetitionButton() {
+  const { data: session } = useSession()
+  const [hasSigned, setHasSigned] = useState(false)
+
+  useEffect(() => {
+    let mounted = true
+
+    async function checkSignature() {
+      if (!session?.user?.id) {
+        if (mounted) setHasSigned(false)
+        return
+      }
+      
+      try {
+        const hasSignature = await checkPetitionSignature('right-to-trial-act')
+        if (mounted) setHasSigned(hasSignature)
+      } catch (error) {
+        console.error('Failed to check signature status:', error)
+        if (mounted) setHasSigned(false)
+      }
+    }
+
+    checkSignature()
+
+    return () => {
+      mounted = false
+    }
+  }, [session?.user?.id])
+
+  return (
+    <SignPetitionButton 
+      petitionId="right-to-trial-act"
+      hasSigned={hasSigned}
+      status="ACTIVE"
+      className={neoBrutalistStyles.button}
+      signedClassName={neoBrutalistStyles.signed}
+      onSignatureChange={() => {
+        // Toggle the hasSigned state immediately for better UX
+        setHasSigned(prev => !prev)
+      }}
+    />
+  )
+} 

app/dfda/right-to-trial-act/components/PetitionSection.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { GitHubEditButton } from './GitHubEditButton'
-import { SignPetitionButton } from './SignPetitionButton'
+import { DFDASignPetitionButton } from './DFDASignPetitionButton'
 
 export function PetitionSection() {
   return (
@@ -10,8 +10,8 @@ export function PetitionSection() {
       <p className="text-xl mb-8 text-black">
         Sign the petition to support the Right to Trial Act and help end the suffering of billions of people.
       </p>
-      <div className="flex flex-col sm:flex-row gap-4 justify-center">
-        <SignPetitionButton />
+      <div className="inline-flex gap-4 justify-center">
+        <DFDASignPetitionButton />
         <GitHubEditButton />
       </div>
     </div>

app/dfda/right-to-trial-act/components/SignPetitionButton.tsx

@@ -2,7 +2,7 @@ import { Metadata } from 'next'
 import { getMarkdownContent } from '@/lib/content/getMarkdownContent'
 import { PetitionSection } from './components/PetitionSection'
 import { FloatingPetitionButton } from './components/FloatingPetitionButton'
-import { SignPetitionButton } from './components/SignPetitionButton'
+import { DFDASignPetitionButton } from './components/DFDASignPetitionButton'
 import CureAccelerationAct from './components/right-to-trial-act'
 import { GitHubEditButton } from './components/GitHubEditButton'
 
@@ -50,7 +50,7 @@ export default async function RightToTrialPage() {
             {/* Bottom Petition Section */}
             <div className="mt-16 text-center border-t-4 pt-12">
               <h3 className="text-2xl font-serif mb-6">Add Your Name to Support This Act</h3>
-              <SignPetitionButton /> <GitHubEditButton />
+              <DFDASignPetitionButton /> <GitHubEditButton />
             </div>
           </div>
         </div>

app/dfda/right-to-trial-act/page.tsx

@@ -59,3 +59,35 @@
     @apply bg-background text-foreground;
   }
 }
+
+@import '@mdxeditor/editor/style.css';
+
+/* Add dark mode styles for the editor */
+.dark .mdxeditor {
+  --mdxeditor-bg: hsl(var(--background));
+  --mdxeditor-text: hsl(var(--foreground));
+  --mdxeditor-border: hsl(var(--border));
+  --mdxeditor-toolbar-bg: hsl(var(--card));
+  --mdxeditor-toolbar-border: hsl(var(--border));
+  --mdxeditor-button-bg: transparent;
+  --mdxeditor-button-border: hsl(var(--border));
+  --mdxeditor-button-hover-bg: hsl(var(--accent));
+  --mdxeditor-button-hover-text: hsl(var(--accent-foreground));
+  --mdxeditor-button-active-bg: hsl(var(--accent));
+  --mdxeditor-button-active-text: hsl(var(--accent-foreground));
+  --mdxeditor-button-active-border: hsl(var(--border));
+}
+
+.dark .mdxeditor-toolbar {
+  background-color: hsl(var(--card));
+  border-color: hsl(var(--border));
+}
+
+.dark .mdxeditor-button {
+  color: hsl(var(--foreground));
+}
+
+.dark .mdxeditor-button:hover {
+  background-color: hsl(var(--accent));
+  color: hsl(var(--accent-foreground));
+}