added bower for mui, jquery and strings. Then gulp bakes them in, shoudl reduce server read now that gzip is turned on.

This commit is contained in:
Martin Donnelly 2016-04-08 12:05:38 +01:00
parent 7f27fb4294
commit 05cdda31c5
6 changed files with 179 additions and 284 deletions

1
.gitignore vendored
View File

@ -77,5 +77,6 @@ build/Release
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git # https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules node_modules
/node_modules /node_modules
bower_components
.idea/workspace.xml .idea/workspace.xml

View File

@ -3,5 +3,6 @@
<component name="JavaScriptLibraryMappings"> <component name="JavaScriptLibraryMappings">
<file url="file://$PROJECT_DIR$" libraries="{rinser node_modules}" /> <file url="file://$PROJECT_DIR$" libraries="{rinser node_modules}" />
<file url="PROJECT" libraries="{jquery-2.2.3, mui, string}" /> <file url="PROJECT" libraries="{jquery-2.2.3, mui, string}" />
<includedPredefinedLibrary name="ECMAScript 6" />
</component> </component>
</project> </project>

View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="JSX" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" /> <OptionsSetting value="true" id="Remove" />

View File

@ -3,8 +3,11 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment=""> <list default="true" id="c2fd5632-2143-4c7e-8b0d-96d7692b700b" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" afterPath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<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$/tech.js" afterPath="$PROJECT_DIR$/tech.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gulpfile.js" afterPath="$PROJECT_DIR$/gulpfile.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/html/index.html" afterPath="$PROJECT_DIR$/html/index.html" />
</list> </list>
<ignored path="rinser.iws" /> <ignored path="rinser.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -26,211 +29,60 @@
<favorites_list name="rinser" /> <favorites_list name="rinser" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.6171032"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
<split-first> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <entry file="file://$PROJECT_DIR$/html/index.html">
<file leaf-file-name="lifestyle.js" pinned="false" current-in-tab="true"> <provider selected="true" editor-type-id="text-editor">
<entry file="file://$PROJECT_DIR$/lifestyle.js"> <state relative-caret-position="190">
<provider selected="true" editor-type-id="text-editor"> <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<state relative-caret-position="81"> <folding />
<caret line="250" column="53" selection-start-line="250" selection-start-column="53" selection-end-line="250" selection-end-column="53" /> </state>
<folding /> </provider>
</state> </entry>
</provider> </file>
</entry> <file leaf-file-name="gulpfile.js" pinned="false" current-in-tab="false">
</file> <entry file="file://$PROJECT_DIR$/gulpfile.js">
<file leaf-file-name="package.json" pinned="false" current-in-tab="false"> <provider selected="true" editor-type-id="text-editor">
<entry file="file://$PROJECT_DIR$/package.json"> <state relative-caret-position="632">
<provider selected="true" editor-type-id="text-editor"> <caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="86" selection-end-column="0" />
<state relative-caret-position="57"> <folding />
<caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" /> </state>
<folding /> </provider>
</state> </entry>
</provider> </file>
</entry> <file leaf-file-name="app.css" pinned="false" current-in-tab="false">
</file> <entry file="file://$PROJECT_DIR$/dist/css/app.css">
<file leaf-file-name="app.css" pinned="false" current-in-tab="false"> <provider selected="true" editor-type-id="text-editor">
<entry file="file://$PROJECT_DIR$/html/css/app.css"> <state relative-caret-position="0">
<provider selected="true" editor-type-id="text-editor"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="3534"> <folding>
<caret line="186" column="29" selection-start-line="186" selection-start-column="23" selection-end-line="186" selection-end-column="29" /> <element signature="e#20769#20976#2" expanded="true" />
<folding /> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="manifest.json" pinned="false" current-in-tab="false"> <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/html/icons/manifest.json"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="760"> <state relative-caret-position="570">
<caret line="40" column="1" selection-start-line="40" selection-start-column="1" selection-end-line="40" selection-end-column="1" /> <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="pipes.appcache" pinned="false" current-in-tab="false"> <file leaf-file-name="remote.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/pipes.appcache"> <entry file="file://$PROJECT_DIR$/dist/js/remote.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228"> <state relative-caret-position="0">
<caret line="12" column="42" selection-start-line="12" selection-start-column="42" selection-end-line="12" selection-end-column="42" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="pipes-server.js" pinned="false" current-in-tab="false"> </leaf>
<entry file="file://$PROJECT_DIR$/pipes-server.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="28" column="51" selection-start-line="28" selection-start-column="51" selection-end-line="28" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jquery.unveil.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/jquery.unveil.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
<folding>
<element signature="n#!!doc" expanded="true" />
</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">
<state relative-caret-position="2432">
<caret line="128" column="7" selection-start-line="128" selection-start-column="7" selection-end-line="128" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="news.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/news.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2679">
<caret line="141" column="5" selection-start-line="130" selection-start-column="0" selection-end-line="141" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fix_images.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/plugins/fix_images.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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>
</file>
</leaf>
</split-first>
<split-second>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
<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 relative-caret-position="152">
<caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="android-chrome-36x36.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/icons/android-chrome-36x36.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
</file>
<file leaf-file-name="android-chrome-48x48.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/icons/android-chrome-48x48.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
</file>
<file leaf-file-name="android-chrome-72x72.png" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/icons/android-chrome-72x72.png">
<provider selected="true" editor-type-id="images">
<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 relative-caret-position="1235">
<caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="shell.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/shell.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="16" column="55" selection-start-line="16" selection-start-column="55" selection-end-line="16" selection-end-column="55" />
<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 relative-caret-position="1235">
<caret line="67" column="36" selection-start-line="67" selection-start-column="36" selection-end-line="67" selection-end-column="36" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2014">
<caret line="106" column="31" selection-start-line="106" selection-start-column="31" selection-end-line="106" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.prod.v2.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/js/app.prod.v2.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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>
</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 relative-caret-position="209">
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
@ -268,7 +120,6 @@
<option value="$PROJECT_DIR$/html/ejs/list.ejs" /> <option value="$PROJECT_DIR$/html/ejs/list.ejs" />
<option value="$PROJECT_DIR$/html/ejs/test.ejs" /> <option value="$PROJECT_DIR$/html/ejs/test.ejs" />
<option value="$PROJECT_DIR$/html/feeds.html" /> <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/cards.css" />
<option value="$PROJECT_DIR$/html/css/md.css" /> <option value="$PROJECT_DIR$/html/css/md.css" />
<option value="$PROJECT_DIR$/gulp/build.js" /> <option value="$PROJECT_DIR$/gulp/build.js" />
@ -287,9 +138,10 @@
<option value="$PROJECT_DIR$/html/css/app.css" /> <option value="$PROJECT_DIR$/html/css/app.css" />
<option value="$PROJECT_DIR$/html/icons/manifest.json" /> <option value="$PROJECT_DIR$/html/icons/manifest.json" />
<option value="$PROJECT_DIR$/html/pipes.appcache" /> <option value="$PROJECT_DIR$/html/pipes.appcache" />
<option value="$PROJECT_DIR$/gulpfile.js" />
<option value="$PROJECT_DIR$/html/js/jquery.unveil.js" /> <option value="$PROJECT_DIR$/html/js/jquery.unveil.js" />
<option value="$PROJECT_DIR$/html/index.html" /> <option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/gulpfile.js" />
<option value="$PROJECT_DIR$/.gitignore" />
</list> </list>
</option> </option>
</component> </component>
@ -334,6 +186,7 @@
<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>
@ -367,9 +220,26 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Rinser" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="dist" />
<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> </subPane>
</pane> </pane>
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -527,7 +397,8 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1437394742450</updated> <updated>1437394742450</updated>
<workItem from="1460106859590" duration="1784000" /> <workItem from="1460106859590" duration="1784000" />
<workItem from="1460109270348" duration="68000" /> <workItem from="1460109270348" duration="705000" />
<workItem from="1460111499918" duration="1402000" />
</task> </task>
<task id="LOCAL-00001" summary="debugging braider"> <task id="LOCAL-00001" summary="debugging braider">
<created>1438335954140</created> <created>1438335954140</created>
@ -813,7 +684,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1852000" /> <option name="totallyTimeSpent" value="3891000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="4" y="23" width="1825" height="1177" extended-state="0" /> <frame x="4" y="23" width="1825" height="1177" extended-state="0" />
@ -822,9 +693,8 @@
<window_info id="Gulp" 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="Gulp" 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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2804878" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2804878" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="SonarLint" 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="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="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20645161" sideWeight="0.48606148" 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.20607176" sideWeight="0.48606148" order="7" 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.32896176" sideWeight="0.4838976" 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.32896176" sideWeight="0.4838976" 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" />
@ -836,6 +706,7 @@
<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" />
<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="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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="SonarLint" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32850778" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32850778" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="SonarQube" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32962137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="SonarQube" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32962137" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" 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="Ant Build" active="false" anchor="right" 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" />
@ -899,48 +770,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/.editorconfig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="16" column="20" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jobs.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="41" column="2" selection-start-line="41" selection-start-column="2" selection-end-line="41" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/libs/ejs.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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$/html/js/appv2.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="183" column="4" selection-start-line="183" selection-start-column="4" selection-end-line="183" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/paleo.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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$/html/ejs/list.ejs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/index.ejs"> <entry file="file://$PROJECT_DIR$/views/index.ejs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
@ -990,13 +819,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/tech.json"> <entry file="file://$PROJECT_DIR$/html/tech.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
@ -1170,7 +992,7 @@
<state relative-caret-position="304"> <state relative-caret-position="304">
<caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" /> <caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
<folding> <folding>
<element signature="n#!!doc" expanded="true" /> <element signature="n#!!doc" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1190,14 +1012,6 @@
<state /> <state />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1235">
<caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/js/shell.js"> <entry file="file://$PROJECT_DIR$/html/js/shell.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="304">
@ -1238,10 +1052,79 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/bower_components/mui/packages/cdn/js/mui.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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$/bower_components/string/README.md">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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>
<provider editor-type-id="MarkdownPreviewEditor">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bower_components/string/dist/string.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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$/bower_components/string/dist/string.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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$/dist/js/remote.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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/index.html"> <entry file="file://$PROJECT_DIR$/html/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152"> <state relative-caret-position="190">
<caret line="9" column="22" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" /> <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gulpfile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<caret line="86" column="0" selection-start-line="86" selection-start-column="0" selection-end-line="86" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/css/app.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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="e#20769#20976#2" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>

