From 388d5378e7bb6b3ac0081d424ba8f212e5a8cf8c Mon Sep 17 00:00:00 2001 From: Gisle Aune Date: Mon, 16 Jul 2018 20:24:01 +0200 Subject: [PATCH] Cleaned up the ui code, addressed warnings --- rpdata-ui/src/App.js | 6 +++--- rpdata-ui/src/common/Background.js | 6 +++--- rpdata-ui/src/common/LoadingScreen.js | 6 +++--- rpdata-ui/src/common/Menu.js | 6 +++--- rpdata-ui/src/routes/logs/LogsMenu.js | 4 ++-- rpdata-ui/src/routes/logs/LogsRoot.js | 6 +++--- rpdata-ui/src/routes/story/StoryMenu.js | 4 ++-- rpdata-ui/src/routes/story/StoryRoot.js | 18 +++++++++--------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/rpdata-ui/src/App.js b/rpdata-ui/src/App.js index 24126c7..7d53ca2 100644 --- a/rpdata-ui/src/App.js +++ b/rpdata-ui/src/App.js @@ -1,8 +1,8 @@ import React, { Component } from 'react' -import { Route, Router, Redirect, Switch } from "react-router-dom"; +import { Route, Redirect, Switch } from "react-router-dom"; -import StoryRoot from './routes/story/StoryRoot'; -import LogsRoot from './routes/logs/LogsRoot'; +import StoryRoot from './routes/story/StoryRoot' +import LogsRoot from './routes/logs/LogsRoot' export default class App extends Component { render() { diff --git a/rpdata-ui/src/common/Background.js b/rpdata-ui/src/common/Background.js index abf09e3..36d5795 100644 --- a/rpdata-ui/src/common/Background.js +++ b/rpdata-ui/src/common/Background.js @@ -1,5 +1,5 @@ -import React, { Component } from 'react'; -import './css/Background.css'; +import React, { Component } from "react" +import "./css/Background.css" /** * Background renders a full-size image that detects whether the source is @@ -58,6 +58,6 @@ export default class Background extends Component { const opacity = this.props.opacity || 0.25 const className = "Background" + (this.state.landscape ? " landscape" : "") - return + return Background } } \ No newline at end of file diff --git a/rpdata-ui/src/common/LoadingScreen.js b/rpdata-ui/src/common/LoadingScreen.js index 0c0c5c3..2f0b77a 100644 --- a/rpdata-ui/src/common/LoadingScreen.js +++ b/rpdata-ui/src/common/LoadingScreen.js @@ -1,7 +1,7 @@ -import React, { Component } from 'react'; -import Background from "./Background"; +import React from "react" +import Background from "./Background" -import './css/LoadingScreen.css'; +import './css/LoadingScreen.css' export function LoadingScreen({className}) { return ( diff --git a/rpdata-ui/src/common/Menu.js b/rpdata-ui/src/common/Menu.js index 40a7757..dbe6e48 100644 --- a/rpdata-ui/src/common/Menu.js +++ b/rpdata-ui/src/common/Menu.js @@ -1,7 +1,7 @@ -import React, { Component } from 'react'; -import { Link } from "react-router-dom"; +import React, { Component } from "react" +import { Link } from "react-router-dom" -import './css/Menu.css'; +import './css/Menu.css' export default class Menu extends Component { render() { diff --git a/rpdata-ui/src/routes/logs/LogsMenu.js b/rpdata-ui/src/routes/logs/LogsMenu.js index 44f6310..7218d8e 100644 --- a/rpdata-ui/src/routes/logs/LogsMenu.js +++ b/rpdata-ui/src/routes/logs/LogsMenu.js @@ -1,5 +1,5 @@ -import React, { Component } from 'react'; -import Menu, { MenuHeader, MenuLink, MenuGap } from '../../common/Menu'; +import React, { Component } from "react" +import Menu, { MenuHeader, MenuLink, MenuGap } from '../../common/Menu' export default class LogsMenu extends Component { render() { diff --git a/rpdata-ui/src/routes/logs/LogsRoot.js b/rpdata-ui/src/routes/logs/LogsRoot.js index b83b685..09f8599 100644 --- a/rpdata-ui/src/routes/logs/LogsRoot.js +++ b/rpdata-ui/src/routes/logs/LogsRoot.js @@ -1,6 +1,6 @@ -import React, { Component } from 'react'; -import Background from '../../common/Background'; -import LogsMenu from './LogsMenu'; +import React, { Component } from "react" +import Background from "../../common/Background" +import LogsMenu from "./LogsMenu" export default class LogsRoot extends Component { render() { diff --git a/rpdata-ui/src/routes/story/StoryMenu.js b/rpdata-ui/src/routes/story/StoryMenu.js index 2f56a60..b8e4543 100644 --- a/rpdata-ui/src/routes/story/StoryMenu.js +++ b/rpdata-ui/src/routes/story/StoryMenu.js @@ -1,5 +1,5 @@ -import React, { Component } from "react"; -import Menu, { MenuHeader, MenuLink, MenuGap } from "../../common/Menu"; +import React, { Component } from "react" +import Menu, { MenuHeader, MenuLink, MenuGap } from "../../common/Menu" import pluralize from "pluralize" export default class StoryMenu extends Component { diff --git a/rpdata-ui/src/routes/story/StoryRoot.js b/rpdata-ui/src/routes/story/StoryRoot.js index af48b91..38f9614 100644 --- a/rpdata-ui/src/routes/story/StoryRoot.js +++ b/rpdata-ui/src/routes/story/StoryRoot.js @@ -1,11 +1,11 @@ -import React, { Component } from 'react'; -import { Query } from 'react-apollo'; +import React, { Component } from "react" +import { Query } from "react-apollo" -import Background from '../../common/Background'; -import StoryMenu from './StoryMenu'; +import Background from "../../common/Background" +import StoryMenu from "./StoryMenu" -import storyRootQuery from "./gql/StoryRoot"; -import { LoadingScreen } from '../../common/LoadingScreen'; +import storyRootQuery from "./gql/StoryRoot" +import { LoadingScreen } from "../../common/LoadingScreen" export class StoryIndex extends Component { render() { @@ -23,10 +23,10 @@ export class StoryIndex extends Component { export default () => ( {({ loading, error, data }) => { - if (loading) return ; - if (error) return `Error! ${error.message}`; + if (loading) return + if (error) return `Error! ${error.message}` return }} -); \ No newline at end of file +) \ No newline at end of file