Merge pull request #44 from DaoCasino/develop

Develop
DaoCasino · Dec 5, 2017 · ec6a281 · ec6a281
2 parents fe06ffb + 5c4d948
commit ec6a281
Show file tree

Hide file tree

Showing 19 changed files with 343 additions and 214 deletions.
diff --git a/DApps/FindTheEthereum b/DApps/FindTheEthereum
diff --git a/DApps/dicedapp_v2/bankroller.js b/DApps/dicedapp_v2/bankroller.js
@@ -1,11 +1,8 @@
 
 //(function(){
-window.MyDApp_debug = (function(){
-	var myDApp = new DCLib.DApp({code : 'dicedapp_v2'})
+window.MultDApp = (function(){
+	let DApp = new DCLib.DApp({slug : 'dicegame_v3'})
 
-	// Banroller side code
-	// console.log(myDApp)
-
-	return myDApp
+	return DApp
 })()
 
diff --git a/DApps/dicedapp_v2/dapp.manifest → DApps/dicedapp_v2/dapp.manifest.json b/DApps/dicedapp_v2/dapp.manifest → DApps/dicedapp_v2/dapp.manifest.json
@@ -1,6 +1,6 @@
 {
-	"name" : "DiceDAppExample2",
-	"code" : "dicedapp_v2",
+	"name" : "Dice Game v.2",
+	"slug" : "dicegame_v3",
 
 	"index" : "./index.html",
 	"logic" : "./dapp_logic.js",

diff --git a/DApps/dicedapp_v2/dapp_logic.js b/DApps/dicedapp_v2/dapp_logic.js
@@ -2,7 +2,7 @@
  * Define our DApp logic constructor, 
  * for use it in frontend and bankroller side
  */
-DCLib.defineDAppLogic('dicedapp_v2', function(){
+DCLib.defineDAppLogic('dicegame_v3', function(){
 	const _self = this
 
 	const MAX_RAND_NUM = 65536
@@ -12,7 +12,7 @@ DCLib.defineDAppLogic('dicedapp_v2', function(){
 
 	var Roll = function(user_bet, user_num, random_hash){
 		// convert 1BET to 100000000
-		user_bet = DCLib.Utils.bet4dec(user_bet)
+		user_bet = DCLib.Utils.bet2dec(user_bet)
 
 		// generate random number
 		const random_num = DCLib.numFromHash(random_hash, 0, 65536)

diff --git a/DApps/dicedapp_v2/index.html b/DApps/dicedapp_v2/index.html
@@ -23,7 +23,7 @@
 
 				// Create our DApp
 				DCLib.on('ready', function(){
-					window.MyDApp = new DCLib.DApp({code :'dicedapp_v2'})
+					window.MyDApp = new DCLib.DApp({slug : 'dicegame_v3'})
 				})
 
 
@@ -43,15 +43,16 @@
 
 			function startGame(deposit){
 				MyDApp.connect({
-					bankroller : 'auto', 
-					paychannel : { deposit : deposit } 
+					bankroller : '0x146c5e3b9395738eb67feceb5e37cd5a56d63342', 
+					paychannel : { deposit : deposit } ,
+					gamedata   : {type:'uint', value: [0, 0, 0]}
 				},
 				function(connected, info){
 					console.log('connect result:', connected)
 					console.log('connect info:', info)
 					if (!connected) return 
 
-					let maxbet = DCLib.Utils.bet2dec( info.channel.player_deposit )
+					let maxbet = DCLib.Utils.dec2bet( info.channel.player_deposit )
 
 					$('#user_bet')[0].max = Math.ceil( maxbet )
 					$('#user_bet').val( (maxbet*0.1).toFixed(2) )
@@ -198,7 +199,7 @@ <h3>1. Open game-channel</h3>
 				<form>
 					<label>
 						Set game deposit:
-						<input id="user_deposit" type="number" value="1.1" min="0" max="4" step="0.1">
+						<input id="user_deposit" type="number" value="1.1" min="0" max="4" step="0.001">
 					</label>
 					<input type="submit" value="Set">
 				</form>
@@ -212,7 +213,7 @@ <h3>1. Open game-channel</h3>
 				<h3>2. Play</h3>
 				<label>
 					your bet:
-					<input id="user_bet" type="number" value="1" min="0" max="4" step="0.1">
+					<input id="user_bet" type="number" value="1" min="0" max="4" step="0.001">
 				</label>
 				<label>
 					your num:

diff --git a/DApps/dicedapp_v2/lib/DC.js b/DApps/dicedapp_v2/lib/DC.js
diff --git a/DApps/example.zip b/DApps/example.zip
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "BankRollerApp",
-	"version": "0.2.3",
+	"version": "0.2.6",
 	"description": "Dao.Casino app for bankroller",
 	"author": "Dao Casino <team@dao.casino>",
 	"repository": {

diff --git a/public/index.electron.js b/public/index.electron.js
@@ -20,7 +20,7 @@ const url  = require('url')
 require('electron-debug')({
 	enabled:      true  ,
 	showDevTools: false ,
-});
+})
 
 
 // Check updates
@@ -87,9 +87,9 @@ function createWindow () {
 	const trayIcon = new Tray(path.join(__dirname, 'static/icons/icon-38.png'))
 	trayIcon.setToolTip('Dao.Casino')
 	trayIcon.setContextMenu(Menu.buildFromTemplate([
-		// { label: 'Show App', click:() => {
-		// 	mainWindow.show()
-		// } },
+		{ label: 'Show Dev Tools', click:() => {
+			mainWindow.webContents.openDevTools()
+		} },
 		{ label: 'Quit', click:() => {
 			app.isQuiting = true
 			app.quit()

diff --git a/public/index.html b/public/index.html
@@ -12,8 +12,6 @@
 		<meta name="format-detection"       content="address=no"/>
 
 		%META_INFORMATION%
-
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.20.19/system-production.js" type="text/javascript"></script>
 	</head>
 	<body>
 		<noscript>You need to enable JavaScript to run this app</noscript>

diff --git a/public/server.electron.js b/public/server.electron.js
@@ -107,17 +107,21 @@ const DApps = {
 		})
 	},
 
-	readManifest: function(path){
-		try	{
-			let dapp_config = JSON.parse(fs.readFileSync(path))	
-			if (typeof dapp_config.run !== 'object') {
-				let str = ''+dapp_config.run 
-				dapp_config.run = {client:str}
+	readManifest: function(file_path){
+		const tryReadFile = (path)=>{	
+			try	{
+				let dapp_config = JSON.parse(fs.readFileSync(path))	
+				if (typeof dapp_config.run !== 'object') {
+					let str = ''+dapp_config.run 
+					dapp_config.run = {client:str}
+				}
+				return dapp_config
+			} catch(e){
+				return false
 			}
-			return dapp_config
-		} catch(e){
-			return false
 		}
+
+		return tryReadFile(file_path) || tryReadFile(file_path+'.json')
 	},
 
 	upload: function(data, callback){
@@ -153,10 +157,10 @@ const DApps = {
 
 		fse.copySync( 
 			cp_from,
-			dapps_path + dapp_config.code 
+			dapps_path + dapp_config.slug 
 		)
 
-		this.init([dapp_config.code], callback )
+		this.init([dapp_config.slug], callback )
 	},
 
 	remove: function(key, callback){

diff --git a/src/index.electron.js b/src/index.electron.js
@@ -20,7 +20,7 @@ const url  = require('url')
 require('electron-debug')({
 	enabled:      true  ,
 	showDevTools: false ,
-});
+})
 
 
 // Check updates
@@ -87,9 +87,9 @@ function createWindow () {
 	const trayIcon = new Tray(path.join(__dirname, 'static/icons/icon-38.png'))
 	trayIcon.setToolTip('Dao.Casino')
 	trayIcon.setContextMenu(Menu.buildFromTemplate([
-		// { label: 'Show App', click:() => {
-		// 	mainWindow.show()
-		// } },
+		{ label: 'Show Dev Tools', click:() => {
+			mainWindow.webContents.openDevTools()
+		} },
 		{ label: 'Quit', click:() => {
 			app.isQuiting = true
 			app.quit()