Permalink
Browse files

Merge pull request #2 from J-O-K-E-R/master

Accept this shit
  • Loading branch information...
tfwyatt committed Oct 7, 2017
2 parents 9235290 + 70fd184 commit c897fd73fd288c50bd71fabb09373e6669a937a6
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -35,9 +35,9 @@ $(document).ready(function() {
socket.on("render player", function(player) {
$(".player-name").text(player.name);
$(".player-money").text(player.money);
$(".player-money").text("Current Money: " + player.money);
$.each(stocks, function(i) {
$("#player-" + stocks[i].toLowerCase()).text(player.stocks[i]);
$("#player-" + stocks[i].toLowerCase()).text( stocks[i] + ": " +player.stocks[i]);
});
});
View
@@ -1,5 +1,6 @@
body {
background: url(../static/Images/StockTickers.png);
background: url(../static/Images/SMALL.JPG) no-repeat;
background-size: 100%;
text-shadow: 1px 1px 2px black;
color: white;
text-align: center;
View
@@ -1,8 +1,6 @@
body {
margin: 0;
padding: 0;
/*background: url(../static/Images/vignette.png) no-repeat;
background-size: 100%;*/
text-shadow: 1px 1px 2px black;
color: white;
@@ -22,29 +20,46 @@ a {
a:hover {
color: red;
}
.tint {
z-index: 1;
height: 100%;
width: 100%;
position: absolute;
top: 0px;
left: 0px;
margin: 0;
padding: 0;
background: rgba(74, 75, 76, 0.7);
}
.stock-element {
display: inline-block;
width: 16%;
width: 10%;
text-align: center;
border-style: solid;
border-width: 2px;
margin:0;
padding: 0;
}
.stock-container {
padding: 0;
margin: 0;
}
.container {
margin: 20px 500px;
padding: 0px;
padding: 0;
text-align: center;
}
.roll-container {
margin: 25px auto;
width: 100%;
text-align: center;
}
.history-boxes {
margin: 25px auto;
text-align: center;
}
@@ -55,10 +70,25 @@ a:hover {
.roll-display {
margin: 0px;
padding: 5px;
width: 100%;
width: 90%;
text-align: center;
}
#roll-history {
#roll-history div {
padding: 5px;
display: inline-block;
}
.player-money {
margin-top: 5px;
margin-bottom: 10px;
}
.player-name {
font-size: 25px;
text-decoration: underline;
}
#history-title {
font-size: 25px;
text-decoration: underline;
}
View
@@ -10,80 +10,90 @@
<div class="tint">
<a id="home" href="/">Home</a>
<div class="container">
<div class="roll-container">
<div class="roll-display">
<div id="roll-stock"></div>
<div id="roll-dir"></div>
<div id="roll-num"></div>
</div>
</div>
<ul class="stock-container">
<li class="stock-element">
<div class="stock-value" id="Grain"></div>
<div class="stock-name">grain</div>
<div id="grain-box">
<div class="stock-value" id="Grain"></div>
<div class="stock-name">Grain</div>
</div>
</li>
<li class="stock-element">
<div class="stock-value" id="Industrial"></div>
<div class="stock-name">industrial</div>
<div id="ind-box">
<div class="stock-value" id="Industrial"></div>
<div class="stock-name">Industrial</div>
</div>
</li>
<li class="stock-element">
<div class="stock-value" id="Bonds"></div>
<div class="stock-name">bonds</div>
<div id="bonds-box">
<div class="stock-value" id="Bonds"></div>
<div class="stock-name">Bonds</div>
</div>
</li>
<li class="stock-element">
<div class="stock-value" id="Oil"></div>
<div class="stock-name">oil</div>
<div id="oil-box">
<div class="stock-value" id="Oil"></div>
<div class="stock-name">Oil</div>
</div>
</li>
<li class="stock-element">
<div class="stock-value" id="Silver"></div>
<div class="stock-name">silver</div>
<div id="silver-box">
<div class="stock-value" id="Silver"></div>
<div class="stock-name">Silver</div>
</div>
</li>
<li class="stock-element">
<div class="stock-value" id="Gold"></div>
<div class="stock-name">gold</div>
<div id="gold-box">
<div class="stock-value" id="Gold"></div>
<div class="stock-name">Gold</div>
</div>
</li>
</ul>
<div class="roll-container">
<div class="roll-display">
<div id="roll-stock"></div>
<div id="roll-dir"></div>
<div id="roll-num"></div>
</div>
<div class="history-boxes">
<div id="history-title">Recent Changes</div>
<ul id="roll-history">
</ul>
</div>
<div class="player-container">
<div class="player-name"></div>
<div>Current Dosh:</div>
<div class="player-money"></div>
<ul class="player-stocks">
<li class="player-stock">
<div id ="player-grain"></div>
<div>Grain</div>
<button class="button buy" id="buy-grain">Buy</button>
<button class="button sell" id="sell-grain">Sell</button>
</li>
<li class="player-stock">
<div id="player-industrial"></div>
<div>Industrial</div>
<button class="button buy" id="buy-industrial">Buy</button>
<button class="button sell" id="sell-industrial">Sell</button>
</li>
<li class="player-stock">
<div id="player-bonds"></div>
<div>Bonds</div>
<button class="button buy" id="buy-bonds">Buy</button>
<button class="button sell" id="sell-bonds">Sell</button>
</li>
<li class="player-stock">
<div id="player-oil"></div>
<div>Oil</div>
<button class="button buy" id="buy-oil">Buy</button>
<button class="button sell" id="sell-oil">Sell</button>
</li>
<li class="player-stock">
<div id="player-silver"></div>
<div>Silver</div>
<button class="button buy" id="buy-silver">Buy</button>
<button class="button sell" id="sell-silver">Sell</button>
</li>
<li class="player-stock">
<div id="player-gold"></div>
<div>Gold</div>
<button class="button buy" id="buy-gold">Buy</button>
<button class="button sell" id="sell-gold">Sell</button>
</li>

0 comments on commit c897fd7

Please sign in to comment.