From 8d6636b1cf2448ee95e166ab2b6ad426115174c1 Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Tue, 29 Aug 2017 18:57:43 -0700 Subject: [PATCH] Add `-demo` to the SVG and text demo files --- demo/client/html/include/header.html | 4 ++-- demo/client/html/include/navbar.html | 2 +- demo/client/html/{svg.html => svg-demo.html} | 2 +- demo/client/html/{text.html => text-demo.html} | 2 +- demo/client/src/{svg.ts => svg-demo.ts} | 4 ++-- demo/client/src/{text.ts => text-demo.ts} | 4 ++-- demo/client/webpack.config.js | 4 ++-- demo/server/src/main.rs | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) rename demo/client/html/{svg.html => svg-demo.html} (93%) rename demo/client/html/{text.html => text-demo.html} (93%) rename demo/client/src/{svg.ts => svg-demo.ts} (99%) rename demo/client/src/{text.ts => text-demo.ts} (99%) diff --git a/demo/client/html/include/header.html b/demo/client/html/include/header.html index 6781fc46..ab3c79c8 100644 --- a/demo/client/html/include/header.html +++ b/demo/client/html/include/header.html @@ -1,5 +1,5 @@ - - + + diff --git a/demo/client/html/include/navbar.html b/demo/client/html/include/navbar.html index 7891ddb7..e75c0220 100644 --- a/demo/client/html/include/navbar.html +++ b/demo/client/html/include/navbar.html @@ -7,7 +7,7 @@ ref="/" aria-haspopup="true" aria-expanded="false">Demos
Text - SVG + SVG
diff --git a/demo/client/html/svg.html b/demo/client/html/svg-demo.html similarity index 93% rename from demo/client/html/svg.html rename to demo/client/html/svg-demo.html index 47780448..cf0869f2 100644 --- a/demo/client/html/svg.html +++ b/demo/client/html/svg-demo.html @@ -4,7 +4,7 @@ SVG — Pathfinder Demo ${require('./include/header.html')} - + ${require('./include/navbar.html')} diff --git a/demo/client/html/text.html b/demo/client/html/text-demo.html similarity index 93% rename from demo/client/html/text.html rename to demo/client/html/text-demo.html index 30c9a6c9..9d4c1d04 100644 --- a/demo/client/html/text.html +++ b/demo/client/html/text-demo.html @@ -4,7 +4,7 @@ Text — Pathfinder Demo ${require('./include/header.html')} - + ${require('./include/navbar.html')} diff --git a/demo/client/src/svg.ts b/demo/client/src/svg-demo.ts similarity index 99% rename from demo/client/src/svg.ts rename to demo/client/src/svg-demo.ts index d7b1b0d4..db4e589f 100644 --- a/demo/client/src/svg.ts +++ b/demo/client/src/svg-demo.ts @@ -1,4 +1,4 @@ -// pathfinder/client/src/svg.ts +// pathfinder/client/src/svg-demo.ts // // Copyright © 2017 The Pathfinder Project Developers. // @@ -21,7 +21,7 @@ import {PathfinderView, Timings} from './view'; import AppController from './app-controller'; import SSAAStrategy from "./ssaa-strategy"; -require('../html/svg.html'); +require('../html/svg-demo.html'); const parseColor = require('parse-color'); diff --git a/demo/client/src/text.ts b/demo/client/src/text-demo.ts similarity index 99% rename from demo/client/src/text.ts rename to demo/client/src/text-demo.ts index 562f2342..fe28d80a 100644 --- a/demo/client/src/text.ts +++ b/demo/client/src/text-demo.ts @@ -1,4 +1,4 @@ -// pathfinder/client/src/text.ts +// pathfinder/client/src/text-demo.ts // // Copyright © 2017 The Pathfinder Project Developers. // @@ -26,7 +26,7 @@ import AppController from './app-controller'; import PathfinderBufferTexture from './buffer-texture'; import SSAAStrategy from './ssaa-strategy'; -require('../html/text.html'); +require('../html/text-demo.html'); const TEXT: string = `’Twas brillig, and the slithy toves diff --git a/demo/client/webpack.config.js b/demo/client/webpack.config.js index 97cdb7e7..78d48ab9 100644 --- a/demo/client/webpack.config.js +++ b/demo/client/webpack.config.js @@ -3,8 +3,8 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); module.exports = { devtool: 'inline-source-map', entry: { - svg: "./src/svg.ts", - text: "./src/text.ts", + 'svg-demo': "./src/svg-demo.ts", + 'text-demo': "./src/text-demo.ts", }, module: { rules: [ diff --git a/demo/server/src/main.rs b/demo/server/src/main.rs index f120e9bb..e82c37c0 100644 --- a/demo/server/src/main.rs +++ b/demo/server/src/main.rs @@ -38,8 +38,8 @@ use std::mem; use std::path::{Path, PathBuf}; use std::u32; -static STATIC_TEXT_DEMO_PATH: &'static str = "../client/text.html"; -static STATIC_SVG_DEMO_PATH: &'static str = "../client/svg.html"; +static STATIC_TEXT_DEMO_PATH: &'static str = "../client/text-demo.html"; +static STATIC_SVG_DEMO_PATH: &'static str = "../client/svg-demo.html"; static STATIC_CSS_BOOTSTRAP_PATH: &'static str = "../client/node_modules/bootstrap/dist/css"; static STATIC_CSS_PATHFINDER_PATH: &'static str = "../client/css/pathfinder.css"; static STATIC_JS_BOOTSTRAP_PATH: &'static str = "../client/node_modules/bootstrap/dist/js"; @@ -475,7 +475,7 @@ fn partition_svg_paths(request: Json) fn static_text_demo() -> io::Result { NamedFile::open(STATIC_TEXT_DEMO_PATH) } -#[get("/svg")] +#[get("/demo/svg")] fn static_svg_demo() -> io::Result { NamedFile::open(STATIC_SVG_DEMO_PATH) }