diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 853c2f1..d175e70 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -3,9 +3,12 @@ "allow": [ "Bash(find:*)", "Bash(ls:*)", + "Bash(git pull:*)", + "Bash(git remote set-url:*)", + "Bash(git add:*)", + "Bash(git commit:*)", "Bash(mv:*)", - "Bash(git checkout:*)", - "Bash(git add:*)" + "Bash(git checkout:*)" ], "deny": [] } diff --git a/.forgejo/workflows/build-check.yml b/.forgejo/workflows/build-check.yml deleted file mode 100644 index 6543cf4..0000000 --- a/.forgejo/workflows/build-check.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Workflow for building and testing Next.js site on non-master branches -name: Build Check - -on: - # Runs on pushes to any branch except master - push: - branches-ignore: ["master"] - - # Runs on pull requests targeting any branch - pull_request: - branches: ["*"] - -# Allow multiple concurrent build checks -concurrency: - group: "build-check-${{ github.ref }}" - cancel-in-progress: true - -jobs: - build-check: - runs-on: self-hosted - permissions: - contents: read - steps: - - name: Checkout - uses: https://code.forgejo.org/actions/checkout@v4 - - - name: Install dependencies - run: npm ci - - - name: Restore Next.js cache - uses: https://code.forgejo.org/actions/cache@v4 - with: - path: | - .next/cache - key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }} - restore-keys: | - ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}- - - - name: Run linting - run: npm run lint - - - name: Build Next.js site - run: npm run build - - - name: Run tests (if available) - run: | - if npm run test --if-present; then - echo "✅ Tests passed" - else - echo "ℹī¸ No tests found or tests skipped" - fi - continue-on-error: true - - - name: Build verification complete - run: | - echo "🎉 Build verification successful!" - echo "✅ Dependencies installed" - echo "✅ Linting passed" - echo "✅ Build completed successfully" - echo "Ready for review and merge!" diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml new file mode 100644 index 0000000..846b4e1 --- /dev/null +++ b/.forgejo/workflows/ci.yml @@ -0,0 +1,29 @@ +name: CI + +on: + push: + branches: [ main, master, feature/* ] + pull_request: + branches: [ main, master ] + +jobs: + test: + runs-on: self-hosted + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install dependencies + run: npm ci + + - name: Run linting + run: npm run lint + + - name: Run type checking + run: npm run typecheck + + - name: Build application + run: npm run build + env: + # Use empty string for YOUTUBE_API_KEY during CI build + YOUTUBE_API_KEY: "" \ No newline at end of file diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml new file mode 100644 index 0000000..0725542 --- /dev/null +++ b/.forgejo/workflows/deploy.yml @@ -0,0 +1,41 @@ +name: Deploy + +on: + push: + branches: [ main, master ] + workflow_dispatch: + +jobs: + deploy: + runs-on: self-hosted + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Install dependencies + run: npm ci + + - name: Build application + run: npm run build + env: + # Access YouTube API key from repository secrets + YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }} + + - name: Deploy to S3 (if configured) + run: | + if [ -n "${{ secrets.AWS_ACCESS_KEY_ID }}" ]; then + echo "Deploying to S3..." + npm run deploy:s3 + else + echo "AWS credentials not configured, skipping S3 deployment" + fi + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_REGION: ${{ secrets.AWS_REGION }} + + - name: Upload build artifacts + uses: https://codeberg.org/actions/upload-artifact@v3 + with: + name: build-output + path: out/ \ No newline at end of file diff --git a/.forgejo/workflows/nextjs.yml b/.forgejo/workflows/nextjs.yml deleted file mode 100644 index ef09276..0000000 --- a/.forgejo/workflows/nextjs.yml +++ /dev/null @@ -1,72 +0,0 @@ -# Workflow for building and deploying a Next.js site to AWS S3 -name: Deploy Next.js site to S3 - -on: - # Runs on pushes targeting the default branch - push: - branches: ["master"] - - # Allows you to run this workflow manually from the Actions tab - workflow_dispatch: - -# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. -concurrency: - group: "s3-deployment" - cancel-in-progress: false - -jobs: - build-and-deploy: - runs-on: self-hosted - permissions: - id-token: write - contents: read - steps: - - name: Checkout - uses: https://code.forgejo.org/actions/checkout@v4 - - - name: Create .env.local file - run: | - echo "YOUTUBE_API_KEY=${{ secrets.YOUTUBE_API_KEY }}" > .env.local - echo "S3_BUCKET_NAME=${{ secrets.S3_BUCKET_NAME }}" >> .env.local - - - name: Install dependencies - run: npm ci - - - name: Restore Next.js cache - uses: https://code.forgejo.org/actions/cache@v4 - with: - path: | - .next/cache - key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }} - restore-keys: | - ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}- - - - name: Build Next.js site - env: - YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }} - S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }} - run: npm run build:static - - - name: Configure AWS credentials - # Note: aws-actions/configure-aws-credentials is GitHub-specific - # For Forgejo, we'll use environment variables directly - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: us-east-1 - run: | - echo "AWS credentials configured via environment variables" - - - name: Deploy to S3 - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: us-east-1 - run: | - aws s3 sync out/ s3://${{ secrets.S3_BUCKET_NAME }} --delete --no-cli-pager - - - name: Output deployment URL - run: | - echo "🎉 Deployment successful!" - echo "S3 website URL: http://${{ secrets.S3_BUCKET_NAME }}.s3-website-us-east-1.amazonaws.com" - echo "Note: Site will be served through CloudFlare proxy for production" diff --git a/src/app/gallery/page.tsx b/src/app/gallery/page.tsx index 6858799..453dccb 100644 --- a/src/app/gallery/page.tsx +++ b/src/app/gallery/page.tsx @@ -3,7 +3,6 @@ import type { Metadata } from 'next'; import { Button } from '@/components/ui/button'; import Link from 'next/link'; import { ExternalLink } from 'lucide-react'; -import { Footer } from '@/components/Footer'; export const metadata: Metadata = { title: "Video Gallery - Community Coverage of Chelsea Smallwood", @@ -85,9 +84,7 @@ export default async function GalleryPage() { const videos = await getYouTubeVideos(videoIds); return ( -
-
-
+

