12 Commits

Author SHA1 Message Date
victorAnumudu 1be78e7484 centralized login and removed image 2023-04-14 15:14:31 +01:00
tokslaw 9103a812b5 Merge branch 'changed-loading-icon' of FloatSystems/float-users into master 2023-04-12 11:19:45 +00:00
victorAnumudu 7dc8503861 loading icon changed 2023-04-11 18:34:48 +01:00
tokslaw a819bcca1f Merge branch 'bg-color-cover' of FloatSystems/float-users into master 2023-04-11 17:18:47 +00:00
victorAnumudu 161bac928b removed image shadow 2023-04-11 18:04:12 +01:00
victorAnumudu 40834b9c38 made the bg color to cover all page 2023-04-11 15:37:37 +01:00
victorAnumudu 7a823fcf74 made the bg color to cover all page 2023-04-11 15:34:16 +01:00
DESKTOP-GBA0BK8\Admin faa4fdf8a6 demo pass changed 2023-04-08 14:48:15 -04:00
DESKTOP-GBA0BK8\Admin a33d405c8c Fix links 2023-04-08 10:41:39 -04:00
tokslaw 56570fbd33 Merge branch 'random_bg' of FloatSystems/float-users into master 2023-04-07 23:15:46 +00:00
victorAnumudu 2d657165bd added a fxn that changes bg color on page refresh 2023-04-07 19:29:04 +01:00
tokslaw 7daf939239 Merge branch 'logo_aligned' of FloatSystems/float-users into master 2023-04-05 19:15:31 +00:00
6 changed files with 52 additions and 57 deletions
+1 -1
View File
@@ -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="Float Users" />
<span>Loading ...</span>
</div>
<div id="root-modals"></div>
+4
View File
@@ -0,0 +1,4 @@
.auth-height {
min-height: 100vh;
}
+2 -1
View File
@@ -12,4 +12,5 @@
@import "header/header-sidebar-light";
@import "content";
@import "toolbar";
@import "page-title";
@import "page-title";
@import "auth";
+41 -51
View File
@@ -1,10 +1,47 @@
/* eslint-disable jsx-a11y/anchor-is-valid */
import {useEffect} from 'react'
import {useEffect, useState} from 'react'
import {Outlet, Link} from 'react-router-dom'
import {toAbsoluteUrl} from '../../../_res/helpers'
const AuthLayout = () => {
//initial background color
let [bgColor, setBgColor] = useState({
backgroundImage: 'linear-gradient(70deg, #E6E7F9, #b4caed)'
})
// function to determine background color
let changeBgColor = () => {
// let randomNum = Math.round(Math.random() * 3)
let randomNum = Number(localStorage.getItem('bg-num'))
if(randomNum){
if(randomNum <= 1){
setBgColor({
backgroundImage: 'linear-gradient(70deg, #E6E7F9, #b4caed)'
})
localStorage.setItem('bg-num', '2')
}else if(randomNum <= 2){
setBgColor({
backgroundImage: 'linear-gradient(70deg, #eee, #fff)'
})
localStorage.setItem('bg-num', '3')
}else{
setBgColor({
backgroundImage: 'linear-gradient(70deg, #d5e1f5, #75a5f0)'
})
localStorage.setItem('bg-num', '1')
}
}else{
setBgColor({
backgroundImage: 'linear-gradient(70deg, #E6E7F9, #b4caed)'
})
localStorage.setItem('bg-num', '1')
}
}
useEffect(() => {
changeBgColor() // calls the change color function after page loads
const root = document.getElementById('root')
if (root) {
root.style.height = '100%'
@@ -17,9 +54,9 @@ const AuthLayout = () => {
}, [])
return (
<div className='d-flex flex-column flex-lg-row flex-column-fluid overflow-auto'>
<div className='auth-height d-flex flex-column flex-lg-row flex-column-fluid' style={{backgroundImage: `${bgColor.backgroundImage}`}}>
{/* begin::Body */}
<div className='d-flex flex-column flex-lg-row-fluid w-lg-50 p-10 order-2 order-lg-1 vh-100'>
<div className='d-flex flex-column flex-lg-row-fluid w-lg-50 p-10 order-2 order-lg-1'>
{/* begin::Form */}
<div className='d-flex flex-center flex-column flex-lg-row-fluid'>
<div className='text-center mb-11'>
@@ -27,7 +64,7 @@ const AuthLayout = () => {
<img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
</div>
{/* begin::Wrapper */}
<div className='w-lg-500px p-10'>
<div className='bg-white w-lg-500px p-10 shadow-lg rounded'>
<Outlet />
</div>
{/* end::Wrapper */}
@@ -62,53 +99,6 @@ const AuthLayout = () => {
</div>
{/* end::Body */}
{/* begin::Aside */}
<div
className='position-relative d-flex flex-lg-row-fluid w-lg-50 p-10 order-1 order-lg-2'
// style={{backgroundImage: `url(${toAbsoluteUrl('/media/misc/auth-bg.png')})`}}
style={{backgroundColor: '#E6E7F9'}}
>
{/* begin::Content */}
<div className='position-relative d-flex flex-column flex-center px-5 px-md-15 w-100'>
{/* begin::Logo */}
<Link to='/' className='mb-12'>
<img alt='Float Mobility' src={toAbsoluteUrl('/media/logos/logo.png')} className='h-35px' />
</Link>
{/* end::Logo */}
<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'>
{/* begin::Title */}
<h1 className='text-dark fs-2qx fw-bolder text-center mb-7'>
Fast, Efficient and Productive
</h1>
{/* end::Title */}
{/* begin::Text */}
<div className='text-dark fs-base text-center'>
In this kind of post,{' '}
<a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
the blogger
</a>
introduces a person theyve interviewed <br /> and provides some background information
about {' '}
<a href='#' className='opacity-75-hover text-warning fw-bold me-1'>
the interviewee
</a>
and their <br /> work following this is a transcript of the interview.
</div>
{/* end::Text */}
</div>
</div>
{/* end::Content */}
</div>
{/* end::Aside */}
</div>
)
}
+3 -3
View File
@@ -21,10 +21,10 @@ const loginSchema = Yup.object().shape({
})
const initialValues = {
email: 'admin@demo.com',
password: 'demo',
email: 'demo@float.sg',
password: '****',
}
//email: 'admin@demo.com',
/*
Formik+YUP+Typescript:
https://jaredpalmer.com/formik/docs/tutorial#getfieldprops
@@ -309,7 +309,7 @@ export function Registration() {
<span>
I Accept the{' '}
<a
href='https://keenthemes.com/metronic/?page=faq'
href='#'
target='_blank'
className='ms-1 link-primary'
>