openstack
/
tripleo-ui
Code Issues Proposed changes

Use history API 

Change-Id: Ieb16218cf6d24fd00e890fd353218918bd5fe782
This commit is contained in:
Florian Fuchs 2016-01-15 15:32:39 +01:00
parent b714cda789
commit aa1ba61969
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app.conf.sample
View File

@ -1,7 +1,7 @@
[app] [app]
# keystone_url = http://192.0.2.1:5000/v2.0 # keystone_url = http://192.0.2.1:5000/v2.0
# validations_url = http://192.0.2.1:8585/v1 # tripleo_api_url = http://192.0.2.1:8585/v1
# tripleo_api_url = http://192.0.2.1:5001/v1 # validations_url = http://192.0.2.1:5001/v1
[service] [service]
# debug = False # debug = False

6
dist/index.html vendored
View File

@ -5,11 +5,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>RDO Manager</title> <title>RDO Manager</title>
<link rel="stylesheet" href="css/base.css" /> <link rel="stylesheet" href="/css/base.css" />
</head> </head>
<body> <body>
<div id="react-app-index"></div> <div id="react-app-index"></div>
<script src="js/rdo_director_ui_config.js"></script> <script src="/js/rdo_director_ui_config.js"></script>
<script src="js/rdo_director_ui.js"></script> <script src="/js/rdo_director_ui.js"></script>
</body> </body>
</html> </html>

6
gulpfile.js
View File

@ -2,6 +2,7 @@ var fs = require('fs');
var gulp = require('gulp'); var gulp = require('gulp');
var browserSync = require('browser-sync'); var browserSync = require('browser-sync');
var historyApiFallback = require('connect-history-api-fallback');
var ini = require('ini'); var ini = require('ini');
var less = require('gulp-less'); var less = require('gulp-less');
// var rename = require('gulp-rename'); // var rename = require('gulp-rename');
@ -21,7 +22,10 @@ gulp.task('webpack-app', ['webpack-tempstorage-worker'], function() {
gulp.task('serve', ['config-create', 'webpack-app', 'less', 'fonts', 'images'], function(){ gulp.task('serve', ['config-create', 'webpack-app', 'less', 'fonts', 'images'], function(){
browserSync.init({ browserSync.init({
open: false, open: false,
server: './dist' server: {
baseDir: './dist',
middleware: [ historyApiFallback() ]
}
}); });
gulp.watch('src/less/**/*.less', ['less']); gulp.watch('src/less/**/*.less', ['less']);

3
package.json
View File

@ -23,7 +23,8 @@
"patternfly": "~2.5.0", "patternfly": "~2.5.0",
"formatjs": "^0.1.1", "formatjs": "^0.1.1",
"keymirror": "~0.1.1", "keymirror": "~0.1.1",
"react-modal": "~0.6.1" "react-modal": "~0.6.1",
"connect-history-api-fallback": "~1.1.0"
}, },
"devDependencies": { "devDependencies": {
"gulp": "~3.9.0", "gulp": "~3.9.0",

3
src/js/index.js
View File

@ -4,6 +4,7 @@ import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { IntlProvider } from 'react-intl'; import { IntlProvider } from 'react-intl';
import { Router, Route, IndexRoute, Redirect } from 'react-router'; import { Router, Route, IndexRoute, Redirect } from 'react-router';
import createBrowserHistory from 'history/lib/createBrowserHistory';
import App from './components/App'; import App from './components/App';
import AuthenticatedContent from './components/AuthenticatedContent'; import AuthenticatedContent from './components/AuthenticatedContent';
@ -83,6 +84,6 @@ TempStorage.initialized.then(() => {
ReactDOM.render( ReactDOM.render(
<IntlProvider locale="en"> <IntlProvider locale="en">
<Router>{routes}</Router> <Router history={createBrowserHistory()}>{routes}</Router>
</IntlProvider>, </IntlProvider>,
document.getElementById('react-app-index')); document.getElementById('react-app-index'));