diff --git a/.env b/.env index 0db2203..69244f5 100644 --- a/.env +++ b/.env @@ -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 \ No newline at end of file +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' \ No newline at end of file diff --git a/public/favicon.ico b/public/favicon.ico index 94838e5..c75e87b 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/index.html b/public/index.html index 49fad37..5356bc6 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ - WrenchBoard + Float-Fleet @@ -36,7 +36,7 @@
- WrenchBoard + WrenchBoard Loading ...
diff --git a/public/media/auth/float-dash.png b/public/media/auth/float-dash.png new file mode 100644 index 0000000..93e94cd Binary files /dev/null and b/public/media/auth/float-dash.png differ diff --git a/public/media/logos/favicon.ico b/public/media/logos/favicon.ico index 94838e5..c75e87b 100644 Binary files a/public/media/logos/favicon.ico and b/public/media/logos/favicon.ico differ diff --git a/public/splash-screen.css b/public/splash-screen.css index 21a5103..e77227c 100644 --- a/public/splash-screen.css +++ b/public/splash-screen.css @@ -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); +} \ No newline at end of file diff --git a/src/app/modules/auth/AuthLayout.tsx b/src/app/modules/auth/AuthLayout.tsx index 25f9a5b..075eb61 100644 --- a/src/app/modules/auth/AuthLayout.tsx +++ b/src/app/modules/auth/AuthLayout.tsx @@ -39,17 +39,16 @@ const AuthLayout = () => { Home - - + Terms - - Plans + + Contact Us - - Contact Us + + About Us {/* end::Links */} @@ -73,8 +72,8 @@ const AuthLayout = () => { {/* begin::Image */} {/* end::Image */} diff --git a/src/app/modules/auth/components/Login.tsx b/src/app/modules/auth/components/Login.tsx index 97427d7..220ea9c 100644 --- a/src/app/modules/auth/components/Login.tsx +++ b/src/app/modules/auth/components/Login.tsx @@ -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 */}
-

Sign In

-
Your Social Campaigns
+ {/*

Sign In

*/} + Logo
{/* begin::Heading */} @@ -120,18 +121,6 @@ export function Login() { {/* end::Separator */} - {formik.status ? ( -
-
{formik.status}
-
- ) : ( -
-
- Any text before login box - please configure -
-
- )} - {/* begin::Form group */}