Skip to content
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.

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

pull #6

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
c39ac9c
Update app.js
pradiptha Jun 15, 2015
87f9ef4
Update app.js
pradiptha Jun 15, 2015
29cf350
Update app.js
pradiptha Jun 15, 2015
3c1e427
Update app.js
pradiptha Jun 15, 2015
bde985c
Update app.js
pradiptha Jun 15, 2015
6a7522e
Update app.js
pradiptha Jun 15, 2015
06e3761
Update app.js
pradiptha Jun 18, 2015
1164e74
Update index.html
pradiptha Jun 18, 2015
f2f9582
Update bootstrap.min.css
pradiptha Jun 20, 2015
c74d837
Update style.css
pradiptha Jun 20, 2015
582b356
Update style.css
pradiptha Jun 20, 2015
8e32b0f
Update app.js
HASbet Jun 23, 2015
699c6c0
icon
pradiptha Jun 23, 2015
29c9e8a
.
pradiptha Jun 23, 2015
ba0db37
.
pradiptha Jun 23, 2015
6fcb4f2
.
pradiptha Jun 23, 2015
1b7aed9
app
pradiptha Jun 23, 2015
fc10f6e
.
pradiptha Jun 23, 2015
0424ea2
.
pradiptha Jun 23, 2015
e290a25
.
pradiptha Jun 23, 2015
fa866f2
.
pradiptha Jun 23, 2015
c3c3f42
.
pradiptha Jun 23, 2015
619b385
Revert "."
pradiptha Jun 23, 2015
5146042
Revert "."
pradiptha Jun 23, 2015
7dee2e1
.
pradiptha Jun 23, 2015
2c89f34
.
pradiptha Jun 23, 2015
289df59
,
pradiptha Jun 23, 2015
764f86e
.
pradiptha Jun 24, 2015
1bb2034
.
pradiptha Jun 24, 2015
fd1690d
,
pradiptha Jun 24, 2015
51b2808
.
pradiptha Jun 24, 2015
3eed0db
.
pradiptha Jun 24, 2015
ac1e7b3
.
pradiptha Jun 24, 2015
af3186e
.
pradiptha Jun 24, 2015
1fbdecc
.
pradiptha Jun 24, 2015
3a547e5
.
pradiptha Jun 24, 2015
7804696
.
pradiptha Jun 24, 2015
fe517ec
.
pradiptha Jun 24, 2015
750a16a
.
pradiptha Jun 24, 2015
a54f1e5
.
pradiptha Jun 24, 2015
a5e4f20
.
pradiptha Jun 24, 2015
a150955
.
pradiptha Jun 24, 2015
80a072b
.
pradiptha Jun 24, 2015
2846d6d
.
pradiptha Jun 24, 2015
61b6ac5
.
pradiptha Jun 24, 2015
82544bf
Revert "."
pradiptha Jun 24, 2015
97bae85
.
pradiptha Jun 25, 2015
d3085c8
Revert "."
pradiptha Jun 25, 2015
972f938
.
pradiptha Jun 25, 2015
3d446a3
Revert "."
pradiptha Jun 25, 2015
75816fd
Update app.js
HASbet Jul 24, 2015
f4eb64f
Update app.js
HASbet Jul 24, 2015
378f890
Update app.js
HASbet Jul 24, 2015
e639ddf
Update app.js
HASbet Aug 28, 2015
753fb12
Merge remote-tracking branch 'untitled-dice/master'
HASbet Aug 28, 2015
fb8ad25
house
HASbet Aug 28, 2015
b6b4e23
Revert "house"
HASbet Aug 29, 2015
d29a090
11
HASbet Aug 29, 2015
436aa60
Update app.js
HASbet Dec 14, 2015
726c909
Update app.js
HASbet Dec 14, 2015
b25c61d
Update app.js
HASbet Dec 14, 2015
3c9359f
Update app.js
HASbet Dec 14, 2015
38197ed
Update app.js
HASbet Dec 14, 2015
429952a
Update app.js
HASbet Dec 14, 2015
565e240
Update app.js
HASbet Dec 15, 2015
a332b8f
Add files via upload
HASbet Sep 20, 2018
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
Binary file added 20073159.mp4
Binary file not shown.
38 changes: 30 additions & 8 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

