Skip to content

feat: login functionality update #20

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.

Sign up for GitHub

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

Merged
sshahriazz merged 1 commit into from
Nov 11, 2025
Merged

feat: login functionality update #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 3 additions & 21 deletions apps/client/src/app/auth/login/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
'use client';

import { useState } from 'react';
import paths from 'routes/paths';
import { authClient } from '@/auth';
import { authPaths } from 'routes/paths';
import LoginForm from 'components/sections/authentications/default/LoginForm';

const Page = () => {
const [rememberMe, setRememberMe] = useState(false);

const handleLogin = async (data: any) => {
console.log(data);

const { data: loginData, error } = await authClient.signIn.email({
email: data.email,
password: data.password,
rememberMe: rememberMe,
});
console.log(loginData, error);
};

return (
<LoginForm
handleLogin={handleLogin}
signUpLink={paths.signup}
forgotPasswordLink={paths.forgotPassword}
signUpLink={authPaths.signup}
forgotPasswordLink={authPaths.forgotPassword}
socialAuth={true}
rememberDevice={true}
/>
Expand Down
27 changes: 15 additions & 12 deletions apps/client/src/components/sections/authentications/default/LoginForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use client';

import { useForm } from 'react-hook-form';
import { useRouter, useSearchParams } from 'next/navigation';
import { yupResolver } from '@hookform/resolvers/yup';
import { useRouter, useSearchParams } from 'next/navigation';
import {
Alert,
Box,
Expand All @@ -15,16 +15,15 @@ import {
TextField,
Typography,
} from '@mui/material';
import * as yup from 'yup';
import { authClient } from '@/auth';
import Grid from '@mui/material/Grid';
import SocialAuth from './SocialAuth';
import { rootPaths } from 'routes/paths';
import * as yup from 'yup';
import { Configuration, HealthApi } from '@/api';
import PasswordTextField from 'components/common/PasswordTextField';
import DefaultCredentialAlert from '../common/DefaultCredentialAlert';
import SocialAuth from './SocialAuth';

interface LoginFormProps {
handleLogin: (data: LoginFormValues) => Promise<any | undefined>;
signUpLink: string;
socialAuth?: boolean;
forgotPasswordLink?: string;
Expand All @@ -44,7 +43,6 @@ const schema = yup.object({
export type LoginFormValues = yup.InferType<typeof schema>;

const LoginForm = ({
handleLogin,
signUpLink,
forgotPasswordLink,
socialAuth = true,
Expand All @@ -69,13 +67,17 @@ const LoginForm = ({
});

const onSubmit = async (data: LoginFormValues) => {
const res = await handleLogin(data);
if (res?.ok) {
router.refresh();
const { data: loginData, error } = await authClient.signIn.email({
email: data.email,
password: data.password,
rememberMe: data.rememberMe,
});

if (loginData) {
router.push(callbackUrl ? callbackUrl : rootPaths.root);
}
if (res?.error) {
setError('root.credential', { type: 'manual', message: res.error });
if (error) {
setError('root.credential', { type: 'manual', message: error.message });
}
};

Expand Down Expand Up @@ -222,6 +224,7 @@ const LoginForm = ({
size="large"
variant="contained"
loading={isSubmitting}
loadingPosition="start"
>
Log in
</Button>
Expand All @@ -237,4 +240,4 @@ const LoginForm = ({
);
};

export default LoginForm;
export default LoginForm;
18 changes: 11 additions & 7 deletions apps/client/src/layouts/main-layout/common/ProfileMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use client';


import { PropsWithChildren, useMemo, useState } from 'react';
import { useRouter } from 'next/navigation';
import {
Expand All @@ -19,13 +18,14 @@ import {
SxProps,
Typography,
} from '@mui/material';
import { authPaths } from 'routes/paths';
import { authClient } from '@/auth';
import Menu from '@mui/material/Menu';
import { useThemeMode } from 'hooks/useThemeMode';
import { useBreakpoints } from 'providers/BreakpointsProvider';
import { useSettingsContext } from 'providers/SettingsProvider';
import paths from 'routes/paths';
import IconifyIcon from 'components/base/IconifyIcon';
import StatusAvatar from 'components/base/StatusAvatar';
import { useBreakpoints } from 'providers/BreakpointsProvider';
import { useSettingsContext } from 'providers/SettingsProvider';

interface ProfileMenuProps {
type?: 'default' | 'slim';
Expand Down Expand Up @@ -95,6 +95,12 @@ const ProfileMenu = ({ type = 'default' }: ProfileMenuProps) => {
/>
</Button>
);

const handleSignout = async () => {
await authClient.signOut();
router.push(authPaths.login);
}
Copy link

Copilot AI Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon at the end of the function declaration. JavaScript/TypeScript best practices recommend using semicolons consistently throughout the codebase.

Suggested change
}
};

Copilot uses AI. Check for mistakes.

return (
<>
{type === 'slim' && upSm ? (
Expand Down Expand Up @@ -199,9 +205,7 @@ const ProfileMenu = ({ type = 'default' }: ProfileMenuProps) => {
<Divider />
<Box sx={{ py: 1 }}>
<ProfileMenuItem
onClick={() => {
router.push(paths.defaultLoggedOut);
}}
onClick={handleSignout}
icon="material-symbols:logout-rounded"
>
Sign Out
Expand Down
10 changes: 4 additions & 6 deletions apps/client/src/routes/paths.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
export const rootPaths = {
root: '/',
pagesRoot: 'pages',
authRoot: 'authentication',
authRoot: 'auth',
authDefaultRoot: 'default',
errorRoot: 'error',
};

const paths = {
login: `/${rootPaths.authRoot}/login`,
signup: `/${rootPaths.authRoot}/signup`,
forgotPassword: `/${rootPaths.authRoot}/forgot-password`,


login: `/${rootPaths.authRoot}/${rootPaths.authDefaultRoot}/login`,
signup: `/${rootPaths.authRoot}/${rootPaths.authDefaultRoot}/signup`,
forgotPassword: `/${rootPaths.authRoot}/${rootPaths.authDefaultRoot}/forgot-password`,

notifications: `/${rootPaths.pagesRoot}/notifications`,

defaultLoggedOut: `/${rootPaths.authRoot}/default/logged-out`,
Expand Down
Loading