View File

@ -30,27 +30,31 @@ gulp.task('scripts', function() {
/*.pipe(rename({suffix: '.min'}))*/ /*.pipe(rename({suffix: '.min'}))*/
/* .pipe(uglify({mangle: false}))*/ /* .pipe(uglify({mangle: false}))*/
/*.pipe(concat('app.js'))*/ /*.pipe(concat('app.js'))*/
.pipe(gulp.dest('dist/js')) .pipe(gulp.dest('dist/js'));
.pipe(notify({ message: 'Scripts task complete' }));
}); });
gulp.task('vendor', function() { 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']) 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(concat('vendor.js'))
.pipe(uglify({mangle: false})) .pipe(uglify({mangle: false}))
.pipe(gulp.dest('dist/js')) .pipe(gulp.dest('dist/js'));
.pipe(notify({ message: 'Scripts task complete' })); });
gulp.task('remote', function() {
return gulp.src(['bower_components/mui/packages/cdn/js/mui.min.js','bower_components/jquery/dist/jquery.min.js','bower_components/string/dist/string.min.js'])
.pipe(concat('remote.js'))
.pipe(uglify({mangle: false}))
.pipe(gulp.dest('dist/js'));
}); });
gulp.task('styles', function() { gulp.task('styles', function() {
return gulp.src(['html/css/app.css','html/css/md.css']) return gulp.src(['bower_components/mui/packages/cdn/css/mui.min.css','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(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4'))
/*.pipe(gulp.dest('dist/css'))*/ /*.pipe(gulp.dest('dist/css'))*/
/*.pipe(rename({suffix: '.min'}))*/ /*.pipe(rename({suffix: '.min'}))*/
.pipe(cssnano()) .pipe(cssnano())
.pipe(concat('app.css')) .pipe(concat('app.css'))
.pipe(gulp.dest('dist/css')) .pipe(gulp.dest('dist/css'));
.pipe(notify({ message: 'Styles task complete' }));
}); });
gulp.task('partials', function() { gulp.task('partials', function() {
@ -69,7 +73,8 @@ gulp.task('index', function () {
.pipe(htmlreplace({ .pipe(htmlreplace({
'css': 'css/app.css', 'css': 'css/app.css',
'js': 'js/app.js', 'js': 'js/app.js',
'vendor': 'js/vendor.js' 'vendor': 'js/vendor.js',
'remote': 'js/remote.js'
})) }))
.pipe(htmlmin({removeComments: true, collapseWhitespace: true, keepClosingSlash: true})) .pipe(htmlmin({removeComments: true, collapseWhitespace: true, keepClosingSlash: true}))
.pipe(gulp.dest('dist/')); .pipe(gulp.dest('dist/'));
@ -81,5 +86,5 @@ gulp.task('clean', function() {
gulp.task('default', ['clean'], function() { gulp.task('default', ['clean'], function() {
gulp.start('styles', 'scripts','vendor', 'partials','index'); gulp.start('styles', 'scripts', 'remote', 'vendor', 'partials','index');
}); });

View File

@ -6,8 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="//cdn.linearicons.com/free/1.0.0/icon-font.min.css"> <link rel="stylesheet" href="//cdn.linearicons.com/free/1.0.0/icon-font.min.css">
<link href="//cdn.muicss.com/mui-0.5.0/css/mui.min.css" rel="stylesheet" type="text/css" />
<!-- build:css --> <!-- build:css -->
<link href="//cdn.muicss.com/mui-0.5.0/css/mui.min.css" rel="stylesheet" type="text/css" />
<link href="css/app.css" rel="stylesheet" type="text/css" /> <link href="css/app.css" rel="stylesheet" type="text/css" />
<link href="css/md.css" rel="stylesheet" type="text/css" /> <link href="css/md.css" rel="stylesheet" type="text/css" />
@ -37,10 +38,11 @@
</style> </style>
<!-- endbuild --> <!-- endbuild -->
<!-- build:remote -->
<script src="//cdn.muicss.com/mui-0.5.0/js/mui.min.js"></script> <script src="//cdn.muicss.com/mui-0.5.0/js/mui.min.js"></script>
<script src="//code.jquery.com/jquery-2.2.3.min.js" integrity="sha256-a23g1Nt4dtEYOj7bR+vTu7+T8VP13humZFBJNIYoEJo=" crossorigin="anonymous"></script> <script src="//code.jquery.com/jquery-2.2.3.min.js" integrity="sha256-a23g1Nt4dtEYOj7bR+vTu7+T8VP13humZFBJNIYoEJo=" crossorigin="anonymous"></script>
<script src="//cdn.rawgit.com/jprichardson/string.js/master/dist/string.min.js"></script> <script src="//cdn.rawgit.com/jprichardson/string.js/master/dist/string.min.js"></script>
<!-- endbuild -->
<!-- build:vendor --> <!-- build:vendor -->
<script src="libs/microevent.js"></script> <script src="libs/microevent.js"></script>