var config = {
// - Your app's id on moneypot.com
app_id: 18, // <----------------------------- EDIT ME!
app_id: 74, // <----------------------------- EDIT ME!
// - Displayed in the navbar
app_name: 'Untitled Dice',
app_name: 'HASbet',
// - For your faucet to work, you must register your site at Recaptcha
// - https://www.google.com/recaptcha/intro/index.html
recaptcha_sitekey: '6LfI_QUTAAAAACrjjuzmLw0Cjx9uABxb8uguLbph', // <----- EDIT ME!
redirect_uri: 'https://untitled-dice.github.io',
recaptcha_sitekey: '6LcnvAgTAAAAAMmJyqRTyubwb0aRNvZh1qUtgvUA', // <----- EDIT ME!
redirect_uri: 'https://hasbet.github.io',
mp_browser_uri: 'https://www.moneypot.com',
mp_api_uri: 'https://api.moneypot.com',
chat_uri: '//socket.moneypot.com',
Expand All @@ -21,7 +21,7 @@ var config = {
force_https_redirect: !isRunningLocally(),
// - Configure the house edge (default is 1%)
// Must be between 0.0 (0%) and 1.0 (100%)
house_edge: 0.01,
house_edge: 0.02,
chat_buffer_size: 250,
// - The amount of bets to show on screen in each tab
bet_buffer_size: 25
Expand Down Expand Up @@ -1268,6 +1268,11 @@ var BetBoxWager = React.createClass({
var n = betStore.state.wager.num * 2;
Dispatcher.sendAction('UPDATE_WAGER', { str: n.toString() });

},
_onMinWager: function() {
var n = 1;
Dispatcher.sendAction('UPDATE_WAGER', { str: n.toString() });

},
_onMaxWager: function() {
// If user is logged in, use their balance as max wager
Expand Down Expand Up @@ -1329,6 +1334,17 @@ var BetBoxWager = React.createClass({
'2x ', worldStore.state.hotkeysEnabled ? el.kbd(null, 'C') : ''
)
),
el.div(
{className: 'btn-group'},
el.button(
{
className: 'btn btn-default btn-md',
type: 'button',
onClick: this._onMinWager
},
'Min', worldStore.state.hotkeysEnabled ? el.kbd(null, 'V') : ''
)
),
el.div(
{className: 'btn-group'},
el.button(
Expand Down Expand Up @@ -2315,15 +2331,15 @@ function onRecaptchaLoad() {
}

$(document).on('keydown', function(e) {
var H = 72, L = 76, C = 67, X = 88, keyCode = e.which;
var H = 72, L = 76, C = 67, X = 88, V = 86, keyCode = e.which;

// Bail is hotkeys aren't currently enabled to prevent accidental bets
if (!worldStore.state.hotkeysEnabled) {
return;
}

// Bail if it's not a key we care about
if (keyCode !== H && keyCode !== L && keyCode !== X && keyCode !== C) {
if (keyCode !== H && keyCode !== L && keyCode !== X && keyCode !== C && keyCode !== V) {
return;
}

Expand All @@ -2345,7 +2361,13 @@ $(document).on('keydown', function(e) {
num: downWager,
str: downWager.toString()
});

break;
case V: // Decrease wager
var minWager = 1;
Dispatcher.sendAction('UPDATE_WAGER', {
num: minWager,
str: minWager.toString()
});
break;
case L: // Bet lo
$('#bet-lo').click();
Expand Down
Binary file modified favicon.ico
Binary file not shown.
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<!doctype html>
<head>
<title>Untitled Dice</title>
<title>HASbet</title>
<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="node_modules/bootstrap/dist/css/bootstrap-theme.min.css" rel="stylesheet">
<link href="style.css" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1" />
</head>
<body>
<div id="app"></div>
Expand Down
25 changes: 19 additions & 6 deletions style.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,25 @@
html {
background-color: #09B55F;
}

body {
margin-top: 20px;
margin-top: 30px;
margin-left: 30px;
margin-right: 30px;
margin-bottom: 30px;
padding: 5px;
border: 2px solid #E0E0E0;
background-repeat: no-repeat;
}

.navbar .navbar-brand {
color: #777777;
color: #00CCBF;
font-size: 42px;
}

.navbar .brand-name:hover {
text-decoration: underline;
float: left;
}

/* ChatBox */
Expand All @@ -28,19 +41,19 @@ body {
.rotate {
display: inline-block;
-webkit-animation-name: rotate;
-webkit-animation-duration: 2s;
-webkit-animation-duration: 3s;
-webkit-animation-iteration-count: infinite;
-webkit-animation-timing-function: linear;
-moz-animation-name: rotate;
-moz-animation-duration: 2s;
-moz-animation-duration: 3s;
-moz-animation-iteration-count: infinite;
-moz-animation-timing-function: linear;
-o-animation-name: rotate;
-o-animation-duration: 2s;
-o-animation-duration: 3s;
-o-animation-iteration-count: infinite;
-o-animation-timing-function: linear;
animation-name: rotate;
animation-duration: 2s;
animation-duration: 3s;
animation-iteration-count: infinite;
animation-timing-function: linear;
}
Expand Down