diff --git a/.env b/.env index 0db2203..8f3e6eb 100644 --- a/.env +++ b/.env @@ -13,4 +13,8 @@ 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_SITE_CONTACT_US=https://www.float.sg/contact +REACT_APP_SITE_TERMS=https://www.float.sg/terms +REACT_APP_SITE_ABOUT_US=https://www.float.sg/about \ No newline at end of file diff --git a/public/index.html b/public/index.html index 49fad37..b963a0a 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ - WrenchBoard + Float diff --git a/public/media/logos/favicon.ico b/public/media/logos/favicon.ico index 94838e5..0d5e309 100644 Binary files a/public/media/logos/favicon.ico and b/public/media/logos/favicon.ico differ diff --git a/public/media/logos/favicon1.ico b/public/media/logos/favicon1.ico new file mode 100644 index 0000000..94838e5 Binary files /dev/null and b/public/media/logos/favicon1.ico differ diff --git a/public/media/misc/auth-bg-new.png b/public/media/misc/auth-bg-new.png new file mode 100644 index 0000000..11b4afd Binary files /dev/null and b/public/media/misc/auth-bg-new.png differ diff --git a/public/media/misc/auth-bg-new.svg b/public/media/misc/auth-bg-new.svg new file mode 100644 index 0000000..9eaf4d9 --- /dev/null +++ b/public/media/misc/auth-bg-new.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/app/modules/auth/AuthLayout.tsx b/src/app/modules/auth/AuthLayout.tsx index 25f9a5b..b9463b6 100644 --- a/src/app/modules/auth/AuthLayout.tsx +++ b/src/app/modules/auth/AuthLayout.tsx @@ -40,16 +40,16 @@ const AuthLayout = () => { - + Terms - - Plans + + Contact Us - - Contact Us + + About Us {/* end::Links */} @@ -60,45 +60,59 @@ const AuthLayout = () => { {/* begin::Aside */}
+ {/* overlay div section */} + {/*
*/} {/* begin::Content */} -
+
{/* begin::Logo */} - + {/* Float Mobility - + */} {/* end::Logo */} {/* begin::Image */} - + /> */} + {/* */} {/* end::Image */} +
+ {/* begin::Title */} +

+ Fast, Efficient and Productive +

+ {/* end::Title */} - {/* begin::Title */} -

- Fast, Efficient and Productive -

- {/* end::Title */} - - {/* begin::Text */} -
- In this kind of post,{' '} - - the blogger - - introduces a person they’ve interviewed
and provides some background information - about - - the interviewee - - and their
work following this is a transcript of the interview. + {/* begin::Text */} + {/*
+ In this kind of post,{' '} + + the blogger + + introduces a person they’ve interviewed
and provides some background information + about + + the interviewee + + and their
work following this is a transcript of the interview. +
*/} +
+

Improve quality of life for the world's population by building the future global transportation platform.

+

Increasing accessibility and personal choices, while reducing travel time traffic congestion, pollution, and loss to local GDP

+
+ {/* end::Text */}
- {/* end::Text */}
{/* end::Content */}
diff --git a/src/app/modules/auth/components/ForgotPassword.tsx b/src/app/modules/auth/components/ForgotPassword.tsx index 4c00229..7f0867a 100644 --- a/src/app/modules/auth/components/ForgotPassword.tsx +++ b/src/app/modules/auth/components/ForgotPassword.tsx @@ -4,6 +4,7 @@ import clsx from 'clsx' import {Link} from 'react-router-dom' import {useFormik} from 'formik' import {requestPassword} from '../core/_requests' +import { toAbsoluteUrl } from '../../../../_metronic/helpers' const initialValues = { email: 'admin@demo.com', @@ -51,7 +52,8 @@ export function ForgotPassword() { >
{/* begin::Title */} -

Forgot Password ?

+ {/*

Forgot Password ?

*/} + Float Mobility {/* end::Title */} {/* begin::Link */} diff --git a/src/app/modules/auth/components/Login.tsx b/src/app/modules/auth/components/Login.tsx index 97427d7..c53ff11 100644 --- a/src/app/modules/auth/components/Login.tsx +++ b/src/app/modules/auth/components/Login.tsx @@ -64,8 +64,8 @@ export function Login() { > {/* begin::Heading */}
-

Sign In

-
Your Social Campaigns
+ {/*

Sign In

*/} + Float Mobility
{/* begin::Heading */} @@ -125,11 +125,12 @@ export function Login() {
{formik.status}
) : ( -
-
- Any text before login box - please configure -
-
+ //
+ //
+ // Any text before login box - please configure + //
+ //
+ null )} {/* begin::Form group */} diff --git a/src/app/modules/auth/components/Registration.tsx b/src/app/modules/auth/components/Registration.tsx index c894349..3b76078 100644 --- a/src/app/modules/auth/components/Registration.tsx +++ b/src/app/modules/auth/components/Registration.tsx @@ -89,10 +89,11 @@ export function Registration() { {/* begin::Heading */}
{/* begin::Title */} -

Sign Up

+ {/*

Sign Up

*/} + Float Mobility {/* end::Title */} -
Your Social Campaigns
+ {/*
Your Social Campaigns
*/}
{/* end::Heading */}