Skip to content

Commit

Permalink
bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
xlc committed Dec 19, 2021
1 parent c72a0ea commit f2b3ec7
Show file tree
Hide file tree
Showing 10 changed files with 1,387 additions and 916 deletions.
7 changes: 6 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,10 @@
"sourceType": "module"
},
"plugins": ["react", "@typescript-eslint"],
"rules": {}
"rules": {},
"settings": {
"react": {
"version": "detect"
}
}
}
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,16 @@
"build": "craco build",
"test": "craco test",
"eject": "react-scripts eject",
"eslint": "eslint {public,src}/**/*.{js,jsx,ts,tsx}",
"prettier": "prettier --check {public,src}/**/*.{js,jsx,ts,tsx,htm,html,json,xml,yml,css,scss,sass,less,webmanifest,svg}",
"prettier:fix": "prettier --write {public,src}/**/*.{js,jsx,ts,tsx,htm,html,json,xml,yml,css,scss,sass,less,webmanifest,svg}"
"eslint": "eslint src/**/*.{ts,tsx}",
"prettier": "prettier --check src/**/*.{ts,tsx,json,css,less}",
"prettier:fix": "prettier --write src/**/*.{ts,tsx,json,css,less}"
},
"dependencies": {
"@ant-design/icons": "^4.6.4",
"@craco/craco": "^6.3.0",
"@polkadot/api": "^6.4.2",
"@polkadot/apps-config": "^0.97.1",
"@polkadot/util": "^7.5.1",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@polkadot/apps-config": "^0.98.1",
"@polkadot/util": "^8.2.2",
"antd": "^4.16.13",
"craco-antd": "^1.19.0",
"moment": "^2.29.1",
Expand All @@ -41,15 +34,22 @@
"webfontloader": "^1.6.28"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-copy-to-clipboard": "^5.0.1",
"@types/react-dom": "^17.0.0",
"@types/react-router-dom": "^5.1.8",
"@types/webfontloader": "^1.6.33",
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
"eslint": "^7.32.0",
"@typescript-eslint/eslint-plugin": "^5.7.0",
"@typescript-eslint/parser": "^5.7.0",
"eslint": "^8.5.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-react": "^7.25.1",
"prettier": "^2.4.0"
"eslint-plugin-react": "^7.27.1",
"prettier": "^2.5.1"
},
"eslintConfig": {
"extends": [
Expand Down
104 changes: 52 additions & 52 deletions src/components/ParachainUtilities.tsx
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
import React, { useEffect, useState } from "react"
import { Layout, message, Spin } from "antd"
import { BrowserRouter, Switch, Route, Redirect } from "react-router-dom"
import { createWsEndpoints } from "@polkadot/apps-config"
import NavbarComponent from "./Navbar/Navbar"
import CustomSpinner from "./utils/CustomSpinner"
import AddressBook from "./AddressBook/AddressBook"
import Configuration from "./Config/Configuration"
import AverageBlockTime from "./AverageBlockTime/AverageBlockTime"
import BlockTime from "./BlockTime/BlockTime"
import BlockAuthor from "./BlockAuthor/BlockAuthor"
import { useAppDispatch, useAppSelector } from "../store/hooks"
import { replaceText } from "../utils/UtilsFunctions"
import { selectNetwork, setNetworkList } from "../store/actions/configActions"
import { PolkadotNetwork } from "../types"
import "./ParachainUtilities.less"
import React, { useEffect, useState } from "react";
import { Layout, message, Spin } from "antd";
import { BrowserRouter, Switch, Route, Redirect } from "react-router-dom";
import { createWsEndpoints } from "@polkadot/apps-config";
import NavbarComponent from "./Navbar/Navbar";
import CustomSpinner from "./utils/CustomSpinner";
import AddressBook from "./AddressBook/AddressBook";
import Configuration from "./Config/Configuration";
import AverageBlockTime from "./AverageBlockTime/AverageBlockTime";
import BlockTime from "./BlockTime/BlockTime";
import BlockAuthor from "./BlockAuthor/BlockAuthor";
import { useAppDispatch, useAppSelector } from "../store/hooks";
import { replaceText } from "../utils/UtilsFunctions";
import { selectNetwork, setNetworkList } from "../store/actions/configActions";
import { PolkadotNetwork } from "../types";
import "./ParachainUtilities.less";

function ParachainUtilities(): React.ReactElement {
const [isLoading, setIsLoading] = useState(false)
const config = useAppSelector(state => {
return state.config
})
const dispatch = useAppDispatch()
const [isLoading, setIsLoading] = useState(false);
const config = useAppSelector((state) => {
return state.config;
});
const dispatch = useAppDispatch();

useEffect(() => {
setIsLoading(true)
loadDefaultEndpoints()
setIsLoading(false)
}, [])
setIsLoading(true);
loadDefaultEndpoints();
setIsLoading(false);
}, []);

const loadDefaultEndpoints = () => {
try {
let newNetworks: PolkadotNetwork[] = []
let newNetworks: PolkadotNetwork[] = [];
// If config has no endpoint, load default configuration
if (!config.networks || config.networks.length === 0) {
const networksMap: Record<string, PolkadotNetwork> = {}
const externalList = createWsEndpoints(replaceText)
const networksMap: Record<string, PolkadotNetwork> = {};
const externalList = createWsEndpoints(replaceText);
for (const auxEndpoint of externalList) {
const networkName = auxEndpoint.text as string
const networkName = auxEndpoint.text as string;
if (
auxEndpoint.value &&
!auxEndpoint.isLightClient &&
Expand All @@ -47,7 +47,7 @@ function ParachainUtilities(): React.ReactElement {
value: auxEndpoint.value,
hostedBy: auxEndpoint.textBy,
enabled: false,
})
});
} else {
networksMap[networkName] = {
networkName,
Expand All @@ -59,57 +59,57 @@ function ParachainUtilities(): React.ReactElement {
},
],
enabled: false,
}
};
}
}
}
// By default enable Polkadot and Kusama
networksMap["Polkadot"].enabled = true
networksMap["Polkadot"].endpoints[0].enabled = true
networksMap["Kusama"].enabled = true
networksMap["Kusama"].endpoints[0].enabled = true
newNetworks = Object.values(networksMap)
networksMap["Polkadot"].enabled = true;
networksMap["Polkadot"].endpoints[0].enabled = true;
networksMap["Kusama"].enabled = true;
networksMap["Kusama"].endpoints[0].enabled = true;
newNetworks = Object.values(networksMap);

