Skip to content

Commit 20f800e

Browse files
author
Minh Tran
committed
Refactor
1 parent a49b3e0 commit 20f800e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+693
-856
lines changed

.bowerrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory": "example/app/assets/bower_components"
2+
"directory": "bower_components"
33
}

.eslintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"no-unused-expressions": 2,
4444
"space-after-keywords": 2,
4545
"space-before-blocks": 2,
46-
"jsx-quotes": [1, "prefer-single"],
46+
"jsx-quotes": [1, "prefer-double"],
4747
"react/display-name": 0,
4848
"react/jsx-boolean-value": [2, "always"],
4949
"react/jsx-no-undef": 2,
@@ -53,7 +53,7 @@
5353
"react/jsx-uses-vars": 2,
5454
"react/no-did-mount-set-state": 2,
5555
"react/no-did-update-set-state": 2,
56-
"react/no-multi-comp": 2,
56+
"react/no-multi-comp": [2, {"ignoreStateless": true}],
5757
"react/no-unknown-property": 2,
5858
"react/prop-types": 1,
5959
"react/react-in-jsx-scope": 2,

bower.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,5 @@
2020
"tests"
2121
],
2222
"dependencies": {},
23-
"devDependencies": {
24-
"bootstrap-customize": "~3.3.4"
25-
}
23+
"devDependencies": {}
2624
}

example/app/app.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@ import 'babel-core/polyfill';
22

33
import React from 'react';
44
import ReactDOM from 'react-dom';
5-
import {createHistory, useBasename} from 'history';
6-
import Router from 'react-router';
5+
import {createHistory} from 'history';
6+
import {Router, useRouterHistory} from 'react-router';
77
import App from 'components/App.js';
88
import {name} from '../../package.json';
99

10-
import 'assets/bower_components/bootstrap-customize/css/bootstrap.css';
10+
import 'bootstrap/dist/css/bootstrap.css';
1111
import 'react-progress-bar-plus/src/progress-bar.scss';
1212
import 'assets/styles/app.scss';
1313

1414
const routes = {
1515
path: '/',
1616
component: App,
1717
indexRoute: {
18-
component: require('./components/pages/Home')
18+
component: require('components/pages/Home')
1919
},
2020
childRoutes: [
21-
require('./routes/Example1Route')
21+
require('routes/AutoIncrement')
2222
]
2323
};
2424

2525
const DEV = process && process.env && process.env.NODE_ENV === 'development';
26-
const history = useBasename(createHistory)({
26+
const history = useRouterHistory(createHistory)({
2727
basename: '/' + (DEV ? '' : name)
2828
});
2929

example/app/assets/styles/_animations.scss

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/* Pre Render
2+
========================================================================== */
3+
@keyframes spinner {
4+
0% {
5+
transform: rotate(0deg);
6+
}
7+
100% {
8+
transform: rotate(360deg);
9+
}
10+
}
11+
12+
.pre-render {
13+
background: rgba(255, 255, 255, .7);
14+
position: fixed;
15+
top: 0;
16+
left: 0;
17+
width: 100%;
18+
height: 100%;
19+
z-index: 99999;
20+
.spinner {
21+
width: 48px;
22+
height: 48px;
23+
border: 1px solid lighten($primary, 40%);
24+
border-left-color: darken($primary, 10%);
25+
border-radius: 50%;
26+
animation: spinner 700ms infinite linear;
27+
position: absolute;
28+
top: 50%;
29+
left: 50%;
30+
margin-left: -24px;
31+
margin-top: -24px;
32+
}
33+
}
File renamed without changes.

example/app/assets/styles/_page.scss

Whitespace-only changes.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* Header
2+
========================================================================== */
3+
.navbar {
4+
border-radius: 0;
5+
}
6+
7+
/* Footer
8+
========================================================================== */
9+
html,
10+
body,
11+
#app {
12+
height: 100%;
13+
}
14+
15+
.layout-page {
16+
position: relative;
17+
min-height: 100%;
18+
padding-bottom: 60px;
19+
}
20+
21+
.layout-main {
22+
margin-bottom: 30px;
23+
}
24+
25+
.layout-footer {
26+
position: absolute;
27+
bottom: 0;
28+
width: 100%;
29+
height: 60px;
30+
background-color: #F8F8F8;
31+
padding: 20px 0;
32+
}
File renamed without changes.

0 commit comments

Comments
 (0)