Update UI

gocreating · Oct 24, 2016 · 9e79ce5 · 9e79ce5
1 parent 8dcb7d6
commit 9e79ce5
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/src/common/components/layouts/PageLayout.js b/src/common/components/layouts/PageLayout.js
@@ -1,16 +1,26 @@
-import React from 'react';
+import React, { PropTypes } from 'react';
 import Grid from 'react-bootstrap/lib/Grid';
 import Navigation from '../utils/Navigation';
 import ErrorList from '../utils/ErrorList';
 
-const PageLayout = ({ children, ...rest }) => (
+let PageLayout = ({ hasGrid, children, ...rest }) => (
   <div>
     <Navigation />
     <ErrorList />
-    <Grid {...rest}>
-      {children}
-    </Grid>
+    {hasGrid ? (
+      <Grid {...rest}>
+        {children}
+      </Grid>
+    ) : children}
   </div>
 );
 
+PageLayout.propTypes = {
+  hasGrid: PropTypes.bool,
+};
+
+PageLayout.defaultProps = {
+  hasGrid: true,
+};
+
 export default PageLayout;
diff --git a/src/common/components/pages/user/LoginPage.js b/src/common/components/pages/user/LoginPage.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PageHeader from 'react-bootstrap/lib/PageHeader';
+import Alert from 'react-bootstrap/lib/Alert';
 import Grid from 'react-bootstrap/lib/Grid';
 import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
@@ -12,14 +13,24 @@ let LoginPage = ({ location }) => {
   let search = next ? '?next=' + next : '';
 
   return (
-    <PageLayout>
+    <PageLayout hasGrid={false}>
       <Head
         links={[
           'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-social/5.0.0/bootstrap-social.min.css',
         ]}
       />
       <Grid>
         <PageHeader>Login</PageHeader>
+        <Row>
+          <Col md={12}>
+            {next && (
+              <Alert bsStyle="warning">
+                <strong>Authentication Required</strong>
+                {' '}Please login first.
+              </Alert>
+            )}
+          </Col>
+        </Row>
         <Row>
           <Col md={9}>
             <LoginForm />