okey c bon, mais dans le profil ajoute l'avatar source (genre la il et e

Author: softpython2884

src/app/(app)/profile/page.tsx

@@ -12,7 +12,7 @@ import { Label } from '@/components/ui/label';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import * as z from 'zod';
-import { useEffect, useState, useActionState, startTransition } from 'react'; // Corrected import
+import { useEffect, useState, useActionState, startTransition } from 'react';
 import { useToast } from '@/hooks/use-toast';
 import * as authService from '@/lib/authService';
 import { fetchUserGithubOAuthTokenAction, disconnectGithubAction, fetchGithubUserDetailsAction, fetchDiscordUserDetailsAction, disconnectDiscordAction } from '@/app/(app)/projects/[id]/actions'; 
@@ -43,6 +43,8 @@ interface DiscordUserDetails {
     discriminator: string;
 }
 
+type AvatarSource = 'flowup' | 'github' | 'discord';
+
 
 export default function ProfilePage() {
   const { user, isLoading: authLoading, refreshUser } = useAuth();
@@ -57,6 +59,8 @@ export default function ProfilePage() {
 
   const [discordUserDetails, setDiscordUserDetails] = useState<DiscordUserDetails | null>(null);
   const [isLoadingDiscord, setIsLoadingDiscord] = useState(true);
+  
+  const [avatarSource, setAvatarSource] = useState<AvatarSource>('flowup');
 
   const [disconnectGithubState, disconnectGithubFormAction, isDisconnectGithubPending] = useActionState(disconnectGithubAction, { success: false });
   const [disconnectDiscordState, disconnectDiscordFormAction, isDisconnectDiscordPending] = useActionState(disconnectDiscordAction, { success: false });
@@ -106,6 +110,18 @@ export default function ProfilePage() {
     if (!authLoading) loadExternalData();
   }, [user, authLoading]);
 
+  useEffect(() => {
+    if (user && !isLoadingGithub && !isLoadingDiscord) {
+        let source: AvatarSource = 'flowup';
+        if (githubUserDetails?.avatar_url && user.avatar === githubUserDetails.avatar_url) {
+            source = 'github';
+        } else if (discordUserDetails?.avatar && user.avatar === `https://cdn.discordapp.com/avatars/${discordUserDetails.id}/${discordUserDetails.avatar}.png`) {
+            source = 'discord';
+        }
+        setAvatarSource(source);
+    }
+  }, [user, githubUserDetails, discordUserDetails, isLoadingGithub, isLoadingDiscord]);
+
   useEffect(() => {
     if (!isDisconnectGithubPending && disconnectGithubState) {
       if (disconnectGithubState.success && disconnectGithubState.message) {
@@ -195,6 +211,15 @@ export default function ProfilePage() {
     }
   };
 
+  const handleAvatarSourceChange = (source: AvatarSource) => {
+    setAvatarSource(source);
+    if (source === 'github' && githubUserDetails?.avatar_url) {
+      form.setValue('avatar', githubUserDetails.avatar_url, { shouldDirty: true });
+    } else if (source === 'discord' && discordUserDetails?.avatar) {
+      form.setValue('avatar', `https://cdn.discordapp.com/avatars/${discordUserDetails.id}/${discordUserDetails.avatar}.png`, { shouldDirty: true });
+    }
+  };
+
   const handleConnectGitHub = () => {
     window.location.href = `/api/auth/github/oauth/login?redirectTo=/profile`;
   };
@@ -265,13 +290,13 @@ export default function ProfilePage() {
                   <Label htmlFor="avatar">Avatar URL</Label>
                   <div className="relative">
                     <ImageIcon className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
-                    <Input id="avatar" placeholder="https://example.com/avatar.png" {...form.register("avatar")} className="pl-10" />
+                    <Input id="avatar" placeholder="https://example.com/avatar.png" {...form.register("avatar")} className="pl-10" onFocus={() => setAvatarSource('flowup')} />
                   </div>
                   {form.formState.errors.avatar && <p className="text-sm text-destructive">{form.formState.errors.avatar.message}</p>}
                 </div>
                 <Card className="p-4 bg-muted/30">
-                  <h4 className="font-semibold mb-2">Avatar Source (Coming Soon)</h4>
-                   <RadioGroup defaultValue="flowup" disabled>
+                  <h4 className="font-semibold mb-2">Avatar Source</h4>
+                   <RadioGroup value={avatarSource} onValueChange={handleAvatarSourceChange}>
                       <div className="flex items-center space-x-2">
                         <RadioGroupItem value="flowup" id="r-flowup" />
                         <Label htmlFor="r-flowup">Use FlowUp Avatar URL</Label>
@@ -419,3 +444,5 @@ export default function ProfilePage() {
     </div>
   );
 }
+
+    

src/app/(app)/projects/[id]/actions.ts

@@ -38,11 +38,13 @@ import {
   getTaskByUuid as dbGetTaskByUuid,
   updateProjectDiscordSettings as dbUpdateProjectDiscordSettings,
   deleteProject as dbDeleteProject,
+  updateProjectWebhookDetails as dbUpdateProjectWebhookDetails,
 } from '@/lib/db';
 import { z } from 'zod';
 import { auth } from '@/lib/authEdge';
 import { Octokit } from 'octokit';
 import { Buffer } from 'buffer';
+import crypto from 'crypto';
 import { generateProjectScaffold, type GenerateProjectScaffoldInput, type GenerateProjectScaffoldOutput } from '@/ai/flows/generate-project-scaffold';
 import { editFileContentWithAI, type EditFileContentAIInput, type EditFileContentAIOutput } from '@/ai/flows/edit-file-content-ai';
 import { sendDiscordNotification } from '@/lib/discord';
@@ -1975,7 +1977,7 @@ export async function updateProjectDiscordSettingsAction(
             return { error: "You do not have permission to change Discord settings for this project." };
         }
 
-        const updatedProject = await dbUpdateProjectDiscordSettings(projectUuid, discordWebhookUrl, discordNotificationsEnabled, notifyTasks, notifyMembers, notifyAnnouncements);
+        const updatedProject = await dbUpdateProjectDiscordSettings(projectUuid, discordWebhookUrl, discordNotificationsEnabled, discordNotifyTasks, discordNotifyMembers, discordNotifyAnnouncements);
 
         if (!updatedProject) {
             return { error: "Failed to update project settings in the database." };
@@ -2024,3 +2026,87 @@ export async function deleteProjectAction(
     return { error: error.message || "An unexpected error occurred." };
   }
 }
+
+export interface SetupGithubWebhookFormState {
+  success?: boolean;
+  message?: string;
+  error?: string;
+  project?: Project;
+}
+
+export async function setupGithubWebhookAction(
+  prevState: SetupGithubWebhookFormState,
+  formData: FormData
+): Promise<SetupGithubWebhookFormState> {
+  const session = await auth();
+  if (!session?.user?.uuid) {
+    return { error: "Authentication required." };
+  }
+
+  const projectUuid = formData.get('projectUuid') as string;
+  if (!projectUuid) {
+    return { error: "Project UUID is required." };
+  }
+  
+  try {
+    const userRole = await dbGetProjectMemberRole(projectUuid, session.user.uuid);
+    if (!userRole || !['owner', 'co-owner'].includes(userRole)) {
+      return { error: "You do not have permission to set up webhooks for this project." };
+    }
+
+    const project = await dbGetProjectByUuid(projectUuid);
+    if (!project || !project.githubRepoName) {
+      return { error: "Project not found or not linked to GitHub." };
+    }
+     if (project.githubWebhookId) {
+      return { error: "A webhook is already configured for this project." };
+    }
+
+    const oauthToken = await dbGetUserGithubOAuthToken(session.user.uuid);
+    if (!oauthToken?.accessToken) {
+      return { error: "GitHub OAuth token not found. Please connect your account." };
+    }
+
+    const [owner, repo] = project.githubRepoName.split('/');
+    if (!owner || !repo) return { error: "Invalid GitHub repository name format." };
+    
+    const octokit = new Octokit({ auth: oauthToken.accessToken });
+    const webhookSecret = crypto.randomBytes(20).toString('hex');
+    const webhookUrl = `${process.env.NEXT_PUBLIC_APP_URL}/api/webhooks/github`;
+
+    const { data: newWebhook } = await octokit.rest.repos.createWebhook({
+      owner,
+      repo,
+      config: {
+        url: webhookUrl,
+        content_type: 'json',
+        secret: webhookSecret,
+      },
+      events: ['push', 'pull_request', 'issues'],
+      active: true,
+    });
+
+    const updatedProject = await dbUpdateProjectWebhookDetails(project.uuid, newWebhook.id, webhookSecret);
+    if (!updatedProject) {
+        return { error: "Webhook created on GitHub, but failed to save details in FlowUp." };
+    }
+    
+    return { success: true, message: `Webhook (ID: ${newWebhook.id}) successfully created on GitHub!`, project: updatedProject };
+
+  } catch (error: any) {
+    console.error("Error setting up GitHub webhook:", error);
+    let errorMessage = error.message || "An unexpected error occurred.";
+    if (error.status === 422) { // Unprocessable Entity
+        if(error.message.includes("Hook already exists")) {
+            errorMessage = "A webhook for this URL already exists on the repository. Please check your repository settings on GitHub.";
+        } else {
+             errorMessage = `Could not create webhook (422): ${error.message}. Check permissions and configuration.`;
+        }
+    } else if (error.status === 404) {
+        errorMessage = "Repository not found. Check that the linked repository exists and you have access.";
+    }
+    return { error: errorMessage };
+  }
+}
+
+    

src/lib/db.ts

@@ -779,19 +779,19 @@ export async function updateProjectDiscordSettings(
     const now = new Date().toISOString();
 
     let setClauses = 'discordWebhookUrl = ?, discordNotificationsEnabled = ?, updatedAt = ?';
-    let params: (string | number | boolean | null | undefined)[] = [webhookUrl, enabled, now];
+    let params: (string | number | boolean | null | undefined)[] = [webhookUrl, enabled ? 1 : 0, now];
 
     if (notifyTasks !== undefined) {
         setClauses += ', discordNotifyTasks = ?';
-        params.push(notifyTasks);
+        params.push(notifyTasks ? 1 : 0);
     }
     if (notifyMembers !== undefined) {
         setClauses += ', discordNotifyMembers = ?';
-        params.push(notifyMembers);
+        params.push(notifyMembers ? 1 : 0);
     }
     if (notifyAnnouncements !== undefined) {
         setClauses += ', discordNotifyAnnouncements = ?';
-        params.push(notifyAnnouncements);
+        params.push(notifyAnnouncements ? 1 : 0);
     }
     params.push(projectUuid);
 
@@ -1328,3 +1328,5 @@ export async function deleteProjectAnnouncement(announcementUuid: string): Promi
   const result = await connection.run('DELETE FROM project_announcements WHERE uuid = ?', announcementUuid);
   return result.changes ? result.changes > 0 : false;
 }
+
+