Skip to content

Commit ad739c9

Browse files
committed
chore(feature-runs): remove unused pages
1 parent d784e8f commit ad739c9

33 files changed

+10
-1235
lines changed

src/app/containers/App.test.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { shallow } from "enzyme";
22
import * as React from "react";
33
import { State as IRouteState } from "router5";
44
import { HomePage } from "../pages/HomePage";
5-
import { ISettingsState } from "../redux/modules/settingsModule";
65
import { getRoutes } from "../routes/routes";
76
import { classNames, mapStateToProps, UnconnectedApp } from "./App";
87

@@ -19,22 +18,13 @@ describe("<App />", () => {
1918
params: {},
2019
path: "/"
2120
};
22-
const settings: ISettingsState = {
23-
error: "",
24-
language: "en",
25-
loaded: true,
26-
pending: false,
27-
translations: { "Not found": "Not Found" }
28-
};
2921
const translations = { notFound: "Not Found" };
3022

3123
it("maps state to props correctly", () => {
3224
const props = mapStateToProps({
33-
router: { route, previousRoute: route, transitionRoute: null, transitionError: null },
34-
settings
25+
router: { route, previousRoute: route, transitionRoute: null, transitionError: null }
3526
});
3627
expect(props.route).toEqual(route);
37-
expect(props.translations).toEqual({ notFound: "Not Found" });
3828
});
3929

4030
it("renders with correct style", () => {

src/app/containers/App.tsx

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,13 @@ import * as React from "react";
22
import { Helmet } from "react-helmet";
33
import { connect } from "react-redux";
44
import { createRouteNodeSelector, RouterState } from "redux-router5";
5-
import { createSelector } from "reselect";
65
import { State as IRouteState } from "router5";
76
import { stylesheet } from "typestyle";
87
import { config as appConfig } from "../../../config";
98
import { setupCss } from "../helpers/setupCss";
10-
import { Translator } from "../models/Translator";
11-
import { ITranslator } from "../models/TranslatorInterfaces";
12-
import { AboutPage } from "../pages/AboutPage";
13-
import { CounterPage } from "../pages/CounterPage";
149
import { HomePage } from "../pages/HomePage";
15-
import { StarsPage } from "../pages/StarsPage";
1610
import { IStore } from "../redux/IStore";
1711
import { RoutePageMap } from "../routes/routes";
18-
import { translationsSelector } from "../selectors/translationsSelector";
1912
import { Header } from "./Header";
2013

2114
setupCss();
@@ -36,10 +29,8 @@ interface IStateToProps {
3629

3730
class App extends React.Component<IStateToProps> {
3831
private components: RoutePageMap = {
39-
aboutPage: AboutPage,
40-
counterPage: CounterPage,
4132
homePage: HomePage,
42-
starsPage: StarsPage
33+
runsPage: null
4334
};
4435
public render(): JSX.Element {
4536
const { route, translations: { notFound } } = this.props;
@@ -54,19 +45,8 @@ class App extends React.Component<IStateToProps> {
5445
}
5546
}
5647

57-
const componentTranslationsSelector = createSelector(
58-
translationsSelector,
59-
(translations) => {
60-
const translator: ITranslator = new Translator(translations);
61-
return {
62-
notFound: translator.translate("Not found")
63-
};
64-
}
65-
);
66-
67-
const mapStateToProps = (state: Pick<IStore, "router" | "settings">): IStateToProps & Partial<RouterState> => ({
68-
...createRouteNodeSelector("")(state),
69-
translations: componentTranslationsSelector(state)
48+
const mapStateToProps = (state: Pick<IStore, "router">): IStateToProps & Partial<RouterState> => ({
49+
...createRouteNodeSelector("")(state)
7050
});
7151

7252
const connected = connect(mapStateToProps)(App);

src/app/containers/Header.test.tsx

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/app/containers/Header.tsx

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import * as React from "react";
2-
import { connect } from "react-redux";
32
import { ConnectedLink } from "react-router5";
4-
import { createSelector } from "reselect";
53
import { stylesheet } from "typestyle";
6-
import { Translator } from "../models/Translator";
7-
import { ITranslator } from "../models/TranslatorInterfaces";
8-
import { IStore } from "../redux/IStore";
94
import { getRoutes } from "../routes/routes";
10-
import { translationsSelector } from "../selectors/translationsSelector";
115

126
const classNames = stylesheet({
137
activeLink: {
@@ -29,66 +23,19 @@ const classNames = stylesheet({
2923
}
3024
});
3125

32-
interface IStateToProps {
33-
translations: {
34-
aboutUs: string;
35-
counter: string;
36-
home: string;
37-
stars: string;
38-
};
39-
}
40-
41-
class Header extends React.Component<IStateToProps> {
26+
export class Header extends React.Component {
4227
public render(): JSX.Element {
43-
const { translations } = this.props;
4428
const routes = getRoutes();
4529
return (
4630
<nav className={classNames.nav}>
4731
<ul>
4832
<li>
4933
<ConnectedLink activeClassName={classNames.activeLink} routeName={routes.homePage.name}>
50-
{translations.home}
51-
</ConnectedLink>
52-
</li>
53-
<li>
54-
<ConnectedLink activeClassName={classNames.activeLink} routeName={routes.aboutPage.name}>
55-
{translations.aboutUs}
56-
</ConnectedLink>
57-
</li>
58-
<li>
59-
<ConnectedLink activeClassName={classNames.activeLink} routeName={routes.counterPage.name}>
60-
{translations.counter}
61-
</ConnectedLink>
62-
</li>
63-
<li>
64-
<ConnectedLink activeClassName={classNames.activeLink} routeName={routes.starsPage.name}>
65-
{translations.stars}
34+
Home
6635
</ConnectedLink>
6736
</li>
6837
</ul>
6938
</nav>
7039
);
7140
}
7241
}
73-
74-
const componentTranslationsSelector = createSelector(
75-
translationsSelector,
76-
(translations) => {
77-
const translator: ITranslator = new Translator(translations);
78-
return {
79-
aboutUs: translator.translate("About us"),
80-
counter: translator.translate("Counter"),
81-
home: translator.translate("Home"),
82-
stars: translator.translate("Stars")
83-
};
84-
}
85-
);
86-
87-
function mapStateToProps(state: Pick<IStore, "settings">): IStateToProps {
88-
return {
89-
translations: componentTranslationsSelector(state)
90-
};
91-
}
92-
93-
const connected = connect(mapStateToProps)(Header);
94-
export { connected as Header, Header as UnconnectedHeader, mapStateToProps };

src/app/models/Translator.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/app/models/TranslatorInterfaces.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/app/pages/AboutPage.test.tsx

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/app/pages/AboutPage.tsx

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)