parent
47e02ef136
commit
7260f5c01f
6 changed files with 23 additions and 7 deletions
|
|
@ -17,19 +17,23 @@
|
||||||
"chrome-remote-interface": "^0.25.5",
|
"chrome-remote-interface": "^0.25.5",
|
||||||
"compression-webpack-plugin": "~1.0.0",
|
"compression-webpack-plugin": "~1.0.0",
|
||||||
"copy-webpack-plugin": "~3.0.1",
|
"copy-webpack-plugin": "~3.0.1",
|
||||||
|
"css-loader": "^0.28.11",
|
||||||
"eslint": "^3.0.0",
|
"eslint": "^3.0.0",
|
||||||
"eslint-loader": "~1.6.1",
|
"eslint-loader": "~1.6.1",
|
||||||
"eslint-plugin-react": "~6.9.0",
|
"eslint-plugin-react": "~6.9.0",
|
||||||
|
"extract-text-webpack-plugin": "^2.1.0",
|
||||||
"htmlparser": "^1.7.7",
|
"htmlparser": "^1.7.7",
|
||||||
"jed": "^1.1.1",
|
"jed": "^1.1.1",
|
||||||
"jshint": "~2.9.1",
|
"jshint": "~2.9.1",
|
||||||
"jshint-loader": "~0.8.3",
|
"jshint-loader": "~0.8.3",
|
||||||
"po2json": "^0.4.5",
|
"po2json": "^0.4.5",
|
||||||
|
"sass-loader": "^7.0.3",
|
||||||
"sizzle": "^2.3.3",
|
"sizzle": "^2.3.3",
|
||||||
"stdio": "^0.2.7",
|
"stdio": "^0.2.7",
|
||||||
"webpack": "^2.6.1"
|
"webpack": "^2.6.1"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"node-sass": "^4.9.0",
|
||||||
"react-lite": "0.15.30"
|
"react-lite": "0.15.30"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@
|
||||||
|
|
||||||
import cockpit from 'cockpit';
|
import cockpit from 'cockpit';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
import './app.scss';
|
||||||
|
|
||||||
const _ = cockpit.gettext;
|
const _ = cockpit.gettext;
|
||||||
|
|
||||||
|
|
@ -36,9 +37,9 @@ export class Application extends React.Component {
|
||||||
return (
|
return (
|
||||||
<div className="container-fluid">
|
<div className="container-fluid">
|
||||||
<h2>Starter Kit</h2>
|
<h2>Starter Kit</h2>
|
||||||
<div>
|
<p>
|
||||||
<span>{ cockpit.format(_("Running on $0"), this.state.hostname) }</span>
|
{ cockpit.format(_("Running on $0"), this.state.hostname) }
|
||||||
</div>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
3
src/app.scss
Normal file
3
src/app.scss
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
p {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
@ -23,6 +23,7 @@ along with this package; If not, see <http://www.gnu.org/licenses/>.
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<link rel="stylesheet" href="../base1/patternfly.css">
|
<link rel="stylesheet" href="../base1/patternfly.css">
|
||||||
|
<link rel="stylesheet" href="index.css">
|
||||||
|
|
||||||
<script type="text/javascript" src="../base1/cockpit.js"></script>
|
<script type="text/javascript" src="../base1/cockpit.js"></script>
|
||||||
<script type="text/javascript" src="../*/po.js"></script>
|
<script type="text/javascript" src="../*/po.js"></script>
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@ class TestApplication(testlib.MachineCase):
|
||||||
|
|
||||||
# verify expected host name
|
# verify expected host name
|
||||||
hostname = m.execute("hostname").strip()
|
hostname = m.execute("hostname").strip()
|
||||||
b.wait_present(".container-fluid span")
|
b.wait_present(".container-fluid p")
|
||||||
b.wait_text(".container-fluid span", "Running on " + hostname)
|
b.wait_text(".container-fluid p", "Running on " + hostname)
|
||||||
|
|
||||||
# change language to German
|
# change language to German
|
||||||
b.switch_to_top()
|
b.switch_to_top()
|
||||||
|
|
@ -46,7 +46,7 @@ class TestApplication(testlib.MachineCase):
|
||||||
b.go("/starter-kit")
|
b.go("/starter-kit")
|
||||||
b.enter_page("/starter-kit")
|
b.enter_page("/starter-kit")
|
||||||
# page label (from js) should be translated
|
# page label (from js) should be translated
|
||||||
b.wait_in_text(".container-fluid span", "Läuft auf")
|
b.wait_in_text(".container-fluid p", "Läuft auf")
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
testlib.test_main()
|
testlib.test_main()
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const copy = require("copy-webpack-plugin");
|
const copy = require("copy-webpack-plugin");
|
||||||
|
const extract = require("extract-text-webpack-plugin");
|
||||||
const fs = require("fs");
|
const fs = require("fs");
|
||||||
const webpack = require("webpack");
|
const webpack = require("webpack");
|
||||||
const CompressionPlugin = require("compression-webpack-plugin");
|
const CompressionPlugin = require("compression-webpack-plugin");
|
||||||
|
|
@ -82,7 +83,8 @@ var plugins = [
|
||||||
'NODE_ENV': JSON.stringify(production ? 'production' : 'development')
|
'NODE_ENV': JSON.stringify(production ? 'production' : 'development')
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
new copy(info.files)
|
new copy(info.files),
|
||||||
|
new extract("[name].css")
|
||||||
];
|
];
|
||||||
|
|
||||||
/* Only minimize when in production mode */
|
/* Only minimize when in production mode */
|
||||||
|
|
@ -149,6 +151,11 @@ module.exports = {
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'babel-loader',
|
loader: 'babel-loader',
|
||||||
test: /\.es6$/
|
test: /\.es6$/
|
||||||
|
},
|
||||||
|
{
|
||||||
|
exclude: /node_modules/,
|
||||||
|
loader: extract.extract('css-loader!sass-loader'),
|
||||||
|
test: /\.scss$/
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue