Browse Source

Add quickbets; small fixes;

feature/split
Nero Ignis 5 years ago
parent
commit
4be2b991b3
  1. 23
      css/blackjack.css
  2. 0
      img/chips/chipBlackWhite.png
  3. 0
      img/chips/chipBlackWhite_border.png
  4. 0
      img/chips/chipBlackWhite_side.png
  5. 0
      img/chips/chipBlackWhite_sideBorder.png
  6. 0
      img/chips/chipBlue.png
  7. 0
      img/chips/chipBlueWhite.png
  8. 0
      img/chips/chipBlueWhite_border.png
  9. 0
      img/chips/chipBlueWhite_side.png
  10. 0
      img/chips/chipBlueWhite_sideBorder.png
  11. 0
      img/chips/chipBlue_border.png
  12. 0
      img/chips/chipBlue_side.png
  13. 0
      img/chips/chipBlue_sideBorder.png
  14. 0
      img/chips/chipGreen.png
  15. 0
      img/chips/chipGreenWhite.png
  16. 0
      img/chips/chipGreenWhite_border.png
  17. 0
      img/chips/chipGreenWhite_side.png
  18. 0
      img/chips/chipGreenWhite_sideBorder.png
  19. 0
      img/chips/chipGreen_border.png
  20. 0
      img/chips/chipGreen_side.png
  21. 0
      img/chips/chipGreen_sideBorder.png
  22. 0
      img/chips/chipRedWhite.png
  23. 0
      img/chips/chipRedWhite_border.png
  24. 0
      img/chips/chipRedWhite_side.png
  25. 0
      img/chips/chipRedWhite_sideBorder.png
  26. 0
      img/chips/chipWhite.png
  27. 0
      img/chips/chipWhiteBlue.png
  28. 0
      img/chips/chipWhiteBlue_border.png
  29. 0
      img/chips/chipWhiteBlue_side.png
  30. 0
      img/chips/chipWhiteBlue_sideBorder.png
  31. 0
      img/chips/chipWhite_border.png
  32. 0
      img/chips/chipWhite_side.png
  33. 0
      img/chips/chipWhite_sideBorder.png
  34. 52
      index.htm
  35. 12
      js/app.js

23
css/blackjack.css

