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

Updating to Version 3

Browse Source
This commit is contained in:
Martin Donnelly 2016-03-15 13:15:41 +00:00
parent 2373734ffd
commit b9a49bfa5e
10 changed files with 575 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

442
.idea/workspace.xml
View File

@ -2,39 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/html/news.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/html/news.json" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/html/news.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/android-chrome-144x144.png" afterPath="$PROJECT_DIR$/html/icons/android-chrome-144x144.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/android-chrome-192x192.png" afterPath="$PROJECT_DIR$/html/icons/android-chrome-192x192.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/android-chrome-36x36.png" afterPath="$PROJECT_DIR$/html/icons/android-chrome-36x36.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/android-chrome-48x48.png" afterPath="$PROJECT_DIR$/html/icons/android-chrome-48x48.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/android-chrome-72x72.png" afterPath="$PROJECT_DIR$/html/icons/android-chrome-72x72.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/android-chrome-96x96.png" afterPath="$PROJECT_DIR$/html/icons/android-chrome-96x96.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-114x114.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-114x114.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-120x120.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-120x120.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-144x144.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-144x144.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-152x152.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-152x152.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-180x180.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-180x180.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-57x57.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-57x57.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-60x60.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-60x60.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-72x72.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-72x72.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-76x76.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-76x76.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon-precomposed.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon-precomposed.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/apple-touch-icon.png" afterPath="$PROJECT_DIR$/html/icons/apple-touch-icon.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/browserconfig.xml" afterPath="$PROJECT_DIR$/html/icons/browserconfig.xml" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/favicon-16x16.png" afterPath="$PROJECT_DIR$/html/icons/favicon-16x16.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/favicon-32x32.png" afterPath="$PROJECT_DIR$/html/icons/favicon-32x32.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/favicon-96x96.png" afterPath="$PROJECT_DIR$/html/icons/favicon-96x96.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/favicon.ico" afterPath="$PROJECT_DIR$/html/icons/favicon.ico" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/manifest.json" afterPath="$PROJECT_DIR$/html/icons/manifest.json" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/mstile-144x144.png" afterPath="$PROJECT_DIR$/html/icons/mstile-144x144.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/mstile-150x150.png" afterPath="$PROJECT_DIR$/html/icons/mstile-150x150.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/mstile-310x150.png" afterPath="$PROJECT_DIR$/html/icons/mstile-310x150.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/mstile-310x310.png" afterPath="$PROJECT_DIR$/html/icons/mstile-310x310.png" />
<change type="MOVED" beforePath="$PROJECT_DIR$/icons/mstile-70x70.png" afterPath="$PROJECT_DIR$/html/icons/mstile-70x70.png" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/gulp/build.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/gulpfile.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.jshintrc" afterPath="$PROJECT_DIR$/.jshintrc" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/css/app.css" afterPath="$PROJECT_DIR$/html/css/app.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/index.html" afterPath="$PROJECT_DIR$/html/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/js/app.v3.js" afterPath="$PROJECT_DIR$/html/js/app.v3.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/js/shell.js" afterPath="$PROJECT_DIR$/html/js/shell.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pipes-server.js" afterPath="$PROJECT_DIR$/pipes-server.js" />
</list>
<ignored path="rinser.iws" />
<ignored path=".idea/workspace.xml" />
@ -55,12 +32,14 @@
<favorites_list name="rinser" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.5">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.8433735">
<caret line="58" column="59" selection-start-line="58" selection-start-column="59" selection-end-line="58" selection-end-column="59" />
<state vertical-scroll-proportion="0.43849206">
<caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" />
<folding />
</state>
</provider>
@ -76,10 +55,10 @@
</provider>
</entry>
</file>
<file leaf-file-name="browserconfig.xml" pinned="false" current-in-tab="true">
<file leaf-file-name="browserconfig.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/icons/browserconfig.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<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>
@ -96,21 +75,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="cards.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/css/cards.css">
<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="-5.0">
<caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
<state vertical-scroll-proportion="-12.423077">
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
<folding />
</state>
</provider>
@ -129,13 +98,35 @@
<file leaf-file-name="app.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.76923">
<state vertical-scroll-proportion="-16.346153">
<caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gulp/build.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="81" column="3" selection-start-line="81" selection-start-column="3" selection-end-line="81" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="tech.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tech.js">
<provider selected="true" editor-type-id="text-editor">
@ -146,20 +137,100 @@
</provider>
</entry>
</file>
</leaf>
</split-first>
<split-second>
<leaf>
<file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="30" column="23" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="shell.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/js/shell.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.0136286">
<caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="10.769231">
<caret line="18" column="39" selection-start-line="18" selection-start-column="39" selection-end-line="18" selection-end-column="39" />
<folding>
<element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="vendor.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/js/vendor.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>
<marker date="1458047424885" expanded="true" signature="50028:50029" placeholder="//..." />
<marker date="1458047424885" expanded="true" signature="50029:50253" placeholder="/** jQuery Unveil ...*/" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".jshintrc" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.jshintrc">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.65384614">
<caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pipes-server.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pipes-server.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="28" column="53" selection-start-line="28" selection-start-column="53" selection-end-line="28" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.v3.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="150" column="0" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" />
<caret line="147" column="5" selection-start-line="147" selection-start-column="5" selection-end-line="147" selection-end-column="5" />
<folding>
<element signature="e#0#43#0" expanded="false" />
<marker date="1458040593461" expanded="true" signature="67:3554" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
@ -195,19 +266,26 @@
<option value="$PROJECT_DIR$/news.js" />
<option value="$PROJECT_DIR$/lifestyle.js" />
<option value="$PROJECT_DIR$/jobs.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/pipes-server.js" />
<option value="$PROJECT_DIR$/html/js/appv2.js" />
<option value="$PROJECT_DIR$/html/partials/list.ejs.js" />
<option value="$PROJECT_DIR$/html/ejs/list.ejs" />
<option value="$PROJECT_DIR$/html/ejs/test.ejs" />
<option value="$PROJECT_DIR$/html/js/app.v3.js" />
<option value="$PROJECT_DIR$/html/feeds.html" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/html/css/cards.css" />
<option value="$PROJECT_DIR$/html/css/md.css" />
<option value="$PROJECT_DIR$/html/css/app.css" />
<option value="$PROJECT_DIR$/gulp/build.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/.jshintrc" />
<option value="$PROJECT_DIR$/html/js/app.v3.js" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/pipes-server.js" />
<option value="$PROJECT_DIR$/dist/js/vendor.js" />
<option value="$PROJECT_DIR$/gulpfile.js" />
<option value="$PROJECT_DIR$/dist/index.html" />
<option value="$PROJECT_DIR$/dist/js/app.js" />
<option value="$PROJECT_DIR$/html/js/shell.js" />
</list>
</option>
</component>
@ -215,6 +293,11 @@
<component name="JsBuildToolPackageJson" detection-done="true" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<gulpfiles>
<GulpfileState>
<gulpfile-path>$PROJECT_DIR$/gulpfile.js</gulpfile-path>
</GulpfileState>
</gulpfiles>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="1592" />
@ -276,7 +359,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemId" value="html" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@ -293,6 +376,10 @@
<option name="myItemId" value="html" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
@ -305,7 +392,7 @@
<property name="recentsLimit" value="5" />
<property name="settings.editor.selected.configurable" value="settings.nodejs" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/tech.js" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/gulpfile.js" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth0" value="157" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatOrder0" value="0" />
<property name="FileHistory.git4idea.history.GitHistoryProvider_flatWidth1" value="186" />
@ -324,6 +411,8 @@
<property name="FileHistory.git4idea.history.GitHistoryProvider_treeOrder3" value="3" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
<property name="editor.config.accepted" value="true" />
<property name="js.buildTools.gulp.node_interpreter" value="C:\Program Files\nodejs\node.exe" />
<property name="js.buildTools.gulp.gulp_package_dir" value="C:\Users\Martin\AppData\Roaming\npm\node_modules\gulp" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
@ -337,7 +426,7 @@
<recent name="C:\mddev\Rinser" />
</key>
</component>
<component name="RunManager" selected="Node.js.Tech">
<component name="RunManager" selected="Gulp.js.Gulp">
<configuration default="false" name="paleo.js" type="NodeJSConfigurationType" factoryName="Node.js" temporary="true" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="paleo.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
@ -390,6 +479,14 @@
<recursive>false</recursive>
<method />
</configuration>
<configuration default="false" name="Gulp" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-options />
<gulpfile>$PROJECT_DIR$/gulpfile.js</gulpfile>
<tasks />
<arguments />
<envs />
<method />
</configuration>
<configuration default="false" name="Unnamed" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="pipes-server.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
@ -399,11 +496,12 @@
<configuration default="false" name="Tech" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="C:/Program Files/nodejs/node" path-to-js-file="tech.js" working-dir="$PROJECT_DIR$">
<method />
</configuration>
<list size="4">
<item index="0" class="java.lang.String" itemvalue="Node.js.Unnamed" />
<item index="1" class="java.lang.String" itemvalue="Node.js.News" />
<item index="2" class="java.lang.String" itemvalue="Node.js.Tech" />
<item index="3" class="java.lang.String" itemvalue="Node.js.paleo.js" />
<list size="5">
<item index="0" class="java.lang.String" itemvalue="Gulp.js.Gulp" />
<item index="1" class="java.lang.String" itemvalue="Node.js.Unnamed" />
<item index="2" class="java.lang.String" itemvalue="Node.js.News" />
<item index="3" class="java.lang.String" itemvalue="Node.js.Tech" />
<item index="4" class="java.lang.String" itemvalue="Node.js.paleo.js" />
</list>
<recent_temporary>
<list size="1">
@ -548,7 +646,13 @@
<option name="project" value="LOCAL" />
<updated>1458042886976</updated>
</task>
<option name="localTasksCounter" value="22" />
<task id="LOCAL-00022" summary="Updating to Version 3">
<created>1458043875334</created>
<option name="number" value="00022" />
<option name="project" value="LOCAL" />
<updated>1458043875334</updated>
</task>
<option name="localTasksCounter" value="23" />
<servers />
</component>
<component name="ToolWindowManager">
@ -559,7 +663,7 @@
<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.33551913" sideWeight="0.34785393" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" 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="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32987553" 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.3620332" sideWeight="0.48606148" 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.33506224" sideWeight="0.65214604" 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" />
@ -624,58 +728,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/plugins/filter_glasgow.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jobs-local.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="14" column="39" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/paleo2.xml">
<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$/cron.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="11" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/paleo.xml">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jobs-local.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="208" column="2" selection-start-line="208" selection-start-column="2" selection-end-line="208" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/paleo.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="5" column="14" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/output.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -738,26 +790,6 @@
</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="12" column="15" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
<folding>
<marker date="1458037477957" expanded="true" signature="68:146" placeholder="{&quot;ejs&quot;: &quot;^2.3.3&quot;...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pipes-server.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="36" column="3" selection-start-line="36" selection-start-column="3" selection-end-line="36" selection-end-column="3" />
<folding>
<marker date="1458036348108" expanded="true" signature="1243:1318" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.55510205">
@ -774,14 +806,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/shell.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$/html/libs/ejs.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@ -846,17 +870,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="150" column="0" selection-start-line="150" selection-start-column="0" selection-end-line="150" selection-end-column="0" />
<folding>
<element signature="e#0#43#0" expanded="false" />
<marker date="1458040593461" expanded="true" signature="67:3554" placeholder="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/ejs/test.ejs">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-1.9615384">
@ -974,26 +987,36 @@
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/icons/manifest.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="9.153846">
<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$/html/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.76923">
<state vertical-scroll-proportion="-16.346153">
<caret line="178" column="29" selection-start-line="178" selection-start-column="29" selection-end-line="178" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<entry file="file://$PROJECT_DIR$/gulp/build.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-2.8433735">
<caret line="58" column="59" selection-start-line="58" selection-start-column="59" selection-end-line="58" selection-end-column="59" />
<folding />
<state vertical-scroll-proportion="0.0">
<caret line="15" column="3" selection-start-line="15" selection-start-column="3" selection-end-line="15" selection-end-column="3" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/icons/manifest.json">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="9.153846">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state vertical-scroll-proportion="-12.423077">
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
<folding />
</state>
</provider>
@ -1006,5 +1029,94 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.jshintrc">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.65384614">
<caret line="1" column="15" selection-start-line="1" selection-start-column="15" selection-end-line="1" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/app.v3.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="147" column="5" selection-start-line="147" selection-start-column="5" selection-end-line="147" selection-end-column="5" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.43849206">
<caret line="43" column="4" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/index.html">
<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>
<element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pipes-server.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="28" column="53" selection-start-line="28" selection-start-column="53" selection-end-line="28" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/js/vendor.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>
<marker date="1458047424885" expanded="true" signature="50028:50029" placeholder="//..." />
<marker date="1458047424885" expanded="true" signature="50029:50253" placeholder="/** jQuery Unveil ...*/" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="30" column="23" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="10.769231">
<caret line="18" column="39" selection-start-line="18" selection-start-column="39" selection-end-line="18" selection-end-column="39" />
<folding>
<element signature="n#style#0;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/shell.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="1.0136286">
<caret line="35" column="44" selection-start-line="35" selection-start-column="44" selection-end-line="35" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
</component>
</project>

