Skip to content

Added broadcast and team members #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sparkyfen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added broadcast and team members #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fd92e2
added broadcast and team members
sparkyfen Apr 13, 2013
271a086
edited main
sparkyfen Apr 14, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,19 @@
<script type="text/javascript" src="js/socket.io.min.js"></script>
</head>
<body>
<h2>UI Interface</h2>
<div class="wrapper">
<div class="container" id="nameContainer">
<h2>Desert-Raspberries</h2>
<h3>Team name:<h3><h4>Desert Green River 0's</h4>
<h5>Team members:
<ul>
<li>Mike</li>
<li>Shanky</li>
<li>Adam</li>
<li>Sergey</li>
</ul>
</h5>
</div>
<div id="cubeContainer">
<div id="cube">
<div class="face one">
Expand Down
14 changes: 10 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
}

6 changes: 3 additions & 3 deletions public/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
div#mainContainer{
div#nameContainer{
float: left;
display: inline;
}
div#sliderContainer{
float: right;
div#cubeContainer{
}

div#cubeContainer {
Expand Down
3 changes: 3 additions & 0 deletions public/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@ $(function () {
document.getElementById('cube').style[prop] = "rotateX("+xAngle+"deg) rotateY("+yAngle+"deg)";
});
});
$("div#cube").swipright(function () {
console.log("Swipped right!");
});
});