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

fix browser sync

This commit is contained in:
tykayn 2016-06-11 17:09:59 +02:00
parent dd00f2225a
commit 12f4aaa5c5
5 changed files with 104 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
.idea/workspace.xml
View File

@ -2,10 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e0ed8919-71cf-4a0f-9de7-89982f172017" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/html/tpl/main.html" afterPath="$PROJECT_DIR$/src/html/tpl/main.html" />
</list>
<ignored path="fromage-js.iws" />
<ignored path=".idea/workspace.xml" />
@ -30,8 +31,8 @@
<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="229">
<caret line="112" column="26" selection-start-line="112" selection-start-column="26" selection-end-line="112" selection-end-column="26" />
<state relative-caret-position="124">
<caret line="102" column="55" selection-start-line="102" selection-start-column="55" selection-end-line="102" selection-end-column="55" />
<folding>
<element signature="e#783#806#0" expanded="true" />
</folding>
@ -39,14 +40,36 @@
</provider>
</entry>
</file>
<file leaf-file-name="main.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/tests/e2e/main.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>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/tests/spec/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="38" column="3" selection-start-line="38" selection-start-column="3" selection-end-line="38" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</file>
<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="120">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
<caret line="11" column="23" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
<folding>
<marker date="1465657059302" expanded="true" signature="311:699" placeholder="{...}" />
<marker date="1465657059302" expanded="true" signature="543:581" placeholder="/*...*/" />
<marker date="1465657758256" expanded="true" signature="344:732" placeholder="{...}" />
<marker date="1465657758256" expanded="true" signature="576:614" placeholder="/*...*/" />
</folding>
</state>
</provider>
@ -55,8 +78,8 @@
<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" />
<state relative-caret-position="195">
<caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
<folding />
</state>
</provider>
@ -75,10 +98,10 @@
<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="525">
<caret line="64" column="6" selection-start-line="64" selection-start-column="6" selection-end-line="64" selection-end-column="6" />
<state relative-caret-position="180">
<caret line="62" column="143" selection-start-line="62" selection-start-column="143" selection-end-line="62" selection-end-column="143" />
<folding>
<marker date="1465656969181" expanded="true" signature="842:996" placeholder="..." />
<marker date="1465657731204" expanded="true" signature="842:996" placeholder="..." />
</folding>
</state>
</provider>
@ -87,8 +110,8 @@
<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="30">
<caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
<state relative-caret-position="180">
<caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
<folding />
</state>
</provider>
@ -104,16 +127,6 @@
</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">
@ -138,9 +151,10 @@
<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/tests/spec/app.js" />
<option value="$PROJECT_DIR$/src/coffee/main.coffee" />
<option value="$PROJECT_DIR$/src/html/tpl/main.html" />
<option value="$PROJECT_DIR$/src/html/index.html" />
<option value="$PROJECT_DIR$/GulpFile.js" />
</list>
@ -217,42 +231,6 @@
<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" />
@ -293,74 +271,6 @@
<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="coffee" />
<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>
<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" />
<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="js" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="NBKnowledgePane" />
@ -424,12 +334,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1465650457129</updated>
<workItem from="1465650458202" duration="6185000" />
<workItem from="1465650458202" duration="6866000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="6185000" />
<option name="totallyTimeSpent" value="6866000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="24" width="1855" height="1056" extended-state="6" />
@ -652,33 +562,17 @@
</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="120">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
<caret line="11" column="23" selection-start-line="11" selection-start-column="23" selection-end-line="11" selection-end-column="23" />
<folding>
<marker date="1465657059302" expanded="true" signature="311:699" placeholder="{...}" />
<marker date="1465657059302" expanded="true" signature="543:581" placeholder="/*...*/" />
<marker date="1465657758256" expanded="true" signature="344:732" placeholder="{...}" />
<marker date="1465657758256" expanded="true" signature="576:614" 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="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">
@ -695,28 +589,62 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/tests/e2e/main.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>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/tests/spec/app.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="339">
<caret line="38" column="3" selection-start-line="38" selection-start-column="3" selection-end-line="38" selection-end-column="3" />
<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$/src/coffee/main.coffee">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
<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="180">
<caret line="12" column="17" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="17" />
<caret line="12" column="8" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="8" />
<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" />
<state relative-caret-position="180">
<caret line="62" column="143" selection-start-line="62" selection-start-column="143" selection-end-line="62" selection-end-column="143" />
<folding>
<marker date="1465656969181" expanded="true" signature="842:996" placeholder="..." />
<marker date="1465657731204" 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" />
<state relative-caret-position="124">
<caret line="102" column="55" selection-start-line="102" selection-start-column="55" selection-end-line="102" selection-end-column="55" />
<folding>
<element signature="e#783#806#0" expanded="true" />
</folding>

16
GulpFile.js
View File

@ -42,14 +42,6 @@ var destinations = {
doc : "dist/doc/"
};
var imageminJpegoptim = require('imagemin-jpegoptim');
gulp.task('imagemin', function () {
return gulp.src('images/*.jpg')
.pipe(imageminJpegoptim({progressive: true})())
.pipe(gulp.dest('dist/images'));
});
/**
* Run test once and exit
*/
@ -108,9 +100,9 @@ gulp.task('watch', function () {
gulp.watch('GulpFile.js', ['default']);
gulp.watch(sources.tests, ['test']);
gulp.watch(sources.sass, ['sass2css']);
gulp.watch('bower.json', ['wiredep']);
gulp.watch(sources.html, ['html_transform']);
gulp.watch(sources.htmls, ['html_transform']);
gulp.watch('bower.json', ['html_transform', "wiredep"]);
gulp.watch(sources.html, ['html_transform', "wiredep"]);
gulp.watch(sources.htmls, ['html_transform', "wiredep"]);
// gulp.watch(sources.htmls, ['html','wiredep']);
gulp.watch(sources.coffee, ['coffee2js', 'test']);
@ -142,6 +134,6 @@ gulp.task('wiredep', ['html_transform'], function () {
.pipe(gulp.dest(destinations.html))
;
});
gulp.task("default", ['html_transform', "wiredep", "coffee2js", "sass2css", "lint", "browser-sync", "imagemin", "watch"], function () {
gulp.task("default", ['html_transform', "wiredep", "coffee2js", "sass2css", "lint", "browser-sync" , "watch"], function () {
console.log("spartiiiii");
});

1
src/coffee/main.coffee
View File

@ -10,6 +10,7 @@ angular.module "tkApp", []
$scope.demo = 'WOHOOO angular ça marche'
$http.get('json/squares.json').then( (data)->
console.log('data', data)
$scope.config = data.data
)
###

16
src/html/index.html
View File

@ -58,22 +58,14 @@
<i class="fa fa-file fa-2x"></i>
Comment jouer:
</h2>
<div class="alert alert-info">
trouvez les argumentations foireuses dans les discours, pas seulement en politique.
Cliquez sur une case correspondant à l'erreur et voyez en combien de temps vous pouvez former une ligne verticale, horizontale, ou diagonale.
</div>
<div class="row">
<div class="col-lg-12">
<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}}

12
src/html/tpl/main.html
View File

@ -1,4 +1,14 @@
<div class="alert alert-success">
Board
<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>
</div>