From 8a7bbe39ffdc5348b0022d7f4f92622ad0fb3474 Mon Sep 17 00:00:00 2001 From: Eric Clemmons Date: Wed, 16 Jan 2019 20:01:55 -0800 Subject: [PATCH] All polydev-specific styles are under /_polydev --- packages/express-example/index.js | 2 +- packages/next-example/pages/index.js | 2 +- packages/polydev/src/middleware/error/index.js | 2 +- packages/polydev/src/middleware/notFound/index.js | 2 +- {public => packages/polydev/src/public}/styles.css | 2 +- {public => packages/polydev/src/public}/triangilify.svg | 0 packages/polydev/src/server.js | 2 ++ packages/sse-example/index.js | 2 +- routes/index.js | 2 +- routes/logo/index.get.js | 2 +- routes/users/[name]/index.js | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) rename {public => packages/polydev/src/public}/styles.css (96%) rename {public => packages/polydev/src/public}/triangilify.svg (100%) diff --git a/packages/express-example/index.js b/packages/express-example/index.js index 80be1a4..ab04966 100644 --- a/packages/express-example/index.js +++ b/packages/express-example/index.js @@ -7,7 +7,7 @@ module.exports = express().get("/express", (req, res) => { res.send(` - +
diff --git a/packages/next-example/pages/index.js b/packages/next-example/pages/index.js index 0816d11..7e32d2d 100644 --- a/packages/next-example/pages/index.js +++ b/packages/next-example/pages/index.js @@ -14,7 +14,7 @@ export default class NextExample extends Component { href="https://fonts.googleapis.com/css?family=Quicksand:300,500" rel="stylesheet" /> - +
diff --git a/packages/polydev/src/middleware/error/index.js b/packages/polydev/src/middleware/error/index.js index b8bb583..08377c9 100644 --- a/packages/polydev/src/middleware/error/index.js +++ b/packages/polydev/src/middleware/error/index.js @@ -4,7 +4,7 @@ module.exports = function errorHandler(error, req, res, next) { res.status(statusCode).send(` - +
diff --git a/packages/polydev/src/middleware/notFound/index.js b/packages/polydev/src/middleware/notFound/index.js index 46c7ab5..324c20b 100644 --- a/packages/polydev/src/middleware/notFound/index.js +++ b/packages/polydev/src/middleware/notFound/index.js @@ -34,7 +34,7 @@ module.exports = express() res.status(404).send(` - + diff --git a/public/styles.css b/packages/polydev/src/public/styles.css similarity index 96% rename from public/styles.css rename to packages/polydev/src/public/styles.css index 0e8c444..1f184d6 100644 --- a/public/styles.css +++ b/packages/polydev/src/public/styles.css @@ -46,7 +46,7 @@ #splash { animation: rotate 15s alternate; - background: url("/triangilify.svg") no-repeat center center fixed; + background: url("./triangilify.svg") no-repeat center center fixed; background-size: cover; bottom: 0; left: 0; diff --git a/public/triangilify.svg b/packages/polydev/src/public/triangilify.svg similarity index 100% rename from public/triangilify.svg rename to packages/polydev/src/public/triangilify.svg diff --git a/packages/polydev/src/server.js b/packages/polydev/src/server.js index 4d97d7f..14fec81 100644 --- a/packages/polydev/src/server.js +++ b/packages/polydev/src/server.js @@ -1,5 +1,6 @@ const express = require("express") const opn = require("opn") +const path = require("path") const { assets, error, notFound, router } = require("./middleware") @@ -22,6 +23,7 @@ proxy.use(router("routes")) // TODO Merge 404 & errors together if (NODE_ENV === "development") { + proxy.use("/_polydev", assets(path.resolve(__dirname, "./public"))) proxy.use(notFound) proxy.use(error) } diff --git a/packages/sse-example/index.js b/packages/sse-example/index.js index c45a928..dd71f21 100644 --- a/packages/sse-example/index.js +++ b/packages/sse-example/index.js @@ -10,7 +10,7 @@ module.exports = express() res.send(` - +
diff --git a/routes/index.js b/routes/index.js index 88e9ea9..e7f1de9 100644 --- a/routes/index.js +++ b/routes/index.js @@ -2,7 +2,7 @@ module.exports = (req, res) => { res.send(` - + diff --git a/routes/logo/index.get.js b/routes/logo/index.get.js index e746f53..6ee2c3d 100644 --- a/routes/logo/index.get.js +++ b/routes/logo/index.get.js @@ -2,7 +2,7 @@ module.exports = (req, res) => { res.send(` - +