diff --git a/src/pages/LoginPage/Login.tsx b/src/pages/LoginPage/Login.tsx index db96aeb..64626f7 100644 --- a/src/pages/LoginPage/Login.tsx +++ b/src/pages/LoginPage/Login.tsx @@ -2,10 +2,10 @@ import { useNavigate } from '@solidjs/router' import { IoChevronBack } from 'solid-icons/io' import { createEffect, createSignal } from 'solid-js' import { Show } from 'solid-js/web' -import { Box, Button, Clickable, Column, Combobox, Display, Input, Link, Logo, Modal, Padding, Page, Radio, Row, Switch } from '../../components' +import { Box, Button, Column, Combobox, Display, Input, Link, Logo, Modal, Padding, Page, Radio, Row, Clickable } from '../../components' import { _employeeId, _employeeName } from '../../stores/employee' import { checkConnection, getApi, securePassword } from '../../utils/functions' -import { VsQuestion } from 'solid-icons/vs' +// import { VsQuestion } from 'solid-icons/vs' import './Login.sass' export default () => { @@ -20,8 +20,9 @@ export default () => { const [loggedin, setLoggedin] = createSignal(0) const [errorMessage, setErrorMessage] = createSignal('') const [connected, setConnected] = createSignal(true) - const [encryptionVersion, setEncryptionVersion] = createSignal('v1') + // const [encryptionVersion, setEncryptionVersion] = createSignal('v2') const [openTooltip, setOpenTooltip] = createSignal(false) + const [openChanges, setOpenChanges] = createSignal(false) const login = async () => { setConnected(await checkConnection()) @@ -32,7 +33,7 @@ export default () => { const employeeid = await getApi('get-employeeid', name()) const dbpassword = await getApi('get-password', employeeid) - const hashPassword = await securePassword(password(), encryptionVersion()) + const hashPassword = await securePassword(password(), 'v2') if (dbpassword === '0') { setErrorMessage('Not yet registered. Please proceed to Registration.') @@ -108,12 +109,12 @@ export default () => { Login - + {/* encryptionVersion() === 'v1' ? setEncryptionVersion('v2') : setEncryptionVersion('v1')} /> setOpenTooltip(true)}> - + */} @@ -166,6 +167,13 @@ export default () => { + + + setOpenChanges(true)}> + Click here to see changes + + + @@ -232,35 +240,67 @@ export default () => {
setOpenTooltip(false)}> - + -