From ce1e66dc2e0dc614b3c9d40e525c5183e02beeca Mon Sep 17 00:00:00 2001 From: Guillaume Vincent Date: Fri, 31 May 2019 12:10:04 +0200 Subject: [PATCH] Rename Container into Page and apply prettier Change-Id: Ib1b132a7a9f09dfcfb94f8e5af22546571a686ac --- package-lock.json | 6 ++++++ package.json | 4 +++- src/App.js | 10 +++++----- src/auth/authReducer.js | 10 +++++----- src/auth/localStorage.test.js | 2 +- src/containers.js | 5 ----- src/http.js | 2 +- .../{LoadingContainer.js => LoadingPage.js} | 2 +- src/layout/{Container404.js => Page404.js} | 9 +++++++-- src/login/{LoginContainer.js => LoginPage.js} | 4 ++-- src/pages.js | 5 +++++ .../{PlaybookContainer.js => PlaybookPage.js} | 16 ++++++++++------ .../{PlaybooksContainer.js => PlaybooksPage.js} | 8 ++++---- 13 files changed, 50 insertions(+), 33 deletions(-) delete mode 100644 src/containers.js rename src/layout/{LoadingContainer.js => LoadingPage.js} (94%) rename src/layout/{Container404.js => Page404.js} (70%) rename src/login/{LoginContainer.js => LoginPage.js} (97%) create mode 100644 src/pages.js rename src/playbooks/{PlaybookContainer.js => PlaybookPage.js} (89%) rename src/playbooks/{PlaybooksContainer.js => PlaybooksPage.js} (95%) diff --git a/package-lock.json b/package-lock.json index 8c55f80..71c9648 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11233,6 +11233,12 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, + "prettier": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.17.1.tgz", + "integrity": "sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==", + "dev": true + }, "pretty-bytes": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.2.0.tgz", diff --git a/package.json b/package.json index 5fcdc5f..b58cab7 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,12 @@ "build": "react-scripts build", "test": "CI=true react-scripts test --env=jsdom", "test:watch": "react-scripts test --env=jsdom", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "prettier": "prettier --write \"src/**/*.js\"" }, "devDependencies": { "axios-mock-adapter": "^1.15.0", + "prettier": "^1.17.1", "redux-mock-store": "^1.5.3" }, "browserslist": [ diff --git a/src/App.js b/src/App.js index e428607..7169419 100644 --- a/src/App.js +++ b/src/App.js @@ -7,7 +7,7 @@ import "@patternfly/patternfly/patternfly-addons.css"; import store from "./store"; import { getConfig } from "./config/configActions"; import { checkAuthentification } from "./auth/authActions"; -import * as Containers from "./containers"; +import * as Pages from "./pages"; import Header from "./layout/Header"; import PrivateRoute from "./auth/PrivateRoute"; import Page from "./layout/Page"; @@ -52,14 +52,14 @@ class App extends Component { - - + + diff --git a/src/auth/authReducer.js b/src/auth/authReducer.js index 299421d..1789808 100644 --- a/src/auth/authReducer.js +++ b/src/auth/authReducer.js @@ -10,12 +10,12 @@ export default function(state = initialState, action) { return { ...state, isAuthenticated: true - } + }; case types.LOGOUT: - return { - ...state, - isAuthenticated: false - } + return { + ...state, + isAuthenticated: false + }; default: return state; } diff --git a/src/auth/localStorage.test.js b/src/auth/localStorage.test.js index aa62762..39dc449 100644 --- a/src/auth/localStorage.test.js +++ b/src/auth/localStorage.test.js @@ -1,7 +1,7 @@ import { setCredentials, getCredentials, - removeCredentials, + removeCredentials } from "./localStorage"; it("localStorage getCredentials", () => { diff --git a/src/containers.js b/src/containers.js deleted file mode 100644 index 9e5288e..0000000 --- a/src/containers.js +++ /dev/null @@ -1,5 +0,0 @@ -export { default as Container404 } from "./layout/Container404"; -export { default as LoadingContainer } from "./layout/LoadingContainer"; -export { default as LoginContainer } from "./login/LoginContainer"; -export { default as PlaybooksContainer } from "./playbooks/PlaybooksContainer"; -export { default as PlaybookContainer } from "./playbooks/PlaybookContainer"; diff --git a/src/http.js b/src/http.js index 5531a77..f3bd30c 100644 --- a/src/http.js +++ b/src/http.js @@ -4,7 +4,7 @@ import { getCredentials } from "./auth/localStorage"; axios.interceptors.request.use(config => { const credentials = getCredentials(); if (credentials) { - config.auth = credentials + config.auth = credentials; } return config; }); diff --git a/src/layout/LoadingContainer.js b/src/layout/LoadingPage.js similarity index 94% rename from src/layout/LoadingContainer.js rename to src/layout/LoadingPage.js index a2032ba..64c0463 100644 --- a/src/layout/LoadingContainer.js +++ b/src/layout/LoadingPage.js @@ -7,7 +7,7 @@ import { PageSectionVariants } from "@patternfly/react-core"; -export default class LoadingContainer extends Component { +export default class LoadingPage extends Component { state = { seconds: 0 }; diff --git a/src/layout/Container404.js b/src/layout/Page404.js similarity index 70% rename from src/layout/Container404.js rename to src/layout/Page404.js index 11466f6..9325e67 100644 --- a/src/layout/Container404.js +++ b/src/layout/Page404.js @@ -6,7 +6,7 @@ import { PageSectionVariants } from "@patternfly/react-core"; -export default class Container404 extends Component { +export default class Page404 extends Component { render() { return ( @@ -14,7 +14,12 @@ export default class Container404 extends Component {

We are looking for your page...but we can't find it
-

diff --git a/src/login/LoginContainer.js b/src/login/LoginPage.js similarity index 97% rename from src/login/LoginContainer.js rename to src/login/LoginPage.js index 053fe9d..8bc6d3b 100644 --- a/src/login/LoginContainer.js +++ b/src/login/LoginPage.js @@ -10,7 +10,7 @@ import { Redirect } from "react-router-dom"; import logo from "../images/logo.svg"; import { login } from "../auth/authActions"; -export class LoginContainer extends Component { +export class AraLoginPage extends Component { state = { showHelperText: false, helperText: "", @@ -113,4 +113,4 @@ function mapDispatchToProps(dispatch) { export default connect( mapStateToProps, mapDispatchToProps -)(LoginContainer); +)(AraLoginPage); diff --git a/src/pages.js b/src/pages.js new file mode 100644 index 0000000..8f02ace --- /dev/null +++ b/src/pages.js @@ -0,0 +1,5 @@ +export { default as Page404 } from "./layout/Page404"; +export { default as LoadingPage } from "./layout/LoadingPage"; +export { default as LoginPage } from "./login/LoginPage"; +export { default as PlaybooksPage } from "./playbooks/PlaybooksPage"; +export { default as PlaybookPage } from "./playbooks/PlaybookPage"; diff --git a/src/playbooks/PlaybookContainer.js b/src/playbooks/PlaybookPage.js similarity index 89% rename from src/playbooks/PlaybookContainer.js rename to src/playbooks/PlaybookPage.js index c0030d2..bffd18a 100644 --- a/src/playbooks/PlaybookContainer.js +++ b/src/playbooks/PlaybookPage.js @@ -8,13 +8,13 @@ import { } from "@patternfly/react-core"; import { connect } from "react-redux"; import { isEmpty } from "lodash"; -import { LoadingContainer, Container404 } from "../containers"; +import { LoadingPage, Page404 } from "../pages"; import { getPlaybook } from "./playbooksActions"; import PlaybookSummary from "./PlaybookSummary"; import Tasks from "../tasks/Tasks"; import { extractTasksFromPlays } from "../tasks/task"; -export class PlaybookContainer extends Component { +export class PlaybookPage extends Component { state = { isLoading: true, playbook: null @@ -32,14 +32,18 @@ export class PlaybookContainer extends Component { const { isLoading, playbook } = this.state; const { history } = this.props; if (isLoading) { - return ; + return ; } if (!isLoading && isEmpty(playbook)) { - return ; + return ; } return ( - + Hosts @@ -87,4 +91,4 @@ function mapDispatchToProps(dispatch) { export default connect( null, mapDispatchToProps -)(PlaybookContainer); +)(PlaybookPage); diff --git a/src/playbooks/PlaybooksContainer.js b/src/playbooks/PlaybooksPage.js similarity index 95% rename from src/playbooks/PlaybooksContainer.js rename to src/playbooks/PlaybooksPage.js index 81f4953..c335f10 100644 --- a/src/playbooks/PlaybooksContainer.js +++ b/src/playbooks/PlaybooksPage.js @@ -15,11 +15,11 @@ import { Title } from "@patternfly/react-core"; import { CubesIcon, ErrorCircleOIcon } from "@patternfly/react-icons"; -import { LoadingContainer } from "../containers"; +import { LoadingPage } from "../pages"; import { getPlaybooks } from "./playbooksActions"; import PlaybookSummary from "./PlaybookSummary"; -export class PlaybooksContainer extends Component { +export class PlaybooksPage extends Component { state = { isLoading: true, hasError: false, @@ -48,7 +48,7 @@ export class PlaybooksContainer extends Component { const { isLoading, hasError, errorMessage } = this.state; if (isLoading) { - return ; + return ; } if (!isLoading && hasError) { @@ -133,4 +133,4 @@ function mapDispatchToProps(dispatch) { export default connect( mapStateToProps, mapDispatchToProps -)(PlaybooksContainer); +)(PlaybooksPage);