From f4ff971c854c98856597b686a23fbf5f30fe2c62 Mon Sep 17 00:00:00 2001
From: joyzhao <zhaoguiyang18@gmail.com>
Date: Thu, 19 Jun 2025 18:26:05 +0800
Subject: [PATCH] refactor(Container): simplify container component and remove
 size prop

Remove size variants from Container component and set a default max-width
Update all instances where Container was used with size prop to use default
---
 src/components/Footer.tsx            |  2 +-
 src/components/GlassHeader.tsx       |  2 +-
 src/components/ui/Container.tsx      | 17 ++---------------
 src/layouts/AboutLayout.astro        |  2 +-
 src/layouts/BlogPostLayout.astro     |  2 +-
 src/layouts/TaxonomyPageLayout.astro |  2 +-
 src/pages/blog/index.astro           |  4 ++--
 src/pages/index.astro                |  8 ++++----
 src/pages/projects.astro             |  4 ++--
 src/pages/zh/blog/index.astro        |  4 ++--
 src/pages/zh/index.astro             |  8 ++++----
 src/pages/zh/projects.astro          |  4 ++--
 12 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 328e8c7..d2b6740 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -21,7 +21,7 @@ export default function Footer({ lang: propLang }: FooterProps) {
   const t = useTranslations(lang);
   return (
     <footer className="border-t border-purple-500/10 py-6 bg-gradient-to-b from-background to-muted/20 backdrop-blur-sm">
-      <Container size="sm">
+      <Container>
         <motion.div
           className="flex flex-col md:flex-row justify-between items-center"
           initial={{ opacity: 0, y: 20 }}
diff --git a/src/components/GlassHeader.tsx b/src/components/GlassHeader.tsx
index 16599fd..c6d3ccd 100644
--- a/src/components/GlassHeader.tsx
+++ b/src/components/GlassHeader.tsx
@@ -44,7 +44,7 @@ export default function GlassHeader({ lang: propLang }: GlassHeaderProps) {
         ? 'backdrop-blur-md backdrop-filter bg-white/80 dark:bg-black/80 border-b border-border/30 shadow-lg shadow-black/5 dark:shadow-black/20' 
         : 'bg-transparent'
     }`}>
-      <Container size="sm" className="p-4 flex justify-between items-center">
+      <Container className="p-4 flex justify-between items-center">
         <a
           className="flex items-center text-lg font-medium transition-opacity duration-150 hover:opacity-80"
           href={getLocalizedPath('/', lang)}
diff --git a/src/components/ui/Container.tsx b/src/components/ui/Container.tsx
index 1c256e1..3973389 100644
--- a/src/components/ui/Container.tsx
+++ b/src/components/ui/Container.tsx
@@ -4,33 +4,20 @@ import { type ReactNode } from "react";
 interface ContainerProps {
   children: ReactNode;
   className?: string;
-  size?: "sm" | "md" | "lg" | "xl" | "full";
 }
 
 /**
  * Container component for consistent content width across the site
  * @param children - The content to be wrapped
  * @param className - Additional classes to apply
- * @param size - Container size variant (sm: max-w-4xl, md: max-w-6xl, lg: max-w-7xl, xl: max-w-screen-2xl, full: w-full)
  */
 export default function Container({ 
   children, 
-  className, 
-  size = "md" 
+  className
 }: ContainerProps) {
-  // Map size variants to max-width classes
-  const sizeClasses = {
-    sm: "max-w-4xl", // Same as header/footer (narrower content)
-    md: "max-w-6xl", // Default for most content areas
-    lg: "max-w-7xl", // For wider content like blog posts with sidebars
-    xl: "max-w-screen-2xl", // For very wide content
-    full: "w-full" // No max width constraint
-  };
-
   return (
     <div className={cn(
-      "container mx-auto px-4 sm:px-6 lg:px-8", 
-      sizeClasses[size],
+      "container mx-auto px-4 sm:px-6 lg:px-8 max-w-6xl", 
       className
     )}>
       {children}
diff --git a/src/layouts/AboutLayout.astro b/src/layouts/AboutLayout.astro
index 3d32436..496e409 100644
--- a/src/layouts/AboutLayout.astro
+++ b/src/layouts/AboutLayout.astro
@@ -30,7 +30,7 @@ const lang = Astro.currentLocale as Lang || defaultLang;
   
   <!-- Main content with proper spacing for fixed header -->
   <div class="pt-16 sm:pt-20">
-    <Container client:load size="md" className="py-8 md:py-12">
+    <Container client:load className="py-8 md:py-12">
       <div class="max-w-7xl mx-auto">
         <div class="grid grid-cols-1 xl:grid-cols-4 gap-6 lg:gap-8">
           <!-- Main Content -->
diff --git a/src/layouts/BlogPostLayout.astro b/src/layouts/BlogPostLayout.astro
index f71f7e9..e3074bc 100644
--- a/src/layouts/BlogPostLayout.astro
+++ b/src/layouts/BlogPostLayout.astro
@@ -42,7 +42,7 @@ const finalReadingTime = readTime ? parseInt(readTime.replace(/\D/g, '')) : unde
   
   <!-- Main content with proper spacing for fixed header -->
   <div class="pt-16 sm:pt-20">
-    <Container client:load size="md" className="py-6 sm:py-8">
+    <Container client:load className="py-6 sm:py-8">
       <div class="max-w-7xl mx-auto">
         <div class="grid grid-cols-1 xl:grid-cols-4 gap-6 lg:gap-8">
           <!-- Main Content -->
diff --git a/src/layouts/TaxonomyPageLayout.astro b/src/layouts/TaxonomyPageLayout.astro
index 24563b4..2f6820b 100644
--- a/src/layouts/TaxonomyPageLayout.astro
+++ b/src/layouts/TaxonomyPageLayout.astro
@@ -54,7 +54,7 @@ const localizedText = getLocalizedText();
 ---
 
 <BlogLayout title={title} description={Astro.props.description}>
-  <Container client:load size="md" className="py-8">
+  <Container client:load className="py-8">
     <!-- Header Section - Centered at the top -->
     <div class="text-center mb-10">
       <h1 class="text-4xl font-bold mb-3">
diff --git a/src/pages/blog/index.astro b/src/pages/blog/index.astro
index 6435ec6..25edb52 100644
--- a/src/pages/blog/index.astro
+++ b/src/pages/blog/index.astro
@@ -44,7 +44,7 @@ const sortedBlogPosts = sortPostsByDate(blogPosts);
 <BlogLayout title="Blog - Joy Zhao" description="Dive into my thoughts on coding, tech trends, and developer life. Explore my latest posts below.">
   <main class="min-h-screen">
     <!-- Header Section -->
-    <Container client:load size="md" className="pt-24 pb-12">
+    <Container client:load className="pt-24 pb-12">
       <div class="text-center mb-16">
         <h1 class="text-5xl md:text-6xl font-bold bg-gradient-to-r from-foreground via-purple-600 to-purple-800 dark:from-foreground dark:via-purple-200 dark:to-purple-300 bg-clip-text text-transparent mb-6">
           Our <span class="text-purple-500">Latest</span> Blog
@@ -56,7 +56,7 @@ const sortedBlogPosts = sortPostsByDate(blogPosts);
     </Container>
 
     <!-- Main Content -->
-    <Container client:load size="md" className="pb-20">
+    <Container client:load className="pb-20">
       <div class="grid grid-cols-1 lg:grid-cols-4 gap-8">
         <!-- 侧边栏 -->
         <div class="lg:col-span-1 space-y-8">
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 33c0437..89fbe6e 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -22,7 +22,7 @@ const pageTitle = t('site.title');
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-br from-purple-900/20 via-purple-800/10 to-purple-700/20 dark:from-purple-900/30 dark:via-purple-800/20 dark:to-purple-700/30"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <!-- Greeting -->
           <div class="flex items-center justify-center mb-6">
@@ -170,7 +170,7 @@ const pageTitle = t('site.title');
     
     <!-- Services Section - Inlined Content -->
     <section id="services" class="py-20 bg-gradient-to-br from-slate-50 to-blue-50 dark:from-slate-900 dark:to-slate-800">
-      <Container client:load size="md">
+      <Container client:load>
         <h2 class="text-4xl font-bold text-center mb-16 bg-gradient-to-r from-blue-600 to-purple-600 bg-clip-text text-transparent">
           Services I Offer
         </h2>
@@ -205,7 +205,7 @@ const pageTitle = t('site.title');
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-br from-blue-900/10 via-purple-800/5 to-indigo-700/10 dark:from-blue-900/20 dark:via-purple-800/10 dark:to-indigo-700/20"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <!-- Section Title -->
           <div class="flex items-center justify-center mb-6">
@@ -340,7 +340,7 @@ const pageTitle = t('site.title');
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-b from-transparent via-purple-900/5 to-transparent"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <h2 class="text-4xl md:text-5xl font-bold mb-4 bg-gradient-to-r from-purple-400 to-purple-600 bg-clip-text text-transparent">
             Latest Projects
diff --git a/src/pages/projects.astro b/src/pages/projects.astro
index c2ab56a..0a16280 100644
--- a/src/pages/projects.astro
+++ b/src/pages/projects.astro
@@ -24,7 +24,7 @@ const currentProjects = projects[lang as keyof typeof projects] || projects.en;
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-br from-purple-900/20 via-purple-800/10 to-purple-700/20 dark:from-purple-900/30 dark:via-purple-800/20 dark:to-purple-700/30"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <!-- Main title -->
           <h1 class="text-5xl md:text-6xl font-bold mb-6 bg-gradient-to-r from-gray-900 via-purple-600 to-purple-800 dark:from-white dark:via-purple-200 dark:to-purple-300 bg-clip-text text-transparent">
@@ -44,7 +44,7 @@ const currentProjects = projects[lang as keyof typeof projects] || projects.en;
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-b from-transparent via-purple-900/5 to-transparent"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="grid grid-cols-1 lg:grid-cols-3 gap-8 items-stretch">
           {currentProjects.map((project) => (
             <div class={`group overflow-hidden border border-${project.color}-500/20 hover:border-${project.color}-500/40 h-full flex flex-col transition-all duration-500 hover:scale-105 bg-white/10 dark:bg-gray-800/50 backdrop-blur-sm rounded-xl relative`}>              
diff --git a/src/pages/zh/blog/index.astro b/src/pages/zh/blog/index.astro
index bdbfba1..c261211 100644
--- a/src/pages/zh/blog/index.astro
+++ b/src/pages/zh/blog/index.astro
@@ -56,7 +56,7 @@ const tags = extractTags(allPostsArray);
 <BlogLayout title="博客 - 赵桂阳" description="深入我对编程、技术趋势和开发者生活的思考。探索我的最新文章。">
   <main class="min-h-screen">
     <!-- 头部区域 -->
-    <Container client:load size="md" className="pt-24 pb-12">
+    <Container client:load className="pt-24 pb-12">
       <div class="text-center mb-16">
         <h1 class="text-5xl md:text-6xl font-bold bg-gradient-to-r from-foreground via-purple-600 to-purple-800 dark:from-foreground dark:via-purple-200 dark:to-purple-300 bg-clip-text text-transparent mb-6">
           我的<span class="text-purple-500">博客</span>
@@ -68,7 +68,7 @@ const tags = extractTags(allPostsArray);
     </Container>
 
     <!-- 主要内容 -->
-    <Container client:load size="md" className="pb-20">
+    <Container client:load className="pb-20">
       <div class="grid grid-cols-1 lg:grid-cols-4 gap-8">
         <!-- 侧边栏 -->
         <div class="lg:col-span-1 space-y-8">
diff --git a/src/pages/zh/index.astro b/src/pages/zh/index.astro
index 00b85b1..3b7470d 100644
--- a/src/pages/zh/index.astro
+++ b/src/pages/zh/index.astro
@@ -22,7 +22,7 @@ const pageTitle = t('site.title');
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-br from-purple-900/20 via-purple-800/10 to-purple-700/20 dark:from-purple-900/30 dark:via-purple-800/20 dark:to-purple-700/30"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <!-- Greeting -->
           <div class="flex items-center justify-center mb-6">
@@ -171,7 +171,7 @@ const pageTitle = t('site.title');
     
     <!-- Services Section - Inlined Content -->
     <section id="services" class="py-20 px-4 bg-gradient-to-br from-slate-50 to-blue-50 dark:from-slate-900 dark:to-slate-800">
-      <Container client:load size="md">
+      <Container client:load>
         <h2 class="text-4xl font-bold text-center mb-16 bg-gradient-to-r from-blue-600 to-purple-600 bg-clip-text text-transparent">
           我提供的服务
         </h2>
@@ -206,7 +206,7 @@ const pageTitle = t('site.title');
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-br from-blue-900/10 via-purple-800/5 to-indigo-700/10 dark:from-blue-900/20 dark:via-purple-800/10 dark:to-indigo-700/20"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <!-- Section Title -->
           <div class="flex items-center justify-center mb-6">
@@ -341,7 +341,7 @@ const pageTitle = t('site.title');
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-b from-transparent via-purple-900/5 to-transparent"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <h2 class="text-4xl md:text-5xl font-bold mb-4 bg-gradient-to-r from-purple-400 to-purple-600 bg-clip-text text-transparent">
             我的项目
diff --git a/src/pages/zh/projects.astro b/src/pages/zh/projects.astro
index c2ab56a..0a16280 100644
--- a/src/pages/zh/projects.astro
+++ b/src/pages/zh/projects.astro
@@ -24,7 +24,7 @@ const currentProjects = projects[lang as keyof typeof projects] || projects.en;
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-br from-purple-900/20 via-purple-800/10 to-purple-700/20 dark:from-purple-900/30 dark:via-purple-800/20 dark:to-purple-700/30"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="text-center mb-16">
           <!-- Main title -->
           <h1 class="text-5xl md:text-6xl font-bold mb-6 bg-gradient-to-r from-gray-900 via-purple-600 to-purple-800 dark:from-white dark:via-purple-200 dark:to-purple-300 bg-clip-text text-transparent">
@@ -44,7 +44,7 @@ const currentProjects = projects[lang as keyof typeof projects] || projects.en;
       <!-- Background gradient -->
       <div class="absolute inset-0 bg-gradient-to-b from-transparent via-purple-900/5 to-transparent"></div>
       
-      <Container client:load size="md" className="relative z-10">
+      <Container client:load className="relative z-10">
         <div class="grid grid-cols-1 lg:grid-cols-3 gap-8 items-stretch">
           {currentProjects.map((project) => (
             <div class={`group overflow-hidden border border-${project.color}-500/20 hover:border-${project.color}-500/40 h-full flex flex-col transition-all duration-500 hover:scale-105 bg-white/10 dark:bg-gray-800/50 backdrop-blur-sm rounded-xl relative`}>