dispatch(setNetworkList(newNetworks))
dispatch(setNetworkList(newNetworks));
}
// If no endpoint is selected, set the first enabled endpoint as selected
if (!config.selectedNetwork) {
dispatch(
selectNetwork(
config.networks?.find(auxEndpoint => auxEndpoint.enabled) ||
config.networks?.find((auxEndpoint) => auxEndpoint.enabled) ||
newNetworks[0]
)
)
);
}
} catch (err) {
console.log(err)
message.error("An error ocurred when trying to load default networks")
console.log(err);
message.error("An error ocurred when trying to load default networks");
}
}
};

return (
<BrowserRouter>
<Spin spinning={isLoading} indicator={CustomSpinner}>
<Layout className='app-layout'>
<Layout className="app-layout">
<NavbarComponent />
<Layout.Content className='app-content'>
<Layout.Content className="app-content">
<Switch>
<Route exact path='/address-book' component={AddressBook} />
<Route exact path="/address-book" component={AddressBook} />
<Route
exact
path='/average-block-time'
path="/average-block-time"
component={AverageBlockTime}
/>
<Route exact path='/block-time' component={BlockTime} />
<Route exact path='/block-author' component={BlockAuthor} />
<Route exact path='/config' component={Configuration} />
<Redirect to='/address-book' />
<Route exact path="/block-time" component={BlockTime} />
<Route exact path="/block-author" component={BlockAuthor} />
<Route exact path="/config" component={Configuration} />
<Redirect to="/address-book" />
</Switch>
</Layout.Content>
</Layout>
</Spin>
</BrowserRouter>
)
);
}

export default ParachainUtilities
export default ParachainUtilities;
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ body {
}

code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
monospace;
}
13 changes: 7 additions & 6 deletions src/store/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { Dispatch } from 'react'
import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
import { AnyAction } from 'redux'
import type { RootState, AppDispatch } from './'
import { Dispatch } from "react";
import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux";
import { AnyAction } from "redux";
import type { RootState, AppDispatch } from "./";

export const useAppDispatch = (): Dispatch<AnyAction> => useDispatch<AppDispatch>()
export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector
export const useAppDispatch = (): Dispatch<AnyAction> =>
useDispatch<AppDispatch>();
export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
28 changes: 14 additions & 14 deletions src/store/index.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import { createStore, applyMiddleware, compose, Store } from "redux"
import thunk from "redux-thunk"
import { persistStore, persistReducer } from "redux-persist"
import storage from "redux-persist/lib/storage" // defaults to localStorage for web
import { createStore, applyMiddleware, compose, Store } from "redux";
import thunk from "redux-thunk";
import { persistStore, persistReducer } from "redux-persist";
import storage from "redux-persist/lib/storage"; // defaults to localStorage for web

import rootReducer from "./reducers"
import { Persistor } from "redux-persist/lib/types"
import rootReducer from "./reducers";
import { Persistor } from "redux-persist/lib/types";

const middleware = [thunk]
const middleware = [thunk];

const rootPersistConfig = {
key: "root",
storage: storage,
whitelist: ["addresses", "config"],
}
};

const store = createStore(
persistReducer(rootPersistConfig, rootReducer),
compose(applyMiddleware(...middleware))
)
);

export type RootState = ReturnType<typeof store.getState>
export type AppDispatch = typeof store.dispatch
export type RootState = ReturnType<typeof store.getState>;
export type AppDispatch = typeof store.dispatch;

export default (): { store: Store; persistor: Persistor } => {
const persistor = persistStore(store)
return { store, persistor }
}
const persistor = persistStore(store);
return { store, persistor };
};
2 changes: 1 addition & 1 deletion src/styles/spacing.less
Original file line number Diff line number Diff line change
Expand Up @@ -2164,4 +2164,4 @@
.mx-xl-auto {
margin-left: auto !important;
}
}
}
Loading

0 comments on commit f2b3ec7

Please sign in to comment.