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

should render page now

Browse Source
This commit is contained in:
Martin Donnelly 2016-02-17 10:10:09 +00:00
parent 4cbd586bc4
commit 45171019b7
2 changed files with 72 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
.idea/workspace.xml
View File

@ -3,6 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8a985735-5aff-47ce-a55f-2957d4f9c5f9" name="Default" comment="modified to use events, hopefully will fix the crashing particle"> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/routes/temp.js" afterPath="$PROJECT_DIR$/routes/temp.js" />
</list> </list>
<ignored path="silvrapi.iws" /> <ignored path="silvrapi.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -26,8 +27,8 @@
<file leaf-file-name="temp.ejs" pinned="false" current-in-tab="false"> <file leaf-file-name="temp.ejs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/temp.ejs"> <entry file="file://$PROJECT_DIR$/views/temp.ejs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="17.333334">
<caret line="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" /> <caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -46,18 +47,18 @@
<file leaf-file-name="temp.js" pinned="false" current-in-tab="true"> <file leaf-file-name="temp.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/routes/temp.js"> <entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.4142114"> <state vertical-scroll-proportion="0.36842105">
<caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> <caret line="136" column="60" selection-start-line="136" selection-start-column="60" selection-end-line="136" selection-end-column="60" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="time.js" pinned="false" current-in-tab="false"> <file leaf-file-name="trace.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/time.js"> <entry file="file://$PROJECT_DIR$/node_modules/sqlite3/lib/trace.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <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" /> <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -87,7 +88,7 @@
<entry file="file://$PROJECT_DIR$/newapp.js"> <entry file="file://$PROJECT_DIR$/newapp.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <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" /> <caret line="36" column="16" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -166,9 +167,10 @@
<detection-done>true</detection-done> <detection-done>true</detection-done>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="1598" /> <option name="x" value="1592" />
<option name="width" value="1369" /> <option name="y" value="-8" />
<option name="height" value="1056" /> <option name="width" value="1936" />
<option name="height" value="1096" />
</component> </component>
<component name="ProjectInspectionProfilesVisibleTreeState"> <component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default"> <entry key="Project Default">
@ -217,7 +219,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
@ -309,6 +310,7 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -669,26 +671,38 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1455294934975</updated> <updated>1455294934975</updated>
</task> </task>
<option name="localTasksCounter" value="43" /> <task id="LOCAL-00043" summary="modified to use events, hopefully will fix the crashing particle">
<created>1455294941363</created>
<option name="number" value="00043" />
<option name="project" value="LOCAL" />
<updated>1455294941363</updated>
</task>
<task id="LOCAL-00044" summary="modified to use events, hopefully will fix the crashing particle">
<created>1455295145027</created>
<option name="number" value="00044" />
<option name="project" value="LOCAL" />
<updated>1455295145027</updated>
</task>
<option name="localTasksCounter" value="45" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1598" y="0" width="1369" height="1056" extended-state="0" /> <frame x="1592" y="-8" width="1936" height="1096" extended-state="6" />
<editor active="true" /> <editor active="false" />
<layout> <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="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.29182583" 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.2947761" 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="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="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="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.26280624" sideWeight="0.5" order="7" 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.2614108" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47095436" 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="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="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="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="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="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="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="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" /> <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" />
@ -739,14 +753,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<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"> <entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -806,20 +812,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <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" /> <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>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -896,20 +888,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <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" /> <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>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -978,20 +956,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <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" /> <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>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1080,20 +1044,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <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" /> <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>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -1128,14 +1078,6 @@
</state> </state>
</provider> </provider>
</entry> </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="60" column="29" selection-start-line="60" selection-start-column="29" selection-end-line="60" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/weight.js"> <entry file="file://$PROJECT_DIR$/routes/weight.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1160,14 +1102,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <entry file="file://$PROJECT_DIR$/bin/www">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -1176,10 +1110,34 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/newapp.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="36" column="16" selection-start-line="36" selection-start-column="16" selection-end-line="36" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/temp.ejs">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="17.333334">
<caret line="22" column="31" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/sqlite3/lib/trace.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/temp.js"> <entry file="file://$PROJECT_DIR$/routes/temp.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.4142114"> <state vertical-scroll-proportion="0.36842105">
<caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" /> <caret line="136" column="60" selection-start-line="136" selection-start-column="60" selection-end-line="136" selection-end-column="60" />
<folding /> <folding />
</state> </state>
</provider> </provider>

35
routes/temp.js
View File

@ -41,7 +41,7 @@ function connectDB() {
"use strict"; "use strict";
logger.debug('Connect db.'); logger.debug('Connect db.');
temp_db = new sqlite3.Database(file); temp_db = new sqlite3.Database(file);
//logger.log(temp_db); //logger.debug(temp_db);
return temp_db; return temp_db;
} }
@ -54,7 +54,7 @@ function createTable() {
function closeDB() { function closeDB() {
"use strict"; "use strict";
logger.log('Closing db.'); logger.debug('Closing db.');
temp_db.close(); temp_db.close();
} }
@ -71,8 +71,8 @@ function insertTempReading(time, reading) {
var t = req.query; var t = req.query;
logger.log('t:'); logger.debug('t:');
logger.log(JSON.stringify(t)); logger.debug(JSON.stringify(t));
if (req.query != {} && req.query.temp != null) { if (req.query != {} && req.query.temp != null) {
// createDB(); // createDB();
@ -92,23 +92,14 @@ function insertTempReading(time, reading) {
/*router.get('/:id', function (req, res, next) { /*router.get('/:id', function (req, res, next) {
var id = req.params.id; var id = req.params.id;
logger.log('id: ' + id); logger.debug('id: ' + id);
res.writeHead(200, {"ContentType": "text/html"}); res.writeHead(200, {"ContentType": "text/html"});
//res.send(JSON.stringify(t)); //res.send(JSON.stringify(t));
res.end('ok'); res.end('ok');
});*/ });*/
router.get('/reading', function (req, res, next) { router.get('/', function (req, res, next) {
var now = new Date(); res.render('temp');
var t = req.query;
logger.log('t:');
logger.log(JSON.stringify(t));
res.writeHead(200, {"ContentType": "application/json"});
//res.send(JSON.stringify(t));
res.end(JSON.stringify({}));
}); });
@ -140,16 +131,16 @@ router.post('/', function (req, res, next) {
router.get('/all', function (req, res, next) { router.get('/all', function (req, res, next) {
"use strict"; "use strict";
logger.log('Selecint all..'); logger.debug('Selecint all..');
var db = connectDB(); //var db = connectDB();
db.all('SELECT * from temp', function (err, rows) { temp_db.all('SELECT * from temp', function (err, rows) {
var out = []; var out = [];
logger.log(err); logger.debug(err);
logger.log(rows); logger.debug(rows);
rows.forEach(function (row) { rows.forEach(function (row) {
logger.log(row.date + ', ' + row.reading); logger.debug(row.date + ', ' + row.reading);
// var t = ; // var t = ;
// out.push({"date": Date(row.date), "reading":row.reading}); // out.push({"date": Date(row.date), "reading":row.reading});
out.push({"date": row.date, "reading": row.reading}); out.push({"date": row.date, "reading": row.reading});