diff --git a/.gitignore b/.gitignore
index 83dfeeb..79263c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
node_modules
.idea
-build
\ No newline at end of file
+public/build
+public/index.html
\ No newline at end of file
diff --git a/assets/data/cards.js b/assets/data/cards.js
index cd908eb..6c7f778 100644
--- a/assets/data/cards.js
+++ b/assets/data/cards.js
@@ -271,7 +271,7 @@ module.exports = {
"havekar_healer": {
name: "Havekar Healer",
power: 0,
- ability: "morale_boost",
+ ability: "medic",
img: "healer",
faction: "Scoia'tael",
type: 1
diff --git a/public/css/bootstrap.css b/client/css/bootstrap.css
similarity index 100%
rename from public/css/bootstrap.css
rename to client/css/bootstrap.css
diff --git a/client/index.html b/client/index.html
new file mode 100644
index 0000000..eaf3ad9
--- /dev/null
+++ b/client/index.html
@@ -0,0 +1,242 @@
+
+
+
+
+ Gwent
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/js/backbone.modal-min.js b/client/js/backbone.modal-min.js
similarity index 100%
rename from public/js/backbone.modal-min.js
rename to client/js/backbone.modal-min.js
diff --git a/public/js/client-lobby.js b/client/js/client-lobby.js
similarity index 100%
rename from public/js/client-lobby.js
rename to client/js/client-lobby.js
diff --git a/public/js/client.js b/client/js/client.js
similarity index 99%
rename from public/js/client.js
rename to client/js/client.js
index e0a7628..3f638ea 100644
--- a/public/js/client.js
+++ b/client/js/client.js
@@ -21,6 +21,7 @@ Handlebars.registerHelper("health", function(lives, options){
return out;
});
+/*
var Config = {};
Config.Server = {
@@ -28,6 +29,7 @@ Config.Server = {
"port": 16918,
secure: false
}
+*/
var App = Backbone.Router.extend({
routes: {
diff --git a/public/js/main.js b/client/js/main.js
similarity index 100%
rename from public/js/main.js
rename to client/js/main.js
diff --git a/public/scss/_backbone.modal.sass b/client/scss/_backbone.modal.sass
similarity index 100%
rename from public/scss/_backbone.modal.sass
rename to client/scss/_backbone.modal.sass
diff --git a/public/scss/_backbone.modal.theme.sass b/client/scss/_backbone.modal.theme.sass
similarity index 100%
rename from public/scss/_backbone.modal.theme.sass
rename to client/scss/_backbone.modal.theme.sass
diff --git a/public/scss/_style.sass b/client/scss/_style.sass
similarity index 100%
rename from public/scss/_style.sass
rename to client/scss/_style.sass
diff --git a/public/scss/main.scss b/client/scss/main.scss
similarity index 94%
rename from public/scss/main.scss
rename to client/scss/main.scss
index cef1200..f6990ad 100644
--- a/public/scss/main.scss
+++ b/client/scss/main.scss
@@ -123,9 +123,9 @@ i {
float: left;
height: 40px;
width: 40px;
- background: url("../assets/ruby-grey.png");
+ background: url("../../assets/ruby-grey.png");
&.ruby {
- background: url("../assets/ruby.png");
+ background: url("../../assets/ruby.png");
}
}
diff --git a/gulpfile.js b/gulpfile.js
index 5ac1162..ba9d3e6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -12,7 +12,7 @@ livereload({start: true});
gulp.task('browserify', function(){
- browserify('./public/js/main.js', {standalone: "app", debug: true})
+ browserify('./client/js/main.js', {standalone: "app", debug: true})
.transform(babelify)
.bundle().on("error", function(err){
console.log(err);
@@ -20,19 +20,20 @@ gulp.task('browserify', function(){
.pipe(source('app.js').on("error", function(err){
console.log(err);
}))
- .pipe(gulp.dest('./build/').on("error", function(err){
+ .pipe(gulp.dest('./public/build/').on("error", function(err){
console.log(err);
}));
+
});
gulp.task('sass', function(){
- gulp.src('./public/scss/main.scss')
+ gulp.src('./client/scss/main.scss')
.pipe(sass({
outputStyle: 'compressed'
}).on("error", function(err){
console.log(err);
}))
- .pipe(gulp.dest('./build/').on("error", function(err){
+ .pipe(gulp.dest('./public/build/').on("error", function(err){
console.log(err);
}))
.pipe(livereload().on("error", function(err){
@@ -41,7 +42,7 @@ gulp.task('sass', function(){
});
gulp.task("unit tests", function(){
- browserify('./test/spec/mainSpec.js', {standalone: "app", debug: true})
+ browserify('./test/src/mainSpec.js', {standalone: "app", debug: true})
.transform(babelify)
.bundle().on("error", function(err){
console.log(err);
@@ -55,9 +56,17 @@ gulp.task("unit tests", function(){
})
gulp.task("watch", function(){
- gulp.watch("./public/js/*", ["browserify"]);
- gulp.watch("./public/scss/*", ["sass"]);
- gulp.watch("./test/spec/*", ["unit tests"]);
+ gulp.watch("./client/js/*", ["browserify"]);
+ gulp.watch("./client/scss/*", ["sass"]);
+ gulp.watch("./test/src/*", ["unit tests"]);
})
-gulp.task("default", ["watch", "browserify", "sass", "unit tests"]);
+gulp.task("index", function() {
+ gulp.src("./client/index.html")
+ .pipe(gulp.dest("./public/"));
+
+ gulp.src("./client/css/bootstrap.css")
+ .pipe(gulp.dest("./public/build"));
+})
+
+gulp.task("default", ["watch", "browserify", "sass", "unit tests", "index"]);
diff --git a/public/Config.js b/public/Config.js
new file mode 100644
index 0000000..b86dc88
--- /dev/null
+++ b/public/Config.js
@@ -0,0 +1,8 @@
+
+window.Config = {};
+
+Config.Server = {
+ "hostname": "localhost",
+ "port": 16918,
+ secure: false
+}
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index b4d536e..eaf3ad9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,8 +4,9 @@
Gwent
-
-
+
+
+
-
+