diff --git a/index.html b/index.html index d774035..4132230 100644 --- a/index.html +++ b/index.html @@ -13,8 +13,19 @@ -

UI Interface

+
+

Desert-Raspberries

+

Team name:

Desert Green River 0's

+
Team members: +
    +
  • Mike
    • +
  • Shanky
    • +
  • Adam
    • +
  • Sergey
    • +
+
+
diff --git a/package.json b/package.json index 593d89a..a5a08e3 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,19 @@ { - "name": "application-name", + "name": "desert-raspberries", "version": "0.0.1", - "private": true, + "private": false, "scripts": { - "start": "node app" + "main": "public/js/main.js", + "app": "app.js", + "bootstrap": "public/js/bootstrap.min.js", + "jquery": "public/js/jquery.min.js", + "socket.io": "public/js/socket.io.min.js" }, "dependencies": { "express": "3.0.5", - "socket.io": "*" + "socket.io": "0.9.10", + "http": "0.0.0", + "sys": "0.0.1" } } diff --git a/public/css/main.css b/public/css/main.css index 952a0ea..ef14de6 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -1,8 +1,8 @@ -div#mainContainer{ +div#nameContainer{ float: left; + display: inline; } -div#sliderContainer{ - float: right; +div#cubeContainer{ } div#cubeContainer { diff --git a/public/js/main.js b/public/js/main.js index a4847dc..8053e76 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -39,4 +39,7 @@ $(function () { document.getElementById('cube').style[prop] = "rotateX("+xAngle+"deg) rotateY("+yAngle+"deg)"; }); }); + $("div#cube").swipright(function () { + console.log("Swipped right!"); + }); }); \ No newline at end of file