lukas/WordClockESP
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade UI libs, fix linting issues (#218)

Browse Source 
* remove redundant component

* upgrade various libraries
sort linting issues issues regarding redeclaring types WRT contexts
This commit is contained in:
rjwats 2021-01-16 18:08:41 +00:00 committed by GitHub
parent 3ecdc27550
commit 4917b38747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 6026 additions and 3781 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,4 +6,5 @@
/lib/framework/WWWData.h
/interface/build
/interface/node_modules
/interface/.eslintcache
.vscode

9705
interface/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

25
interface/package.json
View File

@ -3,32 +3,31 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@types/jwt-decode": "^3.1.0",
"@material-ui/core": "^4.11.2",
"@material-ui/icons": "^4.11.2",
"@types/lodash": "^4.14.165",
"@types/node": "^12.12.32",
"@types/react": "^16.9.56",
"@types/react-dom": "^16.9.9",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@types/react-material-ui-form-validator": "^2.1.0",
"@types/react-router": "^5.1.8",
"@types/react-router-dom": "^5.1.6",
"compression-webpack-plugin": "^4.0.0",
"jwt-decode": "^3.1.1",
"jwt-decode": "^3.1.2",
"lodash": "^4.17.20",
"mime-types": "^2.1.27",
"mime-types": "^2.1.28",
"moment": "^2.29.1",
"notistack": "^1.0.1",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"notistack": "^1.0.3",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-dropzone": "^11.2.4",
"react-form-validator-core": "^1.0.0",
"react-material-ui-form-validator": "^2.1.1",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.4",
"react-scripts": "4.0.1",
"sockette": "^2.0.6",
"typescript": "^4.0.2",
"typescript": "4.0.5",
"zlib": "^1.0.5"
},
"scripts": {
@ -52,6 +51,6 @@
]
},
"devDependencies": {
"react-app-rewired": "^2.1.6"
"react-app-rewired": "^2.1.8"
}
}

2
interface/src/ap/APSettingsForm.tsx
View File

