diff --git a/.gitignore b/.gitignore index fd3dbb5..7494fa5 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ yarn-error.log* # local env files .env*.local +.env # vercel .vercel @@ -34,3 +35,81 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts + +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..b58b603 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,5 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ diff --git a/.idea/a-naklejka.iml b/.idea/a-naklejka.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/a-naklejka.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..9c69411 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..d23208f --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml new file mode 100644 index 0000000..541945b --- /dev/null +++ b/.idea/jsLinters/eslint.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/markdown.xml b/.idea/markdown.xml new file mode 100644 index 0000000..1e34094 --- /dev/null +++ b/.idea/markdown.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..fee08b8 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/prettier.xml b/.idea/prettier.xml new file mode 100644 index 0000000..0c83ac4 --- /dev/null +++ b/.idea/prettier.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..8306744 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml new file mode 100644 index 0000000..fb0d65a --- /dev/null +++ b/.idea/watcherTasks.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/actions/login.ts b/actions/login.ts new file mode 100644 index 0000000..3473df1 --- /dev/null +++ b/actions/login.ts @@ -0,0 +1,55 @@ +'use server' + +import { infer as zInfer } from 'zod' +import { LoginSchema } from '@/schemas' +import { signIn } from '@/config/auth' +import { DEFAULT_LOGIN_REDIRECT } from '@/config/routes' +import { AuthError } from 'next-auth' +import { getUserByEmail } from '@/data/user' +import { sendVerificationEmail } from '@/actions/send-verification-email' + +export const login = async (values: zInfer) => { + const validatedFields = LoginSchema.safeParse(values) + + if (!validatedFields.success) { + return { error: 'auth.form.error.invalid_fields' } + } + + const { email, password } = validatedFields.data + + const existingUser = await getUserByEmail(email) + + if (!existingUser || !existingUser.email || !existingUser.password) { + return { error: 'auth.form.error.invalid_credentials' } + } + + if (!existingUser.emailVerified) { + return await sendVerificationEmail(existingUser.email, existingUser.name) + } + + try { + await signIn('credentials', { + email, password, redirectTo: DEFAULT_LOGIN_REDIRECT, + }) + } catch (error) { + if (error instanceof AuthError) { + switch (error.type) { + case 'CredentialsSignin': + return { error: 'auth.form.error.invalid_credentials' } + case 'AccessDenied': + return { error: 'auth.form.error.access_denied' } + default: + console.error('ERROR.TYPE:', error.type) + return { error: 'common.something_went_wrong' } + } + } + + throw error + } +} + +export const SignInProvider = async (provider: 'google' | 'github' | 'facebook') => { + await signIn(provider, { + redirectTo: DEFAULT_LOGIN_REDIRECT, + }) +} \ No newline at end of file diff --git a/actions/register.ts b/actions/register.ts new file mode 100644 index 0000000..c238bab --- /dev/null +++ b/actions/register.ts @@ -0,0 +1,35 @@ +'use server' + +import { infer as zInfer } from 'zod' +import bcrypt from 'bcryptjs' + +import { RegisterSchema } from '@/schemas' +import { PASSWORD_SALT_LENGTH } from '@/config/validation' +import { db } from '@/lib/db' +import { getUserByEmail } from '@/data/user' +import { sendVerificationEmail } from '@/actions/send-verification-email' + +export const register = async (values: zInfer) => { + const validatedFields = RegisterSchema.safeParse(values) + + if (!validatedFields.success) { + return { error: 'auth.form.error.invalid_fields' } + } + + const { email, password, name } = validatedFields.data + const hashedPassword = await bcrypt.hash(password, PASSWORD_SALT_LENGTH) + + const existingUser = await getUserByEmail(email) + + if (existingUser) { + return { error: 'auth.form.error.email_taken' } + } + + await db.user.create({ + data: { + name, email, password: hashedPassword, + }, + }) + + return await sendVerificationEmail(email, name) +} \ No newline at end of file diff --git a/actions/send-verification-email.ts b/actions/send-verification-email.ts new file mode 100644 index 0000000..4aa3899 --- /dev/null +++ b/actions/send-verification-email.ts @@ -0,0 +1,27 @@ +'use server' + +import mailer from '@/lib/mailer' +import { env } from 'process' +import { AUTH_EMAIL_VERIFICATION_URL } from '@/config/routes' +import { generateVerificationToken } from '@/lib/tokens' + +const sendVerificationEmail = async (email: string, name?: string | null) => { + const verificationToken = await generateVerificationToken(email) + const confirmLink: string = [env.SITE_URL, AUTH_EMAIL_VERIFICATION_URL, '?token=', verificationToken].join('') + + const { isOk, code, info, error } = await mailer({ + to: name ? [ + { name: name?.toString(), address: verificationToken.email }, + `test-xyhy2bvhj@srv1.mail-tester.com`] : verificationToken.email, + subject: 'Complete email verification for A-Naklejka', + html: `

