From 16e972e53c7c9c4b52c3cb497d3701143c154c11 Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Tue, 3 May 2016 23:43:43 -0700 Subject: [PATCH] Separated css and fonts into a separate file --- index.html | 21 --------------------- package.json | 2 ++ server/routes.js | 2 +- server/static/dev.html | 11 +++++++++++ server/static/index.html | 2 -- src/fonts/atlas/atlas.css | 12 ++++++------ src/index.js | 2 ++ src/scenes/App/App.js | 2 -- webpack.config.js | 17 +++++++++++++++-- 9 files changed, 37 insertions(+), 34 deletions(-) delete mode 100644 index.html create mode 100644 server/static/dev.html diff --git a/index.html b/index.html deleted file mode 100644 index eefcb81d5..000000000 --- a/index.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - Beautiful Atlas - - - -
- - - - \ No newline at end of file diff --git a/package.json b/package.json index 1c4be6d3c..802c191f3 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,8 @@ "babel-preset-react-hmre": "^1.0.1", "babel-preset-stage-0": "^6.5.0", "debug": "^2.2.0", + "extract-text-webpack-plugin": "^1.0.1", + "html-webpack-plugin": "^2.16.1", "http-errors": "^1.4.0", "isomorphic-fetch": "^2.2.1", "jsonwebtoken": "^5.7.0", diff --git a/server/routes.js b/server/routes.js index a83dc4e1f..3c0161f9c 100644 --- a/server/routes.js +++ b/server/routes.js @@ -25,7 +25,7 @@ router.get('/service-worker.js', async (ctx) => { }); router.get('*', async (ctx) => { - const stats = await sendfile(ctx, path.join(__dirname, 'static/index.html')); + const stats = await sendfile(ctx, path.join(__dirname, './static/dev.html')); if (!ctx.status) ctx.throw(httpErrors.NotFound()); }); diff --git a/server/static/dev.html b/server/static/dev.html new file mode 100644 index 000000000..dc5538d44 --- /dev/null +++ b/server/static/dev.html @@ -0,0 +1,11 @@ + + + + Beautiful Atlas + + + +
+ + + \ No newline at end of file diff --git a/server/static/index.html b/server/static/index.html index eefcb81d5..25ae71cc1 100644 --- a/server/static/index.html +++ b/server/static/index.html @@ -2,11 +2,9 @@ Beautiful Atlas -
-