3

diff --git a/src/app/(site)/page.tsx b/src/app/(site)/page.tsx index 0eb0fd0c..6cdaf324 100644 --- a/src/app/(site)/page.tsx +++ b/src/app/(site)/page.tsx @@ -1,15 +1,31 @@ -"use client"; - +import type { Metadata } from "next"; import { BackgroundSection, BentoGridSection, CTASection, + FAQSection, FeaturesSection, HeroSection, VisionSection, - FAQSection, } from "@/components/home"; import HomeTabs from "@/components/home/home-tabs"; +import { baseUrl } from "@/lib/metadata"; + +export const metadata: Metadata = { + title: "Javaistic - Master Java Programming with Interactive Tutorials", + description: + "Learn Java from fundamentals to advanced concepts. Javaistic provides comprehensive documentation, practical programs, and a modern learning environment for developers.", + keywords: [ + "Java tutorial", + "learn Java", + "Java programming", + "Java examples", + "OOP concepts Java", + ], + alternates: { + canonical: baseUrl, + }, +}; export default function HomePage() { return ( diff --git a/src/app/(site)/security/page.tsx b/src/app/(site)/security/page.tsx index b64577fc..a2618866 100644 --- a/src/app/(site)/security/page.tsx +++ b/src/app/(site)/security/page.tsx @@ -1,24 +1,24 @@ "use client"; -import { motion, easeOut } from "motion/react"; import { - Shield, - Lock, - Eye, - Server, + Activity, AlertTriangle, CheckCircle, + Code, + ExternalLink, + Eye, FileText, Globe, - ShieldCheck, - Github, - ExternalLink, + Lock, Mail, - Activity, - Code, + Server, + Shield, + ShieldCheck, } from "lucide-react"; -import { useState, useEffect } from "react"; -import Particles from "@/components/Particles"; +import { easeOut, motion } from "motion/react"; import Link from "next/link"; +import { useEffect, useState } from "react"; +import { GitHubIcon as Github } from "@/components/icons"; +import Particles from "@/components/Particles"; const SecurityPage = () => { const [isDarkMode, setIsDarkMode] = useState(false); @@ -231,7 +231,7 @@ const SecurityPage = () => { variants={titleVariants} > Security &{" "} - + Privacy @@ -275,6 +275,7 @@ const SecurityPage = () => { {tabsData.map((tab) => ( setActiveTab(tab.id)} className={`flex items-center rounded-t-lg px-4 py-3 font-medium transition-all duration-200 ${ activeTab === tab.id @@ -449,9 +450,9 @@ const SecurityPage = () => {

- {complianceStandards.map((standard, index) => ( + {complianceStandards.map((standard) => ( @@ -502,9 +503,9 @@ const SecurityPage = () => { type: "Web", url: "/legal/terms", }, - ].map((doc, index) => ( + ].map((doc) => ( { Contact Information

-

- - Email: - - - arghyaxcodes@gmail.com - -

GitHub Issues: @@ -599,6 +592,7 @@ const SecurityPage = () => { { "Vulnerability disclosures", ], }, - ].map((item, index) => ( + ].map((item) => ( { {item.description}

- {item.items.map((listItem, idx) => ( + {item.items.map((listItem) => (
• {
  { ; }) { const params = await props.params; const page = source.getPage(params.slug); - const owner = "javaistic"; - const repo = "javaistic"; + const _owner = "javaistic"; + const _repo = "javaistic"; if (!page) notFound(); @@ -28,49 +30,92 @@ export default async function Page(props: { "@type": "Article", headline: page.data.title, description: page.data.description, + image: `${baseUrl}/og.png`, author: { "@type": "Organization", name: "Javaistic", + url: baseUrl, }, publisher: { "@type": "Organization", name: "Javaistic", + logo: { + "@type": "ImageObject", + url: `${baseUrl}/favicon.ico`, + }, }, mainEntityOfPage: { "@type": "WebPage", - "@id": `https://javaistic.vercel.app${page.url}`, + "@id": `${baseUrl}${page.url}`, }, }; + const breadcrumbsJsonLd: WithContext = { + "@context": "https://schema.org", + "@type": "BreadcrumbList", + itemListElement: [ + { + "@type": "ListItem", + position: 1, + name: "Home", + item: baseUrl, + }, + { + "@type": "ListItem", + position: 2, + name: "Docs", + item: `${baseUrl}/docs`, + }, + { + "@type": "ListItem", + position: 3, + name: page.data.title, + item: `${baseUrl}${page.url}`, + }, + ], + }; + return ( - - {page.data.title} - - {page.data.description} - + <> + + {page.data.title} + + {page.data.description} + - - - - + - + + > ); } @@ -84,8 +129,8 @@ type Props = { }; export async function generateMetadata( - { params, searchParams }: Props, - parent: ResolvingMetadata, + { params, searchParams: _searchParams }: Props, + _parent: ResolvingMetadata, ): Promise { const { slug } = await params; @@ -94,13 +139,16 @@ export async function generateMetadata( if (!page) notFound(); return { - title: `${page.data.title} - Javaistic`, + title: `${page.data.title} | Java Tutorial - Javaistic`, description: page.data.description, + alternates: { + canonical: page.url, + }, openGraph: { - title: `${page.data.title} - Javaistic`, + title: `${page.data.title} | Java Tutorial - Javaistic`, description: page.data.description, siteName: "Javaistic", - url: `https://javaistic.vercel.app${page.url}`, + url: `${baseUrl}${page.url}`, images: `https://og-javaistic.vercel.app/og?title=${page.data.title}`, }, twitter: { diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 7eadfa1e..0016d092 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,9 +1,10 @@ -import SearchDialog from "@/components/search"; import { GoogleAnalytics } from "@next/third-parties/google"; import { RootProvider } from "fumadocs-ui/provider"; import type { Metadata } from "next"; import { Funnel_Display, Inter, JetBrains_Mono } from "next/font/google"; import type { ReactNode } from "react"; +import SearchDialog from "@/components/search"; +import { baseUrl } from "@/lib/metadata"; import "./global.css"; const inter = Inter({ @@ -31,19 +32,25 @@ const jetbrainsMono = JetBrains_Mono({ }); export const metadata: Metadata = { - metadataBase: new URL("https://javaistic.vercel.app"), + metadataBase: new URL(baseUrl), title: "Javaistic - Learn Java for Free", description: "Javaistic is a free platform to learn Java programming language with interactive tutorials and resources.", openGraph: { - images: "https://javaistic.vercel.app/og.png", + images: ["/og.png"], siteName: "Javaistic", - url: "https://javaistic.vercel.app", + url: baseUrl, + type: "website", }, + // ... twitter: { card: "summary_large_image", + title: "Javaistic - Learn Java for Free", + description: + "Javaistic is a free platform to learn Java programming language with interactive tutorials and resources.", site: "@javaistic", creator: "@arghyaxcodes", + images: ["/og.png"], }, }; @@ -61,7 +68,7 @@ export default function RootLayout({ children }: { children: ReactNode }) { {children} - + ); } diff --git a/src/app/programs/[[...slug]]/page.tsx b/src/app/programs/[[...slug]]/page.tsx index 5900ebaf..c2378263 100644 --- a/src/app/programs/[[...slug]]/page.tsx +++ b/src/app/programs/[[...slug]]/page.tsx @@ -1,5 +1,3 @@ -import { programsSource } from "@/lib/source"; -import { getMDXComponents } from "@/mdx-components"; import { createRelativeLink } from "fumadocs-ui/mdx"; import { DocsBody, @@ -9,7 +7,11 @@ import { } from "fumadocs-ui/page"; import type { Metadata, ResolvingMetadata } from "next"; import { notFound } from "next/navigation"; -import { HowTo, WithContext } from "schema-dts"; +import Script from "next/script"; +import type { BreadcrumbList, HowTo, WithContext } from "schema-dts"; +import { baseUrl } from "@/lib/metadata"; +import { programsSource } from "@/lib/source"; +import { getMDXComponents } from "@/mdx-components"; export default async function Page(props: { params: Promise<{ slug?: string[] }>; @@ -25,41 +27,80 @@ export default async function Page(props: { "@type": "HowTo", name: page.data.title, description: page.data.description, + image: `${baseUrl}/og.png`, provider: { "@type": "Organization", name: "Javaistic", + url: baseUrl, }, mainEntityOfPage: { "@type": "WebPage", - "@id": `https://javaistic.vercel.app${page.url}`, + "@id": `${baseUrl}${page.url}`, }, }; + const breadcrumbsJsonLd: WithContext = { + "@context": "https://schema.org", + "@type": "BreadcrumbList", + itemListElement: [ + { + "@type": "ListItem", + position: 1, + name: "Home", + item: baseUrl, + }, + { + "@type": "ListItem", + position: 2, + name: "Programs", + item: `${baseUrl}/programs`, + }, + { + "@type": "ListItem", + position: 3, + name: page.data.title, + item: `${baseUrl}${page.url}`, + }, + ], + }; + return ( - - {page.data.title} - {page.data.description} - - - - + - + + > ); } @@ -73,21 +114,24 @@ type Props = { }; export async function generateMetadata( - { params, searchParams }: Props, - parent: ResolvingMetadata, + { params, searchParams: _searchParams }: Props, + _parent: ResolvingMetadata, ): Promise { const { slug } = await params; const page = programsSource.getPage(slug); if (!page) notFound(); return { - title: `${page.data.title} - Javaistic`, + title: `${page.data.title} | Java Program Example - Javaistic`, description: page.data.description, + alternates: { + canonical: page.url, + }, openGraph: { - title: `${page.data.title} - Javaistic`, + title: `${page.data.title} | Java Program Example - Javaistic`, description: page.data.description, siteName: "Javaistic", - url: `https://javaistic.vercel.app${page.url}`, + url: `${baseUrl}${page.url}`, images: `https://og-javaistic.vercel.app/og?title=${page.data.title}`, }, twitter: { From d4f4d0fe47bffcd214a60cd9ff10e642a4635541 Mon Sep 17 00:00:00 2001 From: Arghya Ghosh <71373838+arghyaxcodes@users.noreply.github.com> Date: Wed, 22 Apr 2026 04:45:50 +0530 Subject: [PATCH 5/5] fix(mdx): ensure proper type casting in Proxy get handler --- src/mdx-components.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mdx-components.tsx b/src/mdx-components.tsx index e521c375..ac6baf30 100644 --- a/src/mdx-components.tsx +++ b/src/mdx-components.tsx @@ -20,10 +20,10 @@ export function getMDXComponents(components?: MDXComponents): MDXComponents { return new Proxy(merged, { get: (target, prop: string) => { if (typeof prop !== "string") return undefined; - if (prop in target) return target[prop]; + if (prop in target) return (target as any)[prop]; if (prop.endsWith("Icon")) { const baseName = prop.slice(0, -4); - return target[baseName]; + return (target as any)[baseName]; } return undefined; },