martin/SilvrAPI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modified to use events, hopefully will fix the crashing particle

Browse Source
This commit is contained in:
Martin Donnelly 2016-02-12 11:50:50 +00:00
parent f3a0164b33
commit b3f094f125
5 changed files with 442 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/jsLibraryMappings.xml
View File

@ -2,6 +2,7 @@
<project version="4">
<component name="JavaScriptLibraryMappings">
<file url="file://$PROJECT_DIR$" libraries="{silvrapi node_modules}" />
<includedPredefinedLibrary name="ECMAScript 6" />
<includedPredefinedLibrary name="Node.js Core" />
</component>
</project>

2
.idea/runConfigurations/bin_www.xml
View File

@ -1,5 +1,5 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="bin/www" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="/usr/local/bin/node" path-to-js-file="bin/www" working-dir="$PROJECT_DIR$">
<configuration default="false" name="bin/www" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="bin/www" working-dir="$PROJECT_DIR$">
<envs>
<env name="DEBUG" value="silvrapi:*" />
<env name="DB_HOME" value="/Users/martin" />

389
.idea/workspace.xml
View File

@ -2,7 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8a985735-5aff-47ce-a55f-2957d4f9c5f9" name="Default" comment="add a get route&#10;">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" afterPath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/bin_www.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/bin_www.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/temp.js" afterPath="$PROJECT_DIR$/routes/temp.js" />
</list>
<ignored path="silvrapi.iws" />
@ -27,9 +30,22 @@
<file leaf-file-name="temp.ejs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/temp.ejs">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-37.5">
<state vertical-scroll-proportion="-0.65384614">
<caret line="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
<folding />
<folding>
<marker date="1455274273146" expanded="true" signature="597:1004" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="714:764" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="802:995" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="897:967" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1073:1746" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1138:1386" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1171:1313" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273146" expanded="true" signature="1252:1300" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1268:1285" placeholder="/*...*/" />
<marker date="1455274273146" expanded="true" signature="1429:1642" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1506:1579" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1693:1737" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -39,17 +55,20 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jquery.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/lib/jquery.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<marker date="1455274273147" expanded="true" signature="611:1030" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="730:782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="820:1021" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="921:993" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1101:1782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1172:1422" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1205:1349" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273147" expanded="true" signature="1288:1336" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1304:1321" placeholder="/*...*/" />
<marker date="1455274273147" expanded="true" signature="1465:1678" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1542:1615" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1729:1773" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -67,8 +86,8 @@
<file leaf-file-name="temp.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.37413073">
<caret line="89" column="45" selection-start-line="89" selection-start-column="45" selection-end-line="89" selection-end-column="45" />
<state vertical-scroll-proportion="0.7641509">
<caret line="135" column="34" selection-start-line="135" selection-start-column="34" selection-end-line="135" selection-end-column="34" />
<folding />
</state>
</provider>
@ -77,7 +96,7 @@
<file leaf-file-name="time.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/time.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.222222">
<state vertical-scroll-proportion="0.0">
<caret line="22" column="58" selection-start-line="22" selection-start-column="58" selection-end-line="22" selection-end-column="58" />
<folding />
</state>
@ -98,7 +117,7 @@
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="37" column="12" selection-start-line="37" selection-start-column="12" selection-end-line="37" selection-end-column="12" />
<caret line="37" column="22" selection-start-line="37" selection-start-column="22" selection-end-line="37" selection-end-column="22" />
<folding />
</state>
</provider>
@ -106,9 +125,22 @@
</file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.730769">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding>
<marker date="1455276533397" expanded="true" signature="78:113" placeholder="{&quot;start&quot;: &quot;node ./bin/www&quot;...}" />
<marker date="1455276533397" expanded="true" signature="133:347" placeholder="{&quot;body-parser&quot;: &quot;~1.13.2&quot;...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="www" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bin/www">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<caret line="24" column="17" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
<folding />
</state>
</provider>
@ -168,8 +200,30 @@
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1932" />
<option name="height" value="1056" />
<option name="width" value="1616" />
<option name="height" value="876" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Code style issuesJavaScript</id>
</State>
<State>
<id>JavaScript</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>CoffeeScript</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
@ -196,6 +250,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@ -214,6 +269,20 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="silvrapi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="silvrapi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="undefined" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="silvrapi" />
@ -242,14 +311,27 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="silvrapi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="silvrapi" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="bin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Font" />
<property name="settings.editor.selected.configurable" value="JavaScript.Libraries" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="nodejs_interpreter_path" value="/usr/local/bin/node" />
@ -259,7 +341,7 @@
<property name="restartRequiresConfirmation" value="false" />
<property name="JavaScriptPreferStrict" value="true" />
<property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/bower.json" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/bin/www" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="102" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="130" />
@ -276,6 +358,7 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder2" value="2" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeWidth3" value="799" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="ignore_missing_gitignore" value="true" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@ -464,22 +547,22 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1932" height="1056" extended-state="0" />
<frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23931624" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24228792" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16143012" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17184265" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3310153" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37552157" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32919255" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32823366" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39958593" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@ -527,11 +610,91 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/lib/jquery.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/javascripts/temp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/time.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="22" column="58" selection-start-line="22" selection-start-column="58" selection-end-line="22" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/weight.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="37" column="12" selection-start-line="37" selection-start-column="12" selection-end-line="37" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<marker date="1455276533397" expanded="true" signature="78:113" placeholder="{&quot;start&quot;: &quot;node ./bin/www&quot;...}" />
<marker date="1455276533397" expanded="true" signature="133:347" placeholder="{&quot;body-parser&quot;: &quot;~1.13.2&quot;...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/users.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="9" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/temp.ejs">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="59" column="27" selection-start-line="0" selection-start-column="0" selection-end-line="92" selection-end-column="7" />
<folding />
<folding>
<marker date="1455274273146" expanded="true" signature="597:1004" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="714:764" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="802:995" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="897:967" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1073:1746" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1138:1386" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1171:1313" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273146" expanded="true" signature="1252:1300" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1268:1285" placeholder="/*...*/" />
<marker date="1455274273146" expanded="true" signature="1429:1642" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1506:1579" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1693:1737" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -539,7 +702,20 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
<folding>
<marker date="1455274273147" expanded="true" signature="611:1030" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="730:782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="820:1021" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="921:993" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1101:1782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1172:1422" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1205:1349" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273147" expanded="true" signature="1288:1336" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1304:1321" placeholder="/*...*/" />
<marker date="1455274273147" expanded="true" signature="1465:1678" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1542:1615" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1729:1773" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -595,7 +771,10 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding />
<folding>
<marker date="1455276533397" expanded="true" signature="78:113" placeholder="{&quot;start&quot;: &quot;node ./bin/www&quot;...}" />
<marker date="1455276533397" expanded="true" signature="133:347" placeholder="{&quot;body-parser&quot;: &quot;~1.13.2&quot;...}" />
</folding>
</state>
</provider>
</entry>
@ -611,7 +790,20 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="59" column="27" selection-start-line="0" selection-start-column="0" selection-end-line="92" selection-end-column="7" />
<folding />
<folding>
<marker date="1455274273146" expanded="true" signature="597:1004" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="714:764" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="802:995" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="897:967" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1073:1746" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1138:1386" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1171:1313" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273146" expanded="true" signature="1252:1300" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1268:1285" placeholder="/*...*/" />
<marker date="1455274273146" expanded="true" signature="1429:1642" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1506:1579" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1693:1737" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -619,7 +811,20 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
<folding>
<marker date="1455274273147" expanded="true" signature="611:1030" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="730:782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="820:1021" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="921:993" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1101:1782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1172:1422" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1205:1349" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273147" expanded="true" signature="1288:1336" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1304:1321" placeholder="/*...*/" />
<marker date="1455274273147" expanded="true" signature="1465:1678" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1542:1615" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1729:1773" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -682,7 +887,20 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="59" column="27" selection-start-line="0" selection-start-column="0" selection-end-line="92" selection-end-column="7" />
<folding />
<folding>
<marker date="1455274273146" expanded="true" signature="597:1004" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="714:764" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="802:995" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="897:967" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1073:1746" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1138:1386" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1171:1313" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273146" expanded="true" signature="1252:1300" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1268:1285" placeholder="/*...*/" />
<marker date="1455274273146" expanded="true" signature="1429:1642" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1506:1579" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1693:1737" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -690,7 +908,20 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
<folding>
<marker date="1455274273147" expanded="true" signature="611:1030" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="730:782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="820:1021" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="921:993" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1101:1782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1172:1422" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1205:1349" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273147" expanded="true" signature="1288:1336" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1304:1321" placeholder="/*...*/" />
<marker date="1455274273147" expanded="true" signature="1465:1678" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1542:1615" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1729:1773" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -749,13 +980,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/www">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="46" column="3" selection-start-line="46" selection-start-column="3" selection-end-line="46" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/btc.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -797,15 +1021,20 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="56" column="0" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/weight.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
<folding>
<marker date="1455274273147" expanded="true" signature="611:1030" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="730:782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="820:1021" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="921:993" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1101:1782" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1172:1422" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1205:1349" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273147" expanded="true" signature="1288:1336" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1304:1321" placeholder="/*...*/" />
<marker date="1455274273147" expanded="true" signature="1465:1678" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1542:1615" placeholder="{...}" />
<marker date="1455274273147" expanded="true" signature="1729:1773" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
@ -817,18 +1046,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<entry file="file://$PROJECT_DIR$/routes/time.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<caret line="22" column="58" selection-start-line="22" selection-start-column="58" selection-end-line="22" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/temp.ejs">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-37.5">
<caret line="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
<state vertical-scroll-proportion="0.0">
<caret line="37" column="22" selection-start-line="37" selection-start-column="22" selection-end-line="37" selection-end-column="22" />
<folding />
</state>
</provider>
@ -841,26 +1070,58 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.730769">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding>
<marker date="1455276533397" expanded="true" signature="78:113" placeholder="{&quot;start&quot;: &quot;node ./bin/www&quot;...}" />
<marker date="1455276533397" expanded="true" signature="133:347" placeholder="{&quot;body-parser&quot;: &quot;~1.13.2&quot;...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bin/www">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="37" column="12" selection-start-line="37" selection-start-column="12" selection-end-line="37" selection-end-column="12" />
<caret line="24" column="17" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/time.js">
<entry file="file://$PROJECT_DIR$/views/temp.ejs">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.222222">
<caret line="22" column="58" selection-start-line="22" selection-start-column="58" selection-end-line="22" selection-end-column="58" />
<state vertical-scroll-proportion="-0.65384614">
<caret line="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
<folding>
<marker date="1455274273146" expanded="true" signature="597:1004" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="714:764" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="802:995" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="897:967" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1073:1746" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1138:1386" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1171:1313" placeholder="{&quot;method&quot;: &quot;get&quot;...}" />
<marker date="1455274273146" expanded="true" signature="1252:1300" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1268:1285" placeholder="/*...*/" />
<marker date="1455274273146" expanded="true" signature="1429:1642" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1506:1579" placeholder="{...}" />
<marker date="1455274273146" expanded="true" signature="1693:1737" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/weight.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.37413073">
<caret line="89" column="45" selection-start-line="89" selection-start-column="45" selection-end-line="89" selection-end-column="45" />
<state vertical-scroll-proportion="0.7641509">
<caret line="135" column="34" selection-start-line="135" selection-start-column="34" selection-end-line="135" selection-end-column="34" />
<folding />
</state>
</provider>

