diff --git a/client/assets/fonts/BRUSHSCI.TTF b/client/assets/fonts/BRUSHSCI.TTF
new file mode 100644
index 0000000..85634c0
Binary files /dev/null and b/client/assets/fonts/BRUSHSCI.TTF differ
diff --git a/client/assets/fonts/Roboto-Bold.ttf b/client/assets/fonts/Roboto-Bold.ttf
new file mode 100644
index 0000000..68822ca
Binary files /dev/null and b/client/assets/fonts/Roboto-Bold.ttf differ
diff --git a/client/assets/glasses.png b/client/assets/glasses.png
new file mode 100644
index 0000000..852b960
Binary files /dev/null and b/client/assets/glasses.png differ
diff --git a/common/component/layout/Header.css b/common/component/layout/Header.css
new file mode 100644
index 0000000..145b52a
--- /dev/null
+++ b/common/component/layout/Header.css
@@ -0,0 +1,12 @@
+@font-face
+{
+ font-family: myFirstFont;
+ src: url('../../../client/assets/fonts/Roboto-Bold.ttf');
+}
+
+.name{
+ /*display:none;*/
+ /*background-color: red;*/
+ /*background-image: url('./assets/glasses.png')*/
+ font-family: myFirstFont
+}
\ No newline at end of file
diff --git a/common/component/page/Indexpage.jsx b/common/component/page/Indexpage.jsx
index 5e47082..eb0141a 100644
--- a/common/component/page/Indexpage.jsx
+++ b/common/component/page/Indexpage.jsx
@@ -59,7 +59,7 @@ class Indexpage extends Component {
zDepth={0}
>
-
+
Hello Welcome to My Blog Site
diff --git a/index.js b/index.js
index e9a5c46..1bc1f78 100644
--- a/index.js
+++ b/index.js
@@ -1,2 +1,20 @@
+require('babel-polyfill');
+//加载样式钩子,补足服务端渲染无法识别CSS文件的情况
+require('css-modules-require-hook')({
+ extensions: ['.css'],
+ generateScopedName: '[name]__[local]-[hash:base64:8]'
+});
+// Image required hook
+//引入asset-require-hook,来识别图片资源,对小于8K的图片转换成base64字符串,大于8k的图片转换成路径引用。
+require('asset-require-hook')({
+ extensions: ['jpg', 'png', 'gif','webp'],
+ limit: 10000
+});
+//处理字体
+require('asset-require-hook')({
+ extensions: ['ttf','woff','svg','eot','woff2'],
+ limit: 10000
+});
+
//启动服务端脚本
require('./server/server');
\ No newline at end of file
diff --git a/package.json b/package.json
index 5048a4d..7c57e00 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
},
"homepage": "https://github.com/BetaMee/ReactBlog#readme",
"dependencies": {
+ "asset-require-hook": "^1.0.2",
"config-lite": "^1.5.0",
"connect-flash": "^0.1.1",
"connect-mongo": "^1.3.2",
@@ -66,6 +67,7 @@
"css-loader": "^0.26.1",
"css-modules-require-hook": "^4.0.5",
"extract-text-webpack-plugin": "^2.0.0-rc.3",
+ "file-loader": "^0.10.0",
"isomorphic-style-loader": "^1.1.0",
"node-sass": "^4.5.0",
"postcss-loader": "^1.3.1",
@@ -75,6 +77,7 @@
"redux-devtools-log-monitor": "^1.2.0",
"sass-loader": "^6.0.2",
"style-loader": "^0.13.1",
+ "url-loader": "^0.5.7",
"webpack": "^2.2.1",
"webpack-dev-middleware": "^1.10.1",
"webpack-dev-server": "^2.4.1",
diff --git a/server/lib/view.js b/server/lib/view.js
index a333bb3..d90acea 100644
--- a/server/lib/view.js
+++ b/server/lib/view.js
@@ -32,6 +32,7 @@ function renderFullPage(html, initiaState,env) {
十二棵橡树
+