@ -45,11 +45,26 @@ body {
padding: 20px 5px 5px 5px; padding: 20px 5px 5px 5px;
} }
#actions button { #actions button,
#actions a {
width: 100%; width: 100%;
margin-bottom: 5px; margin-bottom: 5px;
} }
#quick-bet-buttons {
padding-left: 25px;
padding-right: 25px;
}
#quick-bet-buttons div {
padding-left: 2px;
padding-right: 2px;
}
#quick-bet-buttons a {
padding: 5px;
}
#card-space { #card-space {
color: white; color: white;
} }
@ -58,7 +73,7 @@ body {
text-align: center; text-align: center;
color: white; color: white;
padding-top: 25px; padding-top: 25px;
padding-bottom: 25px; padding-bottom: 45px;
} }
.navbar-toggler { .navbar-toggler {
@ -71,3 +86,7 @@ body {
color: green; color: green;
margin: 3px 6px 3px 6px; margin: 3px 6px 3px 6px;
} }
.quick-bet {
height: 16px;
}

0
img/Chips/chipBlackWhite.png → img/chips/chipBlackWhite.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
img/Chips/chipBlackWhite_border.png → img/chips/chipBlackWhite_border.png

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
img/Chips/chipBlackWhite_side.png → img/chips/chipBlackWhite_side.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
img/Chips/chipBlackWhite_sideBorder.png → img/chips/chipBlackWhite_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
img/Chips/chipBlue.png → img/chips/chipBlue.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
img/Chips/chipBlueWhite.png → img/chips/chipBlueWhite.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
img/Chips/chipBlueWhite_border.png → img/chips/chipBlueWhite_border.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
img/Chips/chipBlueWhite_side.png → img/chips/chipBlueWhite_side.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
img/Chips/chipBlueWhite_sideBorder.png → img/chips/chipBlueWhite_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
img/Chips/chipBlue_border.png → img/chips/chipBlue_border.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
img/Chips/chipBlue_side.png → img/chips/chipBlue_side.png

Before

Width:  |  Height:  |  Size: 1011 B

After

Width:  |  Height:  |  Size: 1011 B

0
img/Chips/chipBlue_sideBorder.png → img/chips/chipBlue_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
img/Chips/chipGreen.png → img/chips/chipGreen.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
img/Chips/chipGreenWhite.png → img/chips/chipGreenWhite.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
img/Chips/chipGreenWhite_border.png → img/chips/chipGreenWhite_border.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
img/Chips/chipGreenWhite_side.png → img/chips/chipGreenWhite_side.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
img/Chips/chipGreenWhite_sideBorder.png → img/chips/chipGreenWhite_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
img/Chips/chipGreen_border.png → img/chips/chipGreen_border.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
img/Chips/chipGreen_side.png → img/chips/chipGreen_side.png

Before

Width:  |  Height:  |  Size: 1006 B

After

Width:  |  Height:  |  Size: 1006 B

0
img/Chips/chipGreen_sideBorder.png → img/chips/chipGreen_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
img/Chips/chipRedWhite.png → img/chips/chipRedWhite.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
img/Chips/chipRedWhite_border.png → img/chips/chipRedWhite_border.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
img/Chips/chipRedWhite_side.png → img/chips/chipRedWhite_side.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
img/Chips/chipRedWhite_sideBorder.png → img/chips/chipRedWhite_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
img/Chips/chipWhite.png → img/chips/chipWhite.png

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
img/Chips/chipWhiteBlue.png → img/chips/chipWhiteBlue.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
img/Chips/chipWhiteBlue_border.png → img/chips/chipWhiteBlue_border.png

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
img/Chips/chipWhiteBlue_side.png → img/chips/chipWhiteBlue_side.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
img/Chips/chipWhiteBlue_sideBorder.png → img/chips/chipWhiteBlue_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
img/Chips/chipWhite_border.png → img/chips/chipWhite_border.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
img/Chips/chipWhite_side.png → img/chips/chipWhite_side.png

Before

Width:  |  Height:  |  Size: 935 B

After

Width:  |  Height:  |  Size: 935 B

0
img/Chips/chipWhite_sideBorder.png → img/chips/chipWhite_sideBorder.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

52
index.htm

@ -16,7 +16,7 @@
<div id="root"> <div id="root">
<nav class="navbar navbar-expand-lg"> <nav class="navbar navbar-expand-lg">
<a class="navbar-brand" href="/blackjack/"> <a class="navbar-brand" href="/blackjack/">
<img src="img/Chips/chipBlueWhite.png" alt="logo"> <img src="img/chips/chipBlueWhite.png" alt="logo">
BlackJack BlackJack
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
@ -72,11 +72,13 @@
<div class="col-md-12 hand"> <div class="col-md-12 hand">
<h4> <h4>
Hand Hand
({{ handScore === 21 && usersHand.count < 2 ? 'BlackJack' : handScore > 21 ? 'Plus! ' + handScore : handScore }}) ({{ handScore === 21 && usersHand.count < 2 ? 'BlackJack' : handScore > 21 ? 'Plus! ' + handScore : handScore
}})
</h4> </h4>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<img :src="card.asset" :alt="card.symbol + '_' + card.points" class="playing-card" v-for="card in usersHand"> <img :src="card.asset" :alt="card.symbol + '_' + card.points" class="playing-card"
v-for="card in usersHand">
</div> </div>
</div> </div>
</div> </div>
@ -89,9 +91,11 @@
</div> </div>
<div class="col-md-2 card" id="actions"> <div class="col-md-2 card" id="actions">
<div class="card-body"> <div class="card-body">
<button class="btn btn-success" @click="startRound" v-if="!roundActive"> <div v-if="!roundActive">
<button class="btn btn-success" @click="startRound">
New round <i class="fas fa-play"></i> New round <i class="fas fa-play"></i>
</button> </button>
</div>
<button class="btn btn-success" @click="drawAnotherCard" v-if="roundActive"> <button class="btn btn-success" @click="drawAnotherCard" v-if="roundActive">
Draw a card <i class="fas fa-hand-pointer"></i> Draw a card <i class="fas fa-hand-pointer"></i>
@ -111,10 +115,44 @@
<label>Money available:</label> <label>Money available:</label>
<span class="font-weight-bold">{{ money }}</span> <span class="font-weight-bold">{{ money }}</span>
</div> </div>
<div class="form-group"> <div class="form-group" v-if="!roundActive">
<label>Place your bet:</label> <label>Place your bet:</label>
<input class="form-control bet-input" v-model="bet" v-if="!roundActive"> <input class="form-control bet-input" type="number" v-model="bet">
<input class="form-control bet-input" v-model="bet" v-else disabled/> </div>
<div class="form-group" v-else>
<label>Your bet:</label>
<span class="font-weight-bold">{{ bet }}</span>
</div>
<label class="font-weight-bold">Quick-Bets <small class="text-muted">(100, 250, 500, 1000)</small></label>
<div class="row">
<div class="col-12" id="quick-bet-buttons">
<div class="row">
<div class="col-3">
<a class="btn btn-success" @click="quickBet(100)">
<img class="quick-bet" src="img/chips/chipBlueWhite.png"/>
</a>
</div>
<div class="col-3">
<a class="btn btn-success" @click="quickBet(250)">
<img class="quick-bet" src="img/chips/chipGreenWhite.png"/>
</a>
</div>
<div class="col-3">
<a class="btn btn-success" @click="quickBet(500)">
<img class="quick-bet" src="img/chips/chipRedWhite.png"/>
</a>
</div>
<div class="col-3">
<a class="btn btn-success" @click="quickBet(1000)">
<img class="quick-bet" src="img/chips/chipBlackWhite.png"/>
</a>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

12
js/app.js

@ -13,7 +13,7 @@ let app = new Vue({
handScore: 0, handScore: 0,
dealerScore: 0, dealerScore: 0,
status: '', status: '',
bet: 0, bet: 100,
bankIsActive: false, bankIsActive: false,
bank: 0, bank: 0,
@ -356,6 +356,16 @@ let app = new Vue({
isMoney(number) { isMoney(number) {
return new Intl.NumberFormat('de-DE', {style: 'decimal'}).format(number); return new Intl.NumberFormat('de-DE', {style: 'decimal'}).format(number);
}, },
quickBet(bet) {
if (this.bet > this.money) {
alertify.notify('You don\'t have enough money to do this.', 'custom');
return false;
}
this.bet = bet;
this.startRound();
}
}, },
created() { created() {
this.cardDeck = this.generateDeck(); this.cardDeck = this.generateDeck();

Loading…
Cancel
Save