This commit is contained in:
MrARM
2018-11-23 18:13:01 -06:00
parent c9c73b0aa2
commit 0f8de384ab
3 changed files with 131 additions and 71 deletions

199
.idea/workspace.xml generated
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="792feb45-6e3f-45d4-a001-5c7cbb169965" name="Default" comment="CIA In a box!">
<list default="true" id="792feb45-6e3f-45d4-a001-5c7cbb169965" name="Default" comment="ad">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/routes/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/routes/config.js" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -40,24 +40,24 @@
<entry key="project.open.time.0" value="2" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.4" value="1" />
<entry key="project.open.time.5" value="2" />
<entry key="project.open.time.5" value="4" />
<entry key="project.open.time.6" value="2" />
<entry key="project.opened" value="8" />
<entry key="project.opened" value="10" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="gitignore" value="14" />
<entry key="js" value="3277" />
<entry key="js" value="3447" />
<entry key="json" value="191" />
<entry key="txt" value="539" />
<entry key="txt" value="657" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="JSON" value="191" />
<entry key="JavaScript" value="3277" />
<entry key="PLAIN_TEXT" value="553" />
<entry key="JavaScript" value="3447" />
<entry key="PLAIN_TEXT" value="671" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
@@ -96,8 +96,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/shows.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="7" column="27" selection-end-line="56" />
<state relative-caret-position="506">
<caret line="22" column="49" lean-forward="true" selection-start-line="15" selection-start-column="16" selection-end-line="22" selection-end-column="49" />
</state>
</provider>
</entry>
@@ -105,8 +105,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="605">
<caret line="331" column="73" selection-start-line="331" selection-start-column="73" selection-end-line="331" selection-end-column="73" />
<state relative-caret-position="299">
<caret line="40" selection-start-line="40" selection-end-line="40" />
</state>
</provider>
</entry>
@@ -132,8 +132,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/schedule.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="598">
<caret line="26" column="19" lean-forward="true" selection-start-line="24" selection-start-column="16" selection-end-line="26" selection-end-column="19" />
<state relative-caret-position="621">
<caret line="66" column="14" lean-forward="true" selection-start-line="56" selection-start-column="12" selection-end-line="66" selection-end-column="14" />
</state>
</provider>
</entry>
@@ -150,8 +150,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/routes/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
<state relative-caret-position="414">
<caret line="18" column="42" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="42" />
</state>
</provider>
</entry>
@@ -175,7 +175,6 @@
<find>password</find>
<find>HQ</find>
<find>config</find>
<find>live</find>
<find>taurus</find>
<find>interceptor</find>
<find>morgan</find>
@@ -188,6 +187,8 @@
<find>headers</find>
<find>includes</find>
<find>client</find>
<find>shows/sch</find>
<find>live</find>
</findStrings>
<replaceStrings>
<replace>assets</replace>
@@ -220,16 +221,16 @@
<option value="$PROJECT_DIR$/routes/index.js" />
<option value="$PROJECT_DIR$/views/index.ejs" />
<option value="$PROJECT_DIR$/TODO" />
<option value="$PROJECT_DIR$/routes/shows.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/eraserbot/main.js" />
<option value="$PROJECT_DIR$/eraserbot/hq.js" />
<option value="$PROJECT_DIR$/bots.json" />
<option value="$PROJECT_DIR$/routes/config.js" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/players.json" />
<option value="$PROJECT_DIR$/config.json" />
<option value="$PROJECT_DIR$/routes/shows.js" />
<option value="$PROJECT_DIR$/routes/schedule.js" />
<option value="$PROJECT_DIR$/routes/config.js" />
<option value="$PROJECT_DIR$/app.js" />
</list>
</option>
@@ -496,7 +497,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -504,26 +504,21 @@
<item name="TES" type="b2602c69:ProjectViewProjectNode" />
<item name="TES" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="TES" type="b2602c69:ProjectViewProjectNode" />
<item name="TES" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="TES" type="b2602c69:ProjectViewProjectNode" />
<item name="TES" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="TES" type="b2602c69:ProjectViewProjectNode" />
<item name="TES" type="462c0819:PsiDirectoryNode" />
<item name="routes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="TES" type="b2602c69:ProjectViewProjectNode" />
<item name="TES" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="AndroidView" />
<pane id="PackagesPane" />
</panes>
@@ -543,6 +538,7 @@
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\MrARM\WebstormProjects\TES\public" />
<recent name="C:\Users\MrARM\WebstormProjects\TES\public\assets" />
<recent name="C:\Users\MrARM\WebstormProjects\TES\eraserbot" />
<recent name="C:\Users\MrARM\Documents\projects\HQAdmin\public" />
@@ -604,13 +600,8 @@
<workItem from="1542255355269" duration="3263000" />
<workItem from="1542774105749" duration="7693000" />
<workItem from="1542917073862" duration="787000" />
</task>
<task id="LOCAL-00001" summary="Add logging&#10;Add Charles settings&#10;Add android info to html">
<created>1535989710661</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1535989710662</updated>
<workItem from="1542933902120" duration="353000" />
<workItem from="1543000019105" duration="4013000" />
</task>
<task id="LOCAL-00002" summary="Build should be stable">
<created>1535992379061</created>
@@ -885,17 +876,87 @@
<option name="project" value="LOCAL" />
<updated>1542821420131</updated>
</task>
<option name="localTasksCounter" value="41" />
<task id="LOCAL-00041" summary="Add Android build">
<created>1542933948046</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1542933948046</updated>
</task>
<task id="LOCAL-00042" summary="Add more logs">
<created>1543001027958</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1543001027958</updated>
</task>
<task id="LOCAL-00043" summary="Disable config">
<created>1543001275725</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1543001275725</updated>
</task>
<task id="LOCAL-00044" summary="back to basics">
<created>1543001541624</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1543001541624</updated>
</task>
<task id="LOCAL-00045" summary="?Fix">
<created>1543001805316</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1543001805316</updated>
</task>
<task id="LOCAL-00046" summary="adaddheaders">
<created>1543002617328</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1543002617328</updated>
</task>
<task id="LOCAL-00047" summary="words support">
<created>1543002669955</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1543002669955</updated>
</task>
<task id="LOCAL-00048" summary="Ok, Ok">
<created>1543002716183</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1543002716183</updated>
</task>
<task id="LOCAL-00049" summary="for now">
<created>1543002845153</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1543002845153</updated>
</task>
<task id="LOCAL-00050" summary="Old shows route">
<created>1543003379273</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1543003379273</updated>
</task>
<option name="localTasksCounter" value="51" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="94383000" />
<option name="totallyTimeSpent" value="98749000" />
</component>
<component name="ToolWindowManager">
<frame x="70" y="-8" width="1858" height="1096" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18846154" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19615385" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" />
<window_info id="Image Layers" order="3" />
@@ -904,7 +965,7 @@
<window_info id="Capture Tool" order="6" />
<window_info id="Favorites" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32897604" />
<window_info active="true" anchor="bottom" id="Find" order="1" visible="true" weight="0.32805908" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32805908" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39978212" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -934,16 +995,6 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Add JSON to client injection" />
<MESSAGE value="Client sided giftdrops" />
<MESSAGE value="clean airdrop" />
<MESSAGE value="&quot;That ass is cash!&quot;" />
<MESSAGE value="Make TS = instead of ~" />
<MESSAGE value="The emoji update" />
<MESSAGE value="Add HQWords beta flag" />
<MESSAGE value="Fix erasers" />
<MESSAGE value="How on earth did this not syntax error out?" />
<MESSAGE value="Sync current eraser progress." />
<MESSAGE value="Sync current eraser progress. &#10;TODO: Implement ws sending, Answer handling and removing bots, erasing, erasing by command." />
<MESSAGE value="Add schedule route" />
<MESSAGE value="fix?" />
@@ -959,7 +1010,17 @@
<MESSAGE value="Log unauthenticated bearers" />
<MESSAGE value="Add more logging" />
<MESSAGE value="CIA In a box!" />
<option name="LAST_COMMIT_MESSAGE" value="CIA In a box!" />
<MESSAGE value="Add Android build" />
<MESSAGE value="Add more logs" />
<MESSAGE value="Disable config" />
<MESSAGE value="back to basics" />
<MESSAGE value="?Fix" />
<MESSAGE value="adaddheaders" />
<MESSAGE value="words support" />
<MESSAGE value="Ok, Ok" />
<MESSAGE value="for now" />
<MESSAGE value="Old shows route" />
<option name="LAST_COMMIT_MESSAGE" value="Old shows route" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/routes/verifications.js" />
@@ -1055,10 +1116,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/shows.js">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="7" column="27" selection-end-line="56" />
<state relative-caret-position="138">
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
</state>
</provider>
</entry>
@@ -1078,29 +1139,29 @@
</entry>
<entry file="file://$PROJECT_DIR$/routes/schedule.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="598">
<caret line="26" column="19" lean-forward="true" selection-start-line="24" selection-start-column="16" selection-end-line="26" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
<state relative-caret-position="621">
<caret line="66" column="14" lean-forward="true" selection-start-line="56" selection-start-column="12" selection-end-line="66" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
<state relative-caret-position="414">
<caret line="18" column="42" selection-start-line="18" selection-start-column="42" selection-end-line="18" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/routes/shows.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="22" column="49" lean-forward="true" selection-start-line="15" selection-start-column="16" selection-end-line="22" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="605">
<caret line="331" column="73" selection-start-line="331" selection-start-column="73" selection-end-line="331" selection-end-column="73" />
<state relative-caret-position="299">
<caret line="40" selection-start-line="40" selection-end-line="40" />
</state>
</provider>
</entry>

2
app.js
View File

@@ -38,7 +38,7 @@ app.use(express.static(path.join(__dirname, 'public')));
app.use('/', indexRouter);
app.use('/shows/schedule', newShowsRouter);
//app.use('/config', configRouter);
app.use('/config', configRouter);
app.use('/shows/now', showsRouter);
app.use('/tes.pac', pacRouter);
app.use('/cert', certRouter);

View File

@@ -17,7 +17,6 @@ router.all('/', function(ureq, res, next) {
//it works!
//console.log(body);
var output = JSON.parse(body);
output.words = true;
output.newLobby = true;
output.erase1Enabled = true;
output.ddStatsEnabled = true;