Click here to confirm email

`, + }) + + if (isOk) { + return { success: code === 250 ? 'auth.email.success.confirmation_email_sent' : info?.response } + } else { + return { error: env.DEBUG === 'true' ? error?.response : 'auth.email.error.verification_email_sending_error' } + } +} + +export { sendVerificationEmail } \ No newline at end of file diff --git a/app/[locale]/(protected)/cabinet/page.tsx b/app/[locale]/(protected)/cabinet/page.tsx new file mode 100644 index 0000000..f2563dd --- /dev/null +++ b/app/[locale]/(protected)/cabinet/page.tsx @@ -0,0 +1,18 @@ +import { auth, signOut } from '@/config/auth' + +const CabinetPage = async () => { + const session = await auth() + return ( +
+ {JSON.stringify(session)} +
{ + 'use server' + await signOut() + }}> + +
+
+ ) +} + +export default CabinetPage diff --git a/app/[locale]/(root)/(routes)/about/page.tsx b/app/[locale]/(root)/(routes)/about/page.tsx new file mode 100644 index 0000000..94fc942 --- /dev/null +++ b/app/[locale]/(root)/(routes)/about/page.tsx @@ -0,0 +1,23 @@ +'use client' + +import mailer from '@/lib/mailer' + +export default function AboutPage () { + const onClick = () => { + mailer({ + to: [ + { name: 'Yevhen', address: 'it@amok.space' }, + { name: 'Євген', address: 'yevhen.odynets@gmail.com' }, + ], + subject: 'ПОСИЛЕННЯ МОБІЛІЗАЦІЇ В УКРАЇНІ', + html: `
Коли Рада розгляне законопроєкт про мобілізацію у другому читанні
`, + }).catch(console.error) + } + + return ( + + ) +} \ No newline at end of file diff --git a/app/[locale]/(root)/(routes)/about/us/page.tsx b/app/[locale]/(root)/(routes)/about/us/page.tsx new file mode 100644 index 0000000..2ef4c01 --- /dev/null +++ b/app/[locale]/(root)/(routes)/about/us/page.tsx @@ -0,0 +1,3 @@ +export default function AboutUsPage () { + return (
AboutUsPage
) +} \ No newline at end of file diff --git a/app/[locale]/(root)/page.tsx b/app/[locale]/(root)/page.tsx new file mode 100644 index 0000000..f5886ac --- /dev/null +++ b/app/[locale]/(root)/page.tsx @@ -0,0 +1,29 @@ +import { Poppins } from 'next/font/google' +import { getScopedI18n } from '@/locales/server' +import { cn } from '@/lib/utils' +import { Button } from '@/components/ui/button' +import LoginButton from '@/components/auth/LoginButton' +import { bg as bgg } from '@/config/layout' + +const font = Poppins({ + subsets: ['latin'], weight: ['600'], +}) + +export default async function Home () { + const t = await getScopedI18n('auth') + return (
+
+

+ 🔐 {t('title')} +

+

{t('subtitle')}

+
+ + + +
+
+
) +} diff --git a/app/[locale]/auth/error/page.tsx b/app/[locale]/auth/error/page.tsx new file mode 100644 index 0000000..e731e49 --- /dev/null +++ b/app/[locale]/auth/error/page.tsx @@ -0,0 +1,9 @@ +import ErrorCard from '@/components/auth/ErrorCard' + +const AuthErrorPage = () => { + return ( + + ) +} + +export default AuthErrorPage diff --git a/app/[locale]/auth/layout.tsx b/app/[locale]/auth/layout.tsx new file mode 100644 index 0000000..af073a5 --- /dev/null +++ b/app/[locale]/auth/layout.tsx @@ -0,0 +1,22 @@ +'use client' + +import { ReactElement } from 'react' +import Navbar from '@/components/auth/Navbar' + +type Props = { + //params: { locale: string }; + children: ReactElement; +} +const AuthLayout = ({ children }: Props) => { + return ( + <> + +
+ {children} +
+ + ) +} + +export default AuthLayout \ No newline at end of file diff --git a/app/[locale]/auth/login/page.tsx b/app/[locale]/auth/login/page.tsx new file mode 100644 index 0000000..d875274 --- /dev/null +++ b/app/[locale]/auth/login/page.tsx @@ -0,0 +1,9 @@ +import { LoginForm } from '@/components/auth/LoginForm' + +const LoginPage = () => { + return ( + + ) +} + +export default LoginPage \ No newline at end of file diff --git a/app/[locale]/auth/register/page.tsx b/app/[locale]/auth/register/page.tsx new file mode 100644 index 0000000..988422b --- /dev/null +++ b/app/[locale]/auth/register/page.tsx @@ -0,0 +1,11 @@ +import { RegisterForm } from '@/components/auth/RegisterForm' + +const RegisterPage = () => { + return ( +
+ +
+ ) +} + +export default RegisterPage \ No newline at end of file diff --git a/app/[locale]/globals.css b/app/[locale]/globals.css new file mode 100644 index 0000000..451d5ef --- /dev/null +++ b/app/[locale]/globals.css @@ -0,0 +1,66 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +html, +body, +:root { + height: 100%; +} + +@layer base { + :root { + --background: 0 0% 100%; + --foreground: 222.2 84% 4.9%; + --card: 0 0% 100%; + --card-foreground: 222.2 84% 4.9%; + --popover: 0 0% 100%; + --popover-foreground: 222.2 84% 4.9%; + --primary: 221.2 83.2% 53.3%; + --primary-foreground: 210 40% 98%; + --secondary: 210 40% 96.1%; + --secondary-foreground: 222.2 47.4% 11.2%; + --muted: 210 40% 96.1%; + --muted-foreground: 215.4 16.3% 46.9%; + --accent: 210 40% 96.1%; + --accent-foreground: 222.2 47.4% 11.2%; + --destructive: 0 84.2% 60.2%; + --destructive-foreground: 210 40% 98%; + --border: 214.3 31.8% 91.4%; + --input: 214.3 31.8% 91.4%; + --ring: 221.2 83.2% 53.3%; + --radius: 0rem; + } + + .dark { + --background: 222.2 84% 4.9%; + --foreground: 210 40% 98%; + --card: 222.2 84% 4.9%; + --card-foreground: 210 40% 98%; + --popover: 222.2 84% 4.9%; + --popover-foreground: 210 40% 98%; + --primary: 217.2 91.2% 59.8%; + --primary-foreground: 222.2 47.4% 11.2%; + --secondary: 217.2 32.6% 17.5%; + --secondary-foreground: 210 40% 98%; + --muted: 217.2 32.6% 17.5%; + --muted-foreground: 215 20.2% 65.1%; + --accent: 217.2 32.6% 17.5%; + --accent-foreground: 210 40% 98%; + --destructive: 0 62.8% 30.6%; + --destructive-foreground: 210 40% 98%; + --border: 217.2 32.6% 17.5%; + --input: 217.2 32.6% 17.5%; + --ring: 224.3 76.3% 48%; + } +} + +@layer base { + * { + @apply border-border; + } + + body { + @apply bg-background text-foreground; + } +} \ No newline at end of file diff --git a/app/[locale]/layout.tsx b/app/[locale]/layout.tsx new file mode 100644 index 0000000..e56506c --- /dev/null +++ b/app/[locale]/layout.tsx @@ -0,0 +1,29 @@ +import type { Metadata } from 'next' +import { Inter } from 'next/font/google' +import './globals.css' +import { ReactElement } from 'react' +import { I18nProviderClient } from '@/locales/client' +import { lc } from '@/lib/utils' + +const inter = Inter({ subsets: ['cyrillic'] }) + +export const metadata: Metadata = { + title: 'Create Next App', description: 'Generated by create next app', +} + +type Props = { + params: { locale: string }; children: ReactElement; +} + +export default function RootLayout ({ + params: { locale }, children, +}: Readonly) { + + return ( + + Loading...

}> + {children} + + + ) +} diff --git a/app/api/auth/[...nextauth]/route.ts b/app/api/auth/[...nextauth]/route.ts new file mode 100644 index 0000000..5200eb3 --- /dev/null +++ b/app/api/auth/[...nextauth]/route.ts @@ -0,0 +1 @@ +export { GET, POST } from '@/config/auth' \ No newline at end of file diff --git a/app/favicon.ico b/app/favicon.ico index 718d6fe..16661f6 100644 Binary files a/app/favicon.ico and b/app/favicon.ico differ diff --git a/app/globals.css b/app/globals.css deleted file mode 100644 index 875c01e..0000000 --- a/app/globals.css +++ /dev/null @@ -1,33 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - -:root { - --foreground-rgb: 0, 0, 0; - --background-start-rgb: 214, 219, 220; - --background-end-rgb: 255, 255, 255; -} - -@media (prefers-color-scheme: dark) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 0, 0, 0; - --background-end-rgb: 0, 0, 0; - } -} - -body { - color: rgb(var(--foreground-rgb)); - background: linear-gradient( - to bottom, - transparent, - rgb(var(--background-end-rgb)) - ) - rgb(var(--background-start-rgb)); -} - -@layer utilities { - .text-balance { - text-wrap: balance; - } -} diff --git a/app/layout.tsx b/app/layout.tsx deleted file mode 100644 index 3314e47..0000000 --- a/app/layout.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import type { Metadata } from "next"; -import { Inter } from "next/font/google"; -import "./globals.css"; - -const inter = Inter({ subsets: ["latin"] }); - -export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", -}; - -export default function RootLayout({ - children, -}: Readonly<{ - children: React.ReactNode; -}>) { - return ( - - {children} - - ); -} diff --git a/app/page.tsx b/app/page.tsx deleted file mode 100644 index dc191aa..0000000 --- a/app/page.tsx +++ /dev/null @@ -1,113 +0,0 @@ -import Image from "next/image"; - -export default function Home() { - return ( -
-
-

- Get started by editing  - app/page.tsx -

- -
- -
- Next.js Logo -
- - -
- ); -} diff --git a/auth.config.ts b/auth.config.ts new file mode 100644 index 0000000..8f57311 --- /dev/null +++ b/auth.config.ts @@ -0,0 +1,46 @@ +import type { NextAuthConfig } from 'next-auth' +import Credentials from 'next-auth/providers/credentials' +import Google from 'next-auth/providers/google' +import Github from 'next-auth/providers/github' +//import Facebook from 'next-auth/providers/facebook' +//import Twitter from 'next-auth/providers/twitter' +import { LoginSchema } from '@/schemas' +import bcrypt from 'bcryptjs' +import { getUserByEmail } from '@/data/user' +import { env } from 'process' + +export default { + secret: env.AUTH_SECRET, + providers: [ + Google({ + clientId: env.GOOGLE_CLIENT_ID, + clientSecret: env.GOOGLE_CLIENT_SECRET, + }), + Github({ + clientId: env.GITHUB_CLIENT_ID, + clientSecret: env.GITHUB_CLIENT_SECRET, + }), + //Twitter({}), + /*Facebook({ + clientId: env.FACEBOOK_CLIENT_ID, + clientSecret: env.FACEBOOK_CLIENT_SECRET, + }),*/ + Credentials({ + // @ts-ignore + async authorize (credentials) { + const validatedFields = LoginSchema.safeParse(credentials) + + if (validatedFields.success) { + const { email, password } = validatedFields.data + + const user = await getUserByEmail(email) + + if (!user || !user.password) return null + + const passwordMatch: boolean = await bcrypt.compare(password, user.password) + if (passwordMatch) return user + } + return null + }, + })], +} satisfies NextAuthConfig \ No newline at end of file diff --git a/components.json b/components.json new file mode 100644 index 0000000..8a1aeb4 --- /dev/null +++ b/components.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://ui.shadcn.com/schema.json", + "style": "default", + "rsc": true, + "tsx": true, + "tailwind": { + "config": "tailwind.config.ts", + "css": "app/[locale]/globals.css", + "baseColor": "slate", + "cssVariables": true, + "prefix": "" + }, + "aliases": { + "components": "@/components", + "utils": "@/lib/utils" + } +} \ No newline at end of file diff --git a/components/FormError.tsx b/components/FormError.tsx new file mode 100644 index 0000000..e90988a --- /dev/null +++ b/components/FormError.tsx @@ -0,0 +1,19 @@ +import { TriangleAlert } from 'lucide-react' + +type Props = { + message?: string +} + +const FormError = ({ message }: Props) => { + if (!message) return null + + return ( +
+ +

{message}

+
+ ) +} + +export default FormError diff --git a/components/FormSuccess.tsx b/components/FormSuccess.tsx new file mode 100644 index 0000000..f799daf --- /dev/null +++ b/components/FormSuccess.tsx @@ -0,0 +1,19 @@ +import { CircleCheck } from 'lucide-react' + +type Props = { + message?: string +} + +const FormSuccess = ({ message }: Props) => { + if (!message) return null + + return ( +
+ +

{message}

+
+ ) +} + +export default FormSuccess diff --git a/components/LocaleSwitcher.tsx b/components/LocaleSwitcher.tsx new file mode 100644 index 0000000..2fabc5a --- /dev/null +++ b/components/LocaleSwitcher.tsx @@ -0,0 +1,24 @@ +'use client' +import { useChangeLocale, useCurrentLocale } from '@/locales/client' +import { LC, type loc } from '@/config/locales' +import { ChangeEvent } from 'react' +import styles from '@/styles/LocaleSwitcher.module.scss' + +export default function LocaleSwitcher () { + const changeLocale = useChangeLocale() + const locale = useCurrentLocale() + const selectHandler = (e: ChangeEvent) => changeLocale( + e.target.value as loc) + + return ( + //@ts-ignore + + ) +} \ No newline at end of file diff --git a/components/TranslateClientFragment.tsx b/components/TranslateClientFragment.tsx new file mode 100644 index 0000000..91b49f2 --- /dev/null +++ b/components/TranslateClientFragment.tsx @@ -0,0 +1,26 @@ +import { useI18n } from '@/locales/client' + +type Props = { + message: string +} + +const _ = (message: string): string => { + const t = useI18n() + if (message.startsWith('["')) { + const data = JSON.parse(message) + if (data.length > 1) { + message = data.shift() + // @ts-ignore + return t(message, ...data) + } + } + + // @ts-ignore + return t(message) +} + +const TranslateClientFragment = ({ message }: Props) => { + return <>{_(message)} +} + +export default TranslateClientFragment diff --git a/components/auth/.PasswordInput.tsx.todo b/components/auth/.PasswordInput.tsx.todo new file mode 100644 index 0000000..a860f8c --- /dev/null +++ b/components/auth/.PasswordInput.tsx.todo @@ -0,0 +1,65 @@ + +'use client' +//https://gist.github.com/mjbalcueva/b21f39a8787e558d4c536bf68e267398 + +import { forwardRef, useState } from 'react' +import { EyeIcon, EyeOffIcon } from 'lucide-react' +import { Button } from '@/components/ui/button' +import { Input, InputProps } from '@/components/ui/input' +import { cn } from '@/lib/utils' +import { FormControl } from '@/components/ui/form' + +const PasswordInput = forwardRef( + ({ className, ...props }, ref) => { + const [showPassword, setShowPassword] = useState(false) + const disabled = props.value === '' || props.value === undefined || + props.disabled + + return (
+ + + + {/* hides browsers password toggles */} + +
+ ) + }, +) +PasswordInput.displayName = 'PasswordInput' + +export { PasswordInput } + diff --git a/components/auth/BackButton.tsx b/components/auth/BackButton.tsx new file mode 100644 index 0000000..ec06072 --- /dev/null +++ b/components/auth/BackButton.tsx @@ -0,0 +1,18 @@ +'use client' + +import { Button } from '@/components/ui/button' +import Link from 'next/link' + +type Props = { + href: string + label: string +} + +export const BackButton = ({ href, label }: Props) => { + return ( + + ) +} \ No newline at end of file diff --git a/components/auth/CardWrapper.tsx b/components/auth/CardWrapper.tsx new file mode 100644 index 0000000..b6a4f55 --- /dev/null +++ b/components/auth/CardWrapper.tsx @@ -0,0 +1,55 @@ +'use client' +import { Card, CardContent, CardFooter, CardHeader } from '@/components/ui/card' +import { Header } from '@/components/auth/Header' +import { Social } from '@/components/auth/Social' +import { BackButton } from '@/components/auth/BackButton' + +type Props = { + children: React.ReactNode + headerLabel: string + headerTitle: string + backButtonLabel: string + backButtonHref: string + showSocial?: boolean + continueWithLabel?: string +} + +export const CardWrapper = ({ + children, + headerLabel, + headerTitle, + backButtonLabel, + backButtonHref, + showSocial, + continueWithLabel, +}: Props) => { + return ( + + +
+ + + {children} + + {showSocial && +
+
+ +
+
+ {continueWithLabel} +
+
+ + {/**/} + + } + + + + + ) +} \ No newline at end of file diff --git a/components/auth/ErrorCard.tsx b/components/auth/ErrorCard.tsx new file mode 100644 index 0000000..994e4b7 --- /dev/null +++ b/components/auth/ErrorCard.tsx @@ -0,0 +1,25 @@ +'use client' + +import { CardWrapper } from '@/components/auth/CardWrapper' +import { AUTH_LOGIN_URL } from '@/config/routes' +import { useI18n } from '@/locales/client' +import { TriangleAlert } from 'lucide-react' + +const ErrorCard = () => { + const t = useI18n() + return ( + +
+ +

ssss

+
+ + ) +} + +export default ErrorCard diff --git a/components/auth/Header.tsx b/components/auth/Header.tsx new file mode 100644 index 0000000..2e07ddd --- /dev/null +++ b/components/auth/Header.tsx @@ -0,0 +1,20 @@ +import { Poppins } from 'next/font/google' +import { cn } from '@/lib/utils' + +const font = Poppins({ + subsets: ['latin'], weight: ['600'], +}) + +type Props = { + label: string, title: string +} + +export const Header = ({ label, title }: Props) => { + return ( +
+

+ 🔐 {title || 'Auth'} +

+

{label}

+
) +} \ No newline at end of file diff --git a/components/auth/LoginButton.tsx b/components/auth/LoginButton.tsx new file mode 100644 index 0000000..c2ff9cc --- /dev/null +++ b/components/auth/LoginButton.tsx @@ -0,0 +1,25 @@ +'use client' + +import { useRouter } from 'next/navigation' +import { AUTH_LOGIN_URL } from '@/config/routes' + +type Props = { + children: React.ReactNode + mode?: 'modal' | 'redirect' + asChild?: boolean +} + +const LoginButton = ({ + children, mode = 'redirect', asChild, +}: Props) => { + const router = useRouter() + const onClick = () => router.push(AUTH_LOGIN_URL) + + if (mode === 'modal') { + return TODO: Implement modal + } + + return {children} +} + +export default LoginButton diff --git a/components/auth/LoginForm.tsx b/components/auth/LoginForm.tsx new file mode 100644 index 0000000..5af821d --- /dev/null +++ b/components/auth/LoginForm.tsx @@ -0,0 +1,112 @@ +'use client' + +import { infer as zInfer } from 'zod' +import { useState, useTransition } from 'react' +import { useForm } from 'react-hook-form' +import { useSearchParams } from 'next/navigation' +import { zodResolver } from '@hookform/resolvers/zod' +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from '@/components/ui/form' +import { Input } from '@/components/ui/input' +import { CardWrapper } from '@/components/auth/CardWrapper' +import { useI18n } from '@/locales/client' +import { Button } from '@/components/ui/button' +import FormError from '@/components/FormError' +import FormSuccess from '@/components/FormSuccess' +import { login } from '@/actions/login' +import { LoginSchema } from '@/schemas' +import { AUTH_REGISTER_URL } from '@/config/routes' + +export const LoginForm = () => { + const t = useI18n() + + const searchParams = useSearchParams() + const urlError = searchParams.get('error') === 'OAuthAccountNotLinked' + ? t('auth.form.error.email_in_use') + : '' + + const [error, setError] = useState('') + const [success, setSuccess] = useState('') + const [isPending, startTransition] = useTransition() + + const form = useForm>({ + resolver: zodResolver(LoginSchema), defaultValues: { + email: '', password: '', + }, + }) + + const onSubmit = (values: zInfer) => { + setError('') + setSuccess('') + + startTransition(() => { + login(values).then((data) => { + // @ts-ignore + setError(t(data?.error)) + // @ts-ignore + setSuccess(t(data?.success)) + }) + }) + } + + return ( +
+ +
+ ( + {t('form.label.email')} + + + + + )}/> + {/*Password*/} + ( + {t('form.label.password')} + + + + + )}/> +
+ + + + + +
) +} + +//1:30:00 \ No newline at end of file diff --git a/components/auth/Navbar.tsx b/components/auth/Navbar.tsx new file mode 100644 index 0000000..d913d1d --- /dev/null +++ b/components/auth/Navbar.tsx @@ -0,0 +1,14 @@ +'use client' +//import { useScopedI18n } from '@/locales/client' +import LocaleSwitcher from '@/components/LocaleSwitcher' + +export default function Navbar () { + //const t = useScopedI18n('navbar') + + return ( + + ) +} \ No newline at end of file diff --git a/components/auth/RegisterForm.tsx b/components/auth/RegisterForm.tsx new file mode 100644 index 0000000..e2fbe1c --- /dev/null +++ b/components/auth/RegisterForm.tsx @@ -0,0 +1,123 @@ +'use client' + +import { infer as zInfer } from 'zod' +import { useState, useTransition } from 'react' +import { useForm } from 'react-hook-form' +import { zodResolver } from '@hookform/resolvers/zod' +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from '@/components/ui/form' +import { Input } from '@/components/ui/input' +import { CardWrapper } from '@/components/auth/CardWrapper' +import { useI18n } from '@/locales/client' +import { Button } from '@/components/ui/button' +import FormError from '@/components/FormError' +import FormSuccess from '@/components/FormSuccess' + +import { register } from '@/actions/register' +import { RegisterSchema } from '@/schemas' +import { AUTH_LOGIN_URL } from '@/config/routes' + +export const RegisterForm = () => { + // const [currentPassword, setCurrentPassword] = useState('') + // const [password, setPassword] = useState('') + // const [passwordConfirmation, setPasswordConfirmation] = useState('') + const [error, setError] = useState('') + const [success, setSuccess] = useState('') + const [isPending, startTransition] = useTransition() + + const t = useI18n() + + const form = useForm>({ + resolver: zodResolver(RegisterSchema), defaultValues: { + email: '', password: '', name: '', + }, + }) + + const onSubmit = (values: zInfer) => { + setError('') + setSuccess('') + + startTransition(() => { + register(values).then((data) => { + // @ts-ignore + setError(t(data?.error)) + // @ts-ignore + setSuccess(t(data?.success)) + }) + }) + } + + return ( +
+ +
+ {/*Name*/} + ( + {t('form.label.name')} + + + + + )}/> + {/*Email*/} + ( + {t('form.label.email')} + + + + + )}/> + {/*Password*/} + ( + {t('form.label.password')} + + + + + )}/> +
+ + + + + +
) +} diff --git a/components/auth/Social.tsx b/components/auth/Social.tsx new file mode 100644 index 0000000..e1171f1 --- /dev/null +++ b/components/auth/Social.tsx @@ -0,0 +1,31 @@ +'use client' + +import { FcGoogle } from 'react-icons/fc' +import { FaFacebook, FaGithub } from 'react-icons/fa' +//import { RiTwitterXLine } from 'react-icons/ri' + +import { Button } from '@/components/ui/button' +import { SignInProvider } from '@/actions/login' + +export const Social = () => { + + return ( +
+ + + {/**/} + {/**/} +
+ ) +} diff --git a/components/ui/button.tsx b/components/ui/button.tsx new file mode 100644 index 0000000..0ba4277 --- /dev/null +++ b/components/ui/button.tsx @@ -0,0 +1,56 @@ +import * as React from "react" +import { Slot } from "@radix-ui/react-slot" +import { cva, type VariantProps } from "class-variance-authority" + +import { cn } from "@/lib/utils" + +const buttonVariants = cva( + "inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50", + { + variants: { + variant: { + default: "bg-primary text-primary-foreground hover:bg-primary/90", + destructive: + "bg-destructive text-destructive-foreground hover:bg-destructive/90", + outline: + "border border-input bg-background hover:bg-accent hover:text-accent-foreground", + secondary: + "bg-secondary text-secondary-foreground hover:bg-secondary/80", + ghost: "hover:bg-accent hover:text-accent-foreground", + link: "text-primary underline-offset-4 hover:underline", + }, + size: { + default: "h-10 px-4 py-2", + sm: "h-9 rounded-md px-3", + lg: "h-11 rounded-md px-8", + icon: "h-10 w-10", + }, + }, + defaultVariants: { + variant: "default", + size: "default", + }, + } +) + +export interface ButtonProps + extends React.ButtonHTMLAttributes, + VariantProps { + asChild?: boolean +} + +const Button = React.forwardRef( + ({ className, variant, size, asChild = false, ...props }, ref) => { + const Comp = asChild ? Slot : "button" + return ( + + ) + } +) +Button.displayName = "Button" + +export { Button, buttonVariants } diff --git a/components/ui/card.tsx b/components/ui/card.tsx new file mode 100644 index 0000000..afa13ec --- /dev/null +++ b/components/ui/card.tsx @@ -0,0 +1,79 @@ +import * as React from "react" + +import { cn } from "@/lib/utils" + +const Card = React.forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ className, ...props }, ref) => ( +
+)) +Card.displayName = "Card" + +const CardHeader = React.forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ className, ...props }, ref) => ( +
+)) +CardHeader.displayName = "CardHeader" + +const CardTitle = React.forwardRef< + HTMLParagraphElement, + React.HTMLAttributes +>(({ className, ...props }, ref) => ( +

+)) +CardTitle.displayName = "CardTitle" + +const CardDescription = React.forwardRef< + HTMLParagraphElement, + React.HTMLAttributes +>(({ className, ...props }, ref) => ( +

+)) +CardDescription.displayName = "CardDescription" + +const CardContent = React.forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ className, ...props }, ref) => ( +

+)) +CardContent.displayName = "CardContent" + +const CardFooter = React.forwardRef< + HTMLDivElement, + React.HTMLAttributes +>(({ className, ...props }, ref) => ( +
+)) +CardFooter.displayName = "CardFooter" + +export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent } diff --git a/components/ui/form.tsx b/components/ui/form.tsx new file mode 100644 index 0000000..88b670b --- /dev/null +++ b/components/ui/form.tsx @@ -0,0 +1,152 @@ +import * as React from 'react' +import * as LabelPrimitive from '@radix-ui/react-label' +import { Slot } from '@radix-ui/react-slot' +import { + Controller, + ControllerProps, + FieldPath, + FieldValues, + FormProvider, + useFormContext, +} from 'react-hook-form' + +import { cn } from '@/lib/utils' +import { Label } from '@/components/ui/label' +import TranslateClientFragment from '@/components/TranslateClientFragment' + +const Form = FormProvider + +type FormFieldContextValue = FieldPath> = { + name: TName +} + +const FormFieldContext = React.createContext( + {} as FormFieldContextValue) + +const FormField = = FieldPath> ({ + ...props +}: ControllerProps) => { + return ( + + ) +} + +const useFormField = () => { + const fieldContext = React.useContext(FormFieldContext) + const itemContext = React.useContext(FormItemContext) + const { getFieldState, formState } = useFormContext() + + const fieldState = getFieldState(fieldContext.name, formState) + + if (!fieldContext) { + throw new Error('useFormField should be used within ') + } + + const { id } = itemContext + + return { + id, + name: fieldContext.name, + formItemId: `${id}-form-item`, + formDescriptionId: `${id}-form-item-description`, + formMessageId: `${id}-form-item-message`, ...fieldState, + } +} + +type FormItemContextValue = { + id: string +} + +const FormItemContext = React.createContext( + {} as FormItemContextValue) + +const FormItem = React.forwardRef>( + ({ className, ...props }, ref) => { + const id = React.useId() + + return ( +
+ ) + }) +FormItem.displayName = 'FormItem' + +const FormLabel = React.forwardRef, React.ComponentPropsWithoutRef>( + ({ className, ...props }, ref) => { + const { error, formItemId } = useFormField() + + return (