@ -17,7 +17,7 @@ type APSettingsFormProps = RestFormProps<APSettings>;
class APSettingsForm extends React.Component<APSettingsFormProps> {
componentWillMount() {
componentDidMount() {
ValidatorForm.addValidationRule('isIP', isIP);
}

4
interface/src/authentication/AuthenticatedRoute.tsx
View File

@ -3,7 +3,7 @@ import { Redirect, Route, RouteProps, RouteComponentProps } from "react-router-d
import { withSnackbar, WithSnackbarProps } from 'notistack';
import * as Authentication from './Authentication';
import { withAuthenticationContext, AuthenticationContextProps, AuthenticatedContext } from './AuthenticationContext';
import { withAuthenticationContext, AuthenticationContextProps, AuthenticatedContext, AuthenticatedContextValue } from './AuthenticationContext';
type ChildComponent = React.ComponentType<RouteComponentProps<any>> | React.ComponentType<any>;
@ -21,7 +21,7 @@ export class AuthenticatedRoute extends React.Component<AuthenticatedRouteProps>
const renderComponent: RenderComponent = (props) => {
if (authenticationContext.me) {
return (
<AuthenticatedContext.Provider value={authenticationContext as AuthenticatedContext}>
<AuthenticatedContext.Provider value={authenticationContext as AuthenticatedContextValue}>
<Component {...props} />
</AuthenticatedContext.Provider>
);

12
interface/src/authentication/AuthenticationContext.tsx
View File

@ -5,20 +5,20 @@ export interface Me {
admin: boolean;
}
export interface AuthenticationContext {
export interface AuthenticationContextValue {
refresh: () => void;
signIn: (accessToken: string) => void;
signOut: () => void;
me?: Me;
}
const AuthenticationContextDefaultValue = {} as AuthenticationContext
const AuthenticationContextDefaultValue = {} as AuthenticationContextValue
export const AuthenticationContext = React.createContext(
AuthenticationContextDefaultValue
);
export interface AuthenticationContextProps {
authenticationContext: AuthenticationContext;
authenticationContext: AuthenticationContextValue;
}
export function withAuthenticationContext<T extends AuthenticationContextProps>(Component: React.ComponentType<T>) {
@ -33,17 +33,17 @@ export function withAuthenticationContext<T extends AuthenticationContextProps>(
};
}
export interface AuthenticatedContext extends AuthenticationContext {
export interface AuthenticatedContextValue extends AuthenticationContextValue {
me: Me;
}
const AuthenticatedContextDefaultValue = {} as AuthenticatedContext
const AuthenticatedContextDefaultValue = {} as AuthenticatedContextValue
export const AuthenticatedContext = React.createContext(
AuthenticatedContextDefaultValue
);
export interface AuthenticatedContextProps {
authenticatedContext: AuthenticatedContext;
authenticatedContext: AuthenticatedContextValue;
}
export function withAuthenticatedContext<T extends AuthenticatedContextProps>(Component: React.ComponentType<T>) {

4
interface/src/authentication/AuthenticationWrapper.tsx
View File

@ -5,14 +5,14 @@ import jwtDecode from 'jwt-decode';
import history from '../history'
import { VERIFY_AUTHORIZATION_ENDPOINT } from '../api';
import { ACCESS_TOKEN, authorizedFetch, getStorage } from './Authentication';
import { AuthenticationContext, Me } from './AuthenticationContext';
import { AuthenticationContext, AuthenticationContextValue, Me } from './AuthenticationContext';
import FullScreenLoading from '../components/FullScreenLoading';
import { withFeatures, WithFeaturesProps } from '../features/FeaturesContext';
export const decodeMeJWT = (accessToken: string): Me => jwtDecode(accessToken) as Me;
interface AuthenticationWrapperState {
context: AuthenticationContext;
context: AuthenticationContextValue;
initialized: boolean;
}

23
interface/src/features/ApplicationContext.tsx
View File

@ -1,23 +0,0 @@
import React from 'react';
import { Features } from './types';
export interface ApplicationContext {
features: Features;
}
const ApplicationContextDefaultValue = {} as ApplicationContext
export const ApplicationContext = React.createContext(
ApplicationContextDefaultValue
);
export function withAuthenticatedContexApplicationContext<T extends ApplicationContext>(Component: React.ComponentType<T>) {
return class extends React.Component<Omit<T, keyof ApplicationContext>> {
render() {
return (
<ApplicationContext.Consumer>
{authenticatedContext => <Component {...this.props as T} features={authenticatedContext} />}
</ApplicationContext.Consumer>
);
}
};
}

4
interface/src/features/FeaturesContext.tsx
View File

@ -1,11 +1,11 @@
import React from 'react';
import { Features } from './types';
export interface FeaturesContext {
export interface FeaturesContextValue {
features: Features;
}
const FeaturesContextDefaultValue = {} as FeaturesContext
const FeaturesContextDefaultValue = {} as FeaturesContextValue
export const FeaturesContext = React.createContext(
FeaturesContextDefaultValue
);

4
interface/src/validators/optional.ts
View File

@ -1 +1,3 @@
export default (validator: (value: any) => boolean) => (value: any) => !value || validator(value);
const OPTIONAL = (validator: (value: any) => boolean) => (value: any) => !value || validator(value);
export default OPTIONAL;

6
interface/src/validators/or.ts
View File

@ -1,3 +1,5 @@
export default (validator1: (value: any) => boolean, validator2: (value: any) => boolean) => {
const OR = (validator1: (value: any) => boolean, validator2: (value: any) => boolean) => {
return (value: any) => validator1(value) || validator2(value);
}
};
export default OR;

4
interface/src/wifi/WiFiConnection.tsx
View File

@ -9,12 +9,12 @@ import { MenuAppBar } from '../components';
import WiFiStatusController from './WiFiStatusController';
import WiFiSettingsController from './WiFiSettingsController';
import WiFiNetworkScanner from './WiFiNetworkScanner';
import { WiFiConnectionContext } from './WiFiConnectionContext';
import { WiFiConnectionContext, WiFiConnectionContextValue } from './WiFiConnectionContext';
import { WiFiNetwork } from './types';
type WiFiConnectionProps = AuthenticatedContextProps & RouteComponentProps;
class WiFiConnection extends Component<WiFiConnectionProps, WiFiConnectionContext> {
class WiFiConnection extends Component<WiFiConnectionProps, WiFiConnectionContextValue> {
constructor(props: WiFiConnectionProps) {
super(props);

4
interface/src/wifi/WiFiConnectionContext.tsx
View File

@ -1,13 +1,13 @@
import React from 'react';
import { WiFiNetwork } from './types';
export interface WiFiConnectionContext {
export interface WiFiConnectionContextValue {
selectedNetwork?: WiFiNetwork;
selectNetwork: (network: WiFiNetwork) => void;
deselectNetwork: () => void;
}
const WiFiConnectionContextDefaultValue = {} as WiFiConnectionContext
const WiFiConnectionContextDefaultValue = {} as WiFiConnectionContextValue
export const WiFiConnectionContext = React.createContext(
WiFiConnectionContextDefaultValue
);

6
interface/src/wifi/WiFiSettingsForm.tsx
View File

@ -13,7 +13,7 @@ import SaveIcon from '@material-ui/icons/Save';
import { RestFormProps, PasswordValidator, BlockFormControlLabel, FormActions, FormButton } from '../components';
import { isIP, isHostname, optional } from '../validators';
import { WiFiConnectionContext } from './WiFiConnectionContext';
import { WiFiConnectionContext, WiFiConnectionContextValue } from './WiFiConnectionContext';
import { isNetworkOpen, networkSecurityMode } from './WiFiSecurityModes';
import { WiFiSettings } from './types';
@ -24,7 +24,7 @@ class WiFiSettingsForm extends React.Component<WiFiStatusFormProps> {
static contextType = WiFiConnectionContext;
context!: React.ContextType<typeof WiFiConnectionContext>;
constructor(props: WiFiStatusFormProps, context: WiFiConnectionContext) {
constructor(props: WiFiStatusFormProps, context: WiFiConnectionContextValue) {
super(props);
const { selectedNetwork } = context;
@ -39,7 +39,7 @@ class WiFiSettingsForm extends React.Component<WiFiStatusFormProps> {
}
}
componentWillMount() {
componentDidMount() {
ValidatorForm.addValidationRule('isIP', isIP);
ValidatorForm.addValidationRule('isHostname', isHostname);
ValidatorForm.addValidationRule('isOptionalIP', optional(isIP));

3
interface/tsconfig.json
View File

@ -17,7 +17,8 @@
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react"
"jsx": "react",
"noFallthroughCasesInSwitch": true
},
"include": [
"src"