Skip to content

Commit cc9411d

Browse files
authored
Bug fixes (#35)
* fix lock file * fix routing issue
1 parent c3a3500 commit cc9411d

File tree

9 files changed

+14
-124
lines changed

9 files changed

+14
-124
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ VITE_APP_VERSION=v4.0.0
22
GENERATE_SOURCEMAP=false
33

44
PUBLIC_URL = https://codedthemes.com/demos/admin-templates/datta-able/react/free/
5-
VITE_APP_BASE_NAME= demos/admin-templates/datta-able/react/free
5+
VITE_APP_BASE_NAME= /demos/admin-templates/datta-able/react/free
66

77
## Google Map Key
88
VITE_APP_GOOGLE_MAPS_API_KEY=AIzaSyAXv4RQK39CskcIB8fvM1Q7XCofZcLxUXw

src/menu-items/pages.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ const pages = {
1515
id: 'login',
1616
title: 'Login',
1717
type: 'item',
18-
url: '/auth/login',
18+
url: '/login',
1919
target: true
2020
},
2121
{
2222
id: 'register',
2323
title: 'Register',
2424
type: 'item',
25-
url: '/auth/register',
25+
url: '/register',
2626
target: true
2727
}
2828
]

src/routes/NavigationRoutes.jsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,7 @@ const NavigationRoutes = {
1818
children: [
1919
{
2020
path: '/',
21-
element: <DefaultPages />,
22-
children: [{ path: 'default', element: <DefaultPages /> }]
23-
},
24-
{
25-
path: 'dashboard',
26-
children: [
27-
{
28-
path: 'default',
29-
element: <DefaultPages />
30-
}
31-
]
21+
element: <DefaultPages />
3222
}
3323
]
3424
}

src/routes/PagesRoutes.jsx

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,22 @@ const LoginPage = Loadable(lazy(() => import('views/auth/login/Login')));
1111
// render - register pages
1212
const RegisterPage = Loadable(lazy(() => import('views/auth/register/Register')));
1313

14-
// render - reset password pages
15-
const ResetPasswordPage = Loadable(lazy(() => import('views/auth/reset-password/ResetPassword')));
16-
1714
// ==============================|| AUTH PAGES ROUTING ||============================== //
1815

1916
const PagesRoutes = {
2017
path: '/',
2118
children: [
2219
{
2320
path: '/',
24-
element: <DashboardLayout />
25-
},
26-
{
2721
element: <AuthLayout />,
2822
children: [
2923
{
30-
path: 'auth',
31-
children: [
32-
{
33-
path: 'login',
34-
element: <LoginPage />
35-
},
36-
{
37-
path: 'register',
38-
element: <RegisterPage />
39-
},
40-
{
41-
path: 'reset-password',
42-
element: <ResetPasswordPage />
43-
}
44-
]
24+
path: 'login',
25+
element: <LoginPage />
26+
},
27+
{
28+
path: 'register',
29+
element: <RegisterPage />
4530
}
4631
]
4732
}

src/sections/auth/AuthLogin.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import DarkLogo from 'assets/images/logo-dark.svg';
2020

2121
// ==============================|| AUTH LOGIN FORM ||============================== //
2222

23-
export default function AuthLoginForm({ className, link, resetLink }) {
23+
export default function AuthLoginForm({ className, link }) {
2424
const [showPassword, setShowPassword] = useState(false);
2525

2626
const {
@@ -82,7 +82,7 @@ export default function AuthLoginForm({ className, link, resetLink }) {
8282
className={`input-primary ${className ? className : 'text-muted'} `}
8383
/>
8484
</Form.Group>
85-
<a href={resetLink ?? '/'} className={`text-secondary f-w-400 mb-0 ${className}`}>
85+
<a href="#!" className={`text-secondary f-w-400 mb-0 ${className}`}>
8686
Forgot Password?
8787
</a>
8888
</Stack>

src/sections/auth/AuthResetPassword.jsx

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/views/auth/login/Login.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function LoginPage() {
1515
<span className="r s"></span>
1616
<span className="r"></span>
1717
</div>
18-
<AuthLoginForm link="/auth/register" resetLink="/auth/reset-password" />
18+
<AuthLoginForm link="/register" />
1919
</div>
2020
</div>
2121
</div>

src/views/auth/register/Register.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function RegisterPage() {
1515
<span className="r s"></span>
1616
<span className="r"></span>
1717
</div>
18-
<AuthRegisterForm link="/auth/login" />
18+
<AuthRegisterForm link="/login" />
1919
</div>
2020
</div>
2121
</div>

src/views/auth/reset-password/ResetPassword.jsx

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)