Skip to content

Commit 2d96cd1

Browse files
grwgreggrwgreg
committedNov 5, 2016
removed ui router but need to factor out into individual directives
1 parent 3e40c1a commit 2d96cd1

File tree

7 files changed

+119
-98
lines changed

7 files changed

+119
-98
lines changed
 

‎app/index.html

+65-2
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,77 @@
1717
</head>
1818
<body ng-app="rangeStatApp">
1919

20-
<div ng-controller="MainCtrl as main" class="views-container clearfix">
20+
<div ng-controller="MainCtrl as main" class="views-container main clearfix">
21+
<!--
2122
<div ui-view="rangeSelector" class="range-selector"></div>
2223
<div ui-view="rangeChart" class="range-chart"></div>
24+
-->
25+
<div class="range-selector">
26+
<deb></deb>
27+
28+
<div class="card-matrix" ng-controller="cardMatrixCtrl as cardMatrix">
29+
<ul>
30+
<li ng-repeat="row in ::cardMatrix.matrix">
31+
<preflop-hand ng-repeat="cardData in ::row"
32+
ranks='{{cardData.cards}}'
33+
suit-type='{{cardData.type}}'
34+
active="main.active">
35+
</preflop-hand>
36+
</li>
37+
</ul>
38+
</div><!-- /cardMatrix -->
39+
40+
<div class="board-matrix" ng-controller="boardMatrixCtrl as boardMatrix">
41+
<ul>
42+
<li ng-repeat="rank in ::boardMatrix.ranks">
43+
<board-card ng-repeat="suit in ::boardMatrix.suits" board="main.board" rank="{{rank}}" suit="{{suit}}"></board-card>
44+
</li>
45+
</ul>
46+
<div class="board-display">
47+
<ul>
48+
<li ng-repeat="card in main.board">
49+
{{card[0]}}<span class="{{boardMatrix.suitIcon[card[1]]}}"></span>
50+
</li>
51+
</ul>
2352
</div>
53+
</div><!-- /board-matrix -->
54+
55+
<div ng-controller="suitMatrixCtrl as suitMatrix">
56+
<h2>{{main.active.tag}}</h2>
57+
<ul class="suit-matrix">
58+
<li ng-repeat="row in ::suitMatrix.matrix">
59+
<hand-suits ng-repeat="suits in ::row" active="main.active" suits="{{suits}}"></hand-suits>
60+
</li>
61+
</ul>
62+
</div><!-- /suitMatrixCtrl -->
63+
64+
<input class = 'range-string'
65+
ng-model='main.rangeStringDummy'
66+
range-string-model='main.rangeStringModel'
67+
active-input-mode='main.active'
68+
range-string preflop-hands='main.preflopHands'
69+
type='text'>
70+
71+
</div><!-- /range-selector -->
72+
73+
<div class="range-chart" ng-controller="RangeChartCtrl as rangeChart">
74+
<svg id="bar-chart" bar-chart tip="rangeChart.tip" percent-of-group=rangeChart.percentOfGroup data="rangeChart.data" ng-click="rangeChart.changeChart($event)"></svg>
75+
<div class="bar-combos">this is the hover el that shows current bar's hand combos</div>
76+
<p>Kc, 9s, Th</p>
77+
<p>AK-2, KK-33 fill this otu later</p>
78+
<div class="chart-container">
79+
<button ng-click="rangeChart.load()">Load Chart</button>
80+
<input ng-model='greg'/>
81+
<button ng-click="rangeChart.togglePercentOfGroup()" ng-disabled="rangeChart.isMain()">Show Percent of something</button>
82+
<div class="chart-title">Showing Percent of {{rangeChart.group}}</div>
83+
</div><!-- chart-container -->
84+
</div><!-- range-chart -->
2485

86+
</div><!-- /main -->
87+
<!--
2588
<a ui-sref="range({board: 'Ah,Kc,Js', range: 'KK,QTs,88-22'})">change</a>
2689
<a ui-sref="index">range</a>
90+
-->
2791

