diff --git a/public/assets/css/default.css b/public/assets/css/default.css index 2abd37ee..db070129 100644 --- a/public/assets/css/default.css +++ b/public/assets/css/default.css @@ -30,9 +30,7 @@ width: 45px; } -.app-brand-logo-login { - width: 100px; -} + .app-brand-logo-border { border: 1px solid #d5d5d5; @@ -164,3 +162,24 @@ thead tr { border-top: 1px solid white; } + +.app-brand-logo-login { + max-width: 50px; /* default for mobile */ + height: auto; /* keep aspect ratio */ +} + + +/* Tablet and up (≥768px) */ +@media (min-width: 768px) { + .app-brand-logo-login { + max-width: 60px; + } +} + +/* Desktop and up (≥1200px) */ +@media (min-width: 1200px) { + .app-brand-logo-login { + max-width: 80px; + } +} + diff --git a/public/assets/vendor/css/core.css b/public/assets/vendor/css/core.css index 85124986..c95b2642 100644 --- a/public/assets/vendor/css/core.css +++ b/public/assets/vendor/css/core.css @@ -32541,3 +32541,6 @@ body:not(.modal-open) .layout-content-navbar .layout-navbar { var(--bs-dark-contrast) ); } +.bg-gray-60{ + background-color:var(--bs-gray-60) +} \ No newline at end of file diff --git a/src/pages/authentication/AuthWrapper.jsx b/src/pages/authentication/AuthWrapper.jsx index 5c8f0eb9..3b1ed4ca 100644 --- a/src/pages/authentication/AuthWrapper.jsx +++ b/src/pages/authentication/AuthWrapper.jsx @@ -14,7 +14,7 @@ export const AuthWrapper = ({ children }) => { to="/" className="app-brand-link gap-2" > - + marco-logo { } } return ( -
+

Forgot Password? 🔒

diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx index 30080e37..835895ae 100644 --- a/src/pages/authentication/LoginPage.jsx +++ b/src/pages/authentication/LoginPage.jsx @@ -75,7 +75,7 @@ const LoginPage = () => { }, [IsLoginWithOTP]); return ( -

+

Welcome to PMS!

@@ -93,7 +93,7 @@ const LoginPage = () => { { { return ( - -

+ // +
+

Verify Your OTP

Please enter the 4-digit code sent to your email.

@@ -209,8 +210,9 @@ const LoginWithOtp = () => { )} +
-
+ // ); }; diff --git a/src/pages/authentication/MainForgetPage.jsx b/src/pages/authentication/MainForgetPage.jsx index 1aabc1e6..b5c26528 100644 --- a/src/pages/authentication/MainForgetPage.jsx +++ b/src/pages/authentication/MainForgetPage.jsx @@ -7,9 +7,9 @@ const MainForgetPage = () => { <>
-
-
- Login image +
+
+ Login image
diff --git a/src/pages/authentication/MainLoginWithOTPPage.jsx b/src/pages/authentication/MainLoginWithOTPPage.jsx new file mode 100644 index 00000000..ea6afa82 --- /dev/null +++ b/src/pages/authentication/MainLoginWithOTPPage.jsx @@ -0,0 +1,26 @@ +import React from 'react' +import LoginWithOtp from './LoginWithOtp' + +const MainLoginWithOTPPage = () => { + return ( + <> +
+
+
+ Login image +
+
+ +
+ + ) +} + +export default MainLoginWithOTPPage \ No newline at end of file diff --git a/src/pages/authentication/MainRegisterPage.jsx b/src/pages/authentication/MainRegisterPage.jsx index 3a2ef031..bf7c42a4 100644 --- a/src/pages/authentication/MainRegisterPage.jsx +++ b/src/pages/authentication/MainRegisterPage.jsx @@ -5,10 +5,10 @@ const MainRegisterPage = () => { return ( <> -
-
-
- Login image +
+
+
+ Login image
diff --git a/src/pages/authentication/MainResetPasswordPage.jsx b/src/pages/authentication/MainResetPasswordPage.jsx new file mode 100644 index 00000000..41f9e03a --- /dev/null +++ b/src/pages/authentication/MainResetPasswordPage.jsx @@ -0,0 +1,26 @@ +import React from 'react' +import ResetPasswordPage from './ResetPassword' + +const MainResetPasswordPage = () => { + return ( + <> +
+
+
+ Login image +
+
+ +
+ + ) +} + +export default MainResetPasswordPage \ No newline at end of file diff --git a/src/pages/authentication/RegisterPage.jsx b/src/pages/authentication/RegisterPage.jsx index c3d1000f..6458248c 100644 --- a/src/pages/authentication/RegisterPage.jsx +++ b/src/pages/authentication/RegisterPage.jsx @@ -72,24 +72,25 @@ const RegisterPage = () => { return ( <> -
+
-

Adventure starts here 🚀

-

Make your app management easy and fun!

+

Adventure starts here

+

Make your app management easy and fun!

-
+
+
{
)}
-
+
{
)}
-
+
+
+
-
-
{errors.contactPerson && (
{
)}
-
+
-
-
{errors.contactNumber && (
{
)}
+