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 14:53:12 +00:00
parent f375f5a5c4
commit 99a857de39
2 changed files with 135 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

307
.idea/workspace.xml
View File

@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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" />
<list default="true" id="8a985735-5aff-47ce-a55f-2957d4f9c5f9" name="Default" comment="modified to use events, hopefully will fix the crashing particle">
<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" />
@ -29,46 +26,10 @@
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="-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>
</file>
<file leaf-file-name="weight.ejs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/weight.ejs">
<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>
<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>
<caret line="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
@ -86,8 +47,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.7641509">
<caret line="135" column="34" selection-start-line="135" selection-start-column="34" selection-end-line="135" selection-end-column="34" />
<state vertical-scroll-proportion="0.7826772">
<caret line="156" column="10" selection-start-line="156" selection-start-column="10" selection-end-line="156" selection-end-column="10" />
<folding />
</state>
</provider>
@ -117,7 +78,27 @@
<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="22" selection-start-line="37" selection-start-column="22" selection-end-line="37" selection-end-column="22" />
<caret line="32" column="15" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="newapp.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/newapp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding />
</state>
</provider>
@ -126,12 +107,9 @@
<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">
<state vertical-scroll-proportion="0.0">
<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>
<folding />
</state>
</provider>
</entry>
@ -146,23 +124,13 @@
</provider>
</entry>
</file>
<file leaf-file-name="users.js" pinned="false" current-in-tab="false">
<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>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="JavaScript File" />
<option value="EJS" />
<option value="JavaScript File" />
</list>
</option>
</component>
@ -182,6 +150,7 @@
<option value="$PROJECT_DIR$/routes/weight.js" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/routes/time.js" />
<option value="$PROJECT_DIR$/newapp.js" />
<option value="$PROJECT_DIR$/routes/temp.js" />
</list>
</option>
@ -198,10 +167,9 @@
<detection-done>true</detection-done>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1616" />
<option name="height" value="876" />
<option name="x" value="1586" />
<option name="width" value="1369" />
<option name="height" value="1056" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
@ -250,6 +218,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
@ -269,6 +238,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="views" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="silvrapi" />
@ -327,7 +310,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@ -341,7 +323,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$/bin/www" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../rinser" />
<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" />
@ -365,7 +347,7 @@
<recent name="$PROJECT_DIR$/public/lib" />
</key>
</component>
<component name="RunManager" selected="Node.js.bin/www">
<component name="RunManager" selected="Node.js.newapp">
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<method />
</configuration>
@ -414,8 +396,15 @@
<recursive>false</recursive>
<method />
</configuration>
<list size="1">
<configuration default="false" name="newapp" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="newapp.js" working-dir="$PROJECT_DIR$">
<envs>
<env name="DB_HOME" value="/Users/martin" />
</envs>
<method />
</configuration>
<list size="2">
<item index="0" class="java.lang.String" itemvalue="Node.js.bin/www" />
<item index="1" class="java.lang.String" itemvalue="Node.js.newapp" />
</list>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
@ -543,20 +532,32 @@
<option name="project" value="LOCAL" />
<updated>1453076121936</updated>
</task>
<option name="localTasksCounter" value="20" />
<task id="LOCAL-00020" summary="modified to use events, hopefully will fix the crashing particle">
<created>1455277850341</created>
<option name="number" value="00020" />
<option name="project" value="LOCAL" />
<updated>1455277850341</updated>
</task>
<task id="LOCAL-00021" summary="modified to use events, hopefully will fix the crashing particle">
<created>1455279437844</created>
<option name="number" value="00021" />
<option name="project" value="LOCAL" />
<updated>1455279437844</updated>
</task>
<option name="localTasksCounter" value="22" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
<frame x="1586" y="0" width="1369" height="1056" extended-state="0" />
<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.24228792" 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.29182583" 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="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="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="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2625139" 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.4705228" 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.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" />
@ -595,7 +596,8 @@
<MESSAGE value="Turn off all routes but time" />
<MESSAGE value="back to normal" />
<MESSAGE value="add a get route&#10;" />
<option name="LAST_COMMIT_MESSAGE" value="add a get route&#10;" />
<MESSAGE value="modified to use events, hopefully will fix the crashing particle" />
<option name="LAST_COMMIT_MESSAGE" value="modified to use events, hopefully will fix the crashing particle" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@ -610,14 +612,6 @@
<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">
@ -662,10 +656,7 @@
<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>
<folding />
</state>
</provider>
</entry>
@ -673,7 +664,6 @@
<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>
@ -681,20 +671,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@ -723,7 +700,6 @@
<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>
@ -731,7 +707,6 @@
<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>
@ -771,10 +746,7 @@
<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>
<folding />
</state>
</provider>
</entry>
@ -782,7 +754,6 @@
<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>
@ -790,20 +761,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@ -832,7 +790,6 @@
<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>
@ -840,7 +797,6 @@
<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>
@ -887,20 +843,7 @@
<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>
<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>
<folding />
</state>
</provider>
</entry>
@ -929,7 +872,6 @@
<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>
@ -937,7 +879,6 @@
<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>
@ -987,13 +928,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="5" column="46" selection-start-line="5" selection-start-column="2" selection-end-line="5" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/index.ejs">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -1005,7 +939,6 @@
<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>
@ -1013,7 +946,6 @@
<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>
@ -1042,7 +974,6 @@
<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>
@ -1054,14 +985,6 @@
</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="22" selection-start-line="37" selection-start-column="22" selection-end-line="37" selection-end-column="22" />
<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">
@ -1071,42 +994,18 @@
</provider>
</entry>
<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="24" column="17" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="17" />
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" 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.65384614">
<state vertical-scroll-proportion="0.0">
<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>
<folding />
</state>
</provider>
</entry>
@ -1118,10 +1017,42 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" 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="32" column="15" selection-start-line="32" selection-start-column="15" selection-end-line="32" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/newapp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="31" column="22" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="22" />
<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="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/temp.js">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state vertical-scroll-proportion="0.7826772">
<caret line="156" column="10" selection-start-line="156" selection-start-column="10" selection-end-line="156" selection-end-column="10" />
<folding />
</state>
</provider>

28
routes/temp.js
View File

@ -27,6 +27,7 @@ function createDB() {
}
else {
logger.info('Database already created.');
connectDB();
}
@ -41,6 +42,8 @@ function connectDB() {
logger.debug('Connect db.');
temp_db = new sqlite3.Database(file);
console.log(temp_db);
return temp_db;
}
function createTable() {
@ -57,18 +60,19 @@ function closeDB() {
function insertTempReading(time, reading) {
console.log('Inserting reading:' + reading);
connectDB();
// 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');
closeDB();
temp_db.run('INSERT into temp(date, reading) VALUES (?,?);', [time, reading]);
// temp_db.run('END');
temp_db.run('commit');
}
router.get('/', function (req, res, next) {
/*router.get('/', function (req, res, next) {
var now = new Date();
var t = req.query;
@ -89,16 +93,16 @@ router.get('/', function (req, res, next) {
}
});
});*/
router.get('/:id', function (req, res, next) {
/*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();
@ -132,9 +136,9 @@ router.post('/', function (req, res, next) {
router.get('/all', function (req, res, next) {
"use strict";
console.log('Selecint all..');
connectDB();
var db = connectDB();
temp_db.all('SELECT * from temp', function (err, rows) {
db.all('SELECT * from temp', function (err, rows) {
var out = [];
console.log(err);
@ -150,7 +154,7 @@ router.get('/all', function (req, res, next) {
//res.send(JSON.stringify(t));
res.end(JSON.stringify(out));
closeDB();
//closeDB();
});