diff --git a/client/config/development/entry.js b/client/config/development/entry.js
index dee5314..ea94b65 100644
--- a/client/config/development/entry.js
+++ b/client/config/development/entry.js
@@ -1,5 +1,9 @@
import { createHistory, useQueries } from 'history';
+import '!style-loader!css-loader!bootstrap/dist/css/bootstrap.css';
+import '!style-loader!css-loader!font-awesome/css/font-awesome.css';
+import 'assets/css/app.scss';
+
import app from 'client/app';
app(useQueries(createHistory));
diff --git a/client/config/development/webpack.js b/client/config/development/webpack.js
index 85e168d..572666a 100644
--- a/client/config/development/webpack.js
+++ b/client/config/development/webpack.js
@@ -9,8 +9,7 @@ const ROOT = CLIENT + '/..';
// Identical to development webpack config, except minified.
module.exports = {
entry: {
- app: __dirname + '/entry',
- style: __dirname + '/style'
+ app: __dirname + '/entry'
},
devtool: 'source-map',
output: {
@@ -22,12 +21,12 @@ module.exports = {
{
test: /\.js$/,
loader: 'babel'
- }, {
- test: /\.scss$/,
- loader: ExtractTextPlugin.extract('style', 'css!sass?sourceMap=true')
}, {
test: /\.css$/,
- loader: ExtractTextPlugin.extract('style', 'css?sourceMap=true')
+ loader: 'style-loader!css-loader?modules'
+ }, {
+ test: /\.scss$/,
+ loader: 'style-loader!css-loader?modules!sass-loader'
}, {
test: /\.json$/,
loader: 'json'
@@ -57,7 +56,7 @@ module.exports = {
loader: 'url?limit=10000&mimetype=image/svg+xml'
}, {
test: /\.rt\.html$/,
- loader: 'react-templates-loader?targetVersion=0.14.0'
+ loader: 'react-templates-loader?modules=amd'
}
]
},
@@ -90,4 +89,3 @@ module.exports = {
}
}
}
-
diff --git a/package.json b/package.json
index 3a6ecee..390429c 100644
--- a/package.json
+++ b/package.json
@@ -91,16 +91,16 @@
"i18next-xhr-backend": "^0.5.3",
"immutable": "3.8.x",
"jquery": "2.2.x",
- "morgan": "~1.5.1",
"moment": "2.13.x",
+ "morgan": "~1.5.1",
"query-string": "^3.0.0",
"react": "0.14.7",
"react-addons-test-utils": "0.14.7",
"react-bootstrap": "0.29.x",
"react-dom": "0.14.7",
"react-redux": "4.4.x",
- "react-templates": "0.4.x",
- "react-templates-loader": "0.4.x",
+ "react-templates": "^0.5.4",
+ "react-templates-loader": "^0.5.1",
"redux": "3.5.x",
"redux-act": "0.5.x",
"redux-loop": "2.1.x",
diff --git a/server/assets/css/app.scss b/server/assets/css/app.scss
index 80540b4..f6878e0 100644
--- a/server/assets/css/app.scss
+++ b/server/assets/css/app.scss
@@ -1,16 +1,18 @@
-html, body {
- height:100%;
-}
-#app_container {
- min-height: 100%;
- position:relative;
- padding-bottom:100px;
-}
-#app_footer {
- width:100%;
- padding:15px;
- position:absolute;
- bottom:0px;
- border-top:2px solid darkgrey;
- background-color:#F8F8F8;
+:global {
+ html, body {
+ height:100%;
+ }
+ #app_container {
+ min-height: 100%;
+ position:relative;
+ padding-bottom:100px;
+ }
+ #app_footer {
+ width:100%;
+ padding:15px;
+ position:absolute;
+ bottom:0px;
+ border-top:2px solid darkgrey;
+ background-color:#F8F8F8;
+ }
}
diff --git a/shared/components/layouts/test/test.component.js b/shared/components/layouts/test/test.component.js
new file mode 100644
index 0000000..27e1921
--- /dev/null
+++ b/shared/components/layouts/test/test.component.js
@@ -0,0 +1,20 @@
+/*global module*/
+
+import React from 'react';
+
+import template from './test.rt.html';
+import SpikeComponent from 'shared/lib/base_classes/spike_component';
+
+class TestComponent extends SpikeComponent {
+
+ get template(){
+ return template;
+ }
+
+}
+
+TestComponent.propTypes = {
+
+};
+
+module.exports = TestComponent;
diff --git a/shared/components/layouts/test/test.rt.html b/shared/components/layouts/test/test.rt.html
new file mode 100644
index 0000000..698ca87
--- /dev/null
+++ b/shared/components/layouts/test/test.rt.html
@@ -0,0 +1,5 @@
+