51
.jshintrc
View File

@ -1,33 +1,32 @@
{
"predef": [
"server",
"document",
"window",
"-Promise"
],
"browser": true,
"boss": true,
"node": true,
"esnext": true,
"bitwise": true,
"camelcase": true,
"curly": true,
"debug": false,
"devel": true,
"eqeqeq": true,
"evil": true,
"forin": false,
"immed": false,
"laxbreak": false,
"immed": true,
"indent": 2,
"latedef": true,
"newcap": true,
"noarg": true,
"noempty": false,
"nonew": false,
"nomen": false,
"onevar": false,
"plusplus": false,
"regexp": false,
"quotmark": "single",
"regexp": true,
"undef": true,
"sub": true,
"strict": false,
"white": false,
"eqnull": true,
"esnext": true,
"unused": true
"unused": true,
"strict": true,
"trailing": true,
"smarttabs": true,
"white": true,
"validthis": true,
"browser" : true,
"jquery":true,
"globals": {
"$": false,
"EJS": false,
"MicroEvent": false
}
}

16
gulp/build.js Normal file
View File

@ -0,0 +1,16 @@
/**
* Created by Martin on 15/03/2016.
*/
'use strict';
var gulp = require('gulp');
function handleError(err) {
console.error(err.toString());
this.emit('end');
}
gulp.task('clean', function () {
return gulp.src(['.tmp', 'dist'], { read: false }).pipe($.rimraf());
});

