From 69a081ccf8e6a574443089c15444149355d1adaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Mon, 2 Jul 2018 16:22:24 +0200 Subject: [PATCH] renaming: loading to login --- scm-ui/src/Login.js | 4 ++-- scm-ui/src/containers/Page.js | 8 ++++---- scm-ui/src/containers/Users.js | 8 ++++---- scm-ui/src/modules/page.js | 6 +++--- scm-ui/src/modules/users.js | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scm-ui/src/Login.js b/scm-ui/src/Login.js index d6ef5a29a1..f85fbef9ed 100644 --- a/scm-ui/src/Login.js +++ b/scm-ui/src/Login.js @@ -8,7 +8,7 @@ const styles = { display: 'flex', height: '10em' }, - loading: { + login: { margin: 'auto', textAlign: 'center' } @@ -24,7 +24,7 @@ class Login extends React.Component { const { classes } = this.props; return (
-
+
You need to log in! ...
diff --git a/scm-ui/src/containers/Page.js b/scm-ui/src/containers/Page.js index f94914c2b8..7586be9167 100644 --- a/scm-ui/src/containers/Page.js +++ b/scm-ui/src/containers/Page.js @@ -7,7 +7,7 @@ import Login from '../Login'; type Props = { - loading: boolean, + login: boolean, error: any, repositories: any, fetchRepositoriesIfNeeded: () => void @@ -20,10 +20,10 @@ class Page extends React.Component { } render() { - const { loading, error, repositories } = this.props; + const { login, error, repositories } = this.props; - if(loading) { + if(login) { return (

SCM

@@ -31,7 +31,7 @@ class Page extends React.Component {
); } - else if(!loading){ + else if(!login){ return (

SCM

diff --git a/scm-ui/src/containers/Users.js b/scm-ui/src/containers/Users.js index 00b22862f8..8a4bfd5494 100644 --- a/scm-ui/src/containers/Users.js +++ b/scm-ui/src/containers/Users.js @@ -6,7 +6,7 @@ import { fetchRepositoriesIfNeeded } from '../modules/users'; import Login from '../Login'; type Props = { - loading: boolean, + login: boolean, error: any, repositories: any, fetchRepositoriesIfNeeded: () => void @@ -19,11 +19,11 @@ class Users extends React.Component { } render() { - const { loading, error, repositories } = this.props; + const { login, error, repositories } = this.props; - if(loading) { + if(login) { return (

SCM

@@ -31,7 +31,7 @@ class Users extends React.Component {
); } - else if(!loading){ + else if(!login){ return (

SCM

diff --git a/scm-ui/src/modules/page.js b/scm-ui/src/modules/page.js index fe8db685e0..58fd12ca18 100644 --- a/scm-ui/src/modules/page.js +++ b/scm-ui/src/modules/page.js @@ -37,13 +37,13 @@ export default function reducer(state = {}, action = {}) { case FETCH_REPOSITORIES: return { ...state, - loading: true, + login: true, error: null }; case FETCH_REPOSITORIES_SUCCESS: return { ...state, - loading: true, + login: true, timestamp: action.timestamp, error: null, repositories: action.payload @@ -51,7 +51,7 @@ export default function reducer(state = {}, action = {}) { case FETCH_REPOSITORIES_FAILURE: return { ...state, - loading: true, + login: true, error: action.payload }; diff --git a/scm-ui/src/modules/users.js b/scm-ui/src/modules/users.js index b482010b61..d4617c3a47 100644 --- a/scm-ui/src/modules/users.js +++ b/scm-ui/src/modules/users.js @@ -37,13 +37,13 @@ export default function reducer(state = {}, action = {}) { case FETCH_REPOSITORIES: return { ...state, - loading: true, + login: true, error: null }; case FETCH_REPOSITORIES_SUCCESS: return { ...state, - loading: false, + login: false, timestamp: action.timestamp, error: null, repositories: action.payload @@ -51,7 +51,7 @@ export default function reducer(state = {}, action = {}) { case FETCH_REPOSITORIES_FAILURE: return { ...state, - loading: false, + login: false, error: action.payload };