From 0b239a02f0b5e7fb418179ae44ad9f62ef3731da Mon Sep 17 00:00:00 2001 From: DIKSHIT MORADIYA Date: Fri, 4 Jul 2025 12:19:41 +0530 Subject: [PATCH 1/2] fix lock file --- .github/workflows/prod.yml | 2 +- package.json | 2 -- yarn.lock | 15 +-------------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index 2e4fdbd..3fbe49d 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -32,7 +32,7 @@ jobs: corepack enable yarn set version 4.9.1 yarn - yarn build-stage + yarn build - name: 📂 Deploy to Server uses: easingthemes/ssh-deploy@main diff --git a/package.json b/package.json index c315c8c..f023bda 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "scripts": { "start": "vite", "build": "vite build", - "build-stage": "env-cmd -f .env.qa vite build", "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"", "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx}\"", "prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"", @@ -38,7 +37,6 @@ "@eslint/eslintrc": "3.3.1", "@eslint/js": "9.15.0", "@vitejs/plugin-react": "4.3.4", - "env-cmd": "10.1.0", "eslint": "9.15.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-jsx-a11y": "6.10.2", diff --git a/yarn.lock b/yarn.lock index 87254ec..5713183 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1580,7 +1580,7 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.5, cross-spawn@npm:^7.0.6": +"cross-spawn@npm:^7.0.5, cross-spawn@npm:^7.0.6": version: 7.0.6 resolution: "cross-spawn@npm:7.0.6" dependencies: @@ -1652,7 +1652,6 @@ __metadata: axios: "npm:1.7.9" bootstrap: "npm:5.3.3" chance: "npm:1.1.12" - env-cmd: "npm:10.1.0" eslint: "npm:9.15.0" eslint-config-prettier: "npm:9.1.0" eslint-plugin-jsx-a11y: "npm:6.10.2" @@ -1807,18 +1806,6 @@ __metadata: languageName: node linkType: hard -"env-cmd@npm:10.1.0": - version: 10.1.0 - resolution: "env-cmd@npm:10.1.0" - dependencies: - commander: "npm:^4.0.0" - cross-spawn: "npm:^7.0.0" - bin: - env-cmd: bin/env-cmd.js - checksum: 10c0/8ea5f4205bed83f39ea0ef0eb94d52a47bc815302c55779fb6c38346ca9284df1855f0847c8f5c702554f7f01e3575d171f12cffd13a1bada01961815842abe3 - languageName: node - linkType: hard - "env-paths@npm:^2.2.0": version: 2.2.1 resolution: "env-paths@npm:2.2.1" From db5ca2b49391384a2e0daeee8d1b271b1778cd52 Mon Sep 17 00:00:00 2001 From: DIKSHIT MORADIYA Date: Fri, 4 Jul 2025 12:51:50 +0530 Subject: [PATCH 2/2] fix routing issue --- .env | 2 +- src/menu-items/pages.jsx | 4 +- src/routes/NavigationRoutes.jsx | 12 +--- src/routes/PagesRoutes.jsx | 27 ++------ src/sections/auth/AuthLogin.jsx | 4 +- src/sections/auth/AuthResetPassword.jsx | 61 ------------------- src/views/auth/login/Login.jsx | 2 +- src/views/auth/register/Register.jsx | 2 +- .../auth/reset-password/ResetPassword.jsx | 24 -------- 9 files changed, 14 insertions(+), 124 deletions(-) delete mode 100644 src/sections/auth/AuthResetPassword.jsx delete mode 100644 src/views/auth/reset-password/ResetPassword.jsx diff --git a/.env b/.env index c1934a4..1eab438 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ VITE_APP_VERSION=v4.0.0 GENERATE_SOURCEMAP=false PUBLIC_URL = https://codedthemes.com/demos/admin-templates/datta-able/react/free/ -VITE_APP_BASE_NAME= demos/admin-templates/datta-able/react/free +VITE_APP_BASE_NAME= /demos/admin-templates/datta-able/react/free ## Google Map Key VITE_APP_GOOGLE_MAPS_API_KEY=AIzaSyAXv4RQK39CskcIB8fvM1Q7XCofZcLxUXw diff --git a/src/menu-items/pages.jsx b/src/menu-items/pages.jsx index 3e7fefc..e3787dd 100644 --- a/src/menu-items/pages.jsx +++ b/src/menu-items/pages.jsx @@ -15,14 +15,14 @@ const pages = { id: 'login', title: 'Login', type: 'item', - url: '/auth/login', + url: '/login', target: true }, { id: 'register', title: 'Register', type: 'item', - url: '/auth/register', + url: '/register', target: true } ] diff --git a/src/routes/NavigationRoutes.jsx b/src/routes/NavigationRoutes.jsx index ec3a2df..b0e0b17 100644 --- a/src/routes/NavigationRoutes.jsx +++ b/src/routes/NavigationRoutes.jsx @@ -18,17 +18,7 @@ const NavigationRoutes = { children: [ { path: '/', - element: , - children: [{ path: 'default', element: }] - }, - { - path: 'dashboard', - children: [ - { - path: 'default', - element: - } - ] + element: } ] } diff --git a/src/routes/PagesRoutes.jsx b/src/routes/PagesRoutes.jsx index 734aef6..89149a0 100644 --- a/src/routes/PagesRoutes.jsx +++ b/src/routes/PagesRoutes.jsx @@ -11,9 +11,6 @@ const LoginPage = Loadable(lazy(() => import('views/auth/login/Login'))); // render - register pages const RegisterPage = Loadable(lazy(() => import('views/auth/register/Register'))); -// render - reset password pages -const ResetPasswordPage = Loadable(lazy(() => import('views/auth/reset-password/ResetPassword'))); - // ==============================|| AUTH PAGES ROUTING ||============================== // const PagesRoutes = { @@ -21,27 +18,15 @@ const PagesRoutes = { children: [ { path: '/', - element: - }, - { element: , children: [ { - path: 'auth', - children: [ - { - path: 'login', - element: - }, - { - path: 'register', - element: - }, - { - path: 'reset-password', - element: - } - ] + path: 'login', + element: + }, + { + path: 'register', + element: } ] } diff --git a/src/sections/auth/AuthLogin.jsx b/src/sections/auth/AuthLogin.jsx index e874453..3752e9c 100644 --- a/src/sections/auth/AuthLogin.jsx +++ b/src/sections/auth/AuthLogin.jsx @@ -20,7 +20,7 @@ import DarkLogo from 'assets/images/logo-dark.svg'; // ==============================|| AUTH LOGIN FORM ||============================== // -export default function AuthLoginForm({ className, link, resetLink }) { +export default function AuthLoginForm({ className, link }) { const [showPassword, setShowPassword] = useState(false); const { @@ -82,7 +82,7 @@ export default function AuthLoginForm({ className, link, resetLink }) { className={`input-primary ${className ? className : 'text-muted'} `} /> - + Forgot Password? diff --git a/src/sections/auth/AuthResetPassword.jsx b/src/sections/auth/AuthResetPassword.jsx deleted file mode 100644 index 5dfd4e8..0000000 --- a/src/sections/auth/AuthResetPassword.jsx +++ /dev/null @@ -1,61 +0,0 @@ -import PropTypes from 'prop-types'; -// react-bootstrap -import Button from 'react-bootstrap/Button'; -import Form from 'react-bootstrap/Form'; -import Image from 'react-bootstrap/Image'; - -// third-party -import { useForm } from 'react-hook-form'; - -// project-imports -import MainCard from 'components/MainCard'; -import { emailSchema } from 'utils/validationSchema'; - -// assets -import DarkLogo from 'assets/images/logo-dark.svg'; - -// ==============================|| AUTH RESET PASSWORD FORM ||============================== // - -export default function AuthResetPasswordForm({ className }) { - const { - register, - handleSubmit, - reset, - formState: { errors } - } = useForm(); - - const onSubmit = () => { - reset(); - }; - - return ( - -
- - img - -
-
-

