From 1958dcef74a7befbf0cedf2459ffa0674906f737 Mon Sep 17 00:00:00 2001 From: hisener Date: Fri, 2 Jun 2017 16:38:11 +0300 Subject: [PATCH] Some improvements --- README.md | 3 ++- package.json | 3 ++- src/client/containers/App.js | 28 +++++++++++++++++++++++++++- src/client/containers/Root.js | 4 ++-- src/config/index.js | 2 +- src/server/index.js | 4 ++++ 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 39d8f68..bd76059 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,11 @@ localhost:3000 ``` ### Demo -TOOD: Deploy on heroku +https://pirate-radio.herokuapp.com/ ### TODO - [ ] More documentation (mostly client side) +- [ ] AppBar > More Icon > About ## License diff --git a/package.json b/package.json index a47927a..5bd75b3 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "src/server/index.js", "scripts": { "dev": "gulp watch & nodemon -w src/server --exec \"babel-node src/server\"", - "prestart": "gulp --env=production build", + "postinstall": "gulp --env=production build", "start": "NODE_ENV=production node dist/server", "test": "standard && npm run test-node", "test-node": "tape test/*.js" @@ -23,6 +23,7 @@ "babel-preset-stage-0": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.3.0", + "compression": "^1.6.2", "express": "^4.15.2", "gulp": "^3.9.1", "gulp-babel": "^6.1.2", diff --git a/src/client/containers/App.js b/src/client/containers/App.js index 19ee5b8..3b5e41e 100644 --- a/src/client/containers/App.js +++ b/src/client/containers/App.js @@ -4,6 +4,11 @@ import getMuiTheme from 'material-ui/styles/getMuiTheme' import { deepOrange500 } from 'material-ui/styles/colors' import AppBar from 'material-ui/AppBar' +import IconButton from 'material-ui/IconButton' +import FlatButton from 'material-ui/FlatButton' +import IconMenu from 'material-ui/IconMenu' +import MoreVertIcon from 'material-ui/svg-icons/navigation/more-vert' + import ActiveRadio from './ActiveRadio' import Content from './Content' @@ -22,10 +27,31 @@ const muiTheme = getMuiTheme({ } }) +const RightIconMenu = (props) => ( + + } + targetOrigin={{horizontal: 'right', vertical: 'top'}} + anchorOrigin={{horizontal: 'right', vertical: 'top'}} + > + + +) + const App = () => (
- + } + />
diff --git a/src/client/containers/Root.js b/src/client/containers/Root.js index 28a15ec..e8323b6 100644 --- a/src/client/containers/Root.js +++ b/src/client/containers/Root.js @@ -10,13 +10,13 @@ let preloadedState = { { 'id': '16534', 'title': 'Capital London', - 'image': 'http://cdn-radiotime-logos.tunein.com/s16534q.png', + 'image': 'https://cdn-radiotime-logos.tunein.com/s16534q.png', 'song': 'Unknown', 'stream': 'http://media-the.musicradio.com/CapitalMP3' }, { 'id': '126794', 'title': '181.FM UK Top 40', - 'image': 'http://cdn-radiotime-logos.tunein.com/s126794q.png', + 'image': 'https://cdn-radiotime-logos.tunein.com/s126794q.png', 'song': 'Unknown', 'stream': 'http://listen.181fm.com/181-uktop40_128k.mp3?noPreRoll=true' } diff --git a/src/config/index.js b/src/config/index.js index b9abff4..53a637c 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,5 +1,5 @@ export const isProd = process.env.NODE_ENV === 'production' export const protocol = 'http' -export const port = isProd ? 8080 : 3000 +export const port = isProd ? (process.env.PORT || 8080) : 3000 export const title = 'Pirate Radio' diff --git a/src/server/index.js b/src/server/index.js index b6ca582..c249eef 100644 --- a/src/server/index.js +++ b/src/server/index.js @@ -1,6 +1,7 @@ import http from 'http' import express from 'express' import path from 'path' +import compression from 'compression' import { port } from '../config' import routes from './routes' @@ -16,6 +17,9 @@ app.set('views', path.join(__dirname, 'views')) app.use(express.static(path.join(__dirname, '../../static'))) app.use('/', routes) +// compress all requests +app.use(compression()) + // catch 404 and forward to error handler app.use(middlewares.notFound)