Force push current state after conflict

.env

@@ -46,10 +46,3 @@ ROCKET_CHAT_TOKEN=w91TYgkH-Z67Oz72usYdkW5TZLLRwnre7qyAhp7aHJB
 ROCKET_CHAT_USER_ID=Tpuww59PJKsrGNQJB
 LEANTIME_TOKEN=lt_lsdShQdoYHaPUWuL07XZR1Rf3GeySsIs_UDlll3VJPk5EwAuILpMC4BwzJ9MZFRrb
 LEANTIME_API_URL=https://agilite.slm-lab.net
-
-DATABASE_URL="postgresql://alma:Sict33711###@cube.governance-labs.com:5432/rivacube?schema=public"
-
-DB_USER=alma
-DB_PASSWORD=Sict33711###
-DB_NAME=rivacube
-DB_HOST=cube.governance-labs.com

app/api/emails/route.ts

@@ -7,7 +7,6 @@ export async function GET(req: NextRequest) {
     const session = await getServerSession(authOptions);
 
     if (!session?.user?.email) {
-      console.error('No session or email found');
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
@@ -20,152 +19,35 @@ export async function GET(req: NextRequest) {
       );
     }
 
-    // Get the Keycloak token from the session
+    // Test Nextcloud connectivity
-    const keycloakToken = session.accessToken;
+    const testResponse = await fetch(`${nextcloudUrl}/status.php`);
-    if (!keycloakToken) {
+    if (!testResponse.ok) {
-      console.error('Missing Keycloak token in session');
+      console.error('Nextcloud is not accessible:', await testResponse.text());
-      return NextResponse.json(
-        { error: 'Authentication token is missing' },
-        { status: 401 }
-      );
-    }
-
-    // First, try the unified inbox endpoint for unread messages
-    const unifiedResponse = await fetch(
-      `${nextcloudUrl}/index.php/apps/mail/api/messages?filter=is:unread`,
-      {
-        headers: {
-          'Authorization': `Bearer ${keycloakToken}`,
-          'Accept': 'application/json',
-          'OCS-APIRequest': 'true',
-          'X-Requested-With': 'XMLHttpRequest'
-        }
-      }
-    );
-
-    // Log the response status and headers for debugging
-    console.log('Unified inbox response status:', unifiedResponse.status);
-    console.log('Unified inbox response headers:', Object.fromEntries(unifiedResponse.headers.entries()));
-
-    if (unifiedResponse.ok) {
-      const unifiedData = await unifiedResponse.json();
-      console.log('Unified inbox data:', unifiedData);
-      const messages = unifiedData.data || [];
-      
-      const unreadEmails = messages.map((msg: any) => ({
-        id: msg.id,
-        subject: msg.subject,
-        sender: {
-          name: msg.from[0].label || msg.from[0].email,
-          email: msg.from[0].email
-        },
-        date: msg.date,
-        isUnread: true
-      }));
-
-      return NextResponse.json({
-        emails: unreadEmails,
-        mailUrl: `${nextcloudUrl}/apps/mail/box/unified`
-      });
-    }
-
-    // If unified inbox fails, fall back to the account-based approach
-    const accountsResponse = await fetch(
-      `${nextcloudUrl}/index.php/apps/mail/api/accounts`,
-      {
-        headers: {
-          'Authorization': `Bearer ${keycloakToken}`,
-          'Accept': 'application/json',
-          'OCS-APIRequest': 'true',
-          'X-Requested-With': 'XMLHttpRequest'
-        }
-      }
-    );
-
-    // Log the response status and headers for debugging
-    console.log('Accounts response status:', accountsResponse.status);
-    console.log('Accounts response headers:', Object.fromEntries(accountsResponse.headers.entries()));
-
-    if (!accountsResponse.ok) {
-      const errorText = await accountsResponse.text();
-      console.error('Failed to fetch mail accounts. Response:', errorText);
       return NextResponse.json(
         { 
-          error: "L'application Mail n'est pas disponible sur Nextcloud. Veuillez contacter votre administrateur.",
+          error: "Nextcloud n'est pas accessible. Veuillez contacter votre administrateur.",
           emails: []
         },
-        { status: 404 }
+        { status: 503 }
       );
     }
 
-    const accountsData = await accountsResponse.json();
+    // For now, return a test response
-    console.log('Accounts data:', accountsData);
-    const accounts = accountsData.data || [];
-
-    const unreadEmails = [];
-    for (const account of accounts) {
-      // Get mailboxes for the account
-      const mailboxesResponse = await fetch(
-        `${nextcloudUrl}/index.php/apps/mail/api/accounts/${account.id}/mailboxes`,
-        {
-          headers: {
-            'Authorization': `Bearer ${keycloakToken}`,
-            'Accept': 'application/json',
-            'OCS-APIRequest': 'true',
-            'X-Requested-With': 'XMLHttpRequest'
-          }
-        }
-      );
-
-      if (!mailboxesResponse.ok) {
-        console.error(`Failed to fetch mailboxes for account ${account.id}`);
-        continue;
-      }
-
-      const mailboxesData = await mailboxesResponse.json();
-      const mailboxes = mailboxesData.data || [];
-
-      // Get unread messages from each mailbox
-      for (const mailbox of mailboxes) {
-        const messagesResponse = await fetch(
-          `${nextcloudUrl}/index.php/apps/mail/api/accounts/${account.id}/mailboxes/${mailbox.id}/messages?filter=is:unread`,
-          {
-            headers: {
-              'Authorization': `Bearer ${keycloakToken}`,
-              'Accept': 'application/json',
-              'OCS-APIRequest': 'true',
-              'X-Requested-With': 'XMLHttpRequest'
-            }
-          }
-        );
-
-        if (!messagesResponse.ok) {
-          console.error(`Failed to fetch messages for mailbox ${mailbox.id}`);
-          continue;
-        }
-
-        const messagesData = await messagesResponse.json();
-        const messages = messagesData.data || [];
-
-        unreadEmails.push(...messages.map((msg: any) => ({
-          id: msg.id,
-          subject: msg.subject,
-          sender: {
-            name: msg.from[0].label || msg.from[0].email,
-            email: msg.from[0].email
-          },
-          date: msg.date,
-          isUnread: true
-        })));
-      }
-    }
-
     return NextResponse.json({
-      emails: unreadEmails,
+      emails: [{
+        id: 'test-1',
+        subject: 'Test Email',
+        sender: {
+          name: 'System',
+          email: 'system@example.com'
+        },
+        date: new Date().toISOString(),
+        isUnread: true
+      }],
       mailUrl: `${nextcloudUrl}/apps/mail/box/unified`
     });
   } catch (error) {
-    console.error('Error getting emails:', error);
+    console.error('Error:', error);
     return NextResponse.json(
       { 
         error: "Une erreur est survenue. Veuillez contacter votre administrateur.",

app/api/news/route.ts

@@ -1,137 +0,0 @@
-import { NextResponse } from 'next/server';
-import { Pool } from 'pg';
-
-// Function to clean database host URL
-function cleanDatabaseHost(host: string | undefined): string {
-  if (!host) {
-    throw new Error('Database host is not defined');
-  }
-  // Remove any protocol and trailing slashes
-  return host.replace(/^https?:\/\//, '').replace(/\/$/, '');
-}
-
-// Create connection configuration
-const dbConfig = {
-  user: process.env.DB_USER,
-  password: process.env.DB_PASSWORD,
-  host: cleanDatabaseHost(process.env.DB_HOST),
-  database: process.env.DB_NAME,
-  port: 5432, // Default PostgreSQL port
-  ssl: {
-    rejectUnauthorized: false
-  }
-};
-
-// Create a new pool using the configuration
-const pool = new Pool(dbConfig);
-
-// Mock data for development
-const MOCK_NEWS = [
-  {
-    id: 1,
-    title: "New Project Management Features Released",
-    url: "#",
-    date: "2024-03-20",
-    source: "Internal",
-    description: "New features added to improve project management workflow",
-    category: "Update",
-    sentiment: { score: null, label: null },
-    symbols: null,
-    symbol: null
-  },
-  {
-    id: 2,
-    title: "Team Meeting Schedule Changes",
-    url: "#",
-    date: "2024-03-19",
-    source: "Internal",
-    description: "Updates to the team meeting schedule",
-    category: "Announcement",
-    sentiment: { score: null, label: null },
-    symbols: null,
-    symbol: null
-  },
-  {
-    id: 3,
-    title: "Upcoming Training Sessions",
-    url: "#",
-    date: "2024-03-18",
-    source: "Internal",
-    description: "Schedule for upcoming training sessions",
-    category: "Training",
-    sentiment: { score: null, label: null },
-    symbols: null,
-    symbol: null
-  }
-];
-
-export async function GET() {
-  try {
-    console.log('Attempting database connection with config:', {
-      user: dbConfig.user,
-      host: dbConfig.host,
-      database: dbConfig.database,
-      // Excluding password for security
-    });
-
-    // Connect to the database
-    const client = await pool.connect();
-    console.log('Successfully connected to database');
-    
-    try {
-      console.log('Executing news query...');
-      // Query the news table for the latest 10 news items
-      const result = await client.query(`
-        SELECT 
-          id,
-          title,
-          url,
-          date,
-          source,
-          description,
-          category,
-          sentiment_score,
-          sentiment,
-          symbols,
-          symbol
-        FROM news
-        ORDER BY date DESC
-        LIMIT 10
-      `);
-
-      console.log(`Found ${result.rows.length} news items`);
-
-      // Format the response
-      const news = result.rows.map(row => ({
-        id: row.id,
-        title: row.title,
-        url: row.url,
-        date: row.date,
-        source: row.source,
-        description: row.description,
-        category: row.category,
-        sentiment: {
-          score: row.sentiment_score,
-          label: row.sentiment
-        },
-        symbols: row.symbols,
-        symbol: row.symbol
-      }));
-
-      return NextResponse.json({ news });
-    } finally {
-      // Release the client back to the pool
-      client.release();
-      console.log('Database client released');
-    }
-  } catch (error) {
-    console.error('Database error:', error);
-    return NextResponse.json(
-      { 
-        error: 'Failed to fetch news',
-        details: error instanceof Error ? error.message : String(error)
-      },
-      { status: 500 }
-    );
-  }
-} 

components/calendar.tsx

@@ -90,7 +90,7 @@ export function Calendar() {
   return (
     <Card className="transition-transform duration-500 ease-in-out transform hover:scale-105 bg-white/95 backdrop-blur-sm border-0 shadow-lg">
       <CardHeader className="flex flex-row items-center justify-between pb-2 border-b border-gray-100">
-        <CardTitle className="text-lg font-semibold text-gray-800">Calendar</CardTitle>
+        <CardTitle className="text-lg font-semibold text-gray-800">Agenda</CardTitle>
         <Button 
           variant="ghost" 
           size="icon" 
@@ -118,24 +118,36 @@ export function Calendar() {
               >
                 <div className="flex gap-2">
                   <div 
-                    className="flex-shrink-0 w-12 h-12 rounded-lg flex flex-col items-center justify-center border"
+                    className="flex-shrink-0 w-14 h-14 rounded-lg flex flex-col items-center justify-center border"
                     style={{
                       backgroundColor: `${event.calendarColor}10`,
                       borderColor: event.calendarColor
                     }}
                   >
-                    <CalendarIcon className="h-4 w-4" style={{ color: event.calendarColor }} />
                     <span 
-                      className="text-[10px] font-medium mt-0.5"
+                      className="text-[10px] font-medium"
                       style={{ color: event.calendarColor }}
                     >
                       {formatDate(event.start)}
                     </span>
+                    <span 
+                      className="text-[10px] font-bold mt-0.5"
+                      style={{ color: event.calendarColor }}
+                    >
+                      {formatTime(event.start)}
+                    </span>
                   </div>
                   <div className="flex-1 min-w-0 space-y-1">
-                    <p className="text-sm font-medium text-gray-800 line-clamp-2">
+                    <div className="flex items-start justify-between gap-2">
+                      <p className="text-sm font-medium text-gray-800 line-clamp-2 flex-1">
                         {event.title}
                       </p>
+                      {!event.allDay && (
+                        <span className="text-[10px] text-gray-500 whitespace-nowrap">
+                          {formatTime(event.start)} - {formatTime(event.end)}
+                        </span>
+                      )}
+                    </div>
                     <div 
                       className="flex items-center text-[10px] px-1.5 py-0.5 rounded-md"
                       style={{

components/email.tsx

@@ -5,20 +5,101 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import { RefreshCw, Mail } from "lucide-react";
 import { useSession, signIn } from "next-auth/react";
+import { formatDistance } from 'date-fns/formatDistance';
+import { fr } from 'date-fns/locale/fr';
+
+interface Email {
+  id: string;
+  subject: string;
+  sender: {
+    name: string;
+    email: string;
+  };
+  date: string;
+  isUnread: boolean;
+}
+
+interface EmailResponse {
+  emails: Email[];
+  mailUrl: string;
+  error?: string;
+}
 
 export function Email() {
+  const [emails, setEmails] = useState<Email[]>([]);
+  const [mailUrl, setMailUrl] = useState<string | null>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
+  const [refreshing, setRefreshing] = useState(false);
   const { status } = useSession();
 
+  const fetchEmails = async (isRefresh = false) => {
+    if (isRefresh) setRefreshing(true);
+    if (!isRefresh) setLoading(true);
+    
+    try {
+      const response = await fetch('/api/emails');
+      const data: EmailResponse = await response.json();
+      
+      if (!response.ok) {
+        // Handle session expiration
+        if (response.status === 401) {
+          signIn(); // Redirect to login
+          return;
+        }
+        
+        // Handle specific error messages
+        if (response.status === 404) {
+          setError("L'application Mail n'est pas disponible sur Nextcloud. Veuillez contacter votre administrateur.");
+          return;
+        }
+        
+        throw new Error(data.error || 'Failed to fetch emails');
+      }
+      
+      setEmails(data.emails || []);
+      setMailUrl(data.mailUrl);
+      setError(null);
+    } catch (err) {
+      console.error('Error fetching emails:', err);
+      setError(err instanceof Error ? err.message : 'Erreur lors de la récupération des emails');
+    } finally {
+      setLoading(false);
+      setRefreshing(false);
+    }
+  };
+
+  // Initial fetch
   useEffect(() => {
     if (status === 'authenticated') {
-      setLoading(false);
+      fetchEmails();
-    } else if (status === 'unauthenticated') {
-      signIn();
     }
   }, [status]);
 
+  // Auto-refresh every 5 minutes
+  useEffect(() => {
+    if (status !== 'authenticated') return;
+
+    const interval = setInterval(() => {
+      fetchEmails(true);
+    }, 5 * 60 * 1000);
+
+    return () => clearInterval(interval);
+  }, [status]);
+
+  const formatDate = (dateString: string) => {
+    try {
+      const date = new Date(dateString);
+      return formatDistance(date, new Date(), {
+        addSuffix: true,
+        locale: fr
+      });
+    } catch (err) {
+      console.error('Error formatting date:', err);
+      return dateString;
+    }
+  };
+
   if (status === 'loading' || loading) {
     return (
       <Card className="transition-transform duration-500 ease-in-out transform hover:scale-105 bg-white/95 backdrop-blur-sm border-0 shadow-lg h-full">
@@ -26,7 +107,7 @@ export function Email() {
           <CardTitle className="text-lg font-semibold text-gray-800">
             <div className="flex items-center gap-2">
               <Mail className="h-5 w-5" />
-              <span>Emails</span>
+              <span>Emails non lus</span>
             </div>
           </CardTitle>
         </CardHeader>
@@ -45,16 +126,50 @@ export function Email() {
         <CardTitle className="text-lg font-semibold text-gray-800">
           <div className="flex items-center gap-2">
             <Mail className="h-5 w-5" />
-            <span>Emails</span>
+            <span>Emails non lus</span>
           </div>
         </CardTitle>
+        <Button
+          variant="ghost"
+          size="icon"
+          onClick={() => fetchEmails(true)}
+          disabled={refreshing}
+          className={`${refreshing ? 'animate-spin' : ''} text-gray-600 hover:text-gray-900`}
+        >
+          <RefreshCw className="h-4 w-4" />
+        </Button>
       </CardHeader>
-      <CardContent className="p-0 h-[calc(100%-3.5rem)]">
+      <CardContent className="p-3">
-        <iframe
+        {error ? (
-          src="https://lab.slm-lab.net/email"
+          <p className="text-center text-red-500">{error}</p>
-          className="w-full h-full border-0"
+        ) : (
-          title="Email Inbox"
+          <div className="space-y-2 max-h-[220px] overflow-y-auto">
-        />
+            {emails.length === 0 ? (
+              <p className="text-center text-gray-500">Aucun email non lu</p>
+            ) : (
+              emails.map((email) => (
+                <div
+                  key={email.id}
+                  className="p-2 hover:bg-gray-50/50 rounded-lg transition-colors cursor-pointer"
+                  onClick={() => mailUrl && window.open(mailUrl, '_blank')}
+                >
+                  <div className="flex items-center justify-between mb-1">
+                    <span className="text-sm text-gray-600 truncate max-w-[60%]" title={email.sender.name}>
+                      {email.sender.name}
+                    </span>
+                    <div className="flex items-center space-x-2">
+                      <span className="w-1.5 h-1.5 bg-blue-600 rounded-full"></span>
+                      <span className="text-xs text-gray-500">{formatDate(email.date)}</span>
+                    </div>
+                  </div>
+                  <h3 className="text-sm font-semibold text-gray-800 line-clamp-2" title={email.subject}>
+                    {email.subject}
+                  </h3>
+                </div>
+              ))
+            )}
+          </div>
+        )}
       </CardContent>
     </Card>
   );

components/news.tsx

@@ -1,36 +1,16 @@
 "use client";
 
-import { useEffect, useState, useCallback } from "react";
+import { useEffect, useState } from "react";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { formatDistanceToNow } from 'date-fns';
+import { Button } from "@/components/ui/button";
-import { fr } from 'date-fns/locale';
+import { RefreshCw } from "lucide-react";
-import Link from 'next/link';
+import { useSession } from "next-auth/react";
-import { Button } from '@/components/ui/button';
-import { RefreshCw } from 'lucide-react';
 
 interface NewsItem {
-  id: number;
+  id: string;
   title: string;
-  url: string;
   date: string;
-  source: string;
-  description: string;
   category: string;
-  sentiment: {
-    score: number | null;
-    label: string | null;
-  };
-  symbols: string[] | null;
-  symbol: string | null;
-}
-
-interface DebugState {
-  newsCount: number;
-  loading: boolean;
-  error: string | null;
-  dbStatus: string;
-  lastUpdate: string;
-  lastError: string | null;
 }
 
 export function News() {
@@ -38,204 +18,91 @@ export function News() {
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
   const [refreshing, setRefreshing] = useState(false);
-  const [dbStatus, setDbStatus] = useState<'connecting' | 'connected' | 'error'>('connecting');
+  const { status } = useSession();
-  const [debugState, setDebugState] = useState<DebugState>({
-    newsCount: 0,
-    loading: true,
-    error: null,
-    dbStatus: 'connecting',
-    lastUpdate: new Date().toISOString(),
-    lastError: null
-  });
-
-  const updateDebugState = useCallback((updates: Partial<DebugState>) => {
-    setDebugState(prev => {
-      const newState = { ...prev, ...updates, lastUpdate: new Date().toISOString() };
-      console.table(newState);
-      return newState;
-    });
-  }, []);
-
-  const fetchNews = useCallback(async (isRefresh = false) => {
-    updateDebugState({ loading: true, dbStatus: 'connecting' });
-    
-    if (isRefresh) {
-      setRefreshing(true);
-      updateDebugState({ lastError: null });
-    }
 
+  const fetchNews = async (isRefresh = false) => {
+    if (isRefresh) setRefreshing(true);
     setLoading(true);
-    setDbStatus('connecting');
+    
+    // Placeholder data - replace with actual API call
+    const mockNews = [
+      { id: '1', title: 'New Project Management Features Released', date: '2024-03-20', category: 'Product Update' },
+      { id: '2', title: 'Team Meeting Schedule Changes', date: '2024-03-19', category: 'Announcement' },
+      { id: '3', title: 'Upcoming Training Sessions', date: '2024-03-18', category: 'Training' },
+    ];
     
     try {
-      updateDebugState({ dbStatus: 'fetching' });
+      // Simulate API call
-      const response = await fetch('/api/news');
+      await new Promise(resolve => setTimeout(resolve, 1000));
-      
+      setNews(mockNews);
-      updateDebugState({ dbStatus: response.ok ? 'received' : 'error' });
-      
-      if (!response.ok) {
-        throw new Error(`HTTP error! status: ${response.status}`);
-      }
-      
-      const data = await response.json();
-      
-      if (data.error) {
-        throw new Error(data.error);
-      }
-      
-      setNews(data.news || []);
       setError(null);
-      setDbStatus('connected');
-      
-      updateDebugState({
-        newsCount: (data.news || []).length,
-        error: null,
-        dbStatus: 'connected',
-        loading: false
-      });
     } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : 'Failed to load news';
+      setError('Failed to fetch news');
-      setError(errorMessage);
+      console.error('Error fetching news:', err);
-      setDbStatus('error');
-      setNews([]);
-      
-      updateDebugState({
-        error: errorMessage,
-        dbStatus: 'error',
-        loading: false,
-        lastError: errorMessage
-      });
     } finally {
       setLoading(false);
       setRefreshing(false);
     }
-  }, [updateDebugState]);
+  };
 
   useEffect(() => {
-    updateDebugState({ dbStatus: 'initializing' });
+    if (status === 'authenticated') {
       fetchNews();
+    }
+  }, [status]);
 
-    return () => {
+  if (status === 'loading' || loading) {
-      updateDebugState({ dbStatus: 'unmounting' });
-    };
-  }, [fetchNews, updateDebugState]);
-
-  const DebugInfo = () => (
-    <div className="text-xs text-gray-500 mt-2 p-2 bg-gray-100 rounded">
-      <p>Status: {debugState.dbStatus}</p>
-      <p>Loading: {debugState.loading ? 'true' : 'false'}</p>
-      <p>Error: {debugState.error || 'none'}</p>
-      <p>News items: {debugState.newsCount}</p>
-      <p>Last update: {new Date(debugState.lastUpdate).toLocaleTimeString()}</p>
-      {debugState.lastError && (
-        <p className="text-red-500">Last error: {debugState.lastError}</p>
-      )}
-      <details>
-        <summary>Debug Details</summary>
-        <pre className="mt-2 text-[10px] whitespace-pre-wrap">
-          {JSON.stringify(news, null, 2)}
-        </pre>
-      </details>
-    </div>
-  );
-
-  if (loading && !refreshing) {
     return (
-      <Card className="w-full">
+      <Card className="transition-transform duration-500 ease-in-out transform hover:scale-105 bg-white/95 backdrop-blur-sm border-0 shadow-lg h-full">
-        <CardHeader>
+        <CardHeader className="flex flex-row items-center justify-between pb-2 border-b border-gray-100">
-          <CardTitle>News</CardTitle>
+          <CardTitle className="text-lg font-semibold text-gray-800">News</CardTitle>
         </CardHeader>
-        <CardContent>
+        <CardContent className="p-6">
-          <div className="flex flex-col items-center justify-center h-32 space-y-2">
+          <p className="text-center text-gray-500">Loading...</p>
-            <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-gray-900"></div>
-            <p className="text-sm text-gray-500">
-              {dbStatus === 'connecting' ? 'Connecting to database...' : 'Loading news...'}
-            </p>
-          </div>
-          <DebugInfo />
         </CardContent>
       </Card>
     );
   }
 
   return (
-    <Card className="w-full">
+    <Card className="transition-transform duration-500 ease-in-out transform hover:scale-105 bg-white/95 backdrop-blur-sm border-0 shadow-lg h-full">
-      <CardHeader className="flex flex-row items-center justify-between">
+      <CardHeader className="flex flex-row items-center justify-between pb-2 space-x-4 border-b border-gray-100">
-        <CardTitle>News</CardTitle>
+        <CardTitle className="text-lg font-semibold text-gray-800">News</CardTitle>
         <Button
           variant="ghost"
           size="icon"
           onClick={() => fetchNews(true)}
           disabled={refreshing}
-          className={`${refreshing ? 'animate-spin' : ''}`}
+          className={`${refreshing ? 'animate-spin' : ''} text-gray-600 hover:text-gray-900`}
         >
           <RefreshCw className="h-4 w-4" />
         </Button>
       </CardHeader>
-      <CardContent>
+      <CardContent className="p-3">
-        <div className="space-y-4">
         {error ? (
-            <div className="text-red-500 space-y-2">
+          <p className="text-center text-red-500">{error}</p>
-              <p>{error}</p>
+        ) : (
-              <p className="text-sm text-gray-500">
+          <div className="space-y-2 max-h-[220px] overflow-y-auto">
-                {dbStatus === 'error' ? 'Database connection error' : 'Failed to fetch news'}
+            {news.length === 0 ? (
-              </p>
+              <p className="text-center text-gray-500">No news available</p>
-            </div>
-          ) : news.length === 0 ? (
-            <div className="text-center text-gray-500 py-8">
-              No news available
-            </div>
             ) : (
               news.map((item) => (
-              <div key={item.id} className="border-b pb-4 last:border-b-0">
+                <div
-                <div className="flex items-start justify-between">
+                  key={item.id}
-                  <div className="flex-1">
+                  className="p-2 hover:bg-gray-50/50 rounded-lg transition-colors"
-                    <Link 
-                      href={item.url} 
-                      target="_blank" 
-                      rel="noopener noreferrer"
-                      className="text-blue-600 hover:underline font-medium"
                 >
-                      {item.title}
+                  <div className="flex items-center justify-between mb-1">
-                    </Link>
+                    <span className="text-sm text-gray-500">{item.date}</span>
-                    <p className="text-sm text-gray-500 mt-1">
+                    <span className="text-xs px-2 py-0.5 rounded-full bg-blue-50 text-blue-600">
-                      {item.source} • {formatDistanceToNow(new Date(item.date), { addSuffix: true, locale: fr })}
+                      {item.category}
-                    </p>
-                    {item.description && (
-                      <p className="text-sm text-gray-600 mt-2 line-clamp-2">
-                        {item.description.replace(/<[^>]*>/g, '')}
-                      </p>
-                    )}
-                  </div>
-                  {item.sentiment.score !== null && (
-                    <div className={`ml-4 px-2 py-1 rounded text-sm ${
-                      item.sentiment.score > 0 ? 'bg-green-100 text-green-800' :
-                      item.sentiment.score < 0 ? 'bg-red-100 text-red-800' :
-                      'bg-gray-100 text-gray-800'
-                    }`}>
-                      {item.sentiment.label || 'Neutral'}
-                    </div>
-                  )}
-                </div>
-                {(item.symbols?.length || item.symbol) && (
-                  <div className="mt-2 flex flex-wrap gap-2">
-                    {item.symbols?.map((symbol, index) => (
-                      <span key={index} className="bg-blue-100 text-blue-800 text-xs px-2 py-1 rounded">
-                        {symbol}
                     </span>
-                    ))}
-                    {item.symbol && !item.symbols?.includes(item.symbol) && (
-                      <span className="bg-blue-100 text-blue-800 text-xs px-2 py-1 rounded">
-                        {item.symbol}
-                      </span>
-                    )}
                   </div>
-                )}
+                  <h3 className="text-sm font-medium text-gray-800 line-clamp-2">{item.title}</h3>
                 </div>
               ))
             )}
           </div>
-        <DebugInfo />
+        )}
       </CardContent>
     </Card>
   );