Merge branch 'float_customization' of FloatSystems/float-users into master

.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
+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

public/index.html

@@ -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</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>

src/app/modules/auth/AuthLayout.tsx

@@ -40,16 +40,16 @@ const AuthLayout = () => {
             </a>
 
 
-            <a href='#' className='px-5' target='_blank'>
+            <a href={process.env.REACT_APP_SITE_TERMS} className='px-5' target='_blank'>
               Terms
             </a>
 
-            <a href='#' className='px-5' target='_blank'>
+            <a href={process.env.REACT_APP_SITE_CONTACT_US} className='px-5' target='_blank'>
-              Plans
+              Contact Us
             </a>
 
-            <a href='#' className='px-5' target='_blank'>
+            <a href={process.env.REACT_APP_SITE_ABOUT_US} className='px-5' target='_blank'>
-              Contact Us
+              About Us
             </a>
           </div>
           {/* end::Links */}
@@ -60,45 +60,59 @@ const AuthLayout = () => {
 
       {/* begin::Aside */}
       <div
-        className='d-flex flex-lg-row-fluid w-lg-50 bgi-size-cover bgi-position-center order-1 order-lg-2'
+        className='position-relative d-flex flex-lg-row-fluid w-lg-50 order-1 order-lg-2'
-        style={{backgroundImage: `url(${toAbsoluteUrl('/media/misc/auth-bg.png')})`}}
+        // style={{backgroundImage: `url(${toAbsoluteUrl('/media/misc/auth-bg.png')})`}}
+        style={{backgroundImage: `url(${toAbsoluteUrl('/media/misc/auth-bg-new.svg')})`, backgroundRepeat: 'no-repeat', backgroundSize: 'cover', backgroundPosition: 'left top'}}
       >
+        {/* overlay div section */}
+        {/* <div className='position-absolute w-100 h-100 top-0 left-0' style={{backgroundColor: 'rgba(0, 0, 0, .4)', zIndex: '1'}}></div> */}
         {/* begin::Content */}
-        <div className='d-flex flex-column flex-center py-15 px-5 px-md-15 w-100'>
+        <div className='position-relative d-flex flex-column flex-center py-15 px-5 px-md-15 w-100'>
           {/* begin::Logo */}
-          <Link to='/' className='mb-12'>
+          {/* <Link to='/' className='mb-12'>
             <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
-          </Link>
+          </Link> */}
           {/* end::Logo */}
 
           {/* begin::Image */}
-          <img
+          {/* <img
             className='mx-auto w-275px w-md-50 w-xl-500px mb-10 mb-lg-20'
             src={toAbsoluteUrl('/media/misc/auth-screens.png')}
             alt=''
-          />
+          /> */}
+          {/* <img
+            className='mx-auto w-350px w-md-50 w-xl-500px mb-10 mb-lg-20 rounded'
+            src={toAbsoluteUrl('/media/misc/auth-bg-new.png')}
+            alt=''
+            style={{boxShadow: '0px 0px 10px white'}}
+          /> */}
           {/* end::Image */}
+          <div className='w-100 w-md-75 rounded p-3 p-lg-5' style={{backgroundColor: 'rgba(0, 0, 0, .8)', boxShadow: '0px 0px 10px white'}}>
+            {/* begin::Title */}
+            <h1 className='text-white fs-2qx fw-bolder text-center mb-7 py-3'>
+              Fast, Efficient and Productive
+            </h1>
+            {/* end::Title */}
 
-          {/* begin::Title */}
+            {/* begin::Text */}
-          <h1 className='text-white fs-2qx fw-bolder text-center mb-7'>
+            {/* <div className='text-white fs-base text-center'>
-            Fast, Efficient and Productive
+              In this kind of post,{' '}
-          </h1>
+              <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
-          {/* end::Title */}
+                the blogger
-
+              </a>
-          {/* begin::Text */}
+              introduces a person they’ve interviewed <br /> and provides some background information
-          <div className='text-white fs-base text-center'>
+              about
-            In this kind of post,{' '}
+              <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
-            <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
+                the interviewee
-              the blogger
+              </a>
-            </a>
+              and their <br /> work following this is a transcript of the interview.
-            introduces a person they’ve interviewed <br /> and provides some background information
+            </div> */}
-            about
+            <div className='text-white fs-base text-center py-3'>
-            <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
+              <p>Improve quality of life for the world's population by <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>building</a> the future global transportation platform.</p>
-              the interviewee
+              <p>Increasing accessibility and personal choices, <a href='#' className='opacity-75-hover text-warning fw-bold me-1'>while reducing</a> travel time traffic congestion, pollution, and loss to local GDP</p>
-            </a>
+            </div>
-            and their <br /> work following this is a transcript of the interview.
+            {/* end::Text */}
           </div>
-          {/* end::Text */}
         </div>
         {/* end::Content */}
       </div>

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() {
     >
       <div className='text-center mb-10'>
         {/* begin::Title */}
-        <h1 className='text-dark fw-bolder mb-3'>Forgot Password ?</h1>
+        {/* <h1 className='text-dark fw-bolder mb-3'>Forgot Password ?</h1> */}
+        <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
         {/* end::Title */}
 
         {/* begin::Link */}

src/app/modules/auth/components/Login.tsx

@@ -64,8 +64,8 @@ export function Login() {
     >
       {/* begin::Heading */}
       <div className='text-center mb-11'>
-        <h1 className='text-dark fw-bolder mb-3'>Sign In</h1>
+        {/* <h1 className='text-dark fw-bolder mb-3'>Sign In</h1> */}
-        <div className='text-gray-500 fw-semibold fs-6'>Your Social Campaigns</div>
+        <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
       </div>
       {/* begin::Heading */}
 
@@ -125,11 +125,12 @@ export function Login() {
           <div className='alert-text font-weight-bold'>{formik.status}</div>
         </div>
       ) : (
-        <div className='mb-10 bg-light-info p-8 rounded'>
+        // <div className='mb-10 bg-light-info p-8 rounded'>
-          <div className='text-info'>
+        //   <div className='text-info'>
-            Any text before login box - please configure
+        //     Any text before login box - please configure
-          </div>
+        //   </div>
-        </div>
+        // </div>
+        null
       )}
 
       {/* begin::Form group */}

src/app/modules/auth/components/Registration.tsx

@@ -89,10 +89,11 @@ export function Registration() {
       {/* begin::Heading */}
       <div className='text-center mb-11'>
         {/* begin::Title */}
-        <h1 className='text-dark fw-bolder mb-3'>Sign Up</h1>
+        {/* <h1 className='text-dark fw-bolder mb-3'>Sign Up</h1> */}
+        <img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
         {/* end::Title */}
 
-        <div className='text-gray-500 fw-semibold fs-6'>Your Social Campaigns</div>
+        {/* <div className='text-gray-500 fw-semibold fs-6'>Your Social Campaigns</div> */}
       </div>
       {/* end::Heading */}