YouTube Community Coverage @@ -128,10 +125,6 @@ export default async function GalleryPage() { Back to Home

-
-
- -
); } diff --git a/src/app/layout.tsx b/src/app/layout.tsx index d4e26af..e204f69 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -3,6 +3,7 @@ import { Inter } from 'next/font/google'; import './globals.css'; import { Toaster } from '@/components/ui/toaster'; import { ThemeProvider } from '@/components/theme-provider'; +import { Footer } from '@/components/Footer'; const inter = Inter({ subsets: ['latin'] }); @@ -71,7 +72,12 @@ export default function RootLayout({ enableSystem disableTransitionOnChange > - {children} +
+
+ {children} +
+
diff --git a/src/app/long-story/page.tsx b/src/app/long-story/page.tsx index ae87d10..5e7be2b 100644 --- a/src/app/long-story/page.tsx +++ b/src/app/long-story/page.tsx @@ -7,7 +7,6 @@ import { CardHeader, } from '@/components/ui/card'; import Link from 'next/link'; -import { Footer } from '@/components/Footer'; export const metadata: Metadata = { title: "The Full Story: Chelsea Smallwood's Controversial Empire", description: "A deep dive into how Chelsea Smallwood built a business on monetizing infidelity, the controversy surrounding 'The Other Woman and the Wife,' and the serious allegations of cyberbullying and harassment in the Kristen Jacobs lawsuit.", @@ -15,9 +14,7 @@ export const metadata: Metadata = { export default function LongStoryPage() { return ( -
-
-
+

Chelsea Smallwood's Controversial Empire @@ -199,10 +196,6 @@ export default function LongStoryPage() {

-
- - -