Commit a1b631dce91e14820af1f2eb1d830261386af206
Exists in
master
Merge branch 'refactor/bump_deps_#172'
Showing
6 changed files
Show diff stats
.meteor/release
| 1 | METEOR@1.4 | 1 | METEOR@1.4.0.1 |
| 2 | 2 |
.meteor/versions
| 1 | accounts-base@1.2.9 | 1 | accounts-base@1.2.10 |
| 2 | accounts-password@1.2.12 | 2 | accounts-password@1.2.14 |
| 3 | alanning:roles@1.2.15 | 3 | alanning:roles@1.2.15 |
| 4 | aldeed:collection2@2.9.1 | 4 | aldeed:collection2@2.9.1 |
| 5 | aldeed:collection2-core@1.1.1 | 5 | aldeed:collection2-core@1.1.1 |
| 6 | aldeed:schema-deny@1.0.1 | 6 | aldeed:schema-deny@1.0.1 |
| 7 | aldeed:schema-index@1.0.1 | 7 | aldeed:schema-index@1.0.1 |
| 8 | aldeed:simple-schema@1.5.3 | 8 | aldeed:simple-schema@1.5.3 |
| 9 | allow-deny@1.0.5 | 9 | allow-deny@1.0.5 |
| 10 | audit-argument-checks@1.0.7 | 10 | audit-argument-checks@1.0.7 |
| 11 | autoupdate@1.2.11 | 11 | autoupdate@1.2.11 |
| 12 | babel-compiler@6.9.0 | 12 | babel-compiler@6.9.0 |
| 13 | babel-runtime@0.1.10 | 13 | babel-runtime@0.1.10 |
| 14 | base64@1.0.9 | 14 | base64@1.0.9 |
| 15 | binary-heap@1.0.9 | 15 | binary-heap@1.0.9 |
| 16 | blaze@2.1.8 | 16 | blaze@2.1.8 |
| 17 | blaze-tools@1.0.9 | 17 | blaze-tools@1.0.9 |
| 18 | boilerplate-generator@1.0.9 | 18 | boilerplate-generator@1.0.9 |
| 19 | browser-policy@1.0.9 | 19 | browser-policy@1.0.9 |
| 20 | browser-policy-common@1.0.10 | 20 | browser-policy-common@1.0.10 |
| 21 | browser-policy-content@1.0.11 | 21 | browser-policy-content@1.0.11 |
| 22 | browser-policy-framing@1.0.11 | 22 | browser-policy-framing@1.0.11 |
| 23 | caching-compiler@1.0.6 | 23 | caching-compiler@1.0.6 |
| 24 | caching-html-compiler@1.0.6 | 24 | caching-html-compiler@1.0.6 |
| 25 | callback-hook@1.0.9 | 25 | callback-hook@1.0.9 |
| 26 | check@1.2.3 | 26 | check@1.2.3 |
| 27 | coffeescript@1.1.4 | 27 | coffeescript@1.1.4 |
| 28 | dburles:factory@1.1.0 | 28 | dburles:factory@1.1.0 |
| 29 | ddp@1.2.5 | 29 | ddp@1.2.5 |
| 30 | ddp-client@1.2.9 | 30 | ddp-client@1.2.9 |
| 31 | ddp-common@1.2.6 | 31 | ddp-common@1.2.6 |
| 32 | ddp-rate-limiter@1.0.5 | 32 | ddp-rate-limiter@1.0.5 |
| 33 | ddp-server@1.2.10 | 33 | ddp-server@1.2.10 |
| 34 | deps@1.0.12 | 34 | deps@1.0.12 |
| 35 | diff-sequence@1.0.6 | 35 | diff-sequence@1.0.6 |
| 36 | ecmascript@0.5.7 | 36 | ecmascript@0.5.7 |
| 37 | ecmascript-runtime@0.3.12 | 37 | ecmascript-runtime@0.3.13 |
| 38 | ejson@1.0.12 | 38 | ejson@1.0.12 |
| 39 | email@1.1.16 | 39 | email@1.1.16 |
| 40 | es5-shim@4.6.13 | 40 | es5-shim@4.6.13 |
| 41 | fastclick@1.0.12 | 41 | fastclick@1.0.12 |
| 42 | fortawesome:fontawesome@4.5.0 | 42 | fortawesome:fontawesome@4.5.0 |
| 43 | fourseven:scss@3.8.0_1 | 43 | fourseven:scss@3.8.1 |
| 44 | geojson-utils@1.0.9 | 44 | geojson-utils@1.0.9 |
| 45 | hot-code-push@1.0.4 | 45 | hot-code-push@1.0.4 |
| 46 | html-tools@1.0.10 | 46 | html-tools@1.0.10 |
| 47 | htmljs@1.0.10 | 47 | htmljs@1.0.10 |
| 48 | http@1.1.8 | 48 | http@1.1.8 |
| 49 | id-map@1.0.8 | 49 | id-map@1.0.8 |
| 50 | jquery@1.11.9 | 50 | jquery@1.11.9 |
| 51 | launch-screen@1.0.12 | 51 | launch-screen@1.0.12 |
| 52 | livedata@1.0.18 | 52 | livedata@1.0.18 |
| 53 | localstorage@1.0.11 | 53 | localstorage@1.0.11 |
| 54 | logging@1.1.14 | 54 | logging@1.1.14 |
| 55 | mdg:validated-method@1.1.0 | 55 | mdg:validated-method@1.1.0 |
| 56 | mdg:validation-error@0.5.1 | 56 | mdg:validation-error@0.5.1 |
| 57 | meteor@1.2.16 | 57 | meteor@1.2.16 |
| 58 | meteor-base@1.0.4 | 58 | meteor-base@1.0.4 |
| 59 | minifier-css@1.2.13 | 59 | minifier-css@1.2.13 |
| 60 | minifier-js@1.2.13 | 60 | minifier-js@1.2.13 |
| 61 | minimongo@1.0.17 | 61 | minimongo@1.0.17 |
| 62 | mobile-experience@1.0.4 | 62 | mobile-experience@1.0.4 |
| 63 | mobile-status-bar@1.0.12 | 63 | mobile-status-bar@1.0.12 |
| 64 | modules@0.7.5 | 64 | modules@0.7.5 |
| 65 | modules-runtime@0.7.5 | 65 | modules-runtime@0.7.5 |
| 66 | mongo@1.1.10 | 66 | mongo@1.1.10 |
| 67 | mongo-id@1.0.5 | 67 | mongo-id@1.0.5 |
| 68 | npm-bcrypt@0.8.7 | 68 | npm-bcrypt@0.8.7_1 |
| 69 | npm-mongo@1.5.45 | 69 | npm-mongo@1.5.45 |
| 70 | observe-sequence@1.0.12 | 70 | observe-sequence@1.0.12 |
| 71 | ordered-dict@1.0.8 | 71 | ordered-dict@1.0.8 |
| 72 | practicalmeteor:chai@2.1.0_1 | 72 | practicalmeteor:chai@2.1.0_1 |
| 73 | practicalmeteor:loglevel@1.2.0_2 | 73 | practicalmeteor:loglevel@1.2.0_2 |
| 74 | practicalmeteor:mocha@2.4.5_6 | 74 | practicalmeteor:mocha@2.4.5_6 |
| 75 | practicalmeteor:mocha-core@1.0.1 | 75 | practicalmeteor:mocha-core@1.0.1 |
| 76 | practicalmeteor:sinon@1.14.1_2 | 76 | practicalmeteor:sinon@1.14.1_2 |
| 77 | promise@0.8.3 | 77 | promise@0.8.3 |
| 78 | raix:eventemitter@0.1.3 | 78 | raix:eventemitter@0.1.3 |
| 79 | random@1.0.10 | 79 | random@1.0.10 |
| 80 | rate-limit@1.0.5 | 80 | rate-limit@1.0.5 |
| 81 | reactive-dict@1.1.8 | 81 | reactive-dict@1.1.8 |
| 82 | reactive-var@1.0.10 | 82 | reactive-var@1.0.10 |
| 83 | reload@1.1.10 | 83 | reload@1.1.10 |
| 84 | retry@1.0.8 | 84 | retry@1.0.8 |
| 85 | routepolicy@1.0.11 | 85 | routepolicy@1.0.11 |
| 86 | service-configuration@1.0.10 | 86 | service-configuration@1.0.10 |
| 87 | session@1.1.6 | 87 | session@1.1.6 |
| 88 | sha@1.0.8 | 88 | sha@1.0.8 |
| 89 | spacebars@1.0.12 | 89 | spacebars@1.0.12 |
| 90 | spacebars-compiler@1.0.12 | 90 | spacebars-compiler@1.0.12 |
| 91 | srp@1.0.9 | 91 | srp@1.0.9 |
| 92 | standard-minifier-css@1.1.8 | 92 | standard-minifier-css@1.1.8 |
| 93 | standard-minifier-js@1.1.8 | 93 | standard-minifier-js@1.1.8 |
| 94 | static-html@1.1.11 | 94 | static-html@1.1.11 |
| 95 | templating@1.1.14 | 95 | templating@1.1.14 |
| 96 | templating-tools@1.0.4 | 96 | templating-tools@1.0.4 |
| 97 | themeteorchef:bert@2.1.1 | 97 | themeteorchef:bert@2.1.1 |
| 98 | tmeasday:test-reporter-helpers@0.2.1 | 98 | tmeasday:test-reporter-helpers@0.2.1 |
| 99 | tracker@1.1.0 | 99 | tracker@1.1.0 |
| 100 | ui@1.0.11 | 100 | ui@1.0.11 |
| 101 | underscore@1.0.9 | 101 | underscore@1.0.9 |
| 102 | url@1.0.10 | 102 | url@1.0.10 |
| 103 | webapp@1.3.10 | 103 | webapp@1.3.10 |
| 104 | webapp-hashing@1.0.9 | 104 | webapp-hashing@1.0.9 |
| 105 | xolvio:backdoor@0.2.0 | 105 | xolvio:backdoor@0.2.0 |
| 106 | xolvio:cleaner@0.3.1 | 106 | xolvio:cleaner@0.3.1 |
| 107 | 107 |
imports/startup/client/index.js
| 1 | import { Bert } from 'meteor/themeteorchef:bert'; | 1 | import { Bert } from 'meteor/themeteorchef:bert'; |
| 2 | import 'bootstrap/dist/css/bootstrap.min.css'; | 2 | import 'bootstrap/dist/css/bootstrap.min.css'; |
| 3 | import 'bootstrap/dist/js/bootstrap.min.js'; | ||
| 4 | import './routes.js'; | 3 | import './routes.js'; |
| 5 | 4 | ||
| 6 | Bert.defaults.style = 'growl-top-right'; | 5 | Bert.defaults.style = 'growl-top-right'; |
| 7 | 6 |
imports/ui/components/document.js
| 1 | import React from 'react'; | 1 | import React from 'react'; |
| 2 | import { Row, Col, ListGroupItem, FormControl, Button } from 'react-bootstrap'; | 2 | import { Row, Col, ListGroupItem, FormControl, Button } from 'react-bootstrap'; |
| 3 | import { Bert } from 'meteor/themeteorchef:bert'; | 3 | import { Bert } from 'meteor/themeteorchef:bert'; |
| 4 | import { updateDocument, removeDocument } from '../../api/documents/methods.js'; | 4 | import { updateDocument, removeDocument } from '../../api/documents/methods.js'; |
| 5 | 5 | ||
| 6 | const handleUpdateDocument = (documentId, event) => { | 6 | const handleUpdateDocument = (documentId, event) => { |
| 7 | const title = event.target.value.trim(); | 7 | const title = event.target.value.trim(); |
| 8 | if (title !== '' && event.keyCode === 13) { | 8 | if (title !== '' && event.keyCode === 13) { |
| 9 | updateDocument.call({ | 9 | updateDocument.call({ |
| 10 | _id: documentId, | 10 | _id: documentId, |
| 11 | update: { title }, | 11 | update: { title }, |
| 12 | }, (error) => { | 12 | }, (error) => { |
| 13 | if (error) { | 13 | if (error) { |
| 14 | Bert.alert(error.reason, 'danger'); | 14 | Bert.alert(error.reason, 'danger'); |
| 15 | } else { | 15 | } else { |
| 16 | Bert.alert('Document updated!', 'success'); | 16 | Bert.alert('Document updated!', 'success'); |
| 17 | } | 17 | } |
| 18 | }); | 18 | }); |
| 19 | } | 19 | } |
| 20 | }; | 20 | }; |
| 21 | 21 | ||
| 22 | const handleRemoveDocument = (documentId, event) => { | 22 | const handleRemoveDocument = (documentId, event) => { |
| 23 | event.preventDefault(); | 23 | event.preventDefault(); |
| 24 | // this should be replaced with a styled solution so for now we will | 24 | // this should be replaced with a styled solution so for now we will |
| 25 | // disable the eslint `no-alert` | 25 | // disable the eslint `no-alert` |
| 26 | // eslint-disable-next-line no-alert | 26 | // eslint-disable-next-line no-alert |
| 27 | if (confirm('Are you sure? This is permanent.')) { | 27 | if (confirm('Are you sure? This is permanent.')) { |
| 28 | removeDocument.call({ | 28 | removeDocument.call({ |
| 29 | _id: documentId, | 29 | _id: documentId, |
| 30 | }, (error) => { | 30 | }, (error) => { |
| 31 | if (error) { | 31 | if (error) { |
| 32 | Bert.alert(error.reason, 'danger'); | 32 | Bert.alert(error.reason, 'danger'); |
| 33 | } else { | 33 | } else { |
| 34 | Bert.alert('Document removed!', 'success'); | 34 | Bert.alert('Document removed!', 'success'); |
| 35 | } | 35 | } |
| 36 | }); | 36 | }); |
| 37 | } | 37 | } |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | export const Document = ({ document }) => ( | 40 | export const Document = ({ document }) => ( |
| 41 | <ListGroupItem key={ document._id }> | 41 | <ListGroupItem key={ document._id }> |
| 42 | <Row> | 42 | <Row> |
| 43 | <Col xs={ 8 } sm={ 10 }> | 43 | <Col xs={ 8 } sm={ 10 }> |
| 44 | <FormControl | 44 | <FormControl |
| 45 | type="text" | 45 | type="text" |
| 46 | standalone | ||
| 47 | defaultValue={ document.title } | 46 | defaultValue={ document.title } |
| 48 | onKeyUp={ handleUpdateDocument.bind(this, document._id) } | 47 | onKeyUp={ handleUpdateDocument.bind(this, document._id) } |
| 49 | /> | 48 | /> |
| 50 | </Col> | 49 | </Col> |
| 51 | <Col xs={ 4 } sm={ 2 }> | 50 | <Col xs={ 4 } sm={ 2 }> |
| 52 | <Button | 51 | <Button |
| 53 | bsStyle="danger" | 52 | bsStyle="danger" |
| 54 | className="btn-block" | 53 | className="btn-block" |
| 55 | onClick={ handleRemoveDocument.bind(this, document._id) }> | 54 | onClick={ handleRemoveDocument.bind(this, document._id) }> |
| 56 | Remove | 55 | Remove |
| 57 | </Button> | 56 | </Button> |
| 58 | </Col> | 57 | </Col> |
| 59 | </Row> | 58 | </Row> |
| 60 | </ListGroupItem> | 59 | </ListGroupItem> |
| 61 | ); | 60 | ); |
| 62 | 61 |
imports/ui/components/loading.js
| 1 | import React from 'react'; | 1 | import React from 'react'; |
| 2 | 2 | ||
| 3 | export const Loading = () => ( | 3 | export const Loading = () => ( |
| 4 | <svg | 4 | <svg |
| 5 | version="1.1" | 5 | version="1.1" |
| 6 | className="loading" | 6 | className="loading" |
| 7 | xmlns="http://www.w3.org/2000/svg" | 7 | xmlns="http://www.w3.org/2000/svg" |
| 8 | x="0px" | 8 | x="0px" |
| 9 | y="0px" | 9 | y="0px" |
| 10 | width="40px" | 10 | width="40px" |
| 11 | height="40px" | 11 | height="40px" |
| 12 | viewBox="0 0 40 40" | 12 | viewBox="0 0 40 40" |
| 13 | enable-background="new 0 0 40 40"> | 13 | enableBackground="new 0 0 40 40"> |
| 14 | <path | 14 | <path |
| 15 | opacity="1.0" | 15 | opacity="1.0" |
| 16 | fill="#eee" | 16 | fill="#eee" |
| 17 | d="M20.201,5.169c-8.254,0-14.946,6.692-14.946,14.946c0,8.255,6.692,14.946, | 17 | d="M20.201,5.169c-8.254,0-14.946,6.692-14.946,14.946c0,8.255,6.692,14.946, |
| 18 | 14.946,14.946s14.946-6.691,14.946-14.946C35.146,11.861,28.455,5.169,20.201, | 18 | 14.946,14.946s14.946-6.691,14.946-14.946C35.146,11.861,28.455,5.169,20.201, |
| 19 | 5.169z M20.201,31.749c-6.425,0-11.634-5.208-11.634-11.634c0-6.425, | 19 | 5.169z M20.201,31.749c-6.425,0-11.634-5.208-11.634-11.634c0-6.425, |
| 20 | 5.209-11.634,11.634-11.634c6.425,0,11.633,5.209,11.633,11.634C31.834, | 20 | 5.209-11.634,11.634-11.634c6.425,0,11.633,5.209,11.633,11.634C31.834, |
| 21 | 26.541,26.626,31.749,20.201,31.749z"/> | 21 | 26.541,26.626,31.749,20.201,31.749z"/> |
| 22 | <path | 22 | <path |
| 23 | fill="#da5347" | 23 | fill="#da5347" |
| 24 | d="M26.013,10.047l1.654-2.866c-2.198-1.272-4.743-2.012-7.466-2.012h0v3.312h0 | 24 | d="M26.013,10.047l1.654-2.866c-2.198-1.272-4.743-2.012-7.466-2.012h0v3.312h0 |
| 25 | C22.32,8.481,24.301,9.057,26.013,10.047z"> | 25 | C22.32,8.481,24.301,9.057,26.013,10.047z"> |
| 26 | </path> | 26 | </path> |
| 27 | </svg> | 27 | </svg> |
| 28 | ); | 28 | ); |
| 29 | 29 |
package.json
| 1 | { | 1 | { |
| 2 | "name": "application-name", | 2 | "name": "application-name", |
| 3 | "version": "1.0.0", | 3 | "version": "1.0.0", |
| 4 | "description": "Application description.", | 4 | "description": "Application description.", |
| 5 | "scripts": { | 5 | "scripts": { |
| 6 | "start": "meteor --settings settings-development.json", | 6 | "start": "meteor --settings settings-development.json", |
| 7 | "test": "meteor test --driver-package practicalmeteor:mocha --port 5000", | 7 | "test": "meteor test --driver-package practicalmeteor:mocha --port 5000", |
| 8 | "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests", | 8 | "chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests", |
| 9 | "chimp-test": "chimp --ddp=http://localhost:3000 --mocha --path=tests", | 9 | "chimp-test": "chimp --ddp=http://localhost:3000 --mocha --path=tests", |
| 10 | "staging": "meteor deploy staging.meteor.com --settings settings-development.json", | 10 | "staging": "meteor deploy staging.meteor.com --settings settings-development.json", |
| 11 | "production": "meteor deploy production.meteor.com --settings settings-production.json" | 11 | "production": "meteor deploy production.meteor.com --settings settings-production.json" |
| 12 | }, | 12 | }, |
| 13 | "devDependencies": { | 13 | "devDependencies": { |
| 14 | "chimp": "^0.39.1", | 14 | "chimp": "^0.39.1", |
| 15 | "eslint": "^2.13.1", | 15 | "eslint": "^2.13.1", |
| 16 | "eslint-config-airbnb": "^9.0.1", | 16 | "eslint-config-airbnb": "^9.0.1", |
| 17 | "eslint-plugin-jsx-a11y": "^1.5.5", | 17 | "eslint-plugin-jsx-a11y": "^1.5.5", |
| 18 | "eslint-plugin-meteor": "^3.6.0", | 18 | "eslint-plugin-meteor": "^3.6.0", |
| 19 | "eslint-plugin-react": "^5.2.2", | 19 | "eslint-plugin-react": "^5.2.2", |
| 20 | "faker": "^3.1.0" | 20 | "faker": "^3.1.0" |
| 21 | }, | 21 | }, |
| 22 | "eslintConfig": { | 22 | "eslintConfig": { |
| 23 | "parserOptions": { | 23 | "parserOptions": { |
| 24 | "ecmaFeatures": { | 24 | "ecmaFeatures": { |
| 25 | "jsx": true | 25 | "jsx": true |
| 26 | } | 26 | } |
| 27 | }, | 27 | }, |
| 28 | "plugins": [ | 28 | "plugins": [ |
| 29 | "meteor", | 29 | "meteor", |
| 30 | "react" | 30 | "react" |
| 31 | ], | 31 | ], |
| 32 | "extends": [ | 32 | "extends": [ |
| 33 | "airbnb/base", | 33 | "airbnb/base", |
| 34 | "plugin:meteor/guide", | 34 | "plugin:meteor/guide", |
| 35 | "plugin:react/recommended" | 35 | "plugin:react/recommended" |
| 36 | ], | 36 | ], |
| 37 | "globals": { | 37 | "globals": { |
| 38 | "server": false, | 38 | "server": false, |
| 39 | "browser": false, | 39 | "browser": false, |
| 40 | "expect": false | 40 | "expect": false |
| 41 | }, | 41 | }, |
| 42 | "rules": { | 42 | "rules": { |
| 43 | "import/no-unresolved": 0, | 43 | "import/no-unresolved": 0, |
| 44 | "no-underscore-dangle": [ | 44 | "no-underscore-dangle": [ |
| 45 | "error", | 45 | "error", |
| 46 | { | 46 | { |
| 47 | "allow": [ | 47 | "allow": [ |
| 48 | "_id", | 48 | "_id", |
| 49 | "_ensureIndex", | 49 | "_ensureIndex", |
| 50 | "_verifyEmailToken", | 50 | "_verifyEmailToken", |
| 51 | "_resetPasswordToken", | 51 | "_resetPasswordToken", |
| 52 | "_name" | 52 | "_name" |
| 53 | ] | 53 | ] |
| 54 | } | 54 | } |
| 55 | ] | 55 | ] |
| 56 | } | 56 | } |
| 57 | }, | 57 | }, |
| 58 | "dependencies": { | 58 | "dependencies": { |
| 59 | "bootstrap": "^3.3.7", | 59 | "bootstrap": "^3.3.7", |
| 60 | "jquery": "^2.2.4", | 60 | "jquery": "^2.2.4", |
| 61 | "jquery-validation": "^1.15.1", | 61 | "jquery-validation": "^1.15.1", |
| 62 | "react": "^15.2.1", | 62 | "react": "^15.3.0", |
| 63 | "react-addons-pure-render-mixin": "^15.2.1", | 63 | "react-addons-pure-render-mixin": "^15.2.1", |
| 64 | "react-bootstrap": "^0.29.5", | 64 | "react-bootstrap": "^0.30.2", |
| 65 | "react-dom": "^15.2.1", | 65 | "react-dom": "^15.3.0", |
| 66 | "react-komposer": "^1.13.1", | 66 | "react-komposer": "^1.13.1", |
| 67 | "react-router": "^2.6.0", | 67 | "react-router": "^2.6.1", |
| 68 | "react-router-bootstrap": "^0.23.1" | 68 | "react-router-bootstrap": "^0.23.1" |
| 69 | } | 69 | } |
| 70 | } | 70 | } |
| 71 | 71 |