Forráskód Böngészése

Fix: resources path and CSS bundle

fecaille 9 éve
szülő
commit
2115d30c32

+ 1 - 0
src/main/resources/static/js/app.render.jsx

@@ -8,6 +8,7 @@ import App from './app.jsx';
 
 
 require('bootstrap/dist/css/bootstrap.css');
+require('../css/comments.css');
 
 global.renderClient = function (comments) {
     var data = comments || [];

+ 1 - 1
src/main/resources/templates/fragments/header.html

@@ -24,7 +24,7 @@
 						</ul>
 						<ul class="nav navbar-nav navbar-right">
 							<li>
-								<a href="/signin" th:href="@{/signin}">Sign in</a>
+								<a href="/signin" th:href="@{/signin}" class="glyphicon glyphicon-user">Sign in</a>
 							</li>
 						</ul>
 					</div>

+ 1 - 1
src/main/resources/templates/index.html

@@ -4,7 +4,7 @@
 	<meta charset="UTF-8" />
 	<title>Comments channel</title>
 	<link rel="stylesheet" href="/css/vendors.css" />
-	<link rel="stylesheet" href="/css/comments.css" />
+	<link rel="stylesheet" href="/css/app.css" />
 </head>
 <body>
 

+ 5 - 15
webpack.config.js

@@ -19,8 +19,7 @@ var config = {
     debug: true,
     output: {
         path: './target/classes/static/js',
-        filename: '[name].bundle.js',
-        
+        filename: '[name].bundle.js'        
     },
     plugins: [
         new ExtractTextPlugin("../css/[name].css"),
@@ -41,30 +40,21 @@ var config = {
 				test: /\.css$/, 
 				loader: ExtractTextPlugin.extract("style-loader", "css-loader!postcss-loader") 
 			},
-            { 
-				test: /\.jpe?g$|\.gif$|\.png$|\.svg$|\.woff(2)?$|\.ttf$|\.wav$|\.mp3$/, 
-				loader: require.resolve("file-loader") + "?name=../[path][name].[ext]"
-			},
 			{ 
             	test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, 
-            	loader: "file" 
+            	loader: "file?name=../css/[name].[ext]" 
             },
 			{ 
             	test: /\.(woff|woff2)$/, 
-            	loader:"url?prefix=font/&limit=5000" 
+            	loader:"url?prefix=font/&limit=5000&name=../css/[name].[ext]" 
             },
 			{ 
             	test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, 
-            	loader: "url?limit=10000&mimetype=application/octet-stream" 
+            	loader: "url?limit=10000&mimetype=application/octet-stream&&name=../css/[name].[ext]" 
             },
 			{ 
             	test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, 
-            	loader: "url?limit=10000&mimetype=image/svg+xml" 
-            },
-            {
-            	test: path.join(__dirname, '.'),
-            	exclude: /(node_modules)/,
-            	loader: 'babel-loader'
+            	loader: "url?limit=10000&mimetype=image/svg+xml&&name=../css/[name].[ext]" 
             }
         ]
     },