82
gulpfile.js Normal file
View File

@ -0,0 +1,82 @@
"use strict";
var gulp = require('gulp'),
autoprefixer = require('gulp-autoprefixer'),
cssnano = require('gulp-cssnano'),
jshint = require('gulp-jshint'),
uglify = require('gulp-uglify'),
rename = require('gulp-rename'),
concat = require('gulp-concat'),
notify = require('gulp-notify'),
cache = require('gulp-cache'),
livereload = require('gulp-livereload'),
htmlmin = require('gulp-htmlmin'),
inject = require('gulp-inject'),
del = require('del'),
htmlreplace = require('gulp-html-replace');
var filePath = {
build_dir: './dist'
};
gulp.task('scripts', function() {
return gulp.src(['html/js/shell.js','html/js/app.v3.js'])
.pipe(jshint('.jshintrc'))
.pipe(jshint.reporter('default'))
.pipe(concat('app.js'))
/*.pipe(gulp.dest('dist/js'))*/
/*.pipe(rename({suffix: '.min'}))*/
/* .pipe(uglify())*/
/*.pipe(concat('app.js'))*/
.pipe(gulp.dest('dist/js'))
.pipe(notify({ message: 'Scripts task complete' }));
});
gulp.task('vendor', function() {
return gulp.src(['html/libs/microevent.js','html/js/moment.min.js','html/js/ejs_production.js','html/js/jquery.unveil.js'])
.pipe(concat('vendor.js'))
.pipe(gulp.dest('dist/js'))
.pipe(notify({ message: 'Scripts task complete' }));
});
gulp.task('styles', function() {
return gulp.src(['html/css/app.css','html/css/md.css'])
.pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4'))
/*.pipe(gulp.dest('dist/css'))*/
/*.pipe(rename({suffix: '.min'}))*/
.pipe(cssnano())
.pipe(concat('app.css'))
.pipe(gulp.dest('dist/css'))
.pipe(notify({ message: 'Styles task complete' }));
});
gulp.task('partials', function() {
gulp.src(['html/ejs/**/*']).pipe(gulp.dest('dist/ejs'));
gulp.src(['html/icons/**/*']).pipe(gulp.dest('dist/icons'));
});
gulp.task('index', function () {
var sources = gulp.src(['js/apps.js', 'css/app.css'], {read: false});
return gulp.src(['html/index.html'])
.pipe(htmlreplace({
'css': 'css/app.css',
'js': 'js/app.js',
'vendor': 'js/vendor.js'
}))
.pipe(htmlmin({removeComments: true, collapseWhitespace: true, keepClosingSlash: true}))
.pipe(gulp.dest('dist/'));
});
gulp.task('clean', function() {
return del(['dist']);
});
gulp.task('default', ['clean'], function() {
gulp.start('styles', 'scripts','vendor', 'partials','index');
});

