From 4d49b1adf34581f6428861d53e2f35c358f297b2 Mon Sep 17 00:00:00 2001 From: Alex Kern Date: Sun, 19 Apr 2015 15:30:11 -0700 Subject: [PATCH] Move images into a generic static folder. --- README.md | 6 +- {images => assets}/pizza.psd | Bin client/components/App.js | 21 + css/index.styl | 4 +- images/original.svg | 503 ------------------ server/assets.js | 2 +- .../images}/android-icon-144x144.png | Bin .../images}/android-icon-192x192.png | Bin .../images}/android-icon-36x36.png | Bin .../images}/android-icon-48x48.png | Bin .../images}/android-icon-72x72.png | Bin .../images}/android-icon-96x96.png | Bin .../images}/apple-icon-114x114.png | Bin .../images}/apple-icon-120x120.png | Bin .../images}/apple-icon-144x144.png | Bin .../images}/apple-icon-152x152.png | Bin .../images}/apple-icon-180x180.png | Bin .../images}/apple-icon-57x57.png | Bin .../images}/apple-icon-60x60.png | Bin .../images}/apple-icon-72x72.png | Bin .../images}/apple-icon-76x76.png | Bin .../images}/apple-icon-precomposed.png | Bin .../favicons => static/images}/apple-icon.png | Bin .../images}/browserconfig.xml | 0 {images => static/images}/down.png | Bin .../images}/favicon-16x16.png | Bin .../images}/favicon-32x32.png | Bin .../images}/favicon-96x96.png | Bin .../favicons => static/images}/favicon.ico | Bin .../images}/html-reference.txt | 0 .../favicons => static/images}/manifest.json | 0 .../images}/ms-icon-144x144.png | Bin .../images}/ms-icon-150x150.png | Bin .../images}/ms-icon-310x310.png | Bin .../images}/ms-icon-70x70.png | Bin {images => static/images}/pizza.png | Bin {images => static/images}/spinner-pizza.png | Bin {images => static/images}/up.png | Bin 38 files changed, 27 insertions(+), 509 deletions(-) rename {images => assets}/pizza.psd (100%) delete mode 100644 images/original.svg rename {images/favicons => static/images}/android-icon-144x144.png (100%) rename {images/favicons => static/images}/android-icon-192x192.png (100%) rename {images/favicons => static/images}/android-icon-36x36.png (100%) rename {images/favicons => static/images}/android-icon-48x48.png (100%) rename {images/favicons => static/images}/android-icon-72x72.png (100%) rename {images/favicons => static/images}/android-icon-96x96.png (100%) rename {images/favicons => static/images}/apple-icon-114x114.png (100%) rename {images/favicons => static/images}/apple-icon-120x120.png (100%) rename {images/favicons => static/images}/apple-icon-144x144.png (100%) rename {images/favicons => static/images}/apple-icon-152x152.png (100%) rename {images/favicons => static/images}/apple-icon-180x180.png (100%) rename {images/favicons => static/images}/apple-icon-57x57.png (100%) rename {images/favicons => static/images}/apple-icon-60x60.png (100%) rename {images/favicons => static/images}/apple-icon-72x72.png (100%) rename {images/favicons => static/images}/apple-icon-76x76.png (100%) rename {images/favicons => static/images}/apple-icon-precomposed.png (100%) rename {images/favicons => static/images}/apple-icon.png (100%) rename {images/favicons => static/images}/browserconfig.xml (100%) rename {images => static/images}/down.png (100%) rename {images/favicons => static/images}/favicon-16x16.png (100%) rename {images/favicons => static/images}/favicon-32x32.png (100%) rename {images/favicons => static/images}/favicon-96x96.png (100%) rename {images/favicons => static/images}/favicon.ico (100%) rename {images/favicons => static/images}/html-reference.txt (100%) rename {images/favicons => static/images}/manifest.json (100%) rename {images/favicons => static/images}/ms-icon-144x144.png (100%) rename {images/favicons => static/images}/ms-icon-150x150.png (100%) rename {images/favicons => static/images}/ms-icon-310x310.png (100%) rename {images/favicons => static/images}/ms-icon-70x70.png (100%) rename {images => static/images}/pizza.png (100%) rename {images => static/images}/spinner-pizza.png (100%) rename {images => static/images}/up.png (100%) diff --git a/README.md b/README.md index 364a74b..d847455 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# webdrop - -![XKCD 949](http://imgs.xkcd.com/comics/file_transfer.png) +# FilePizza Peer-to-peer file transfers in your browser +![XKCD 949](http://imgs.xkcd.com/comics/file_transfer.png) + ## Usage $ npm install diff --git a/images/pizza.psd b/assets/pizza.psd similarity index 100% rename from images/pizza.psd rename to assets/pizza.psd diff --git a/client/components/App.js b/client/components/App.js index 273cc59..8edbfff 100644 --- a/client/components/App.js +++ b/client/components/App.js @@ -7,10 +7,31 @@ export default class App extends React.Component { render() { return + FilePizza - Send Files, Easily + + + + + + + + + + + + + + + + + + + + diff --git a/css/index.styl b/css/index.styl index 53bb753..7ae6381 100644 --- a/css/index.styl +++ b/css/index.styl @@ -1,6 +1,6 @@ beige = #F9F2E7 dark-gray = #333 -darker-light-gray = #ddd +darker-light-gray = #DDD gray = #777 green = #8FBE00 light-blue = #40C0CB @@ -8,7 +8,7 @@ light-gray = #EEE light-green = #AEE239 light-red = #E23430 light-yellow = #FFE476 -red = #ae1e1d +red = #AE1E1D @keyframes rotate { from { transform: rotate(0deg) } diff --git a/images/original.svg b/images/original.svg deleted file mode 100644 index 95eb950..0000000 --- a/images/original.svg +++ /dev/null @@ -1,503 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - style="overflow:visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/server/assets.js b/server/assets.js index f9a656d..4dd8427 100644 --- a/server/assets.js +++ b/server/assets.js @@ -27,4 +27,4 @@ routes.get('/js', browserify(path.resolve(__dirname, '../client/index.js'), { transform: 'babelify' })) -routes.use('/images', express.static(path.resolve(__dirname, '../images'))) +routes.use(express.static(path.resolve(__dirname, '../static'))) diff --git a/images/favicons/android-icon-144x144.png b/static/images/android-icon-144x144.png similarity index 100% rename from images/favicons/android-icon-144x144.png rename to static/images/android-icon-144x144.png diff --git a/images/favicons/android-icon-192x192.png b/static/images/android-icon-192x192.png similarity index 100% rename from images/favicons/android-icon-192x192.png rename to static/images/android-icon-192x192.png diff --git a/images/favicons/android-icon-36x36.png b/static/images/android-icon-36x36.png similarity index 100% rename from images/favicons/android-icon-36x36.png rename to static/images/android-icon-36x36.png diff --git a/images/favicons/android-icon-48x48.png b/static/images/android-icon-48x48.png similarity index 100% rename from images/favicons/android-icon-48x48.png rename to static/images/android-icon-48x48.png diff --git a/images/favicons/android-icon-72x72.png b/static/images/android-icon-72x72.png similarity index 100% rename from images/favicons/android-icon-72x72.png rename to static/images/android-icon-72x72.png diff --git a/images/favicons/android-icon-96x96.png b/static/images/android-icon-96x96.png similarity index 100% rename from images/favicons/android-icon-96x96.png rename to static/images/android-icon-96x96.png diff --git a/images/favicons/apple-icon-114x114.png b/static/images/apple-icon-114x114.png similarity index 100% rename from images/favicons/apple-icon-114x114.png rename to static/images/apple-icon-114x114.png diff --git a/images/favicons/apple-icon-120x120.png b/static/images/apple-icon-120x120.png similarity index 100% rename from images/favicons/apple-icon-120x120.png rename to static/images/apple-icon-120x120.png diff --git a/images/favicons/apple-icon-144x144.png b/static/images/apple-icon-144x144.png similarity index 100% rename from images/favicons/apple-icon-144x144.png rename to static/images/apple-icon-144x144.png diff --git a/images/favicons/apple-icon-152x152.png b/static/images/apple-icon-152x152.png similarity index 100% rename from images/favicons/apple-icon-152x152.png rename to static/images/apple-icon-152x152.png diff --git a/images/favicons/apple-icon-180x180.png b/static/images/apple-icon-180x180.png similarity index 100% rename from images/favicons/apple-icon-180x180.png rename to static/images/apple-icon-180x180.png diff --git a/images/favicons/apple-icon-57x57.png b/static/images/apple-icon-57x57.png similarity index 100% rename from images/favicons/apple-icon-57x57.png rename to static/images/apple-icon-57x57.png diff --git a/images/favicons/apple-icon-60x60.png b/static/images/apple-icon-60x60.png similarity index 100% rename from images/favicons/apple-icon-60x60.png rename to static/images/apple-icon-60x60.png diff --git a/images/favicons/apple-icon-72x72.png b/static/images/apple-icon-72x72.png similarity index 100% rename from images/favicons/apple-icon-72x72.png rename to static/images/apple-icon-72x72.png diff --git a/images/favicons/apple-icon-76x76.png b/static/images/apple-icon-76x76.png similarity index 100% rename from images/favicons/apple-icon-76x76.png rename to static/images/apple-icon-76x76.png diff --git a/images/favicons/apple-icon-precomposed.png b/static/images/apple-icon-precomposed.png similarity index 100% rename from images/favicons/apple-icon-precomposed.png rename to static/images/apple-icon-precomposed.png diff --git a/images/favicons/apple-icon.png b/static/images/apple-icon.png similarity index 100% rename from images/favicons/apple-icon.png rename to static/images/apple-icon.png diff --git a/images/favicons/browserconfig.xml b/static/images/browserconfig.xml similarity index 100% rename from images/favicons/browserconfig.xml rename to static/images/browserconfig.xml diff --git a/images/down.png b/static/images/down.png similarity index 100% rename from images/down.png rename to static/images/down.png diff --git a/images/favicons/favicon-16x16.png b/static/images/favicon-16x16.png similarity index 100% rename from images/favicons/favicon-16x16.png rename to static/images/favicon-16x16.png diff --git a/images/favicons/favicon-32x32.png b/static/images/favicon-32x32.png similarity index 100% rename from images/favicons/favicon-32x32.png rename to static/images/favicon-32x32.png diff --git a/images/favicons/favicon-96x96.png b/static/images/favicon-96x96.png similarity index 100% rename from images/favicons/favicon-96x96.png rename to static/images/favicon-96x96.png diff --git a/images/favicons/favicon.ico b/static/images/favicon.ico similarity index 100% rename from images/favicons/favicon.ico rename to static/images/favicon.ico diff --git a/images/favicons/html-reference.txt b/static/images/html-reference.txt similarity index 100% rename from images/favicons/html-reference.txt rename to static/images/html-reference.txt diff --git a/images/favicons/manifest.json b/static/images/manifest.json similarity index 100% rename from images/favicons/manifest.json rename to static/images/manifest.json diff --git a/images/favicons/ms-icon-144x144.png b/static/images/ms-icon-144x144.png similarity index 100% rename from images/favicons/ms-icon-144x144.png rename to static/images/ms-icon-144x144.png diff --git a/images/favicons/ms-icon-150x150.png b/static/images/ms-icon-150x150.png similarity index 100% rename from images/favicons/ms-icon-150x150.png rename to static/images/ms-icon-150x150.png diff --git a/images/favicons/ms-icon-310x310.png b/static/images/ms-icon-310x310.png similarity index 100% rename from images/favicons/ms-icon-310x310.png rename to static/images/ms-icon-310x310.png diff --git a/images/favicons/ms-icon-70x70.png b/static/images/ms-icon-70x70.png similarity index 100% rename from images/favicons/ms-icon-70x70.png rename to static/images/ms-icon-70x70.png diff --git a/images/pizza.png b/static/images/pizza.png similarity index 100% rename from images/pizza.png rename to static/images/pizza.png diff --git a/images/spinner-pizza.png b/static/images/spinner-pizza.png similarity index 100% rename from images/spinner-pizza.png rename to static/images/spinner-pizza.png diff --git a/images/up.png b/static/images/up.png similarity index 100% rename from images/up.png rename to static/images/up.png