From 1c224f95ab771bf8cc910c939c54bf432a037d35 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Sun, 28 Aug 2016 01:59:36 -0500 Subject: [PATCH] added loading icon - next step: add sensor stuff and things --- client/assets/images/loading.svg | 17 +++++++++++++++++ client/assets/scss/Content.scss | 6 +++--- client/assets/scss/main.scss | 12 ++++++++++-- client/js/components/Sidebar.js | 13 +++++++------ client/js/pages/Index.js | 11 +++++++++-- 5 files changed, 46 insertions(+), 13 deletions(-) create mode 100644 client/assets/images/loading.svg diff --git a/client/assets/images/loading.svg b/client/assets/images/loading.svg new file mode 100644 index 0000000..f2b9600 --- /dev/null +++ b/client/assets/images/loading.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/client/assets/scss/Content.scss b/client/assets/scss/Content.scss index a6bc995..1d23a1c 100644 --- a/client/assets/scss/Content.scss +++ b/client/assets/scss/Content.scss @@ -13,7 +13,7 @@ position: absolute; width: 7em; text-align: right; - margin-left: -9em; + margin-left: -8em; } } .intro { @@ -21,8 +21,8 @@ } img { max-width: 100%; - height: auto; - margin: auto; + display: block; + margin: 0 auto; } code, pre { diff --git a/client/assets/scss/main.scss b/client/assets/scss/main.scss index 2d2e0ad..9e9b508 100644 --- a/client/assets/scss/main.scss +++ b/client/assets/scss/main.scss @@ -1,4 +1,7 @@ @import './utils.scss'; + +$linkColor: #3598db; + html { font-family: 'Roboto Slab', serif; max-width: 100%; @@ -34,10 +37,10 @@ p { } a { background-color: transparent; - color: #3598db; + color: $linkColor; text-decoration: none; &:hover { - color: #3598db; + color: $linkColor; } } hr { @@ -71,3 +74,8 @@ hr { text-align: center; } } +.Loading{ + display: flex; + flex: 1; + justify-content: center; +} diff --git a/client/js/components/Sidebar.js b/client/js/components/Sidebar.js index 7d30990..a4a8572 100644 --- a/client/js/components/Sidebar.js +++ b/client/js/components/Sidebar.js @@ -33,17 +33,12 @@ export default class Sidebar extends React.Component{ class="fa fa-2x fa-navicon" aria-hidden="true" /> -

- About Me -

+

About Me

My name is Mitchell and I have a passion for software development. I am currently a software engineer and enjoy working on personal projects in my free time.

-

- Contact Me -

eMail @@ -60,6 +55,12 @@ export default class Sidebar extends React.Component{ Resume

+ +
+ +

Sensors

+
+ ); } diff --git a/client/js/pages/Index.js b/client/js/pages/Index.js index 332f5eb..51f19f4 100644 --- a/client/js/pages/Index.js +++ b/client/js/pages/Index.js @@ -13,6 +13,9 @@ import '../../assets/scss/main.scss'; import 'font-awesome/css/font-awesome.min.css'; import '../../assets/css/dracula.css'; +//loading icon +import loading from '../../assets/images/loading.svg'; + export default class Index extends React.Component { componentDidMount() { this.props.actions.fetchPreview(); @@ -35,14 +38,14 @@ export default class Index extends React.Component { render() { const fetched = this.props.redux.fetched; const fetching = this.props.redux.fetching; - + return (
{typeof this.page === 'undefined' && !fetching ? : null} {this.page === 'post' && !fetching ? : null} - {fetching ?
Fetching
: null} + {fetching ? loadingElement : null}