diff --git a/LICENSE b/LICENSE index be789be..e824d8d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2016 Igor Babuschkin, Kevin Dungs, Tadej Novak, Gabor Biro +Copyright (c) 2016 wassname (Michael Clark) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index 8d16734..0000000 Binary files a/favicon.ico and /dev/null differ diff --git a/gulpfile.js b/gulpfile.js index 9c05e3f..1636df3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -4,7 +4,6 @@ var gulp = require('gulp'); var fs = require('fs'); var gutil = require('gulp-util') -var webpack = require('webpack-stream'); var concurrent = require("concurrent-transform"); var rename = require('gulp-rename'); @@ -18,26 +17,6 @@ var production = (process.env.NODE_ENV === 'production'); var DEBUG = !production; console.log('Running in DEBUG='+DEBUG+' mode'); -var config = { - app_entry: 'client/scripts/main.js', - debug: DEBUG, -}; - -/* -Just run webpack - */ - - -gulp.task('webpack', function () { - DEBUG = config.debug=false; // run production mode - process.env.NODE_ENV='production'; - var webpackConfig = require('./webpack.config.js'); - console.log('debug: ', webpackConfig.debug); - - return gulp.src(config.app_entry) - .pipe(webpack(require('./webpack.config.js'))) - .pipe(gulp.dest('dist/')); -}); /** deploy to s3 using gulp-awspublish @@ -57,7 +36,7 @@ gulp.task('s3', function () { // ... }; - return gulp.src('./dist/**/*.*',{cwd:'.'}) + return gulp.src('./src/**/*.*',{cwd:'.'}) // rename to put in subfolder // .pipe(rename(function (path) { @@ -79,5 +58,5 @@ gulp.task('s3', function () { .pipe(awspublish.reporter()); }); -gulp.task('default', ['webpack']); -gulp.task('deploy', ['webpack','s3']); +// gulp.task('default', ['webpack']); +gulp.task('deploy', [,'s3']); diff --git a/src/assets/favicon.ico b/src/assets/favicon.ico deleted file mode 100644 index 8d16734..0000000 Binary files a/src/assets/favicon.ico and /dev/null differ diff --git a/src/index.webpack b/src/index.html similarity index 100% rename from src/index.webpack rename to src/index.html diff --git a/src/json/cards.json b/src/json/cards.json index 6a36a65..4f56343 100644 --- a/src/json/cards.json +++ b/src/json/cards.json @@ -167,7 +167,7 @@ "suit": "Spades", "color": "Black", "royal": false, - "face": true, + "face": false, "number": true, "red": false, "black": false, @@ -184,7 +184,7 @@ "value": 11, "suit": "Spades", "color": "Black", - "royal": true, + "royal": false, "face": true, "number": false, "red": false, @@ -401,7 +401,7 @@ "suit": "Hearts", "color": "Red", "royal": false, - "face": true, + "face": false, "number": true, "red": false, "black": false, @@ -418,7 +418,7 @@ "value": 11, "suit": "Hearts", "color": "Red", - "royal": true, + "royal": false, "face": true, "number": false, "red": false, @@ -635,7 +635,7 @@ "suit": "Diamonds", "color": "Red", "royal": false, - "face": true, + "face": false, "number": true, "red": false, "black": false, @@ -652,7 +652,7 @@ "value": 11, "suit": "Diamonds", "color": "Red", - "royal": true, + "royal": false, "face": true, "number": false, "red": false, @@ -869,7 +869,7 @@ "suit": "Clubs", "color": "Black", "royal": false, - "face": true, + "face": false, "number": true, "red": false, "black": false, @@ -886,7 +886,7 @@ "value": 11, "suit": "Clubs", "color": "Black", - "royal": true, + "royal": false, "face": true, "number": false, "red": false, @@ -934,58 +934,4 @@ "spade": false, "club": false, "diamond": false -}, { - "key": "🂠", - "name": "Playing Card", - "value": 15, - "suit": "Black", - "color": "Black", - "royal": false, - "face": false, - "number": false, - "red": false, - "black": false, - "even": false, - "odd": true, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃏", - "name": "Joker", - "value": 16, - "suit": "Black", - "color": "Black", - "royal": false, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false -}, { - "key": "🃟", - "name": "Joker", - "value": 16, - "suit": "Red", - "color": "Red", - "royal": false, - "face": true, - "number": false, - "red": false, - "black": false, - "even": true, - "odd": false, - "loop": false, - "heart": false, - "spade": false, - "club": false, - "diamond": false }] diff --git a/src/js/rules/simulate.html b/src/simulate.html similarity index 100% rename from src/js/rules/simulate.html rename to src/simulate.html diff --git a/webpack.config.js b/webpack.config.js index 40b21a4..2355468 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -46,7 +46,7 @@ var extractLESS = new ExtractTextPlugin('[name].less'); // // inject bundles into html file template. Note html loader can overwrite output var htmlWebpack = new HtmlWebpackPlugin({ - template: 'src/index.webpack', + template: 'src/index.html', inject: 'body', filename: 'index.html', hash: true, @@ -104,7 +104,7 @@ module.exports = { { test: /\.(mp3|ac3|ogg|m4a|wav)$/i, loader: "file?name=[path][name].[ext]" }, { test: /\.(ttf|woff|eot|svg|woff2|ico)(\?.*$|$)/i, loader: "file?&name=[path][name].[ext]" }, { test: /\.(json)$/i, loader: "json-loader" }, // this loads it as javascript in one go - { test: /\.html/i, loader: 'file?name=[path][name].[ext]!html-minify'}, // breaks html template // html-minify? + { test: /\.html/i, loader: 'file?name=[path][name].[ext]'}, // breaks html template // html-minify? { test: /\.(less)$/i, loader: extractLESS.extract("style-loader", "css-loader",'less-loader') }, { test: /\.(css)$/i, loader: ExtractTextPlugin.extract("style-loader", "css-loader") } ]