2
html/css/app.css
View File

@ -176,5 +176,5 @@ float:right;
#footer, .mui-appbar {
background-color: #FB7820;
background-color: #775585;
}

16
html/index.html
View File

@ -36,14 +36,19 @@
}
</style>
<!-- endbuild -->
<script src="libs/microevent.js"></script>
<script src="//cdn.muicss.com/mui-0.4.6/js/mui.min.js"></script>
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script src="js/moment.js"></script>
<!-- build:vendor -->
<script src="libs/microevent.js"></script>
<script src="js/moment.js"></script>
<script src="libs/ejs.js"></script>
<script src="libs/view.js"></script>
<script type="text/javascript" src="js/fx.js"></script>
<script type="text/javascript" src="js/fx_methods.js"></script>
<script type="text/javascript" src="js/zprogress.js"></script>
<script type="text/javascript" src="js/jquery.unveil.js"></script>
<!-- endbuild -->
<link rel="apple-touch-icon" sizes="57x57" href="icons/apple-touch-icon-57x57.png">
@ -114,10 +119,7 @@
</footer>
</body>
<!-- build:js -->
<script type="text/javascript" src="js/fx.js"></script>
<script type="text/javascript" src="js/fx_methods.js"></script>
<script type="text/javascript" src="js/zprogress.js"></script>
<script type="text/javascript" src="js/jquery.unveil.js"></script>
<script src="js/shell.js"></script>
<script src="js/app.v3.js"></script>
<!-- endbuild -->

