Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix type definition #44

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage
Expand All @@ -24,12 +25,12 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

# env files
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
5 changes: 2 additions & 3 deletions src/app/(app)/Header.js → app/(app)/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
const Header = ({ title }) => {
const Header = ({ title }: { title: string}) => {
return (
<header className="bg-white shadow">
<div className="max-w-7xl mx-auto py-6 px-4 sm:px-6 lg:px-8">

<h2 className="font-semibold text-xl text-gray-800 leading-tight">
{title}
</h2>
Expand All @@ -11,4 +10,4 @@ const Header = ({ title }) => {
)
}

export default Header
export default Header
File renamed without changes.
5 changes: 3 additions & 2 deletions src/app/(app)/Navigation.js → app/(app)/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import { DropdownButton } from '@/components/DropdownLink'
import { useAuth } from '@/hooks/auth'
import { usePathname } from 'next/navigation'
import { useState } from 'react'
import { User } from '@/lib/definitions'

const Navigation = ({ user }) => {
const Navigation = ({ user }: { user: User }) => {
const { logout } = useAuth()

const [open, setOpen] = useState(false)
Expand Down Expand Up @@ -154,4 +155,4 @@ const Navigation = ({ user }) => {
)
}

export default Navigation
export default Navigation
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ const Dashboard = () => {
)
}

export default Dashboard
export default Dashboard
6 changes: 5 additions & 1 deletion src/app/(app)/layout.js → app/(app)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ import { useAuth } from '@/hooks/auth'
import Navigation from '@/app/(app)/Navigation'
import Loading from '@/app/(app)/Loading'

const AppLayout = ({ children, header }) => {
const AppLayout = ({
children,
}: Readonly<{
children: React.ReactNode
}>) => {
const { user } = useAuth({ middleware: 'auth' })

if (!user) {
Expand Down
8 changes: 7 additions & 1 deletion src/app/(auth)/AuthCard.js → app/(auth)/AuthCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
const AuthCard = ({ logo, children }) => (
const AuthCard = ({
logo,
children,
}: Readonly<{
logo: React.ReactNode,
children: React.ReactNode,
}>) => (
<div className="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100">
<div>{logo}</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
const AuthSessionStatus = ({ status, className, ...props }) => (
const AuthSessionStatus = ({
status,
className,
...props
}: {
status: string | null
} & React.HTMLAttributes<HTMLDivElement>): JSX.Element | null => (
<>
{status && (
<div
Expand Down
9 changes: 9 additions & 0 deletions app/(auth)/api/csrf/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { fetchData } from '@/lib/fetch';
import { type NextRequest } from 'next/server'

export async function GET(request: NextRequest) {
return await fetchData({
path: '/sanctum/csrf-cookie',
request: request,
})
}
13 changes: 13 additions & 0 deletions app/(auth)/api/forgot-password/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { fetchData } from '@/lib/fetch'
import { type NextRequest } from 'next/server'

export async function POST(request: NextRequest) {
const formData = await request.json()

return await fetchData({
path: '/forgot-password',
request: request,
method: 'POST',
formData: formData
})
}
12 changes: 12 additions & 0 deletions app/(auth)/api/login/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { fetchData } from '@/lib/fetch';
import { type NextRequest } from 'next/server'

export async function POST(request: NextRequest) {
const formData = await request.json();
return await fetchData({
path: '/login',
request: request,
method: 'POST',
formData: formData
});
}
10 changes: 10 additions & 0 deletions app/(auth)/api/logout/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { fetchData } from '@/lib/fetch'
import { type NextRequest } from 'next/server'

export async function POST(request: NextRequest) {
return await fetchData({
path: '/logout',
request: request,
method: 'POST',
});
}
12 changes: 12 additions & 0 deletions app/(auth)/api/register/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { fetchData } from '@/lib/fetch'
import { type NextRequest } from 'next/server'

export async function POST(request: NextRequest) {
const formData = await request.json()
return await fetchData({
path: '/register',
request: request,
method: 'POST',
formData: formData,
});
}
12 changes: 12 additions & 0 deletions app/(auth)/api/reset-password/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { fetchData } from '@/lib/fetch'
import { type NextRequest } from 'next/server'

export async function POST(request: NextRequest) {
const formData = await request.json()
return await fetchData({
path: '/reset-password',
request: request,
method: 'POST',
formData: formData,
});
}
9 changes: 9 additions & 0 deletions app/(auth)/api/user/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { fetchData } from '@/lib/fetch'
import { type NextRequest } from 'next/server'

export async function GET(request: NextRequest) {
return await fetchData({
path: '/api/user',
request: request
});
}
10 changes: 10 additions & 0 deletions app/(auth)/api/verification/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { fetchData } from '@/lib/fetch'
import { type NextRequest } from 'next/server'

export async function POST(request: NextRequest) {
return await fetchData({
path: '/email/verification-notification',
request: request,
method: 'POST'
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Input from '@/components/Input'
import InputError from '@/components/InputError'
import Label from '@/components/Label'
import { useAuth } from '@/hooks/auth'
import { useState } from 'react'
import { FormEvent, useState } from 'react'
import AuthSessionStatus from '@/app/(auth)/AuthSessionStatus'

const Page = () => {
Expand All @@ -15,10 +15,10 @@ const Page = () => {
})

const [email, setEmail] = useState('')
const [errors, setErrors] = useState([])
const [status, setStatus] = useState(null)
const [errors, setErrors] = useState<{ [key: string]: string[] }>({})
const [status, setStatus] = useState<string | null>(null)

const submitForm = event => {
const submitForm = (event: FormEvent<HTMLFormElement>) => {
event.preventDefault()

forgotPassword({ email, setErrors, setStatus })
Expand Down
6 changes: 5 additions & 1 deletion src/app/(auth)/layout.js → app/(auth)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ export const metadata = {
title: 'Laravel',
}

const Layout = ({ children }) => {
const Layout = ({
children,
}: Readonly<{
children: React.ReactNode
}>) => {
return (
<div>
<div className="font-sans text-gray-900 antialiased">
Expand Down
23 changes: 14 additions & 9 deletions src/app/(auth)/login/page.js → app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import InputError from '@/components/InputError'
import Label from '@/components/Label'
import Link from 'next/link'
import { useAuth } from '@/hooks/auth'
import { useEffect, useState } from 'react'
import { useRouter } from 'next/navigation'
import { FormEvent, useEffect, useState } from 'react'
import { useSearchParams } from 'next/navigation'
import AuthSessionStatus from '@/app/(auth)/AuthSessionStatus'

const Login = () => {
const router = useRouter()
const searchParams = useSearchParams()

const { login } = useAuth({
middleware: 'guest',
Expand All @@ -20,19 +20,24 @@ const Login = () => {

const [email, setEmail] = useState('')
const [password, setPassword] = useState('')
const [shouldRemember, setShouldRemember] = useState(false)
const [errors, setErrors] = useState([])
const [status, setStatus] = useState(null)
const [shouldRemember, setShouldRemember] = useState<boolean>(false)
const [errors, setErrors] = useState<{ [key: string]: string[] }>({})
const [status, setStatus] = useState<string | null>(null)

useEffect(() => {
if (router.reset?.length > 0 && errors.length === 0) {
setStatus(atob(router.reset))
const resetParam = searchParams.get('reset')
if (
resetParam &&
resetParam.length > 0 &&
Object.keys(errors).length === 0
) {
setStatus(atob(resetParam))
} else {
setStatus(null)
}
})

const submitForm = async event => {
const submitForm = async (event: FormEvent<HTMLFormElement>) => {
event.preventDefault()

login({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Input from '@/components/Input'
import InputError from '@/components/InputError'
import Label from '@/components/Label'
import { useAuth } from '@/hooks/auth'
import { useEffect, useState } from 'react'
import { FormEvent, useEffect, useState } from 'react'
import { useSearchParams } from 'next/navigation'
import AuthSessionStatus from '@/app/(auth)/AuthSessionStatus'

Expand All @@ -17,10 +17,10 @@ const PasswordReset = () => {
const [email, setEmail] = useState('')
const [password, setPassword] = useState('')
const [passwordConfirmation, setPasswordConfirmation] = useState('')
const [errors, setErrors] = useState([])
const [status, setStatus] = useState(null)
const [errors, setErrors] = useState<{ [key: string]: string[] }>({})
const [status, setStatus] = useState<string | null>(null)

const submitForm = event => {
const submitForm = (event: FormEvent<HTMLFormElement>) => {
event.preventDefault()

resetPassword({
Expand All @@ -33,7 +33,8 @@ const PasswordReset = () => {
}

useEffect(() => {
setEmail(searchParams.get('email'))
const emailParam = searchParams.get('email')
if (emailParam) setEmail(emailParam)
}, [searchParams.get('email')])

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import InputError from '@/components/InputError'
import Label from '@/components/Label'
import Link from 'next/link'
import { useAuth } from '@/hooks/auth'
import { useState } from 'react'
import { FormEvent, useState } from 'react'

const Page = () => {
const { register } = useAuth({
Expand All @@ -18,9 +18,9 @@ const Page = () => {
const [email, setEmail] = useState('')
const [password, setPassword] = useState('')
const [passwordConfirmation, setPasswordConfirmation] = useState('')
const [errors, setErrors] = useState([])
const [errors, setErrors] = useState<{ [key: string]: string[] }>({})

const submitForm = event => {
const submitForm = (event: FormEvent<HTMLFormElement>) => {
event.preventDefault()

register({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const Page = () => {
redirectIfAuthenticated: '/dashboard',
})

const [status, setStatus] = useState(null)
const [status, setStatus] = useState<string | null>(null)

return (
<>
Expand Down
2 changes: 1 addition & 1 deletion src/app/LoginLinks.js → app/LoginLinks.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import Link from 'next/link'
import { useAuth } from '@/hooks/auth'
import Link from 'next/link'

const LoginLinks = () => {
const { user } = useAuth({ middleware: 'guest' })
Expand Down
Binary file added app/favicon.ico
Binary file not shown.
File renamed without changes.
9 changes: 7 additions & 2 deletions src/app/layout.js → app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import type { Metadata } from 'next'
import '@/app/global.css'

export const metadata = {
export const metadata: Metadata = {
title: 'Laravel',
}
const RootLayout = ({ children }) => {
const RootLayout = ({
children,
}: Readonly<{
children: React.ReactNode
}>) => {
return (
<html lang="en">
<body className="antialiased">{children}</body>
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion src/app/page.js → app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Metadata } from 'next'
import LoginLinks from '@/app/LoginLinks'

export const metadata = {
export const metadata: Metadata = {
title: 'Laravel',
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const ApplicationLogo = props => (
import { SVGProps } from "react"

const ApplicationLogo: React.FC<SVGProps<SVGSVGElement>> = props => (
<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {...props}>
<path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z" />
</svg>
Expand Down
6 changes: 5 additions & 1 deletion src/components/Button.js → components/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
const Button = ({ type = 'submit', className, ...props }) => (
const Button = ({
type = 'submit',
className,
...props
}: React.ButtonHTMLAttributes<HTMLButtonElement>) => (
<button
type={type}
className={`${className} inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700 active:bg-gray-900 focus:outline-none focus:border-gray-900 focus:ring ring-gray-300 disabled:opacity-25 transition ease-in-out duration-150`}
Expand Down
Loading