Skip to content

Commit cabda20

Browse files
authored
Merge pull request #31 from codaco/feature/loading-spinner
Feature/loading spinner
2 parents 6518aac + 080ef5b commit cabda20

File tree

28 files changed

+560
-398
lines changed

28 files changed

+560
-398
lines changed

bin/dev-server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ const server = require('../server/main');
33
const debug = require('debug')('app:bin:dev-server');
44

55
server.listen(project.server_port);
6-
debug(`Server is now running at http://localhost:${project.server_port}.`);
6+
debug(`Server is now running at http://${project.server_host}:${project.server_port}.`);

config/project.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const config = {
2626
// ----------------------------------
2727
// Server Configuration
2828
// ----------------------------------
29-
server_host : 'localhost', // use string 'localhost' to prevent exposure on local network
29+
server_host : ip.address(), // use string 'localhost' to prevent exposure on local network
3030
server_port : process.env.PORT || 8080,
3131

3232
// ----------------------------------

docs/containers/AppLayout.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,28 @@ class AppLayout extends Component {
2222
},
2323
{
2424
title: 'Typography',
25-
href: 'typography'
25+
href: 'typography',
26+
},
27+
{
28+
title: 'Spinners',
29+
href: 'spinners',
2630
},
2731
{
2832
title: 'Color',
29-
href: 'color'
33+
href: 'color',
3034
},
3135
{
3236
title: 'Buttons',
33-
href: 'buttons'
37+
href: 'buttons',
3438
},
3539
{
3640
title: 'Icons',
37-
href: 'icons'
41+
href: 'icons',
3842
},
3943
{
4044
title: 'Form',
41-
href: 'form'
42-
}
45+
href: 'form',
46+
},
4347
];
4448

4549
toggleSideNav = () => {

docs/containers/SpinnerPage.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import React, { Component } from 'react';
2+
import { Spinner } from 'Components';
3+
4+
class SpinnerPage extends Component {
5+
render() {
6+
return (
7+
<div className="grid__container">
8+
<h1>Network Canvas | Spinners</h1>
9+
<div className="grid__container">
10+
<h2 className="type--page-divider">Sizes</h2>
11+
<h3 className="type--page-title--large">Small</h3>
12+
<Spinner small />
13+
<h3 className="type--page-title--large">Standard</h3>
14+
<Spinner />
15+
<h3 className="type--page-title--large">Large</h3>
16+
<Spinner large />
17+
</div>
18+
</div>
19+
);
20+
}
21+
}
22+
23+
export default SpinnerPage;

docs/containers/TypographyPage.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { Component } from 'react';
2+
import { Spinner } from 'Components';
23

34
class TypographyPage extends Component {
45
render() {
@@ -7,7 +8,7 @@ class TypographyPage extends Component {
78
<h1>Network Canvas | Typography</h1>
89
<div className="grid__container">
910
<h2 className="type--page-divider">Typefaces</h2>
10-
<h3 className="type--page-title-large">Primary Typeface</h3>
11+
<h3 className="type--page-title--large">Primary Typeface</h3>
1112
<h3 className="type--page-title--large">Circular Pro</h3>
1213
<h3 className="type--section-header--large typography__sample">ABCDEFGHIJKLM</h3>
1314
<h3 className="type--section-header--large typography__sample">abcdefghijklm</h3>

docs/containers/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ export FormPage from './FormPage';
66
export HomePage from './HomePage';
77
export IconsPage from './IconsPage';
88
export TypographyPage from './TypographyPage';
9+
export SpinnerPage from './SpinnerPage';

docs/routes.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@ import {
77
FormPage,
88
HomePage,
99
IconsPage,
10-
TypographyPage
11-
} from 'containers';
10+
TypographyPage,
11+
SpinnerPage,
12+
} from './containers';
1213

1314
export default (
14-
<Route path="/" component={AppLayout}>
15-
<IndexRoute component={HomePage} />
15+
<Route path="/" component={AppLayout}>
16+
<IndexRoute component={HomePage} />
1617
<Route path="/buttons" component={ButtonsPage} />
1718
<Route path="/color" component={ColorPage} />
1819
<Route path="/icons" component={IconsPage} />
19-
<Route path="/typography" component={TypographyPage} />
20+
<Route path="/typography" component={TypographyPage} />
2021
<Route path="/form" component={FormPage} />
21-
</Route>
22+
<Route path="/spinners" component={SpinnerPage} />
23+
</Route>
2224
);

docs/styles/main.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ $app-content-padding: 70px;
8989
display: flex;
9090
overflow: hidden;
9191
position: relative;
92+
color: palette('text');
93+
background: palette('background');
9294

9395
&__content {
9496
position: absolute;

lib/components/Example.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

lib/components/Example.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)