feat: fix conflic
This commit is contained in:
@@ -11,7 +11,7 @@ export default function Banner() {
|
||||
className="mt-2 h-full py-2"
|
||||
>
|
||||
<img
|
||||
src={'/public/images/banner.png'}
|
||||
src={'/images/banner.png'}
|
||||
alt={APP.title}
|
||||
className="h-[70px] w-[100%] sm:h-full"
|
||||
/>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
// import { EyeIcon, EyeOffIcon } from 'lucide-react'
|
||||
import { useState, type Dispatch, type SetStateAction } from 'react'
|
||||
import { Link } from 'react-router'
|
||||
|
||||
import { EyeIcon } from '~/components/icons/eye'
|
||||
|
||||
@@ -9,10 +8,11 @@ import { Button } from './button'
|
||||
type TProperties = {
|
||||
setIsRegisterOpen: Dispatch<SetStateAction<boolean>>
|
||||
setIsLoginOpen: Dispatch<SetStateAction<boolean>>
|
||||
setIsForgetOpen: Dispatch<SetStateAction<boolean>>
|
||||
}
|
||||
|
||||
export const FormLogin = (properties: TProperties) => {
|
||||
const { setIsRegisterOpen, setIsLoginOpen } = properties
|
||||
const { setIsRegisterOpen, setIsLoginOpen, setIsForgetOpen } = properties
|
||||
const [showPassword, setShowPassword] = useState(false)
|
||||
|
||||
return (
|
||||
@@ -67,14 +67,18 @@ export const FormLogin = (properties: TProperties) => {
|
||||
</div>
|
||||
|
||||
{/* Lupa Kata Sandi */}
|
||||
<div className="mb-4 flex justify-between">
|
||||
<div className="mb-4 flex items-center justify-between text-sm">
|
||||
<span className="text-gray-600">Lupa Kata Sandi?</span>
|
||||
<Link
|
||||
to="/reset-password"
|
||||
<Button
|
||||
onClick={() => {
|
||||
setIsLoginOpen(false)
|
||||
setIsForgetOpen(true)
|
||||
}}
|
||||
className="font-semibold text-[#2E2F7C]"
|
||||
variant="link"
|
||||
>
|
||||
Reset Kata Sandi
|
||||
</Link>
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
{/* Tombol Masuk */}
|
||||
|
||||
Reference in New Issue
Block a user