2892
<!-- build:js(.) scripts/oldieshim.js -->
2993
<!--[if lt IE 9]>
@@ -55,7 +119,6 @@
55119
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
56120
<script src="bower_components/angular-touch/angular-touch.js"></script>
57121
<script src="bower_components/underscore/underscore.js"></script>
58-
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
59122
<script src="bower_components/d3/d3.js"></script>
60123
<!-- endbower -->
61124
<!-- endbuild -->

‎app/scripts/app.js

+1-26
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,10 @@
22

33
var rangeStatApp = angular.module('rangeStatApp', [
44
'ngResource',
5-
'ui.router',
65
'underscore',
76
'd3js'
87
])
9-
.config(['$locationProvider', '$stateProvider', '$urlRouterProvider', function ($locationProvider, $stateProvider, $urlRouterProvider) {
10-
11-
$stateProvider
12-
.state('range', {
13-
url: "/range/:board/:range",
14-
views: {
15-
rangeSelector: {
16-
templateUrl: "views/base.html",
17-
// controller: 'MainCtrl as main'
18-
},
19-
rangeChart: {
20-
templateUrl: "views/rangechart.html",
21-
controller: 'RangeChartCtrl as rangeChart',
22-
}
23-
}
24-
})
25-
.state('index', {
26-
url: "/",
27-
template: "<div>INDOX</div>"
28-
});
29-
30-
31-
32-
33-
$urlRouterProvider.otherwise('index')
8+
.config(['$locationProvider', function ($locationProvider) {
349

3510
// $locationProvider.html5Mode(true);
3611

‎app/scripts/controllers/main.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
'use strict';
22

3-
rangeStatApp.controller('MainCtrl', ['$scope', '$rootScope', 'preflopHands', 'activeInputMode', '$state', '$stateParams', function ($scope, $rootScope, preflopHands, activeInputMode, $state, $stateParams) {
3+
rangeStatApp.controller('MainCtrl', ['$scope', '$rootScope', 'preflopHands', 'activeInputMode', function ($scope, $rootScope, preflopHands, activeInputMode) {
44

55
var vm = this;
66
vm.preflopHands = preflopHands;
77
vm.active = activeInputMode;
88
vm.board=[];
99

10+
/*
1011
$rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams){
1112
vm.rangeStringModel = toParams.range;
1213
vm.rangeStringDummy = toParams.range;
1314
vm.board = toParams.board.split(',');
1415
});
16+
should I set initial values here?
17+
*/
18+
vm.rangeStringModel = '';
19+
vm.rangeStringDummy = '';
20+
vm.board = [];
1521

1622
}])
1723

@@ -25,6 +31,7 @@ rangeStatApp.controller('MainCtrl', ['$scope', '$rootScope', 'preflopHands', 'ac
2531
controller: ['$scope', function($scope) { //link works here too
2632
$scope.deb = function() {
2733
console.log($scope.main.board);
34+
console.log($scope.main.preflopHands);
2835
};
2936
}]
3037
};

‎app/scripts/controllers/rangechart.js

+45-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
rangeStatApp.controller('RangeChartCtrl', ['$stateParams', '_', function($stateParams, _) {
3+
rangeStatApp.controller('RangeChartCtrl', ['_', '$scope','$http', function(_, $scope, $http) {
44
var vm = this;
55
vm.load = function() {
66
var x = ['fullHousePlus', 'pairPlusDraw', 'pairs', 'draws', 'overcards', 'main'];
@@ -11,6 +11,33 @@ rangeStatApp.controller('RangeChartCtrl', ['$stateParams', '_', function($stateP
1111
}
1212

1313
console.log('im so confused');
14+
/*
15+
console.log($scope.main);
16+
$scope.$watch(function(){return $scope.main.board.length},function() {
17+
console.log('changed');
18+
var range = $scope.main.rangeStringModel.replace(/\s+/g, '');
19+
var board = $scope.main.board.join(',').replace(/\s+/g,'');
20+
$http({
21+
method: 'GET',
22+
url: 'http://localhost:3000/' + board +'/'+range
23+
}).then(function successCallback(response) {
24+
console.log(range);
25+
console.log(board);
26+
var data = JSON.parse(response.data);
27+
console.log(data);
28+
var chartsData = buildChartData(data);
29+
vm.data = chartsData['main'];//this line will be in callback we provide to service or maybe do it
30+
//via promises in controller, need access to this vm variable?
31+
}, function errorCallback(response) {
32+
// called asynchronously if an error occurs
33+
// or server returns response with an error status.
34+
});
35+
});
36+
*/
37+
console.log('im so confused');
38+
39+
40+
1441
vm.group = 'main';
1542

1643
vm.tip = {
@@ -47,20 +74,17 @@ console.log('im so confused');
4774
}
4875
}
4976

50-
var data = mockRangeData();
51-
data = JSON.parse(data);
52-
53-
var handGroups = {
54-
fullHousePlus: ['full_house', 'quads', 'straight_flush'],
55-
pairPlusDraw: ['pair_plus_gutshot', 'pair_plus_oesd', 'pair_plus_flush_draw', 'pair_plus_over'],
56-
pairs: ['premium_pocket', 'pocket_pair', 'over_pair', 'top_pair', 'high_pair', 'mid_pair', 'low_pair'],
57-
draws: ['combo_draw', 'flush_draw', 'oesd', 'doublegut', 'gutshot'],
58-
overcards: ['ace_high', 'premium_overs', 'over_cards', 'one_over_card'],
59-
main: ['full_house_plus', 'flush', 'straight', 'trips', 'two_pair', 'pair', 'pair_plus_draw', 'draws', 'overcards']
60-
};
61-
6277

6378

79+
var handGroups = {
80+
fullHousePlus: ['full_house', 'quads', 'straight_flush'],
81+
pairPlusDraw: ['pair_plus_gutshot', 'pair_plus_oesd', 'pair_plus_flush_draw', 'pair_plus_over'],
82+
pairs: ['premium_pocket', 'pocket_pair', 'over_pair', 'top_pair', 'high_pair', 'mid_pair', 'low_pair'],
83+
draws: ['combo_draw', 'flush_draw', 'oesd', 'doublegut', 'gutshot'],
84+
overcards: ['ace_high', 'premium_overs', 'over_cards', 'one_over_card'],
85+
main: ['full_house_plus', 'flush', 'straight', 'trips', 'two_pair', 'pair', 'pair_plus_draw', 'draws', 'overcards']
86+
};
87+
function buildChartData(data) {
6488
data.full_house_plus.showNext = 'fullHousePlus';
6589
data.pair_plus_draw.showNext = 'pairPlusDraw';
6690
data.overcards.showNext = 'overcards';
@@ -76,6 +100,9 @@ console.log('im so confused');
76100
overcards: prepData(data, handGroups.overcards),
77101
}
78102

103+
return chartsData;
104+
}
105+
79106
function prepData(data, handGroup) {
80107

81108
return _.reduce(handGroup, function(m, hand) {
@@ -111,8 +138,12 @@ console.log('im so confused');
111138
return now.join(' ');
112139
}
113140

114-
vm.data = chartsData['main'];
115141

142+
//data to show on intial load
143+
var data = mockRangeData();
144+
data = JSON.parse(data);
145+
var chartsData = buildChartData(data);
146+
vm.data = chartsData['main'];
116147

117148

118149
}]);

‎app/views/base.html

-44
This file was deleted.

‎app/views/rangechart.html

-10
This file was deleted.

‎bower.json

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"angular-sanitize": "^1.3.0",
1414
"angular-touch": "^1.3.0",
1515
"underscore": "~1.7.0",
16-
"angular-ui-router": "~0.2.13",
1716
"d3": "~3.5.5"
1817
},
1918
"devDependencies": {

0 commit comments

Comments
 (0)
Please sign in to comment.