From 955efe1d67259570953274be4659656d054de26b Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Wed, 16 Mar 2022 11:43:27 -0700 Subject: [PATCH] fixed compile warnings --- net/web/src/App.js | 2 +- net/web/src/AppContext/useAppContext.hook.js | 6 +++--- net/web/src/Create/Create.jsx | 4 +--- net/web/src/Create/useCreate.hook.js | 11 +++++------ net/web/src/Home/Home.jsx | 3 +-- net/web/src/Login/Login.jsx | 4 +--- net/web/src/Login/useLogin.hook.js | 6 +++--- net/web/src/User/User.jsx | 7 ++----- net/web/src/User/useUser.hook.js | 2 +- 9 files changed, 18 insertions(+), 27 deletions(-) diff --git a/net/web/src/App.js b/net/web/src/App.js index 302053f8..a573fdf8 100644 --- a/net/web/src/App.js +++ b/net/web/src/App.js @@ -5,7 +5,7 @@ import { Login } from './Login/Login'; import { Create } from './Create/Create'; import { User } from './User/User'; import { HashRouter as Router, Routes, Route } from "react-router-dom"; -import 'antd/dist/antd.css'; +import 'antd/dist/antd.min.css'; function App() { diff --git a/net/web/src/AppContext/useAppContext.hook.js b/net/web/src/AppContext/useAppContext.hook.js index 8a5035e4..1219aac4 100644 --- a/net/web/src/AppContext/useAppContext.hook.js +++ b/net/web/src/AppContext/useAppContext.hook.js @@ -81,15 +81,15 @@ export default function useAppContext() { setAppState({ token: session.token, access: session.access }) connectStatus(session.token); } else { - setAppState({ }) + setAppState({}) } } catch(err) { console.log(err) - setAppState({ actions: accessActions }) + setAppState({}) } } else { - setAppState({ actions: accessActions }) + setAppState({}) } }, []); diff --git a/net/web/src/Create/Create.jsx b/net/web/src/Create/Create.jsx index 09b65a9c..d7170705 100644 --- a/net/web/src/Create/Create.jsx +++ b/net/web/src/Create/Create.jsx @@ -1,6 +1,4 @@ -import React, { useContext, useState, useEffect, useRef } from 'react' -import { AppContext } from '../AppContext/AppContext'; -import { Input, Button, Spin } from 'antd'; +import React from 'react' import { UserOutlined, LockOutlined } from '@ant-design/icons'; import { useCreate } from './useCreate.hook'; import { CreateWrapper, CreateInput, CreatePassword, CreateLogin, CreateEnter, CreateSpin } from './Create.styled'; diff --git a/net/web/src/Create/useCreate.hook.js b/net/web/src/Create/useCreate.hook.js index 7096e48d..1cc41ea6 100644 --- a/net/web/src/Create/useCreate.hook.js +++ b/net/web/src/Create/useCreate.hook.js @@ -4,7 +4,6 @@ import { useNavigate } from "react-router-dom"; export function useCreate() { const [checked, setChecked] = useState(true) - const [conflict, setConflict] = useState('') const [state, setState] = useState({ username: '', password: '', @@ -29,8 +28,8 @@ export function useCreate() { actions.updateState({ confirmed }); }, isDisabled: () => { - if (state.username != '' && state.password != '' && state.password == state.confirmed && - checked && state.conflict == '') { + if (state.username !== '' && state.password !== '' && state.password === state.confirmed && + checked && state.conflict === '') { return false } return true @@ -60,7 +59,7 @@ export function useCreate() { clearTimeout(debounce.current) debounce.current = setTimeout(async () => { if (app.actions && app.actions.username) { - if (name == '') { + if (name === '') { setChecked(true) actions.updateState({ conflict: '' }) } @@ -80,10 +79,10 @@ export function useCreate() { useEffect(() => { if (app) { if (app.state) { - if (app.state.access == 'user') { + if (app.state.access === 'user') { navigate('/user') } - if (app.state.access == 'admin') { + if (app.state.access === 'admin') { navigate('/admin') } } diff --git a/net/web/src/Home/Home.jsx b/net/web/src/Home/Home.jsx index 90ac24f0..778e93b8 100644 --- a/net/web/src/Home/Home.jsx +++ b/net/web/src/Home/Home.jsx @@ -1,6 +1,5 @@ -import React, { useContext, useState, useEffect, useRef } from 'react' +import React, { useContext, useEffect } from 'react' import { useNavigate } from "react-router-dom"; -import { HashRouter as Router, Routes, Route } from "react-router-dom"; import { AppContext } from '../AppContext/AppContext'; export function Home() { diff --git a/net/web/src/Login/Login.jsx b/net/web/src/Login/Login.jsx index b943b816..c0c573c8 100644 --- a/net/web/src/Login/Login.jsx +++ b/net/web/src/Login/Login.jsx @@ -1,6 +1,4 @@ -import React, { useContext, useState, useEffect, useRef } from 'react' -import { AppContext } from '../AppContext/AppContext'; -import { Input, Button } from 'antd'; +import React from 'react' import { UserOutlined, LockOutlined } from '@ant-design/icons'; import { useLogin } from './useLogin.hook'; import { LoginWrapper, LoginInput, LoginPassword, LoginCreate, LoginEnter, LoginSpin } from './Login.styled'; diff --git a/net/web/src/Login/useLogin.hook.js b/net/web/src/Login/useLogin.hook.js index 64bfc90d..9c5ee889 100644 --- a/net/web/src/Login/useLogin.hook.js +++ b/net/web/src/Login/useLogin.hook.js @@ -50,17 +50,17 @@ export function useLogin() { useEffect(() => { if (app) { if (app.state) { - if (app.state.access == 'user') { + if (app.state.access === 'user') { navigate('/user') } - if (app.state.access == 'admin') { + if (app.state.access === 'admin') { navigate('/admin') } } if (app.actions && app.actions.available) { const count = async () => { const available = await app.actions.available() - actions.updateState({ available: available != 0 }) + actions.updateState({ available: available !== 0 }) } count(); } diff --git a/net/web/src/User/User.jsx b/net/web/src/User/User.jsx index 8ebbd205..ca200b3a 100644 --- a/net/web/src/User/User.jsx +++ b/net/web/src/User/User.jsx @@ -1,9 +1,6 @@ -import React, { useContext, useState, useEffect, useRef } from 'react' -import { useNavigate } from "react-router-dom"; -import { HashRouter as Router, Routes, Route } from "react-router-dom"; -import { AppContext } from '../AppContext/AppContext'; +import React from 'react' import { useUser } from './useUser.hook'; -import { Input, Button } from 'antd'; +import { Button } from 'antd'; export function User() { diff --git a/net/web/src/User/useUser.hook.js b/net/web/src/User/useUser.hook.js index 21774616..c2dc086c 100644 --- a/net/web/src/User/useUser.hook.js +++ b/net/web/src/User/useUser.hook.js @@ -23,7 +23,7 @@ export function useUser() { if (app.state == null) { navigate('/') } - else if (app.state.access == 'admin') { + else if (app.state.access === 'admin') { navigate('/admin') } }