Auth customisation #1

Merged
tokslaw merged 1 commits from auth-customization into master 2023-04-05 12:51:22 +00:00
8 changed files with 22 additions and 26 deletions
+4 -1
View File
@@ -13,4 +13,7 @@ REACT_APP_PURCHASE_URL=https://themeforest.net/item/metronic-responsive-admin-da
REACT_APP_PREVIEW_URL=https://preview.keenthemes.com/metronic8/react/demo1/
REACT_APP_PREVIEW_REACT_URL=https://preview.keenthemes.com/metronic8/react
REACT_APP_PREVIEW_DOCS_URL=https://preview.keenthemes.com/metronic8/react/docs
REACT_APP_THEME_API_URL=https://preview.keenthemes.com/theme-api/api
REACT_APP_THEME_API_URL=https://preview.keenthemes.com/theme-api/api
REACT_APP_TERMS_LINK='https://www.float.sg/terms'
REACT_APP_CONTACT_LINK='https://www.float.sg/contact'
REACT_APP_ABOUT_LINK='https://www.float.sg/about'
Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 15 KiB

+2 -2
View File
@@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" />
<meta name="description" content="Metronic React Demo 1" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Inter:300,400,500,600,700">
<title>WrenchBoard</title>
<title>Float-Fleet</title>
<link rel="shortcut icon" href="%PUBLIC_URL%/media/logos/favicon.ico" />
<link rel="stylesheet" id="layout-styles-anchor" href="%PUBLIC_URL%/splash-screen.css" />
</head>
@@ -36,7 +36,7 @@
<div id="root"></div>
<div id="splash-screen" class="splash-screen">
<img src="%PUBLIC_URL%/media/logos/default-small.svg" alt="WrenchBoard" />
<img src="%PUBLIC_URL%/media/logos/favicon.ico" alt="WrenchBoard" />
<span>Loading ...</span>
</div>
<div id="root-modals"></div>
Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 15 KiB

+5
View File
@@ -41,3 +41,8 @@ body {
[data-theme="dark"] .splash-screen span {
color: #92929F;
}
.auth-aside{
border-radius: 15px;
box-shadow: 0 8px 8px -4px rgb(38, 42, 43);
}
+7 -8
View File
@@ -39,17 +39,16 @@ const AuthLayout = () => {
Home
</a>
<a href='#' className='px-5' target='_blank'>
<a href={process.env.REACT_APP_TERMS_LINK} className='px-5' target='_blank'>
Terms
</a>
<a href='#' className='px-5' target='_blank'>
Plans
<a href={process.env.REACT_APP_CONTACT_LINK} className='px-5' target='_blank'>
Contact Us
</a>
<a href='#' className='px-5' target='_blank'>
Contact Us
<a href={process.env.REACT_APP_ABOUT_LINK} className='px-5' target='_blank'>
About Us
</a>
</div>
{/* end::Links */}
@@ -73,8 +72,8 @@ const AuthLayout = () => {
{/* begin::Image */}
<img
className='mx-auto w-275px w-md-50 w-xl-500px mb-10 mb-lg-20'
src={toAbsoluteUrl('/media/misc/auth-screens.png')}
className='mx-auto w-275px w-md-50 w-xl-500px mb-10 mb-lg-20 auth-aside'
src={toAbsoluteUrl('/media/auth/float-dash.png')}
alt=''
/>
{/* end::Image */}
+4 -15
View File
@@ -7,6 +7,7 @@ import {useFormik} from 'formik'
import {getUserByToken, login} from '../core/_requests'
import {toAbsoluteUrl} from '../../../../_metronic/helpers'
import {useAuth} from '../core/Auth'
// import Logo from '../../../../../public/media/logos/favicon.ico'
const loginSchema = Yup.object().shape({
email: Yup.string()
@@ -21,7 +22,7 @@ const loginSchema = Yup.object().shape({
})
const initialValues = {
email: 'admin@demo.com',
email: 'johndoe@email.com',
password: 'demo',
}
@@ -64,8 +65,8 @@ export function Login() {
>
{/* begin::Heading */}
<div className='text-center mb-11'>
<h1 className='text-dark fw-bolder mb-3'>Sign In</h1>
<div className='text-gray-500 fw-semibold fs-6'>Your Social Campaigns</div>
{/* <h1 className='text-dark fw-bolder mb-3'>Sign In</h1> */}
<img alt='Logo' src={toAbsoluteUrl('/media/logos/favicon.ico')} />
</div>
{/* begin::Heading */}
@@ -120,18 +121,6 @@ export function Login() {
</div>
{/* end::Separator */}
{formik.status ? (
<div className='mb-lg-15 alert alert-danger'>
<div className='alert-text font-weight-bold'>{formik.status}</div>
</div>
) : (
<div className='mb-10 bg-light-info p-8 rounded'>
<div className='text-info'>
Any text before login box - please configure
</div>
</div>
)}
{/* begin::Form group */}
<div className='fv-row mb-8'>
<label className='form-label fs-6 fw-bolder text-dark'>Email</label>