From 7717b3a76b15f12be5caafa3285a9a5bc10c9748 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Mon, 18 Oct 2021 01:00:02 -0400 Subject: [PATCH] cleanup w new version of react --- src/App.tsx | 5 +++-- src/components/Chapter.js | 1 - src/components/Chart.tsx | 1 - src/components/Footer.js | 4 +--- src/components/GenderTable.js | 1 - src/components/Header.js | 4 +--- src/components/InlineInflectionButton.js | 1 - src/components/Sidebar.js | 5 ++--- src/components/Table.js | 1 - src/components/TableOfContents.js | 1 - src/components/formula/Formula.js | 1 - src/components/phonetics/PhoneticsViewer.tsx | 4 ++-- src/components/phonetics/phonemes.tsx | 1 - src/content/sandwiches/sandwiches.tsx | 1 - src/games/GameDisplay.tsx | 1 - src/games/games.tsx | 1 - src/index.js | 6 +++--- src/lib/psmd.js | 1 - src/pages/TableOfContentsPage.js | 1 - 19 files changed, 12 insertions(+), 29 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 93069d6..149fc59 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -7,8 +7,7 @@ */ import { useState } from "react"; -// eslint-disable-next-line -import { BrowserRouter as Router, Route, withRouter, Switch, RouteComponentProps } from "react-router-dom"; +import { Route, withRouter, Switch, RouteComponentProps } from "react-router-dom"; import "./App.css"; import Page404 from "./pages/404"; import Chapter from "./components/Chapter"; @@ -44,10 +43,12 @@ function App(props: RouteComponentProps) { } useEffect(() => { logAnalytics(); + // eslint-disable-next-line }, []); useEffect(() => { window.scroll(0, 0); logAnalytics(); + // eslint-disable-next-line }, [props.location.pathname, user]); return ( <> diff --git a/src/components/Chapter.js b/src/components/Chapter.js index b5c71a3..83f4439 100644 --- a/src/components/Chapter.js +++ b/src/components/Chapter.js @@ -6,7 +6,6 @@ * */ -import React from "react"; import TableOfContents from "./TableOfContents"; import Footer from "./Footer"; diff --git a/src/components/Chart.tsx b/src/components/Chart.tsx index a6a06dd..b435bfe 100644 --- a/src/components/Chart.tsx +++ b/src/components/Chart.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { Types as T, Examples, diff --git a/src/components/Footer.js b/src/components/Footer.js index 5ad4be0..8a56fb0 100644 --- a/src/components/Footer.js +++ b/src/components/Footer.js @@ -6,9 +6,7 @@ * */ -import React from "react"; -// eslint-disable-next-line -import { BrowserRouter as Router, Link } from "react-router-dom"; +import { Link } from "react-router-dom"; import leftChevron from "./chevron_left-24px.svg"; import rightChevron from "./chevron_right-24px.svg"; diff --git a/src/components/GenderTable.js b/src/components/GenderTable.js index 48f2139..d9d0aad 100644 --- a/src/components/GenderTable.js +++ b/src/components/GenderTable.js @@ -1,4 +1,3 @@ -import React from "react"; import { InlinePs, defaultTextOptions as opts, diff --git a/src/components/Header.js b/src/components/Header.js index 5dd2bd4..873bc6a 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -6,9 +6,7 @@ * */ -import React from "react"; -// eslint-disable-next-line -import { BrowserRouter as Router, Link } from "react-router-dom"; +import { Link } from "react-router-dom"; import { useUser } from "../user-context"; const hamburger = diff --git a/src/components/InlineInflectionButton.js b/src/components/InlineInflectionButton.js index 52d09e8..6215af9 100644 --- a/src/components/InlineInflectionButton.js +++ b/src/components/InlineInflectionButton.js @@ -1,4 +1,3 @@ -import React from "react"; import buttonUnpressed from "../images/button-unpressed.png"; import buttonHalfPressed from "../images/button-half-pressed.png"; import buttonFullyPressed from "../images/button-fully-pressed.png"; diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js index e1437b3..b95427d 100644 --- a/src/components/Sidebar.js +++ b/src/components/Sidebar.js @@ -6,9 +6,8 @@ * */ -import React, { useState } from "react"; -// eslint-disable-next-line -import { BrowserRouter as Router, Link } from "react-router-dom"; +import { useState } from "react"; +import { Link } from "react-router-dom"; import classNames from "classnames"; import SmoothCollapse from "react-smooth-collapse"; diff --git a/src/components/Table.js b/src/components/Table.js index b2ff8d5..d4c34a0 100644 --- a/src/components/Table.js +++ b/src/components/Table.js @@ -1,4 +1,3 @@ -import React from "react"; import { Examples, } from "@lingdocs/pashto-inflector"; diff --git a/src/components/TableOfContents.js b/src/components/TableOfContents.js index ac96b03..17efa59 100644 --- a/src/components/TableOfContents.js +++ b/src/components/TableOfContents.js @@ -6,7 +6,6 @@ * */ -import React from 'react'; import { NavHashLink } from 'react-router-hash-link'; import Scrollspy from 'react-scrollspy'; diff --git a/src/components/formula/Formula.js b/src/components/formula/Formula.js index 7f78d31..249c898 100644 --- a/src/components/formula/Formula.js +++ b/src/components/formula/Formula.js @@ -1,4 +1,3 @@ -import React from "react"; // import "./formula.css"; // import teacher from "./teacher-small.png"; diff --git a/src/components/phonetics/PhoneticsViewer.tsx b/src/components/phonetics/PhoneticsViewer.tsx index 92f2e67..966a41d 100644 --- a/src/components/phonetics/PhoneticsViewer.tsx +++ b/src/components/phonetics/PhoneticsViewer.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import { Component } from "react"; import classNames from "classnames"; import highlightExample from "./highlight-example"; import { @@ -16,7 +16,7 @@ interface IAppState { view: ViewOptions; } -class PhoneticsViewer extends React.Component { +class PhoneticsViewer extends Component { constructor(props: any) { super(props); this.state = { diff --git a/src/components/phonetics/phonemes.tsx b/src/components/phonetics/phonemes.tsx index 17e9aef..6e6bc5b 100644 --- a/src/components/phonetics/phonemes.tsx +++ b/src/components/phonetics/phonemes.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { Types as T } from "@lingdocs/pashto-inflector"; interface ILetter { diff --git a/src/content/sandwiches/sandwiches.tsx b/src/content/sandwiches/sandwiches.tsx index 7f3222b..7f4ebbf 100644 --- a/src/content/sandwiches/sandwiches.tsx +++ b/src/content/sandwiches/sandwiches.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { Types as T, } from "@lingdocs/pashto-inflector"; diff --git a/src/games/GameDisplay.tsx b/src/games/GameDisplay.tsx index 726f263..6713a28 100644 --- a/src/games/GameDisplay.tsx +++ b/src/games/GameDisplay.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { useUser } from "../user-context"; function GameDisplay({ record: { title, Game, id } }: { record: GameRecord }) { diff --git a/src/games/games.tsx b/src/games/games.tsx index 6ef3c47..6b00a25 100644 --- a/src/games/games.tsx +++ b/src/games/games.tsx @@ -1,4 +1,3 @@ -import React from "react"; import GenderGame from "./sub-cores/GenderGame"; import UnisexNounGame from "./sub-cores/UnisexNounGame"; diff --git a/src/index.js b/src/index.js index 6d5d608..5d937e5 100644 --- a/src/index.js +++ b/src/index.js @@ -1,4 +1,4 @@ -import React from 'react'; +import { StrictMode } from 'react'; import ReactDOM from 'react-dom'; import App from './App'; import * as serviceWorkerRegistration from './serviceWorkerRegistration'; @@ -9,13 +9,13 @@ import "@fortawesome/fontawesome-free/css/all.css"; import reportWebVitals from './reportWebVitals'; ReactDOM.render( - + - , + , document.getElementById('root') ); diff --git a/src/lib/psmd.js b/src/lib/psmd.js index d25387b..11a7f77 100644 --- a/src/lib/psmd.js +++ b/src/lib/psmd.js @@ -1,4 +1,3 @@ -import React from "react"; import Markdown from "markdown-to-jsx"; export default function mdps(input) { diff --git a/src/pages/TableOfContentsPage.js b/src/pages/TableOfContentsPage.js index f2f69dd..a78ad57 100644 --- a/src/pages/TableOfContentsPage.js +++ b/src/pages/TableOfContentsPage.js @@ -6,7 +6,6 @@ * */ -import React from 'react'; import { Link } from "react-router-dom"; import Footer from "../components/Footer"; import { content } from "../content/index";