Merge branch 'main' into thememock

Author: kanishka-2007-tech

app/api/streak/route.test.ts

@@ -443,15 +443,15 @@ describe('GET /api/streak', () => {
     it('caches until UTC midnight by default, using the value from getSecondsUntilUTCMidnight', async () => {
       const response = await GET(makeRequest({ user: 'octocat' }));
       expect(response.headers.get('Cache-Control')).toBe(
-        'public, max-age=60, s-maxage=1, stale-while-revalidate=59'
+        'public, max-age=60, s-maxage=3600, stale-while-revalidate=59'
       );
     });
 
     it('reflects a different time value when the clock changes', async () => {
       vi.mocked(getSecondsUntilUTCMidnight).mockReturnValue(7200);
       const response = await GET(makeRequest({ user: 'octocat' }));
       expect(response.headers.get('Cache-Control')).toBe(
-        'public, max-age=60, s-maxage=1, stale-while-revalidate=59'
+        'public, max-age=60, s-maxage=7200, stale-while-revalidate=59'
       );
     });
 
@@ -1013,7 +1013,7 @@ describe('GET /api/streak', () => {
       const response = await GET(makeRequest({ user: 'octocat', tz: 'America/New_York' }));
 
       expect(response.headers.get('Cache-Control')).toBe(
-        'public, max-age=60, s-maxage=1, stale-while-revalidate=59'
+        'public, max-age=60, s-maxage=7200, stale-while-revalidate=59'
       );
       expect(getSecondsUntilMidnightInTimezone).toHaveBeenCalledWith('America/New_York');
       expect(getSecondsUntilUTCMidnight).not.toHaveBeenCalled();

app/api/streak/route.ts

@@ -579,7 +579,7 @@ export async function GET(request: Request) {
         : getSecondsUntilUTCMidnight();
       const cacheControl = isRefreshRequested
         ? 'no-cache, no-store, must-revalidate'
-        : `public, s-maxage=1, stale-while-revalidate=86400`;
+        : `public, s-maxage=${secondsToMidnight}, stale-while-revalidate=86400`;
 
       const cacheStatusHeader = shouldBypassCache
         ? `BYPASS, fetched=${new Date().toISOString()}`
@@ -694,7 +694,7 @@ export async function GET(request: Request) {
       ? 'no-cache, no-store, must-revalidate'
       : isHistoricalYear
         ? 'public, max-age=31536000, s-maxage=31536000, immutable'
-        : `public, max-age=60, s-maxage=1, stale-while-revalidate=59`;
+        : `public, max-age=60, s-maxage=${secondsToMidnight}, stale-while-revalidate=59`;
 
     const etag = crypto.createHash('sha256').update(svg).digest('hex');
     const weakEtag = `W/"${etag}"`;

app/api/streak/tests/dateRange.test.ts

@@ -118,7 +118,7 @@ describe('GET /api/streak dateRange parameter', () => {
     expect(res.status).toBe(200);
     expect(res.headers.get('Content-Type')).toBe('image/svg+xml; charset=utf-8');
     expect(res.headers.get('Cache-Control')).toBe(
-      'public, max-age=60, s-maxage=1, stale-while-revalidate=59'
+      'public, max-age=60, s-maxage=3600, stale-while-revalidate=59'
     );
   });
 });

app/api/streak/tests/refresh.test.ts

@@ -105,7 +105,7 @@ describe('GET /api/streak - refresh parameter group', () => {
 
     expect(response.status).toBe(200);
     expect(response.headers.get('Cache-Control')).toBe(
-      'public, max-age=60, s-maxage=1, stale-while-revalidate=59'
+      'public, max-age=60, s-maxage=3600, stale-while-revalidate=59'
     );
     expect(response.headers.get('X-Cache-Status')).toBe('HIT');
   });

app/api/streak/tests/views.test.ts

@@ -159,7 +159,7 @@ describe('GET /api/streak view parameter integration', () => {
     expect(response.status).toBe(200);
     expect(response.headers.get('Content-Type')).toBe('image/svg+xml; charset=utf-8');
     expect(response.headers.get('Cache-Control')).toBe(
-      'public, max-age=60, s-maxage=1, stale-while-revalidate=59'
+      'public, max-age=60, s-maxage=3600, stale-while-revalidate=59'
     );
     expect(response.headers.get('X-Cache-Status')).toBe('HIT');
   });

app/api/streak/tests/weekday.test.ts

@@ -131,7 +131,7 @@ describe('GET /api/streak?view=weekday', () => {
 
     expect(response.status).toBe(200);
     expect(response.headers.get('Cache-Control')).toBe(
-      'public, max-age=60, s-maxage=1, stale-while-revalidate=59'
+      'public, max-age=60, s-maxage=3600, stale-while-revalidate=59'
     );
     expect(response.headers.get('X-Cache-Status')).toBe('HIT');
   });

app/components/LandingPageClient.tsx

@@ -544,7 +544,7 @@ export default function LandingPageClient() {
 
   const handleGenerate = (e: React.FormEvent) => {
     e.preventDefault();
-    if (trimmedUsername.length > 0) {
+    if (trimmedUsername.length > 0 && trimmedUsername !== previewUsername) {
       setInstantUsername(trimmedUsername);
       setBadgeResult(null);
       trackUser(trimmedUsername);

app/generator/components/EditorPanel.type-compiler.test.tsx

@@ -19,6 +19,9 @@ describe('EditorPanel Type Compiler Validation', () => {
       showSnakeGraph: boolean;
       showPacmanGraph: boolean;
       graphPlacement: 'top' | 'middle' | 'bottom';
+      showArticles?: boolean;
+      articlesPlatform?: 'devto' | 'hashnode';
+      articlesUsername?: string;
     }>();
   });
 

app/generator/components/PreviewPanel.type-compiler.test.tsx

@@ -12,6 +12,7 @@ describe('PreviewPanel Type Compiler Validation', () => {
 
     expectTypeOf<Props>().toMatchObjectType<{
       markdown: string;
+      hasContent?: boolean;
     }>();
   });