-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed a weird bug that broke the order keys
- Loading branch information
Showing
4 changed files
with
596 additions
and
592 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,24 @@ | ||
var config = require('../config.js'); | ||
|
||
var mongoose = require('mongoose'); | ||
mongoose.connect(config.mongo); | ||
|
||
var RadioSchema = mongoose.Schema({ | ||
name: { | ||
type: String, | ||
unique: true, | ||
required: true | ||
}, | ||
url: { | ||
type: String, | ||
unique: true, | ||
required: true | ||
}, | ||
order: { | ||
type: Number | ||
} | ||
}); | ||
var Radio = mongoose.model('RadioStation', RadioSchema); | ||
|
||
var config = require('../config.js'); | ||
|
||
var mongoose = require('mongoose'); | ||
mongoose.connect(config.mongo); | ||
|
||
var RadioSchema = mongoose.Schema({ | ||
name: { | ||
type: String, | ||
unique: true, | ||
required: true | ||
}, | ||
url: { | ||
type: String, | ||
unique: true, | ||
required: true | ||
}, | ||
order: { | ||
type: Number, | ||
required: true | ||
} | ||
}); | ||
var Radio = mongoose.model('RadioStation', RadioSchema); | ||
|
||
module.exports = Radio; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,107 +1,107 @@ | ||
{ | ||
"name": "home-control", | ||
"version": "0.0.5", | ||
"description": "", | ||
"main": "homeControl.js", | ||
"scripts": { | ||
"storybook": "start-storybook -p 9001", | ||
"start": "npm-run-all --parallel wakeonlan radiopi homecontrol webpackDevServer", | ||
"build": "node build.js --webpack", | ||
"build:zip": "node build.js --zip", | ||
"build:android": "node build.js --android --install", | ||
"build:all": "node build.js --webpack --android --install --zip", | ||
"build:makeRelease": "node build.js --webpack --zip", | ||
"production": "npm install --production --progress=false && (screen -dm sudo service homecontrol restart && screen -dm sudo service wakeonlan restart && screen -dm sudo service radiopi restart)", | ||
"dev": "npm-run-all --parallel watch:wakeonlan watch:radiopi watch:homecontrol watch:scsslint webpackDevServer", | ||
"devww": "npm-run-all --parallel watch:wakeonlan watch:radiopi watch:homecontrol watch:scsslint", | ||
"wakeonlan": "node servers/WakeOnLan/index.js", | ||
"radiopi": "node servers/RadioPi/index.js", | ||
"homecontrol": "node homeControl.js", | ||
"scsslint": "sass-lint -v --no-exit || true", | ||
"lint": "eslint servers/RadioPi/*.js servers/WakeOnLan/*.js www/**/*.js www/**/*.jsx", | ||
"webpackDevServer": "webpack-dev-server --colors --progress --inline", | ||
"watch:homecontrol": "nodemon --quiet --watch homeControl.js --watch config.js --watch routes/ --watch models/ -x \"npm run homecontrol\"", | ||
"watch:wakeonlan": "nodemon --quiet --watch servers/WakeOnLan/index.js --watch config.js --watch models/ -x \"npm run wakeonlan\"", | ||
"watch:radiopi": "nodemon --quiet --watch servers/RadioPi/ --watch config.js --watch models/ -x \"npm run radiopi\"", | ||
"watch:scsslint": "nodemon --quiet --watch www/scss/*.* -x \"npm run scsslint\"" | ||
}, | ||
"author": "Valentin Mocanu <[email protected]> (http://rontavstudio.com)", | ||
"license": "ISC", | ||
"devDependencies": { | ||
"adm-zip": "^0.4.7", | ||
"autoprefixer": "^6.3.4", | ||
"axios": "^0.14.0", | ||
"babel-core": "^6.8.0", | ||
"babel-eslint": "^7.0.0", | ||
"babel-loader": "^6.2.4", | ||
"babel-preset-es2015": "^6.6.0", | ||
"babel-preset-react": "^6.5.0", | ||
"colors": "^1.1.2", | ||
"copy": "^0.3.0", | ||
"css-reset-and-normalize": "^0.3.0", | ||
"eslint": "^3.6.1", | ||
"eslint-loader": "^1.3.0", | ||
"eslint-plugin-react": "^6.3.0", | ||
"eventemitter3": "^2.0.1", | ||
"node-sass": "^3.6.0", | ||
"nodemon": "^1.9.2", | ||
"npm-run-all": "^3.1.0", | ||
"postcss-loader": "^0.13.0", | ||
"precss": "^1.4.0", | ||
"react-hot-loader": "^1.3.0", | ||
"react-redux": "^4.4.5", | ||
"redux": "^3.6.0", | ||
"sass-lint": "^1.7.0", | ||
"sass-loader": "^4.0.2", | ||
"script-loader": "^0.7.0", | ||
"sortablejs": "^1.4.2", | ||
"webpack-dev-server": "^1.14.1" | ||
}, | ||
"dependencies": { | ||
"arpscan": "^0.1.0", | ||
"async": "^2.0.0-rc.1", | ||
"bcrypt": "^0.8.7", | ||
"body-parser": "^1.15.1", | ||
"buffer-equal-constant-time": "^1.0.1", | ||
"classnames": "^2.2.5", | ||
"connect-mongo": "^1.3.2", | ||
"cookie-parser": "^1.4.3", | ||
"css-loader": "^0.25.0", | ||
"exports-loader": "^0.6.3", | ||
"expose-loader": "^0.7.1", | ||
"express": "^4.13.4", | ||
"express-session": "^1.14.0", | ||
"extract-text-webpack-plugin": "^1.0.1", | ||
"font-awesome": "^4.6.3", | ||
"fs-extra": "^0.30.0", | ||
"hammerjs": "^2.0.8", | ||
"imports-loader": "^0.6.5", | ||
"json-loader": "^0.5.4", | ||
"jsonwebtoken": "^7.1.9", | ||
"jsx-loader": "^0.13.2", | ||
"lirc_node": "0.0.4", | ||
"material-react": "0.0.618", | ||
"minilog": "^3.0.0", | ||
"mongoose": "^4.5.8", | ||
"morgan": "^1.7.0", | ||
"mplayer": "^2.1.0", | ||
"passport": "^0.3.2", | ||
"passport-local": "^1.0.0", | ||
"passport.socketio": "^3.6.2", | ||
"path": "^0.12.7", | ||
"ping": "^0.2.0", | ||
"react": "^15.0.2", | ||
"react-dom": "^15.0.2", | ||
"react-router": "^2.4.0", | ||
"rimraf": "^2.5.2", | ||
"socket.io": "^1.4.5", | ||
"socket.io-client": "^1.4.5", | ||
"style-loader": "^0.13.1", | ||
"url-loader": "^0.5.7", | ||
"wake_on_lan": "0.0.4", | ||
"webpack": "^1.13.0" | ||
}, | ||
"optionalDependencies": { | ||
"rpi-gpio": "^0.7.0" | ||
} | ||
} | ||
{ | ||
"name": "home-control", | ||
"version": "0.0.6", | ||
"description": "", | ||
"main": "homeControl.js", | ||
"scripts": { | ||
"storybook": "start-storybook -p 9001", | ||
"start": "npm-run-all --parallel wakeonlan radiopi homecontrol webpackDevServer", | ||
"build": "node build.js --webpack", | ||
"build:zip": "node build.js --zip", | ||
"build:android": "node build.js --android --install", | ||
"build:all": "node build.js --webpack --android --install --zip", | ||
"build:makeRelease": "node build.js --webpack --zip", | ||
"production": "npm install --production --progress=false && (screen -dm sudo service homecontrol restart && screen -dm sudo service wakeonlan restart && screen -dm sudo service radiopi restart)", | ||
"dev": "npm-run-all --parallel watch:wakeonlan watch:radiopi watch:homecontrol watch:scsslint webpackDevServer", | ||
"devww": "npm-run-all --parallel watch:wakeonlan watch:radiopi watch:homecontrol watch:scsslint", | ||
"wakeonlan": "node servers/WakeOnLan/index.js", | ||
"radiopi": "node servers/RadioPi/index.js", | ||
"homecontrol": "node homeControl.js", | ||
"scsslint": "sass-lint -v --no-exit || true", | ||
"lint": "eslint servers/RadioPi/*.js servers/WakeOnLan/*.js www/**/*.js www/**/*.jsx", | ||
"webpackDevServer": "webpack-dev-server --colors --progress --inline", | ||
"watch:homecontrol": "nodemon --quiet --watch homeControl.js --watch config.js --watch routes/ --watch models/ -x \"npm run homecontrol\"", | ||
"watch:wakeonlan": "nodemon --quiet --watch servers/WakeOnLan/index.js --watch config.js --watch models/ -x \"npm run wakeonlan\"", | ||
"watch:radiopi": "nodemon --quiet --watch servers/RadioPi/ --watch config.js --watch models/ -x \"npm run radiopi\"", | ||
"watch:scsslint": "nodemon --quiet --watch www/scss/*.* -x \"npm run scsslint\"" | ||
}, | ||
"author": "Valentin Mocanu <[email protected]> (http://rontavstudio.com)", | ||
"license": "ISC", | ||
"devDependencies": { | ||
"adm-zip": "^0.4.7", | ||
"autoprefixer": "^6.3.4", | ||
"axios": "^0.14.0", | ||
"babel-core": "^6.8.0", | ||
"babel-eslint": "^7.0.0", | ||
"babel-loader": "^6.2.4", | ||
"babel-preset-es2015": "^6.6.0", | ||
"babel-preset-react": "^6.5.0", | ||
"colors": "^1.1.2", | ||
"copy": "^0.3.0", | ||
"css-reset-and-normalize": "^0.3.0", | ||
"eslint": "^3.6.1", | ||
"eslint-loader": "^1.3.0", | ||
"eslint-plugin-react": "^6.3.0", | ||
"eventemitter3": "^2.0.1", | ||
"node-sass": "^3.6.0", | ||
"nodemon": "^1.9.2", | ||
"npm-run-all": "^3.1.0", | ||
"postcss-loader": "^0.13.0", | ||
"precss": "^1.4.0", | ||
"react-hot-loader": "^1.3.0", | ||
"react-redux": "^4.4.5", | ||
"redux": "^3.6.0", | ||
"sass-lint": "^1.7.0", | ||
"sass-loader": "^4.0.2", | ||
"script-loader": "^0.7.0", | ||
"sortablejs": "^1.4.2", | ||
"webpack-dev-server": "^1.14.1" | ||
}, | ||
"dependencies": { | ||
"arpscan": "^0.1.0", | ||
"async": "^2.0.0-rc.1", | ||
"bcrypt": "^0.8.7", | ||
"body-parser": "^1.15.1", | ||
"buffer-equal-constant-time": "^1.0.1", | ||
"classnames": "^2.2.5", | ||
"connect-mongo": "^1.3.2", | ||
"cookie-parser": "^1.4.3", | ||
"css-loader": "^0.25.0", | ||
"exports-loader": "^0.6.3", | ||
"expose-loader": "^0.7.1", | ||
"express": "^4.13.4", | ||
"express-session": "^1.14.0", | ||
"extract-text-webpack-plugin": "^1.0.1", | ||
"font-awesome": "^4.6.3", | ||
"fs-extra": "^0.30.0", | ||
"hammerjs": "^2.0.8", | ||
"imports-loader": "^0.6.5", | ||
"json-loader": "^0.5.4", | ||
"jsonwebtoken": "^7.1.9", | ||
"jsx-loader": "^0.13.2", | ||
"lirc_node": "0.0.4", | ||
"material-react": "0.0.618", | ||
"minilog": "^3.0.0", | ||
"mongoose": "^4.5.8", | ||
"morgan": "^1.7.0", | ||
"mplayer": "^2.1.0", | ||
"passport": "^0.3.2", | ||
"passport-local": "^1.0.0", | ||
"passport.socketio": "^3.6.2", | ||
"path": "^0.12.7", | ||
"ping": "^0.2.0", | ||
"react": "^15.0.2", | ||
"react-dom": "^15.0.2", | ||
"react-router": "^2.4.0", | ||
"rimraf": "^2.5.2", | ||
"socket.io": "^1.4.5", | ||
"socket.io-client": "^1.4.5", | ||
"style-loader": "^0.13.1", | ||
"url-loader": "^0.5.7", | ||
"wake_on_lan": "0.0.4", | ||
"webpack": "^1.13.0" | ||
}, | ||
"optionalDependencies": { | ||
"rpi-gpio": "^0.7.0" | ||
} | ||
} |
Oops, something went wrong.