119
html/js/app.v3.js
View File

@ -1,9 +1,10 @@
/**
* Created by Martin on 15/03/2016.
*/
"use strict";
var APP = function () {
refreshStep = 0,
var refreshStep = 0,
preUrl = '/',
_storage = {
@ -22,20 +23,13 @@ var APP = function () {
url: 'ejs/testcards.ejs'
});
},
init = function () {
$('#fnRefresh').on('click', $.proxy(refresh, this));
console.log('app starting...');
preCache();
doLoad();
getLastUpdateDate();
console.log('Last updated: ' + lastUpdated);
},
getLastUpdateDate = function () {
var formatted, dt;
// this.lastUpdated = localStorage.getItem('lastUpdated') || null;
if (lastUpdated == null)
if (lastUpdated === null) {
$('#lastupdate').empty().append('Never');
}
else {
dt = new Date(lastUpdated);
formatted = moment(dt).startOf('minute').fromNow();
@ -44,16 +38,16 @@ var APP = function () {
}
},
refresh = function () {
refreshStep = 0;
console.log('refresh');
console.log(this);
console.log('get ' + feeds[refreshStep]);
$('#lastupdate').empty().append('Refreshing...');
// $.zprogress.start();
doRefresh();
doSave = function () {
console.log('Saving...');
lastUpdated = new Date();
_storage.lastupdated = lastUpdated;
localStorage.setItem('lastUpdated', lastUpdated);
localStorage.setItem('_storage', JSON.stringify(_storage));
getLastUpdateDate();
// $.zprogress.done(true);
},
doRefresh = function () {
var self = this;
if (refreshStep < feeds.length) {
@ -70,6 +64,18 @@ var APP = function () {
doSave();
}
},
showFeed = function (opt) {
var output, d;
console.log('show feed ' + opt);
// $('#feedcontent').empty();
d = {
d: _storage.feeds[opt]
};
output = _feed.render(d);
$('#bodyContents').empty().html(output);
$('img').unveil();
},
doUpdate = function (data) {
console.log(this);
console.log(data);
@ -80,33 +86,10 @@ var APP = function () {
// $.zprogress.inc(0.2);
doRefresh();
},
doSave = function () {
console.log('Saving...');
lastUpdated = new Date();
_storage.lastupdated = lastUpdated;
localStorage.setItem('lastUpdated', lastUpdated);
localStorage.setItem('_storage', JSON.stringify(_storage));
getLastUpdateDate();
// $.zprogress.done(true);
},
doLoad = function () {
var _load = localStorage.getItem('_storage');
$('#lastupdate').empty().append('Loading...');
if (_load != null)
_storage = JSON.parse(_load);
else
_storage = {
lastupdated: null,
feeds: {}
};
lastUpdated = _storage.lastupdated || null;
showList();
},
showList = function () {
var output, d = {},
var key, output, d = {},
list = [];
for (var key in _storage.feeds) {
for (key in _storage.feeds) {
console.log(key);
list.push({
name: key
@ -115,26 +98,50 @@ var APP = function () {
d.list = list;
var output = _list.render(d);
output = _list.render(d);
$('#listContainer').empty().html(output);
for (var key in _storage.feeds) {
for (key in _storage.feeds) {
$('#' + key).on('click', $.proxy(showFeed, this, key));
}
},
showFeed = function (opt) {
var output, d;
console.log('show feed ' + opt);
// $('#feedcontent').empty();
d = {
d: _storage.feeds[opt]
};
var output = _feed.render(d);
doLoad = function () {
$('#bodyContents').empty().html(output);
$("img").unveil();
var _load = localStorage.getItem('_storage');
$('#lastupdate').empty().append('Loading...');
if (_load !== null) {
_storage = JSON.parse(_load);
}
else {
_storage = {
lastupdated: null,
feeds: {}
};
}
lastUpdated = _storage.lastupdated || null;
showList();
},
refresh = function () {
refreshStep = 0;
console.log('refresh');
console.log(this);
console.log('get ' + feeds[refreshStep]);
$('#lastupdate').empty().append('Refreshing...');
// $.zprogress.start();
doRefresh();
}, init = function () {
$('#fnRefresh').on('click', $.proxy(refresh, this));
console.log('app starting...');
preCache();
doLoad();
getLastUpdateDate();
console.log('Last updated: ' + lastUpdated);
} ;
$('#fnRefresh').on('click', function () {
doLoad();

2
html/js/shell.js
View File

@ -33,7 +33,7 @@ jQuery(function($) {
$('.js-hide-sidedrawer').on('click', hideSidedrawer);
});
var $titleEls = $('strong', $sidedrawerEl);
var $titleEls = $('strong', $('#sidedrawer'));
$titleEls
.next()

14
package.json
View File

@ -2,7 +2,21 @@
"name": "silvrtree",
"version": "0.1.1",
"devDependencies": {
"del": "^2.2.0",
"ejs": "^2.3.3",
"gulp": "^3.9.1",
"gulp-autoprefixer": "^3.1.0",
"gulp-cache": "^0.4.2",
"gulp-concat": "^2.6.0",
"gulp-cssnano": "^2.1.1",
"gulp-html-replace": "^1.5.5",
"gulp-htmlmin": "^1.3.0",
"gulp-inject": "^3.0.0",
"gulp-jshint": "^2.0.0",
"gulp-livereload": "^3.8.1",
"gulp-notify": "^2.2.0",
"gulp-rename": "^1.2.2",
"gulp-uglify": "^1.5.3",
"lodash": "^4.6.1",
"rss-braider": "^1.0.0"
},

2
pipes-server.js
View File

@ -26,7 +26,7 @@ app.use(function (req, res, next) {
next();
});
//app.use(app.router);
app.use(express.static(path.join(__dirname, 'html')));
app.use(express.static(path.join(__dirname, 'dist')));
app.use(errorhandler({dumpExceptions: true, showStack: true}));