tykayn
/
fromage-js
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix tests

This commit is contained in:
tykayn 2016-06-11 16:59:40 +02:00
parent 14ccb101ae
commit dd00f2225a
6 changed files with 243 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

310
.idea/workspace.xml
View File

@ -2,37 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e0ed8919-71cf-4a0f-9de7-89982f172017" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.bowerrc" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.jshintrc" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.travis.yml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/GulpFile.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/bower.json" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/editorconfig" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/karma-e2e.conf.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/karma.conf.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/coffee/main.coffee" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/coffee/services/myService.coffee" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/html/index.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/html/tpl/main.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/json/squares.json" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/_extendables.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/_global.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/_interactions.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/_nav.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/_overrides.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/_pages.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/_vars.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/sass/main.scss" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/scripts/app.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/scripts/scripts.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/tests/e2e/main.js" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/tests/spec/app.js" />
<change type="DELETED" beforePath="$PROJECT_DIR$/LICENSE" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/fromage.coffee" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/fromage.js" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/GulpFile.js" afterPath="$PROJECT_DIR$/GulpFile.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/coffee/main.coffee" afterPath="$PROJECT_DIR$/src/coffee/main.coffee" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/html/index.html" afterPath="$PROJECT_DIR$/src/html/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/sass/_global.scss" afterPath="$PROJECT_DIR$/src/sass/_global.scss" />
</list>
<ignored path="fromage-js.iws" />
<ignored path=".idea/workspace.xml" />
@ -54,21 +27,11 @@
</component>
<component name="FileEditorManager">
<leaf>
<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 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="GulpFile.js" pinned="false" current-in-tab="false">
<file leaf-file-name="GulpFile.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/GulpFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94">
<caret line="88" column="34" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
<state relative-caret-position="229">
<caret line="112" column="26" selection-start-line="112" selection-start-column="26" selection-end-line="112" selection-end-column="26" />
<folding>
<element signature="e#783#806#0" expanded="true" />
</folding>
@ -79,8 +42,21 @@
<file leaf-file-name="main.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/dist/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="6" column="43" selection-start-line="6" selection-start-column="43" selection-end-line="6" selection-end-column="43" />
<state relative-caret-position="120">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
<folding>
<marker date="1465657059302" expanded="true" signature="311:699" placeholder="{...}" />
<marker date="1465657059302" expanded="true" signature="543:581" placeholder="/*...*/" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.coffee" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/coffee/main.coffee">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="17" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="17" />
<folding />
</state>
</provider>
@ -89,40 +65,60 @@
<file leaf-file-name="squares.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/json/squares.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<state relative-caret-position="510">
<caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.coffee" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/coffee/main.coffee">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="42" column="42" selection-start-line="42" selection-start-column="42" selection-end-line="42" selection-end-column="42" />
<state relative-caret-position="525">
<caret line="64" column="6" selection-start-line="64" selection-start-column="6" selection-end-line="64" selection-end-column="6" />
<folding>
<marker date="1465656094369" expanded="true" signature="842:996" placeholder="..." />
<marker date="1465656969181" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.html" pinned="false" current-in-tab="true">
<file leaf-file-name="main.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/html/tpl/main.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="9" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="9" />
<state relative-caret-position="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="_overrides.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sass/_overrides.scss">
<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="_pages.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sass/_pages.scss">
<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="_global.scss" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sass/_global.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
<folding />
</state>
</provider>
@ -142,10 +138,11 @@
<option value="$PROJECT_DIR$/src/html_wired/index.html" />
<option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/src/json/squares.json" />
<option value="$PROJECT_DIR$/src/html/tpl/main.html" />
<option value="$PROJECT_DIR$/src/coffee/main.coffee" />
<option value="$PROJECT_DIR$/src/sass/_global.scss" />
<option value="$PROJECT_DIR$/src/html/index.html" />
<option value="$PROJECT_DIR$/GulpFile.js" />
<option value="$PROJECT_DIR$/src/coffee/main.coffee" />
<option value="$PROJECT_DIR$/src/html/tpl/main.html" />
</list>
</option>
</component>
@ -157,9 +154,9 @@
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="65" />
<option name="y" value="52" />
<option name="width" value="928" />
<option name="height" value="1028" />
<option name="y" value="24" />
<option name="width" value="1855" />
<option name="height" value="1056" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@ -220,6 +217,42 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="sass" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="json" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
@ -292,6 +325,24 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="dist" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="json" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="fromage-js" />
@ -373,26 +424,26 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1465650457129</updated>
<workItem from="1465650458202" duration="5522000" />
<workItem from="1465650458202" duration="6185000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5522000" />
<option name="totallyTimeSpent" value="6185000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="52" width="928" height="1028" extended-state="4" />
<frame x="65" y="24" width="1855" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33900228" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1652847" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32916668" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" 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="-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="true" show_stripe_button="true" weight="0.38841203" 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="true" show_stripe_button="true" weight="0.37708333" sideWeight="0.5" order="-1" 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="-1" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="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" />
@ -545,14 +596,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/json/squares.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html_wired/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
@ -585,49 +628,100 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/GulpFile.js">
<entry file="file://$PROJECT_DIR$/src/sass/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94">
<caret line="88" column="34" selection-start-line="88" selection-start-column="34" selection-end-line="88" selection-end-column="34" />
<folding>
<element signature="e#783#806#0" expanded="true" />
</folding>
<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$/src/sass/_vars.scss">
<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$/src/sass/_pages.scss">
<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$/src/json/squares.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/dist/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="6" column="43" selection-start-line="6" selection-start-column="43" selection-end-line="6" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/coffee/main.coffee">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="42" column="42" selection-start-line="42" selection-start-column="42" selection-end-line="42" selection-end-column="42" />
<state relative-caret-position="120">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
<folding>
<marker date="1465656094369" expanded="true" signature="842:996" placeholder="..." />
<marker date="1465657059302" expanded="true" signature="311:699" placeholder="{...}" />
<marker date="1465657059302" expanded="true" signature="543:581" placeholder="/*...*/" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/tpl/main.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="9" selection-start-line="1" selection-start-column="9" selection-end-line="1" selection-end-column="9" />
<state relative-caret-position="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sass/_global.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/sass/_overrides.scss">
<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$/src/coffee/main.coffee">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="17" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/html/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="64" column="6" selection-start-line="64" selection-start-column="6" selection-end-line="64" selection-end-column="6" />
<folding>
<marker date="1465656969181" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/GulpFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="229">
<caret line="112" column="26" selection-start-line="112" selection-start-column="26" selection-end-line="112" selection-end-column="26" />
<folding>
<element signature="e#783#806#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

