-
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(assets): refactor assets folder structure
- Loading branch information
Showing
6 changed files
with
0 additions
and
32 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,11 +3,7 @@ | |
"files": [ | ||
{ | ||
"name": "forgot-1.tsx", | ||
<<<<<<< Updated upstream | ||
"content": "\"use client\";\n\n/* eslint-disable @next/next/no-img-element */\nimport Image from \"next/image\";\n\nimport Link from \"next/link\";\nimport React from \"react\";\nimport { useForm } from \"react-hook-form\";\nimport { zodResolver } from \"@hookform/resolvers/zod\";\nimport { z } from \"zod\";\nimport { Button } from \"ruru-ui/components/button\";\nimport { Input } from \"ruru-ui/components/input\";\nimport {\n Form,\n FormControl,\n FormField,\n FormLabel,\n FormItem,\n FormMessage,\n} from \"ruru-ui/components/form\";\n\nconst Forgot1 = (): React.ReactNode => {\n const formSchema = z.object({\n email: z.string().email({ message: \"Please enter a valid email address.\" }),\n });\n\n const form = useForm<z.infer<typeof formSchema>>({\n resolver: zodResolver(formSchema),\n defaultValues: {\n email: \"\",\n },\n });\n\n function onSubmit(values: z.infer<typeof formSchema>) {\n // Do something with the form values.\n console.log(values);\n }\n\n return (\n <div className=\"flex items-center justify-center h-screen\">\n <div className=\"flex flex-col items-center w-96 border rounded-md bg-card p-4\">\n <div className=\"grid place-items-center\">\n <div className=\"flex items-center gap-4\">\n <img\n className=\"dark:block hidden\"\n src={\"https://ruru-ui.vercel.app/assets/logo-white.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <img\n className=\"dark:hidden block\"\n src={\"https://ruru-ui.vercel.app/assets/logo-black.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <span className=\"text-xl\">Ruru UI</span>\n </div>\n <span className=\"text-sm text-muted-foreground mt-4\">\n Forgot your password?\n </span>\n </div>\n\n <Form {...form}>\n <form\n onSubmit={form.handleSubmit(onSubmit)}\n className=\"w-full space-y-2\"\n >\n <div className=\"my-3\">\n <FormField\n control={form.control}\n name=\"email\"\n render={({ field }) => (\n <FormItem>\n <FormLabel>Email</FormLabel>\n <FormControl>\n <Input placeholder=\"[email protected]\" {...field} />\n </FormControl>\n <FormMessage />\n </FormItem>\n )}\n />\n </div>\n\n <div className=\"py-4 w-full space-y-3\">\n <Button type=\"submit\" className=\"w-full\">\n Send reset link\n </Button>\n </div>\n\n <Link\n href={\"#\"}\n className=\"hover:underline text-xs flex justify-center\"\n >\n Back to login\n </Link>\n </form>\n </Form>\n </div>\n </div>\n );\n};\n\nexport default Forgot1;\n" | ||
======= | ||
"content": "\"use client\";\n\n/* eslint-disable @next/next/no-img-element */\nimport Image from \"next/image\";\n\nimport Link from \"next/link\";\nimport React from \"react\";\nimport { useForm } from \"react-hook-form\";\nimport { zodResolver } from \"@hookform/resolvers/zod\";\nimport { z } from \"zod\";\nimport { Button } from \"ruru-ui/components/button\";\nimport { Input } from \"ruru-ui/components/input\";\nimport {\n Form,\n FormControl,\n FormField,\n FormLabel,\n FormItem,\n FormMessage,\n} from \"ruru-ui/components/form\";\n\nconst Forgot1 = (): React.ReactNode => {\n const formSchema = z.object({\n email: z.string().email({ message: \"Please enter a valid email address.\" }),\n });\n\n const form = useForm<z.infer<typeof formSchema>>({\n resolver: zodResolver(formSchema),\n defaultValues: {\n email: \"\",\n },\n });\n\n function onSubmit(values: z.infer<typeof formSchema>) {\n // Do something with the form values.\n console.log(values);\n }\n\n return (\n <div className=\"flex items-center justify-center h-screen\">\n <div className=\"flex flex-col items-center w-96 border rounded-md bg-card p-4\">\n <div className=\"grid place-items-center\">\n <div className=\"flex items-center gap-4\">\n <img\n className=\"dark:block hidden\"\n src={\"https://ruru-ui.vercel.app/logo-white.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <img\n className=\"dark:hidden block\"\n src={\"https://ruru-ui.vercel.app/logo-black.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <span className=\"text-xl\">Ruru UI</span>\n </div>\n <span className=\"text-sm text-muted-foreground mt-4\">\n Forgot your password?\n </span>\n </div>\n\n <Form {...form}>\n <form\n onSubmit={form.handleSubmit(onSubmit)}\n className=\"w-full space-y-2\"\n >\n <div className=\"my-3\">\n <FormField\n control={form.control}\n name=\"email\"\n render={({ field }) => (\n <FormItem>\n <FormLabel>Email</FormLabel>\n <FormControl>\n <Input placeholder=\"[email protected]\" {...field} />\n </FormControl>\n <FormMessage />\n </FormItem>\n )}\n />\n </div>\n\n <div className=\"py-4 w-full space-y-3\">\n <Button type=\"submit\" className=\"w-full\">\n Send reset link\n </Button>\n </div>\n\n <Link\n href={\"#\"}\n className=\"hover:underline text-xs flex justify-center\"\n >\n Back to login\n </Link>\n </form>\n </Form>\n </div>\n </div>\n );\n};\n\nexport default Forgot1;\n" | ||
>>>>>>> Stashed changes | ||
} | ||
], | ||
"dependencies": ["react-hook-form", "@hookform/resolvers", "zod"], | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,11 +3,7 @@ | |
"files": [ | ||
{ | ||
"name": "login-1.tsx", | ||
<<<<<<< Updated upstream | ||
"content": "\"use client\";\n\n/* eslint-disable @next/next/no-img-element */\nimport Image from \"next/image\";\n\nimport Link from \"next/link\";\nimport React from \"react\";\nimport { useForm } from \"react-hook-form\";\nimport { zodResolver } from \"@hookform/resolvers/zod\";\nimport { z } from \"zod\";\nimport { Button } from \"ruru-ui/components/button\";\nimport { Input, PasswordInput } from \"ruru-ui/components/input\";\nimport {\n Form,\n FormControl,\n FormField,\n FormLabel,\n FormItem,\n FormMessage,\n} from \"ruru-ui/components/form\";\n\nconst Login1 = (): React.ReactNode => {\n const loginSchema = z.object({\n email: z.string().email({ message: \"Please enter a valid email address.\" }),\n password: z\n .string()\n .min(8, { message: \"Password must be at least 8 characters long.\" }),\n });\n\n const form = useForm<z.infer<typeof loginSchema>>({\n resolver: zodResolver(loginSchema),\n defaultValues: {\n email: \"\",\n password: \"\",\n },\n });\n\n function onSubmit(values: z.infer<typeof loginSchema>) {\n // Do something with the form values.\n console.log(values);\n }\n\n return (\n <div className=\"flex items-center justify-center h-screen\">\n <div className=\"flex flex-col items-center w-96 border rounded-md bg-card p-4\">\n <div className=\"grid place-items-center\">\n <div className=\"flex items-center gap-4\">\n <img\n className=\"dark:block hidden\"\n src={\"https://ruru-ui.vercel.app/assets/logo-white.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <img\n className=\"dark:hidden block\"\n src={\"https://ruru-ui.vercel.app/assets/logo-black.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <span className=\"text-xl\">Ruru UI</span>\n </div>\n <span className=\"text-sm text-muted-foreground mt-4\">\n Welcome back\n </span>\n </div>\n\n <Form {...form}>\n <form\n onSubmit={form.handleSubmit(onSubmit)}\n className=\"w-full space-y-2\"\n >\n <div className=\"my-3\">\n <FormField\n control={form.control}\n name=\"email\"\n render={({ field }) => (\n <FormItem>\n <FormLabel>Email</FormLabel>\n <FormControl>\n <Input placeholder=\"[email protected]\" {...field} />\n </FormControl>\n <FormMessage />\n </FormItem>\n )}\n />\n\n <FormField\n control={form.control}\n name=\"password\"\n render={({ field }) => (\n <FormItem>\n <FormLabel>Password</FormLabel>\n <FormControl>\n <PasswordInput placeholder=\"••••••••\" {...field} />\n </FormControl>\n <FormMessage />\n </FormItem>\n )}\n />\n </div>\n\n <Link href={\"#\"} className=\"hover:underline text-xs\">\n Forgot password?\n </Link>\n\n <div className=\"py-4 w-full space-y-3\">\n <Button type=\"submit\" className=\"w-full\">\n Login\n </Button>\n <Button\n className=\"w-full\"\n variant={\"secondary\"}\n onClick={() => console.log(\"Login with Github\")}\n >\n Login with Github\n </Button>\n </div>\n\n <Link\n href={\"#\"}\n className=\"hover:underline text-xs flex justify-center\"\n >\n Don't have an account?\n </Link>\n </form>\n </Form>\n </div>\n </div>\n );\n};\n\nexport default Login1;\n" | ||
======= | ||
"content": "\"use client\";\n\n/* eslint-disable @next/next/no-img-element */\nimport Image from \"next/image\";\n\nimport Link from \"next/link\";\nimport React from \"react\";\nimport { useForm } from \"react-hook-form\";\nimport { zodResolver } from \"@hookform/resolvers/zod\";\nimport { z } from \"zod\";\nimport { Button } from \"ruru-ui/components/button\";\nimport { Input, PasswordInput } from \"ruru-ui/components/input\";\nimport {\n Form,\n FormControl,\n FormField,\n FormLabel,\n FormItem,\n FormMessage,\n} from \"ruru-ui/components/form\";\n\nconst Login1 = (): React.ReactNode => {\n const loginSchema = z.object({\n email: z.string().email({ message: \"Please enter a valid email address.\" }),\n password: z\n .string()\n .min(8, { message: \"Password must be at least 8 characters long.\" }),\n });\n\n const form = useForm<z.infer<typeof loginSchema>>({\n resolver: zodResolver(loginSchema),\n defaultValues: {\n email: \"\",\n password: \"\",\n },\n });\n\n function onSubmit(values: z.infer<typeof loginSchema>) {\n // Do something with the form values.\n console.log(values);\n }\n\n return (\n <div className=\"flex items-center justify-center h-screen\">\n <div className=\"flex flex-col items-center w-96 border rounded-md bg-card p-4\">\n <div className=\"grid place-items-center\">\n <div className=\"flex items-center gap-4\">\n <img\n className=\"dark:block hidden\"\n src={\"https://ruru-ui.vercel.app/logo-white.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <img\n className=\"dark:hidden block\"\n src={\"https://ruru-ui.vercel.app/logo-black.png\"}\n alt=\"logo\"\n height={40}\n width={40}\n />\n <span className=\"text-xl\">Ruru UI</span>\n </div>\n <span className=\"text-sm text-muted-foreground mt-4\">\n Welcome back\n </span>\n </div>\n\n <Form {...form}>\n <form\n onSubmit={form.handleSubmit(onSubmit)}\n className=\"w-full space-y-2\"\n >\n <div className=\"my-3\">\n <FormField\n control={form.control}\n name=\"email\"\n render={({ field }) => (\n <FormItem>\n <FormLabel>Email</FormLabel>\n <FormControl>\n <Input placeholder=\"[email protected]\" {...field} />\n </FormControl>\n <FormMessage />\n </FormItem>\n )}\n />\n\n <FormField\n control={form.control}\n name=\"password\"\n render={({ field }) => (\n <FormItem>\n <FormLabel>Password</FormLabel>\n <FormControl>\n <PasswordInput placeholder=\"••••••••\" {...field} />\n </FormControl>\n <FormMessage />\n </FormItem>\n )}\n />\n </div>\n\n <Link href={\"#\"} className=\"hover:underline text-xs\">\n Forgot password?\n </Link>\n\n <div className=\"py-4 w-full space-y-3\">\n <Button type=\"submit\" className=\"w-full\">\n Login\n </Button>\n <Button\n className=\"w-full\"\n variant={\"secondary\"}\n onClick={() => console.log(\"Login with Github\")}\n >\n Login with Github\n </Button>\n </div>\n\n <Link\n href={\"#\"}\n className=\"hover:underline text-xs flex justify-center\"\n >\n Don't have an account?\n </Link>\n </form>\n </Form>\n </div>\n </div>\n );\n};\n\nexport default Login1;\n" | ||
>>>>>>> Stashed changes | ||
} | ||
], | ||
"dependencies": ["react-hook-form", "@hookform/resolvers", "zod"], | ||
|
Oops, something went wrong.