2
package.json
View File

@ -10,11 +10,13 @@
"cookie-parser": "~1.3.5",
"debug": "~2.2.0",
"ejs": "~2.3.3",
"events": "^1.1.0",
"express": "~4.13.1",
"morgan": "~1.6.1",
"serve-favicon": "~2.3.0"
},
"devDependencies": {
"log4js": "^0.6.31",
"sqlite3": "~3.1.1"
}
}

228
routes/temp.js
View File

@ -1,170 +1,168 @@
var express = require('express'), fs = require('fs'), sqlite3 = require('sqlite3').verbose();
var EventEmitter = require('events');
var log4js = require('log4js');
var logger = log4js.getLogger();
var router = express.Router();
var EventEmitter = require('events');
var busEmitter = new EventEmitter();
var temp_db;
var file = process.env.DB_HOME + '/' + "temp.db";
var exists;
/* GET users listing. */
function createDB() {
console.log('Creating Temp db...');
logger.debug('Creating Temp db...');
logger.debug(file);
if (!fs.existsSync(file)) {
logger.debug('creating db file');
fs.openSync(file, 'w');
if (!fs.existsSync(file)) {
console.log('creating db file');
fs.openSync(file,'w');
temp_db = new sqlite3.Database(file, createTable);
temp_db.close();
}
temp_db = new sqlite3.Database(file, createTable);
temp_db.close();
}
else {
logger.info('Database already created.');
}
}
function startEventHandler() {
"use strict";
}
function connectDB() {
"use strict";
console.log('Connect db.');
temp_db = new sqlite3.Database(file);
console.log(temp_db);
"use strict";
logger.debug('Connect db.');
temp_db = new sqlite3.Database(file);
console.log(temp_db);
}
function createTable() {
console.log('Creating temp table...');
temp_db.run('CREATE TABLE IF NOT EXISTS temp (date text, reading real);');
logger.debug('Creating temp table...');
temp_db.run('CREATE TABLE IF NOT EXISTS temp (date text, reading real);');
}
function closeDB() {
"use strict";
console.log('Closing db.');
temp_db.close();
"use strict";
console.log('Closing db.');
temp_db.close();
}
function insertTempReading(time, reading) {
console.log('Inserting reading:' + reading);
console.log('Inserting reading:' + reading);
connectDB();
// var sql = db.prepare('INSERT into temperature(date, reading) VALUES
// (?,?)',[time],[reading]);
// var sql = db.prepare('INSERT into temperature(date, reading) VALUES
// (?,?)',[time],[reading]);
temp_db.run('BEGIN TRANSACTION');
temp_db.run('INSERT into temp(date, reading) VALUES (?,?)',[time, reading]);
temp_db.run('END');
temp_db.run('BEGIN TRANSACTION');
temp_db.run('INSERT into temp(date, reading) VALUES (?,?)', [time, reading]);
temp_db.run('END');
closeDB();
}
router.get('/', function(req, res, next) {
var now = new Date();
router.get('/', function (req, res, next) {
var now = new Date();
var t = req.query;
var t = req.query;
console.log('t:');
console.log(JSON.stringify(t));
if (req.query != {} && req.query.temp != null)
{
// createDB();
console.log(req.query);
connectDB();
insertTempReading(now.toJSON(),parseFloat(req.query.temp) );
closeDB();
res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t));
res.end('ok');
} else
{
res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t));
res.end('error?');
}
});
router.get('/:id', function(req, res, next) {
var id = req.params.id;
console.log('id: ' + id);
res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t));
res.end('ok');
});
router.get('/reading', function(req, res, next) {
var now = new Date();
var t = req.query;
console.log('t:');
console.log(JSON.stringify(t));
res.writeHead(200, {"ContentType": "application/json"});
//res.send(JSON.stringify(t));
res.end(JSON.stringify({}));
});
router.post('/', function(req, res, next) {
"use strict";
console.log('POST');
var t = req.body;
var now = new Date();
console.log('t:');
console.log('t:');
console.log(JSON.stringify(t));
if (t != {} && t.temp != null)
{
// createDB();
console.log(t.temp);
console.log('A');
connectDB();
console.log('B');
if (req.query != {} && req.query.temp != null) {
// createDB();
insertTempReading(now.toJSON(),parseFloat(t.temp) );
console.log('C');
closeDB();
res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t));
res.end('ok');
} else {
res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t));
res.end('error?');
}
res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t));
});
router.get('/:id', function (req, res, next) {
var id = req.params.id;
console.log('id: ' + id);
res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t));
res.end('ok');
});
router.get('/reading', function (req, res, next) {
var now = new Date();
var t = req.query;
console.log('t:');
console.log(JSON.stringify(t));
res.writeHead(200, {"ContentType": "application/json"});
//res.send(JSON.stringify(t));
res.end(JSON.stringify({}));
});
router.post('/', function (req, res, next) {
"use strict";
var t = req.body;
var now = new Date();
console.log(JSON.stringify(t));
if (t != {} && t.temp != null) {
busEmitter.emit("saveTempData", {time: now.toJSON(), value: parseFloat(t.temp)});
}
res.writeHead(200, {"ContentType": "text/html"});
res.end('ok');
});
router.get('/all', function(req, res, next) {
"use strict";
console.log('Selecint all..');
connectDB();
router.get('/all', function (req, res, next) {
"use strict";
console.log('Selecint all..');
connectDB();
temp_db.all('SELECT * from temp', function(err, rows) {
temp_db.all('SELECT * from temp', function (err, rows) {
var out = [];
console.log(err);
var out = [];
console.log(err);
console.log(rows);
rows.forEach(function (row) {
console.log(row.date + ', ' + row.reading);
// var t = ;
// out.push({"date": Date(row.date), "reading":row.reading});
out.push({"date": row.date, "reading":row.reading});
console.log(row.date + ', ' + row.reading);
// var t = ;
// out.push({"date": Date(row.date), "reading":row.reading});
out.push({"date": row.date, "reading": row.reading});
});
res.writeHead(200, {"ContentType": "application/json"});
//res.send(JSON.stringify(t));
res.end(JSON.stringify(out));
res.writeHead(200, {"ContentType": "application/json"});
//res.send(JSON.stringify(t));
res.end(JSON.stringify(out));
closeDB();
closeDB();
});
});
module.exports = router;
//createDB();
createDB();
var sendSocketHandler = (obj) => {
// logger.info('sendSocket: ' + JSON.stringify(obj));
insertTempReading(obj.time, obj.value);
}
busEmitter.on('saveTempData', sendSocketHandler);