Reset Password

- - Email - - {errors.email?.message} - -
- -
-
- - ); -} - -AuthResetPasswordForm.propTypes = { className: PropTypes.string }; diff --git a/src/views/auth/login/Login.jsx b/src/views/auth/login/Login.jsx index d2c8e56..79c132b 100644 --- a/src/views/auth/login/Login.jsx +++ b/src/views/auth/login/Login.jsx @@ -15,7 +15,7 @@ export default function LoginPage() { - + diff --git a/src/views/auth/register/Register.jsx b/src/views/auth/register/Register.jsx index 1cdb7d8..f29d42d 100644 --- a/src/views/auth/register/Register.jsx +++ b/src/views/auth/register/Register.jsx @@ -15,7 +15,7 @@ export default function RegisterPage() { - + diff --git a/src/views/auth/reset-password/ResetPassword.jsx b/src/views/auth/reset-password/ResetPassword.jsx deleted file mode 100644 index 181bd27..0000000 --- a/src/views/auth/reset-password/ResetPassword.jsx +++ /dev/null @@ -1,24 +0,0 @@ -// project-imports -import AuthResetPasswordForm from 'sections/auth/AuthResetPassword'; - -// ===========================|| AUTH - RESET PASSWORD V1 ||=========================== // - -export default function ResetPasswordPage() { - return ( -
-
-
-
-
- - - - -
- -
-
-
-
- ); -}