9
GulpFile.js
View File

@ -28,6 +28,7 @@ var sources = {
html : "src/html/*.html",
htmls : "src/html/**/*.html",
distIndex: "dist/index.html",
json : "src/json/*.json",
js : "src/scripts/*.js",
jsAll : "src/scripts/**/*.js",
coffee : "src/coffee/*.coffee"
@ -35,6 +36,7 @@ var sources = {
var destinations = {
sass : "dist/css/",
html : "dist/",
json : "dist/json",
coffee: "dist/coffee/",
js : "dist/js/",
doc : "dist/doc/"
@ -108,6 +110,7 @@ gulp.task('watch', function () {
gulp.watch(sources.sass, ['sass2css']);
gulp.watch('bower.json', ['wiredep']);
gulp.watch(sources.html, ['html_transform']);
gulp.watch(sources.htmls, ['html_transform']);
// gulp.watch(sources.htmls, ['html','wiredep']);
gulp.watch(sources.coffee, ['coffee2js', 'test']);
@ -118,9 +121,11 @@ gulp.task('lint', function () {
.pipe(jshint.reporter('jshint-stylish'));
});
gulp.task("html_transform", function () {
console.log("html was changed");
gulp.src(sources.json)
.pipe(gulp.dest(destinations.json));
gulp.src([sources.htmls, sources.html])
.pipe(gulp.dest(destinations.html))
.pipe(browserSync.stream());
@ -137,6 +142,6 @@ gulp.task('wiredep', ['html_transform'], function () {
.pipe(gulp.dest(destinations.html))
;
});
gulp.task("default", [ "wiredep","coffee2js", "sass2css", "lint", "browser-sync", "imagemin", "watch"], function () {
gulp.task("default", ['html_transform', "wiredep", "coffee2js", "sass2css", "lint", "browser-sync", "imagemin", "watch"], function () {
console.log("spartiiiii");
});

5
src/coffee/main.coffee
View File

@ -2,13 +2,16 @@
# here we do stuff
###
angular.module "tkApp", []
.controller("MainCtrl", ($scope)->
.controller("MainCtrl", ($scope, $http)->
###
# scoped variables
###
$scope.demo = 'WOHOOO angular ça marche'
$http.get('json/squares.json').then( (data)->
$scope.config = data.data
)
###
# scoped functions
###

15
src/html/index.html
View File

@ -56,7 +56,7 @@
</div>
<h2>
<i class="fa fa-file fa-2x"></i>
Getting started:
Comment jouer:
</h2>
<div class="row">
@ -64,7 +64,20 @@
<div id="board">
<div class="row" ng-repeat="for sq_row in squares_rows">
<div class="square"
ng-repeat="for s in sq_row"
ng-click="s.active = !s.active"
ng-class="{active: s.active}"
>
<strong> {{s.text}}</strong>
</div>
</div>
</div>
<pre class="debug padded warning">
config :
{{config|json}}
</pre>
Code disponible sur
<a href="http://github.com/tykayn">mon github tykayn</a>
</div>

14
src/sass/_global.scss
View File

@ -0,0 +1,14 @@
#board{
border: solid 3px $blue;
background: $white;
}
.square{
&:hover{
background: $blue;
color: $white;
}
&.active{
background: $dark;
color: $white;
}
}

4
src/tests/spec/app.js
View File

@ -14,7 +14,7 @@ describe("A suite", function () {
describe('Controller: MainCtrl', function () {
// load the controller's module
beforeEach(module('myApp'));
beforeEach(module('tkApp'));
var MainCtrl, scope;
scope = 1;
@ -36,4 +36,4 @@ describe('Controller: MainCtrl', function () {
expect(scope).toBeDefined();
});
});
});