External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	yarn.lock
This commit is contained in:
killian-larcher
2024-11-11 15:00:34 +01:00
parent 5c859f53a7 cd4ad4be01
commit b064aa9470
24 changed files with 626 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/wrappers/Agent/AgentForm/AgentForm.tsx
+130
View File
@@ -0,0 +1,130 @@
"use client";
import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
import {
FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage, useZodForm
} from "@/components/ui/form";
import {Input} from "@/components/ui/input";
import {Form} from "@/components/ui/form"
import {Button} from "@/components/ui/button";
import {useRouter} from "next/navigation";
import {useMutation} from "@tanstack/react-query";
import {TooltipProvider} from "@/components/ui/tooltip";
import {AgentSchema, AgentType} from "@/components/wrappers/Agent/AgentForm/agent-form.schema";
import {toast} from "sonner";
import {createAgentAction, updateAgentAction} from "@/components/wrappers/Agent/AgentForm/agent-form.action";
export type agentFormProps = {
defaultValues?: AgentType;
agentId?: string;
}
export const AgentForm = (props: agentFormProps) => {
const isCreate = !Boolean(props.defaultValues)
// const defaultValues = isCreate ? {slug: ""} : props.defaultValues
const form = useZodForm({
schema: AgentSchema,
defaultValues: props.defaultValues,
});
const router = useRouter();
const mutation = useMutation({
mutationFn: async (values: AgentType) => {
console.log("values", values)
const createAgent = isCreate ? await createAgentAction(values) : await updateAgentAction({
id: props.agentId ?? "-",
data: values
});
const data = createAgent?.data?.data
if (createAgent?.serverError || !data) {
console.log(createAgent?.serverError);
toast.error(createAgent?.serverError);
return;
}
toast.success(`Success`);
router.push(`/dashboard/agents/${data.id}`);
router.refresh()
}
})
return (
<TooltipProvider>
<Card>
<CardContent>
<Form form={form}
className="flex flex-col gap-4 mt-3"
onSubmit={async (values) => {
await mutation.mutateAsync(values);
}}
>
<FormField
control={form.control}
name="name"
defaultValue=""
render={({field}) => (
<FormItem>
<FormLabel>Name</FormLabel>
<FormControl>
<Input
placeholder={"Project 1"} {...field} />
</FormControl>
<FormDescription>{"Your agent project name"}</FormDescription>
<FormMessage/>
</FormItem>
)}
/>
<FormField
control={form.control}
defaultValue=""
name="slug"
render={({field}) => (
<FormItem>
<FormLabel>Slug</FormLabel>
<FormControl>
<Input
value={field.value ?? ""}
placeholder={"agent-5-project-1"} {...field}
onChange={(e) => {
const value = e.target.value.replaceAll(" ", "-").toLowerCase()
field.onChange(value)
}}
/>
</FormControl>
<FormDescription>{'The slug is used in the url of the agent'}</FormDescription>
<FormMessage/>
</FormItem>
)}
/>
<FormField
control={form.control}
defaultValue=""
name="description"
render={({field}) => (
<FormItem>
<FormLabel>Description</FormLabel>
<FormControl>
<Input
placeholder={'This agent is for the client exemple.com'} {...field}
value={field.value ?? ""}/>
</FormControl>
<FormDescription>{"Enter your project agent description"}</FormDescription>
<FormMessage/>
</FormItem>
)}
/>
<Button>
{isCreate ? `Create agent` : `Save agent`}
</Button>
</Form>
</CardContent>
</Card>
</TooltipProvider>
)
}
src/components/wrappers/Agent/AgentForm/agent-form.action.ts
+68
View File
@@ -0,0 +1,68 @@
"use server"
import {ActionError, userAction} from "@/safe-actions";
import {prisma} from "@/prisma";
import {AgentSchema} from "@/components/wrappers/Agent/AgentForm/agent-form.schema";
import {z} from "zod";
const verifySlugUniqueness = async (slug: string, agentId?: string) => {
const slugExists = await prisma.agent.count({
where: {
slug: slug,
id: agentId ? {
not: agentId
} : undefined,
},
})
console.log(slugExists)
if (slugExists) {
throw new ActionError("Slug already exists");
}
}
export const createAgentAction = userAction
.schema(AgentSchema)
.action(async ({parsedInput, ctx}) => {
// Verify if slug already exist
await verifySlugUniqueness(parsedInput.slug);
const agent = await prisma.agent.create({
data: {
...parsedInput
}
})
// await sendEmailIfUserCreatedFirstForm(ctx.user)
return {
data: agent,
}
});
export const updateAgentAction = userAction
.schema(
z.object({
id: z.string(),
data: AgentSchema,
}
)
)
.action(async ({parsedInput, ctx}) => {
await verifySlugUniqueness(parsedInput.data.slug, parsedInput.id);
console.log("parsedInput", parsedInput.data)
const updatedAgent = await prisma.agent.update({
where: {
id: parsedInput.id,
},
data: parsedInput.data,
})
return {
data: updatedAgent,
}
})
src/components/wrappers/Agent/AgentForm/agent-form.schema.ts
+9
View File
@@ -0,0 +1,9 @@
import {z} from "zod";
export const AgentSchema = z.object({
name: z.string(),
slug: z.string().regex(/^[a-zA-Z0-9_-]*$/).min(5).max(25),
description: z.string().optional().nullable(),
});
export type AgentType = z.infer<typeof AgentSchema>;
src/components/wrappers/Auth/Login/LoginForm/LoginForm.tsx
+1 -1
View File
@@ -12,7 +12,7 @@ import {useMutation} from "@tanstack/react-query";
import {TooltipProvider} from "@/components/ui/tooltip";
import Link from "next/link";
import {PasswordInput} from "@/components/wrappers/Auth/PaswordInput/password-input";
import {LoginSchema, LoginType} from "@/components/wrappers/Auth/Login/LoginForm/login-form-schema";
import {LoginSchema, LoginType} from "@/components/wrappers/Auth/Login/LoginForm/login-form.schema";
import {signInAction} from "@/features/auth/auth.action";
import {SocialAuthButton} from "@/components/wrappers/Auth/Login/SocialAuth/SocialAuthButtons/SocialAuthButton";
import Image from 'next/image';
src/components/wrappers/Auth/Login/LoginForm/login-form-action.ts → src/components/wrappers/Auth/Login/LoginForm/login-form.action.ts
View File
src/components/wrappers/Auth/Login/LoginForm/login-form-schema.ts → src/components/wrappers/Auth/Login/LoginForm/login-form.schema.ts
View File
src/components/wrappers/Auth/Register/RegisterForm/RegisterForm.tsx
+1
View File
@@ -30,6 +30,7 @@ export const RegisterForm = (props: registerFormProps) => {
mutationFn: async (values: RegisterType) => {
console.log(values)
const createUser = await registerUserAction(values);
console.log(createUser)
const data = createUser?.data?.data
if (createUser?.serverError || !data) {
console.log(createUser?.serverError);
src/components/wrappers/Auth/Register/RegisterForm/register-form.action.ts
+2 -3
View File
@@ -22,7 +22,6 @@ export const registerUserAction = action
data: new_user,
}
}
return {
data: user,
}
throw new Error('An error occured while creating user');
});
src/components/wrappers/Dashboard/LoggedInDropdown/LoggedInDropdown.tsx
+4 -1
View File
@@ -8,6 +8,7 @@ import Link from "next/link";
import {useTranslations} from "use-intl";
import {SidebarMenuButton} from "@/components/ui/sidebar";
import {UserAvatar} from "@/components/wrappers/Dashboard/UserAvatar/UserAvatar";
import {redirect} from "next/navigation";
export type LoggedInDropdownProps = PropsWithChildren<{}>
@@ -22,7 +23,9 @@ export const LoggedInDropdown = (props: LoggedInDropdownProps) => {
side="top"
className="w-[--radix-popper-anchor-width]"
>
<DropdownMenuItem>
<DropdownMenuItem onClick={() => {
redirect("/dashboard/profile")
}}>
<span>Account</span>
</DropdownMenuItem>
<DropdownMenuItem>
src/components/wrappers/Dashboard/Profile/UserForm/UserForm.tsx
+125
View File
@@ -0,0 +1,125 @@
"use client";
import {Card, CardContent, CardDescription, CardHeader, CardTitle} from "@/components/ui/card";
import {
FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage, useZodForm
} from "@/components/ui/form";
import {Input} from "@/components/ui/input";
import {Form} from "@/components/ui/form"
import {Button} from "@/components/ui/button";
import {useRouter} from "next/navigation";
import {useMutation} from "@tanstack/react-query";
import {TooltipProvider} from "@/components/ui/tooltip";
import {UserSchema, UserType} from "@/components/wrappers/Dashboard/Profile/UserForm/user-form.schema";
import {toast} from "sonner";
import {updateUserAction} from "@/components/wrappers/Dashboard/Profile/UserForm/user-form.action";
import { useSession } from "next-auth/react";
export type userFormProps = {
defaultValues?: UserType;
userId?: string;
}
export const UserForm = (props: userFormProps) => {
const isCreate = !Boolean(props.defaultValues)
const form = useZodForm({
schema: UserSchema,
defaultValues: props.defaultValues,
});
const router = useRouter();
const { data: session, update } = useSession();
const mutation = useMutation({
mutationFn: async (values: UserType) => {
console.log("values", values)
console.log(props.userId)
const updateUser = await updateUserAction({
id: props.userId ?? "-",
data: values
})
const data = updateUser?.data?.data
if (updateUser?.serverError || !data) {
console.log(updateUser?.serverError);
toast.error(updateUser?.serverError);
return;
}
console.log("email:", values.email)
const newSession = {
...session,
user: {
...session?.user,
name: values.name,
email: values.email
},
};
const updateSession = await update(newSession);
console.log(updateSession);
toast.success(`Success updating user informations`);
router.push(`/dashboard/profile`);
router.refresh()
}
})
return (
<TooltipProvider>
<Card>
<CardHeader>
<CardTitle>
Account
</CardTitle>
<CardDescription>
Your informations
</CardDescription>
</CardHeader>
<CardContent>
<Form form={form}
className="flex flex-col gap-4"
onSubmit={async (values) => {
await mutation.mutateAsync(values);
}}
>
<FormField
control={form.control}
name="name"
render={({field}) => (
<FormItem>
<FormLabel>Name</FormLabel>
<FormControl>
<Input
placeholder={"Your Name"} {...field} />
</FormControl>
<FormMessage/>
</FormItem>
)}
/>
<FormField
control={form.control}
name="email"
render={({field}) => (
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input
placeholder={'exemple@portabase.com'} disabled {...field}
value={field.value ?? ""}/>
</FormControl>
<FormMessage/>
</FormItem>
)}
/>
<Button>
{isCreate ? `` : `Save`}
</Button>
</Form>
</CardContent>
</Card>
</TooltipProvider>
)
}
src/components/wrappers/Dashboard/Profile/UserForm/user-form.action.ts
+26
View File
@@ -0,0 +1,26 @@
"use server"
import {userAction} from "@/safe-actions";
import {z} from "zod";
import {prisma} from "@/prisma";
import {UserSchema} from "@/components/wrappers/Dashboard/Profile/UserForm/user-form.schema";
export const updateUserAction = userAction
.schema(
z.object({
id: z.string(),
data: UserSchema,
}
)
)
.action(async ({parsedInput, ctx}) => {
const updatedUser = await prisma.user.update({
where: {
id: parsedInput.id,
},
data: parsedInput.data,
})
return {
data: updatedUser,
}
})
src/components/wrappers/Dashboard/Profile/UserForm/user-form.schema.ts
+8
View File
@@ -0,0 +1,8 @@
import {z} from "zod";
export const UserSchema = z.object({
name: z.string(),
email: z.string(),
});
export type UserType = z.infer<typeof UserSchema>;
src/components/wrappers/Dashboard/SideBar/app-sidebar.tsx
+10 -3
View File
@@ -13,27 +13,31 @@ import {
} from "lucide-react";
import {LoggedInButton} from "@/components/wrappers/Dashboard/LoggedInButton/LoggedInButton";
import {SidebarMenuCustom} from "@/components/wrappers/Dashboard/SideBar/SideBarMenu/SideBarMenu";
import Image from 'next/image';
export function AppSidebar() {
return (
<Sidebar collapsible="icon">
<SidebarHeader>
<div className="flex justify-center items-center ">
<h1 className="font-bold text-xl">Portabase</h1>
</div>
<SidebarMenu>
<SidebarMenuItem>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<SidebarMenuButton>
Select Workspace
Select Project
<ChevronDown className="ml-auto"/>
</SidebarMenuButton>
</DropdownMenuTrigger>
<DropdownMenuContent className="w-[--radix-popper-anchor-width]">
<DropdownMenuItem>
<span>Acme Inc</span>
<span>Project 1</span>
</DropdownMenuItem>
<DropdownMenuItem>
<span>Acme Corp.</span>
<span>Project 2</span>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
@@ -54,6 +58,9 @@ export function AppSidebar() {
<LoggedInButton/>
</SidebarMenuItem>
</SidebarMenu>
<div className="text-center">
<h1 className="text-[10px]">Portabase Community Edition 1.0.0</h1>
</div>
</SidebarFooter>
</Sidebar>
)