Commit 64072c39 by Hao Chen

update to meteor 1.4.2.3

parent f18c7733
File added
.idea/
node_modules
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<file url="file://$PROJECT_DIR$" libraries="{mcotton-v1 node_modules}" />
<file url="PROJECT" libraries="{meteor-packages-auto-import-browser}" />
<file url="PROJECT" libraries="{meteor-packages-auto-import-browser, meteor-packages-auto-import-npm}" />
<includedPredefinedLibrary name="Meteor project library" />
</component>
</project>
\ No newline at end of file
......@@ -6,7 +6,5 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="mcotton-v1 node_modules" level="project" />
<orderEntry type="library" name="meteor-packages-auto-import-browser" level="project" />
</component>
</module>
\ No newline at end of file
......@@ -17,16 +17,6 @@
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false" SSL_PROTOCOLS="sslv3">
<option name="USER" value="" />
<option name="PASSWORD" value="" />
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -12,3 +12,4 @@ notices-for-facebook-graph-api-2
1.2.0-breaking-changes
1.3.0-split-minifiers-package
1.4.0-remove-old-dev-bundle-link
1.4.1-add-shell-server-package
......@@ -9,52 +9,49 @@
##############################
meteor-base@1.0.4
session@1.1.6
session@1.1.7
blaze-html-templates@1.0.4
mongo@1.1.10
mongo@1.1.14
random@1.0.10
##############################
# Basic
##############################
reactive-var@1.0.10
underscore@1.0.9
reactive-var@1.0.11
underscore@1.0.10
pauldowman:dotenv
iron:router
jquery@1.11.9
check@1.2.3
# tracker
# logging
#reload
#ejson
#spacebars
jquery@1.11.10
check@1.2.4
##############################
# Performance
##############################
meteorhacks:aggregate
meteorhacks:fast-render
# meteorhacks:fast-render
##############################
# Account
##############################
accounts-password@1.2.12
accounts-password@1.3.3
accounts-base@1.2.14
alanning:roles
# accounts-facebook
# accounts-twitter
# accounts-weibo
# accounts-github
# accounts-google
accounts-base@1.2.9
alanning:roles
stylus@2.513.8
twbs:bootstrap
accounts-ui@1.1.9
# ian:accounts-ui-bootstrap-3
# mrt:accounts-admin-ui-bootstrap-3
# accounts-ui@1.1.9
ian:accounts-ui-bootstrap-3
mrt:accounts-admin-ui-bootstrap-3
theduke:bootstrap-modal-prompt
jparker:crypto-hmac
jparker:crypto-sha256
......@@ -102,15 +99,13 @@ mrt:numeral
##############################
aldeed:autoform
pcuci:bootcards
rcy:nouislider
sacha:spin
less@2.7.4
# pcuci:bootcards
# rcy:nouislider
# yogiben:autoform-modals
aldeed:template-extension
# ajduke:bootstrap-tagsinput
# materialize:materialize
less@2.7.8
sacha:spin
momentjs:moment
meteorhacks:async
......@@ -138,5 +133,6 @@ udondan:jszip
# meteorhacks:kadira
standard-minifier-css
standard-minifier-js
standard-minifier-css@1.3.2
standard-minifier-js@1.2.1
shell-server
METEOR@1.4.0.1
METEOR@1.4.2.3
accounts-base@1.2.10
accounts-password@1.2.14
accounts-ui@1.1.9
accounts-ui-unstyled@1.1.12
accounts-base@1.2.14
accounts-password@1.3.3
alanning:roles@1.2.15
aldeed:autoform@5.8.1
aldeed:collection2@2.9.1
aldeed:collection2-core@1.1.1
aldeed:schema-deny@1.0.1
aldeed:schema-index@1.0.1
aldeed:collection2@2.10.0
aldeed:collection2-core@1.2.0
aldeed:schema-deny@1.1.0
aldeed:schema-index@1.1.1
aldeed:simple-schema@1.5.3
aldeed:template-extension@4.0.0
allow-deny@1.0.5
autoupdate@1.2.11
babel-compiler@6.9.0
babel-runtime@0.1.10
base64@1.0.9
binary-heap@1.0.9
blaze@2.1.8
blaze-html-templates@1.0.4
blaze-tools@1.0.9
boilerplate-generator@1.0.9
anti:i18n@0.4.3
autoupdate@1.3.12
babel-compiler@6.13.0
babel-runtime@1.0.1
base64@1.0.10
binary-heap@1.0.10
blaze@2.2.0
blaze-html-templates@1.0.5
blaze-tools@1.0.10
boilerplate-generator@1.0.11
browser-policy@1.0.9
browser-policy-common@1.0.10
browser-policy-content@1.0.11
browser-policy-framing@1.0.11
caching-compiler@1.1.6
caching-html-compiler@1.0.6
callback-hook@1.0.9
browser-policy-common@1.0.11
browser-policy-content@1.0.12
browser-policy-framing@1.0.12
caching-compiler@1.1.9
caching-html-compiler@1.0.7
callback-hook@1.0.10
cfs:access-point@0.1.49
cfs:base-package@0.0.30
cfs:collection@0.5.5
......@@ -45,28 +45,29 @@ cfs:tempstore@0.1.5
cfs:ui@0.1.3
cfs:upload-http@0.0.20
cfs:worker@0.1.4
check@1.2.3
chuangbo:cookie@1.1.0
coffeescript@1.0.17
check@1.2.4
coffeescript@1.11.1_4
d3@1.0.0
dburles:collection-helpers@1.0.4
dburles:collection-helpers@1.1.0
ddp@1.2.5
ddp-client@1.2.9
ddp-common@1.2.6
ddp-rate-limiter@1.0.5
ddp-server@1.2.10
ddp-client@1.3.2
ddp-common@1.2.8
ddp-rate-limiter@1.0.6
ddp-server@1.3.12
deps@1.0.12
diff-sequence@1.0.6
ecmascript@0.5.7
ecmascript-runtime@0.3.13
ejson@1.0.12
email@1.1.16
geojson-utils@1.0.9
diff-sequence@1.0.7
ecmascript@0.6.1
ecmascript-runtime@0.3.15
ejson@1.0.13
email@1.1.18
fastclick@1.0.13
geojson-utils@1.0.10
hot-code-push@1.0.4
html-tools@1.0.10
htmljs@1.0.10
http@1.1.8
id-map@1.0.8
html-tools@1.0.11
htmljs@1.0.11
http@1.2.10
ian:accounts-ui-bootstrap-3@1.2.89
id-map@1.0.9
iron:controller@1.0.12
iron:core@1.0.11
iron:dynamic-template@1.0.12
......@@ -78,72 +79,74 @@ iron:url@1.0.11
jparker:crypto-core@0.1.0
jparker:crypto-hmac@0.1.0
jparker:crypto-sha256@0.1.1
jquery@1.11.9
less@2.7.4
jquery@1.11.10
launch-screen@1.1.0
less@2.7.8
limemakers:three@0.75.0
livedata@1.0.18
localstorage@1.0.11
logging@1.1.14
mdg:validation-error@0.2.0
meteor@1.2.16
localstorage@1.0.12
logging@1.1.16
mdg:validation-error@0.5.1
meteor@1.6.0
meteor-base@1.0.4
meteor-platform@1.2.6
meteorhacks:aggregate@1.3.0
meteorhacks:async@1.0.0
meteorhacks:collection-utils@1.2.0
meteorhacks:fast-render@2.14.0
meteorhacks:inject-data@2.0.0
meteorhacks:meteorx@1.4.1
meteorhacks:picker@1.0.3
minifier-css@1.2.13
minifier-js@1.2.13
minimongo@1.0.17
minifier-css@1.2.15
minifier-js@1.2.15
minimongo@1.0.19
mkarliner:mqtt@0.3.0
modules@0.7.5
modules-runtime@0.7.5
momentjs:moment@2.14.4
mongo@1.1.10
mongo-id@1.0.5
mobile-status-bar@1.0.13
modules@0.7.7
modules-runtime@0.7.7
momentjs:moment@2.17.1
mongo@1.1.14
mongo-id@1.0.6
mongo-livedata@1.0.12
mrt:accounts-admin-ui-bootstrap-3@0.2.7
mrt:numeral@1.5.3
mrt:nvd3js@0.1.0
nemo64:bootstrap@3.3.5_3
nemo64:bootstrap-data@3.3.5
nimble:restivus@0.8.11
npm-bcrypt@0.8.7_1
npm-mongo@1.5.45
observe-sequence@1.0.12
ordered-dict@1.0.8
npm-bcrypt@0.9.2
npm-mongo@2.2.11_2
observe-sequence@1.0.14
ordered-dict@1.0.9
pauldowman:dotenv@1.0.1
pauloborges:mapbox@2.2.3_2
pcuci:bootcards@1.0.0_6
promise@0.8.3
promise@0.8.8
raix:eventemitter@0.1.3
raix:ui-dropped-event@0.0.7
random@1.0.10
rate-limit@1.0.5
rcy:nouislider@7.0.7_2
rate-limit@1.0.6
reactive-dict@1.1.8
reactive-var@1.0.10
reload@1.1.10
retry@1.0.8
routepolicy@1.0.11
reactive-var@1.0.11
reload@1.1.11
retry@1.0.9
routepolicy@1.0.12
sacha:spin@2.3.1
service-configuration@1.0.10
session@1.1.6
sha@1.0.8
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
shell-server@0.2.1
simple:json-routes@2.1.0
spacebars@1.0.12
spacebars-compiler@1.0.12
srp@1.0.9
standard-minifier-css@1.1.8
standard-minifier-js@1.1.8
templating@1.1.14
templating-tools@1.0.4
tracker@1.1.0
spacebars@1.0.13
spacebars-compiler@1.0.13
srp@1.0.10
standard-app-packages@1.0.9
standard-minifier-css@1.3.2
standard-minifier-js@1.2.1
stylus@2.513.8
templating@1.2.15
templating-compiler@1.2.15
templating-runtime@1.2.15
templating-tools@1.0.5
theduke:bootstrap-modal-prompt@0.0.2
tracker@1.1.1
twbs:bootstrap@3.3.6
udondan:jszip@2.4.0_1
ui@1.0.11
underscore@1.0.9
url@1.0.10
webapp@1.3.10
ui@1.0.12
underscore@1.0.10
url@1.0.11
webapp@1.3.12
webapp-hashing@1.0.9
......@@ -7,29 +7,29 @@ var img_index = 0;
//_imgs = ["/imgs/cover.png", "/imgs/mcookie.jpg", "/imgs/mic_light.png", "/imgs/music_box.png"];
var _imgs = ["/imgs/cover.png"];
var rVarProjectsCount = new ReactiveVar(0), rVarDevicesCount = new ReactiveVar(0),
rVarPublicDevicesCount = new ReactiveVar(0);
// var rVarProjectsCount = new ReactiveVar(0), rVarDevicesCount = new ReactiveVar(0),
// rVarPublicDevicesCount = new ReactiveVar(0);
Template.home.helpers({
ultraVisualData: function () {
var _data = [
{
"title": "<strong> " + rVarProjectsCount.get() + " Awesome Projects </strong>",
"title": "<strong> Awesome Projects </strong>",
"description": "Smart Vulture Egg, Weather Station, City Block",
"buttons": [
{label: "Projects ...", href: "/projects"},
]
},
{}, {
"title": "<strong> " + rVarDevicesCount.get() + " IoT Devices </strong>",
"title": "<strong> IoT Devices </strong>",
"description": "Push data or pull control via API of RESTful, WebSocket, MQTT, ...",
"buttons": [
{label: "microduino", href: "https://www.microduino.cc/store"},
{label: "mCookie", href: "https://www.microduino.cc/store"}
{label: "microduino", href: "https://www.microduino.cn/index-microduino"},
{label: "mCookie", href: "https://www.microduino.cn/index-mcookie"}
]
},
{}, {
"title": "<strong> " + rVarPublicDevicesCount.get() + " Open Data Devices</strong>",
"title": "<strong> Open Data Devices</strong>",
"description": "Share your data to public, and dump it as your wish.",
"buttons": [
{label: "Public Devices ...", href: "/publicdevices"},
......@@ -71,21 +71,21 @@ Template.home.rendered = function () {
//rVarDevicesCount = new ReactiveVar(0);
//rVarPublicDevicesCount = new ReactiveVar(0);
Meteor.call('projectsCount', function (error, result) {
if (result) {
rVarProjectsCount.set(result);
}
});
Meteor.call('devicesCount', function (error, result) {
if (result) {
rVarDevicesCount.set(result);
}
});
Meteor.call('publicDevicesCount', function (error, result) {
if (result) {
rVarPublicDevicesCount.set(result);
}
});
// Meteor.call('projectsCount', function (error, result) {
// if (result) {
// rVarProjectsCount.set(result);
// }
// });
// Meteor.call('devicesCount', function (error, result) {
// if (result) {
// rVarDevicesCount.set(result);
// }
// });
// Meteor.call('publicDevicesCount', function (error, result) {
// if (result) {
// rVarPublicDevicesCount.set(result);
// }
// });
};
Template.scroll_item.helpers({
......
......@@ -73,7 +73,7 @@ STATUS = [STATUS_SUBMIT, STATUS_NORMAL, STATUS_READONLY, STATUS_DISABLE, STATUS_
/////////////////
DATA_POINTS = {
BLD: {label: "Blood Pressure", icon: "/datapoints/blood_pressure.png", unit: "s"},
// BLD: {label: "Blood Pressure", icon: "/datapoints/blood_pressure.png", unit: "s"},
APR: {label: "Air Pressure", icon: "/datapoints/airpressure.png", unit: "kPa"},
APL: {label: "Air Pollution", icon: "/datapoints/airpollution.png", unit: "ppm"},
CSH: {label: "Crash", icon: "/datapoints/crash.png"},
......@@ -81,22 +81,22 @@ DATA_POINTS = {
DOF: {label: "G-Senser & Gyroscope", icon: "/datapoints/dof.png", unit: "G"},
GPS: {label: "GPS Location", icon: "/datapoints/gps.png"},
GRY: {label: "Gray Sensor", icon: "/datapoints/gray_sensor.png"},
HAL: {label: "Holzer", icon: "/datapoints/holzer.png", unit: ""},
// HAL: {label: "Holzer", icon: "/datapoints/holzer.png", unit: ""},
HUM: {label: "Humidity", icon: "/datapoints/wet.png", unit: "%"},
IMG: {label: "Image", icon: "/datapoints/image.png", unit: ""},
JSN: {label: "Json", icon: "/datapoints/json.png", unit: ""},
LVL: {label: "Level", icon: "/datapoints/level.png", unit: ""},
// LVL: {label: "Level", icon: "/datapoints/level.png", unit: ""},
LUX: {label: "Lightness", icon: "/datapoints/lightness.png", unit: "Lux"},
MIC: {label: "Microphone", icon: "/datapoints/mic.png"},
MOT: {label: "Motion", icon: "/datapoints/motion.png"},
// MOT: {label: "Motion", icon: "/datapoints/motion.png"},
NOI: {label: "Noise", icon: "/datapoints/noise.png", unit: "db"},
PIR: {label: "PIR", icon: "/datapoints/pir.png", unit: ""},
P10: {label: "PM 10", icon: "/datapoints/pm.png", unit: "μg/m3"},
P10: {label: "PM", icon: "/datapoints/pm.png", unit: "μg/m3"},
PUS: {label: "Pulse", icon: "/datapoints/pulse.png", unit: "times/min"},
SHK: {label: "Shake", icon: "/datapoints/shake.png"},
SPD: {label: "Speed", icon: "/datapoints/speed.png", unit: "km/h"},
// SPD: {label: "Speed", icon: "/datapoints/speed.png", unit: "km/h"},
TEM: {label: "Temperature", icon: "/datapoints/temperature.png", unit: "℃"},
TIM: {label: "Timer", icon: "/datapoints/timer.png", unit: "s"},
// TIM: {label: "Timer", icon: "/datapoints/timer.png", unit: "s"},
};
DATA_POINT_TYPES = _.keys(DATA_POINTS);
......@@ -116,22 +116,22 @@ DATA_POINT_AUTO_FORM = function () {
CONTROL_POINTS = {
BTN: {label: "Button", icons: ["/controlpoints/button.png"]}, // click = 1
BUZ: {label: "Buzz", icons: ["/controlpoints/buzzer.png"]}, // buzz frequency
CLR: {label: "Color", icons: ["/controlpoints/color.png"]}, // Color RGB
IMG: {label: "Image", icons: ["/controlpoints/image.png"]}, // Image binary
// BUZ: {label: "Buzz", icons: ["/controlpoints/buzzer.png"]}, // buzz frequency
// CLR: {label: "Color", icons: ["/controlpoints/color.png"]}, // Color RGB
// IMG: {label: "Image", icons: ["/controlpoints/image.png"]}, // Image binary
LED: {label: "LED Light", icons: ["/controlpoints/led.png", "/controlpoints/led-on.png"]}, // off. on
MTR: {label: "Motor", icons: ["/controlpoints/motor.png"]}, // direction and speed
PLY: {label: "Sound/Video Player", icons: ["/controlpoints/player.png"]}, // stop, play, pause, prev, next
RTC: {label: "RTC Time Sync", icons: ["/controlpoints/rtc.png"]}, // timestamp
SRV: {label: "Servo", icons: ["/controlpoints/servo.png"]}, // direction and speed
SND: {label: "Sound", icons: ["/controlpoints/sound.png"]}, // Sound binary
STP: {label: "Stepper", icons: ["/controlpoints/stepper.png"]}, // direction and speed
// MTR: {label: "Motor", icons: ["/controlpoints/motor.png"]}, // direction and speed
// PLY: {label: "Sound/Video Player", icons: ["/controlpoints/player.png"]}, // stop, play, pause, prev, next
// RTC: {label: "RTC Time Sync", icons: ["/controlpoints/rtc.png"]}, // timestamp
// SRV: {label: "Servo", icons: ["/controlpoints/servo.png"]}, // direction and speed
// SND: {label: "Sound", icons: ["/controlpoints/sound.png"]}, // Sound binary
// STP: {label: "Stepper", icons: ["/controlpoints/stepper.png"]}, // direction and speed
SWT: {label: "Switch", icons: ["/controlpoints/switch-off.png", "/controlpoints/switch-on.png"]},
TXT: {label: "Text", icons: ["/controlpoints/text.png"]}, // text message or some data threshold
NUM: {label: "Number", icons: ["/controlpoints/text.png"]}, // Number message or some data threshold
JSN: {label: "Json", icons: ["/controlpoints/json.png"]}, // Json message
VLM: {label: "Voice volume", icons: ["/controlpoints/volume.png"]}, // 1-100, or 1-255
VDO: {label: "Video", icons: ["/controlpoints/video.png"]}, // Video binary
// NUM: {label: "Number", icons: ["/controlpoints/text.png"]}, // Number message or some data threshold
// JSN: {label: "Json", icons: ["/controlpoints/json.png"]}, // Json message
// VLM: {label: "Voice volume", icons: ["/controlpoints/volume.png"]}, // 1-100, or 1-255
// VDO: {label: "Video", icons: ["/controlpoints/video.png"]}, // Video binary
};
CONTROL_POINT_TYPES = _.keys(CONTROL_POINTS);
......
......@@ -15,19 +15,18 @@ if (Meteor.users.find().count() === 0) {
name: "Normal User", email: "normal@example.com", password: "123456", roles: ['user'],
photo: "/test/photo1.jpg"
},
{
name: "Editor", email: "editor@microduino.cc", password: "123456", roles: ['editor'],
photo: "/test/photo2.jpg"
},
{
name: "Project Approval", email: "pm@microduino.cc", password: "123456", roles: ['project-approval'],
photo: "/test/photo1.jpg"
},
{
name: "Customer Care", email: "cc@microduino.cc", password: "123456", roles: ['customer-care'],
photo: "/test/photo1.jpg"
},
// {
// name: "Project Approval", email: "pm@microduino.cc", password: "123456", roles: ['project-approval'],
// photo: "/test/photo1.jpg"
// },
// {
// name: "Customer Care", email: "cc@microduino.cc", password: "123456", roles: ['customer-care'],
// photo: "/test/photo1.jpg"
// },
{
name: "Admin User", email: "admin@microduino.cc", password: "12345678", roles: ['admin'],
photo: "/test/photo1.jpg"
......@@ -168,7 +167,7 @@ if (Meteor.users.find().count() === 0) {
],
control_points: [
{control_name: "Message", control_type: "TXT"},
{control_name: "Buzz", control_type: "BUZ"},
// {control_name: "Buzz", control_type: "BUZ"},
{control_name: "Light", control_type: "LED"},
]
},
......@@ -186,30 +185,28 @@ if (Meteor.users.find().count() === 0) {
],
control_points: [
{
control_name: "Water On",
control_type: "TXT",
control_name: "Water On", control_type: "TXT",
control_desc: "Begin water when earth humidity less than this threshold"
},
{
control_name: "Water Off",
control_type: "TXT",
control_name: "Water Off", control_type: "TXT",
control_desc: "Stop water when earth humidity great than this threshold"
},
{control_name: "Light", control_type: "TXT", control_desc: "Adjust light with this lux threshold"},
]
},
{
name: 'Time-lapse Camera', desc: 'Time-lapse Camera.',
module_ids: [
Collections.Modules.findOne({name: 'Microduino-Core+'})._id,
],
data_points: [
{data_name: "Picture", data_type: "IMG", show_list: true},
],
control_points: [
{control_name: "Shutter", control_type: "BTN"},
]
},
// {
// name: 'Time-lapse Camera', desc: 'Time-lapse Camera.',
// module_ids: [
// Collections.Modules.findOne({name: 'Microduino-Core+'})._id,
// ],
// data_points: [
// {data_name: "Picture", data_type: "IMG", show_list: true},
// ],
// control_points: [
// {control_name: "Shutter", control_type: "BTN"},
// ]
// },
{
name: 'Noise Detector', desc: 'Noise Detector in School',
module_ids: [
......@@ -219,25 +216,12 @@ if (Meteor.users.find().count() === 0) {
{data_name: "Max", data_type: "NOI"},
{data_name: "Min", data_type: "NOI"},
{data_name: "Average", data_type: "NOI"},
{data_name: "Best Acceleration", data_desc: "Accelerate from 1 to 100km", data_type: "TIM"},
],
control_points: [
{control_name: "OnOff", control_type: "SWT", control_desc: "Switch of device"},
]
},
{
name: 'mRace', desc: 'mRace',
module_ids: [
Collections.Modules.findOne({name: 'Microduino-Core+'})._id,
],
data_points: [
{data_name: "Max Speed", data_type: "SPD"},
{data_name: "Running Time", data_type: "TIM"},
{data_name: "Best Single lap", data_type: "TIM"},
{data_name: "Best Acceleration", data_desc: "Accelerate from 1 to 100km", data_type: "TIM"},
]
},
{
name: 'Vulture Egg', desc: 'Smart vulture egg',
module_ids: [
Collections.Modules.findOne({name: 'Microduino-Core+'})._id,
......
......@@ -5,6 +5,7 @@
"start": "meteor run"
},
"dependencies": {
"babel-runtime": "^6.18.0",
"bcrypt": "^0.8.5",
"buffalo": "^0.1.3",
"kerberos": "0.0.21",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment