From c4af2fe556229621ddf80fb04439e6ae0b1d7772 Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Sat, 26 Sep 2015 20:35:07 -0600 Subject: [PATCH 1/9] all complete for now - ready to tackle services --- angProject-app.css | 6 + angProject-app.js | 47 +++++ angProject-index.html | 39 ++++ angular-playground.sln | 37 ++++ app/components/bindings/BindingsController.js | 3 +- app/components/bindings/bindings.html | 6 +- .../controllers/ControllersController.js | 11 +- app/components/controllers/controllers.html | 21 ++- .../expressions/ExpressionsController.js | 2 +- app/components/expressions/expressions.html | 6 +- app/components/repeat/RepeatController.js | 133 ++++++++------ app/components/repeat/repeating.html | 167 +++++++++--------- assets/css/site.css | 7 + 13 files changed, 331 insertions(+), 154 deletions(-) create mode 100644 angProject-app.css create mode 100644 angProject-app.js create mode 100644 angProject-index.html create mode 100644 angular-playground.sln diff --git a/angProject-app.css b/angProject-app.css new file mode 100644 index 0000000..935d6b7 --- /dev/null +++ b/angProject-app.css @@ -0,0 +1,6 @@ +body { + background-color: lightblue; +} +.button-custom { + background-color:lightgreen; +} \ No newline at end of file diff --git a/angProject-app.js b/angProject-app.js new file mode 100644 index 0000000..6884156 --- /dev/null +++ b/angProject-app.js @@ -0,0 +1,47 @@ +var app = angular.module('racingFrogs', []); +app.controller('MainController', MainController); +//No need to change anything above this line. + +function MainController() { + var vm = this; //instead of using this when refering to the controller, let's use vm. It will make things easier. + vm.working = "Yes"; + vm.joe = new Guy("Joe", 100); + vm.bob = new Guy("Bob", 150); + vm.bank = 200; + + function Guy(name, startingCash) { + this.name = name; + this.cash = startingCash; + this.giveCash = function (amount) { + if (amount <= this.cash && amount > 0) { + this.cash = this.cash - amount; + return amount; + } else { + console.log("I don't have enough cash to give you " + amount + ". " + this.name + " says..."); + return 0; + } + }; + this.receiveCash = function (amount) { + if (amount > 0) { + this.cash = this.cash + amount; + return amount; + } else { + console.log(amount + " isn't an amount I'll take " + this.name + " says..."); + return 0; + } + } + } + + vm.giveMoneyToJoe = function () { + if (vm.bank >= 10) { + vm.bank -= vm.joe.receiveCash(10); + } else { + alert("The bank is out of money."); + } + } + + vm.receiveMoneyFromBob = function () { + vm.bank += vm.bob.giveCash(5); + } + +} \ No newline at end of file diff --git a/angProject-index.html b/angProject-index.html new file mode 100644 index 0000000..68b6fbc --- /dev/null +++ b/angProject-index.html @@ -0,0 +1,39 @@ + + + + + Racing Frogs + + + + + +
+
+
+
+ Fun with Joe and Bob
+ Angular Working? : {{vm.working}} +
+
+

+ Joe has {{ vm.joe.cash }} +

+

+ Bob has {{ vm.bob.cash }} +

+

+ The bank has {{ vm.bank }} +

+
+
+ Give $10 to Joe + Receive $5 from Bob +
+
+
+ + + + + diff --git a/angular-playground.sln b/angular-playground.sln new file mode 100644 index 0000000..f3c421b --- /dev/null +++ b/angular-playground.sln @@ -0,0 +1,37 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "angular-playground", ".", "{1C264CEB-6514-436C-8705-3789D954C442}" + ProjectSection(WebsiteProperties) = preProject + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" + Debug.AspNetCompiler.VirtualPath = "/localhost_52606" + Debug.AspNetCompiler.PhysicalPath = "..\..\..\..\..\..\source\angular-playground\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_52606\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/localhost_52606" + Release.AspNetCompiler.PhysicalPath = "..\..\..\..\..\..\source\angular-playground\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_52606\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "52606" + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C264CEB-6514-436C-8705-3789D954C442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C264CEB-6514-436C-8705-3789D954C442}.Debug|Any CPU.Build.0 = Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/app/components/bindings/BindingsController.js b/app/components/bindings/BindingsController.js index 281242d..87d65a6 100644 --- a/app/components/bindings/BindingsController.js +++ b/app/components/bindings/BindingsController.js @@ -5,5 +5,6 @@ app.controller('BindingsController', BindingsController); function BindingsController(){ this.bindingsStatus = 'Working'; - this.name= "Please enter your Name"; + this.name = "Please enter your Name"; + this.somethingOfYourChoice = "Something of your choice"; } \ No newline at end of file diff --git a/app/components/bindings/bindings.html b/app/components/bindings/bindings.html index c6bb99f..2887c17 100644 --- a/app/components/bindings/bindings.html +++ b/app/components/bindings/bindings.html @@ -36,10 +36,10 @@

Exercises

diff --git a/app/components/controllers/ControllersController.js b/app/components/controllers/ControllersController.js index 6a3d65f..aecba63 100644 --- a/app/components/controllers/ControllersController.js +++ b/app/components/controllers/ControllersController.js @@ -4,5 +4,12 @@ app.controller('ControllersController', ControllersController); function ControllersController(){ - this.controllersStatus = 'Working'; -} \ No newline at end of file + this.controllersStatus = 'Working'; + this.friends = ['Joey', 'Chandler', 'Monica', 'Phebes', 'Ross & Rachel']; + this.addFriend = function () { + if (this.newFriend) { + this.friends.push(this.newFriend); + this.newFriend = null; + } + } +} diff --git a/app/components/controllers/controllers.html b/app/components/controllers/controllers.html index 4c6da3a..f04e7c6 100644 --- a/app/components/controllers/controllers.html +++ b/app/components/controllers/controllers.html @@ -32,12 +32,18 @@

Exercises

create a property in the constructor called friends which will be an array of strings ['Joey', 'Chandler', 'Monica', 'Phebes', 'Ross & Rachel']; -
-
    -
  • {{friend}}
    • -
-
- +

+
    +

    Friends

    +
    +
      +
        +
      • {{friend}}
        • +
      +
    +
    +

+
  • Write a function called addFriend that will take the input from ng-model="controller.newFriend" If done correctly you should see your new friend pop up on the list above once you click submit
    @@ -50,4 +56,5 @@

    Exercises

    • - \ No newline at end of file + + diff --git a/app/components/expressions/ExpressionsController.js b/app/components/expressions/ExpressionsController.js index f90acbf..e2ee29d 100644 --- a/app/components/expressions/ExpressionsController.js +++ b/app/components/expressions/ExpressionsController.js @@ -5,5 +5,5 @@ app.controller('ExpressionsController', ExpressionsController); function ExpressionsController(){ this.expressionsStatus = 'Working'; - this.test = 'Angular is really neat! Look how easy it was for you to connect this string to your view'; + this.test = 'Angular is really neat! Look how easy it was for you to connect this string to your view'; } \ No newline at end of file diff --git a/app/components/expressions/expressions.html b/app/components/expressions/expressions.html index ca65403..f53d197 100644 --- a/app/components/expressions/expressions.html +++ b/app/components/expressions/expressions.html @@ -69,19 +69,19 @@

    Exercises

  • Write a math equation that Angular can evaluate
    - {{}} + {{8 + 8}}
  • Using string concatination get the customary Hello, World! to display on the screen. Don't forget your quotes
    - {{}} + {{'Hello, ' + 'World!'}}
  • We have a controller driving this view. The controller is nothing more than an object with properties. One of the properties on the controller object is called test. Render the test property to the screen
    - {{}} + {{controller.test}}
    • diff --git a/app/components/repeat/RepeatController.js b/app/components/repeat/RepeatController.js index cf9c4e7..bc33593 100644 --- a/app/components/repeat/RepeatController.js +++ b/app/components/repeat/RepeatController.js @@ -1,60 +1,87 @@ -var app = angular.module('angularPlayground'); +var app = angular.module('angularPlayground'); app.controller('RepeatController', RepeatController); -function RepeatController(){ - this.repeatStatus = 'Working'; - //The cart is an array of items that we are adding from our view - this.cart = []; - //The store is what we are using to populate our page with - this.store = { - items: StoreData - }; - //*** No Need to edit anything above this line **** - - this.name = "My BɼokƏn Cart!"; - - this.getCartCount = function(){ - //return the length of our cart - }; - - /* - * Write a calculateCartTotal function - * make it assesible to our view - * this function should return the total cost - * of each item that is in our cart - */ - - - this.removeItemFromCart = function(item){ - //Item gets passed in from our view when the user clicks the x button +function RepeatController() { + this.repeatStatus = 'Working'; + //The cart is an array of items that we are adding from our view + this.cart = []; + //The store is what we are using to populate our page with + this.store = { + items: StoreData + }; + //*** No Need to edit anything above this line **** + + this.name = "My BɼokƏn Cart!"; + + this.getCount = function () { + //return the length of our cart + return this.cart.length; + }; + /* - * This function should be able to remove the passed in item - * from our cart. You will have to first identify where the passed - * in item is in the array. Then you will need to use the correct - * Array.method to remove 1 item hint method(i, 1); + * Write a calculateCartTotal function + * make it assesible to our view + * this function should return the total cost + * of each item that is in our cart */ - }; - - this.addItemToCart = function(item){ - //item gets passed in to this function from the view - - /* - Our cart demands that items being added to it must have the following properties - var newItem = { - name:'', - color:'', - size: '', - quantity: 1, - price:'', - } - console.log the item being passed in from the view - to figure out which properties from item need to be - remaped to the newItem object. - After building the newItem add it to the cart - */ - - } - + + this.calculateCartTotal = function () { + var total = 0; + for (var i = 0; i < this.cart.length; i++) { + total += this.cart[i].price * this.cart[i].quantity; + //console.log(i + " Item:"+this.cart[i].name+" Price:"+this.cart[i].price+" Quantity:"+this.cart[i].quantity + " RunningTotal:"+ total); + } + return total; + }; + + this.removeItemFromCart = function (item) { + //Item gets passed in from our view when the user clicks the x button + for (var i = 0; i < this.cart.length; i++) { + if (item.name === this.cart[i].name && + item.color === this.cart[i].color && + item.size === this.cart[i].size && + item.quantity === this.cart[i].quantity && + item.price === this.cart[i].price) { + //console.log("Delete " + i + " which is " + item.name + ":" + item.size + ":" + item.color); + this.cart.splice(i, 1); + break; + } + } + /* + * This function should be able to remove the passed in item + * from our cart. You will have to first identify where the passed + * in item is in the array. Then you will need to use the correct + * Array.method to remove 1 item hint method(i, 1); + */ + }; + + this.addItemToCart = function (item) { + //item gets passed in to this function from the view + //console.log(item); + var newItem = { + name: item.name, + color: item.selectedColor, + size: item.selectedSize, + quantity: 1, + price: item.price, + } + //console.log(newItem); + this.cart.push(newItem); + /* + Our cart demands that items being added to it must have the following properties + var newItem = { + name:'', + color:'', + size: '', + quantity: 1, + price:'', + } + console.log the item being passed in from the view + to figure out which properties from item need to be + remaped to the newItem object. + After building the newItem add it to the cart + */ + } } \ No newline at end of file diff --git a/app/components/repeat/repeating.html b/app/components/repeat/repeating.html index 3717987..448a9c2 100644 --- a/app/components/repeat/repeating.html +++ b/app/components/repeat/repeating.html @@ -1,90 +1,89 @@ -RepeatController Status: {{controller.repeatStatus}} +RepeatController Status: {{controller.repeatStatus}}
    -

    Help Fix this Cart

    -

    What we have here is a broken website. There are a few challenges we need to solve to get it working

    -

    using the comments in the html and in the controller file as guides you should be able to get this cart back in top notch condition.

    - -

    First things first lets start with the HTML.

    - +

    Help Fix this Cart

    +

    What we have here is a broken website. There are a few challenges we need to solve to get it working

    +

    using the comments in the html and in the controller file as guides you should be able to get this cart back in top notch condition.

    + +

    First things first lets start with the HTML.

    +
    -

    {{controller.name}}

    -

    Items added to your Cart ({{controller.getCount() || 0}})

    -
    -

    - You have no items in your cart... Buy something! -

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ItemColorSizeQuantityPrice
    {{item.name}}{{item.color}}{{item.size}} - - {{item.price * item.quantity}} - -
    Total:{{controller.calculateCartTotal()}}
    -
    -
    -
    - -
    -
    - -

    {{item.price}}

    -

    - {{item.name}}

    - -

    - - -

    - +

    {{controller.name}}

    +

    Items added to your Cart ({{controller.getCount() | number:0}})

    +
    +

    + You have no items in your cart... Buy something! +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ItemColorSizeQuantityPrice
    {{item.name}}{{item.color}}{{item.size}} + + {{item.price * item.quantity | currency}} + +
    Total:{{controller.calculateCartTotal() | currency}}
    +
    +
    +
    + +
    +
    + +

    {{item.price | currency}}

    +

    {{item.name}}

    + +

    + + +

    + +
    +
    -
    -
    -
    \ No newline at end of file +
    diff --git a/assets/css/site.css b/assets/css/site.css index 483c07b..d3840f1 100644 --- a/assets/css/site.css +++ b/assets/css/site.css @@ -45,4 +45,11 @@ color:yellow; font-size:16px; font-weight:bold; +} + +.box1-custom { + width:300px; + background-color:lightgrey; + border-color:black; + border-width:2px; } \ No newline at end of file From b51e38f414885121db4f4c5e607fa65d7706e0e1 Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Sat, 26 Sep 2015 20:48:15 -0600 Subject: [PATCH 2/9] currency added on 'Fun with Joe and Bob' --- angProject-index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/angProject-index.html b/angProject-index.html index 68b6fbc..046bf5b 100644 --- a/angProject-index.html +++ b/angProject-index.html @@ -17,13 +17,13 @@

    - Joe has {{ vm.joe.cash }} + Joe has {{ vm.joe.cash | currency }}

    - Bob has {{ vm.bob.cash }} + Bob has {{ vm.bob.cash | currency }}

    - The bank has {{ vm.bank }} + The bank has {{ vm.bank | currency }}

    From 11ecde3cef3f4dd8a2617eb7b2165c954f5abfa0 Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Tue, 29 Sep 2015 06:29:55 -0600 Subject: [PATCH 3/9] racingFrogs track layout ready to randomize positions of frogs --- angProject-app.css | 6 -- angProject-index.html | 39 ------------- racingFrogs-app.css | 14 +++++ angProject-app.js => racingFrogs-app.js | 18 ++++++ racingFrogs-index.html | 73 +++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 45 deletions(-) delete mode 100644 angProject-app.css delete mode 100644 angProject-index.html create mode 100644 racingFrogs-app.css rename angProject-app.js => racingFrogs-app.js (69%) create mode 100644 racingFrogs-index.html diff --git a/angProject-app.css b/angProject-app.css deleted file mode 100644 index 935d6b7..0000000 --- a/angProject-app.css +++ /dev/null @@ -1,6 +0,0 @@ -body { - background-color: lightblue; -} -.button-custom { - background-color:lightgreen; -} \ No newline at end of file diff --git a/angProject-index.html b/angProject-index.html deleted file mode 100644 index 046bf5b..0000000 --- a/angProject-index.html +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Racing Frogs - - - - - -
    -
    -
    -
    - Fun with Joe and Bob
    - Angular Working? : {{vm.working}} -
    -
    -

    - Joe has {{ vm.joe.cash | currency }} -

    -

    - Bob has {{ vm.bob.cash | currency }} -

    -

    - The bank has {{ vm.bank | currency }} -

    -
    -
    - Give $10 to Joe - Receive $5 from Bob -
    -
    -
    - - - - - diff --git a/racingFrogs-app.css b/racingFrogs-app.css new file mode 100644 index 0000000..2a53110 --- /dev/null +++ b/racingFrogs-app.css @@ -0,0 +1,14 @@ +body { + background-color: lightblue; +} +.button-custom { + background-color:lightgreen; +} +.float-left { + display:inline-block; + float:left; +} +.float-right { + display:inline-block; + float:right; +} diff --git a/angProject-app.js b/racingFrogs-app.js similarity index 69% rename from angProject-app.js rename to racingFrogs-app.js index 6884156..2fee112 100644 --- a/angProject-app.js +++ b/racingFrogs-app.js @@ -5,6 +5,24 @@ app.controller('MainController', MainController); function MainController() { var vm = this; //instead of using this when refering to the controller, let's use vm. It will make things easier. vm.working = "Yes"; + + // Frog Races ---------------------------------------------------------------------------- + vm.frogs = [ + { lane: 1, name: "Frank", position: 0 }, + { lane: 2, name: "Harry", position: 0 }, + { lane: 3, name: "Ed", position: 0 }, + { lane: 4, name: "Hank", position: 0 }, + { lane: 5, name: "Duane", position: 0 } + ]; + + vm.getCount = function () { + return vm.frogs.length; + }; + //for (var i = 0; i < vm.frogs.length; i++) { + // console.log(vm.frogs[i].name + " in lane " + vm.frogs[i].lane); + //} + + // Fun with Joe and Bob panel ------------------------------------------------------------ vm.joe = new Guy("Joe", 100); vm.bob = new Guy("Bob", 150); vm.bank = 200; diff --git a/racingFrogs-index.html b/racingFrogs-index.html new file mode 100644 index 0000000..b21740c --- /dev/null +++ b/racingFrogs-index.html @@ -0,0 +1,73 @@ + + + + + Racing Frogs + + + + + + {{1 + 1}} +
    +
    +
    +
    + Welcome to The Frog Races + You have {{vm.getCount() | number:0}} frogs ready to WIN!
    +
    +
    + + + + + + + + + + + + + + + +
    | Frog + | START + FINISH | +
    {{frog.lane | number:0}}
    {{frog.name}}
    +
    +
    + Start Race +
    +
    + +
    + +
    +
    + Fun with Joe and Bob +
    +
    +

    + Joe has {{ vm.joe.cash | currency }} +

    +

    + Bob has {{ vm.bob.cash | currency }} +

    +

    + The bank has {{ vm.bank | currency }} +

    +
    +
    + Give $10 to Joe + Receive $5 from Bob +
    +
    +
    + Angular Working? {{vm.working}} + + + + + From 3c9676f4d19e6d3182ef2cf0566666e1ec1c50fe Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Tue, 29 Sep 2015 15:02:23 -0600 Subject: [PATCH 4/9] racingFrogs working up through step 4 of excersize --- img/BullFrog.gif | Bin 0 -> 1830 bytes racingFrogs-app.css | 12 ++++++++ racingFrogs-app.js | 63 +++++++++++++++++++++++++++++++++++------ racingFrogs-index.html | 16 ++++++++--- 4 files changed, 78 insertions(+), 13 deletions(-) create mode 100644 img/BullFrog.gif diff --git a/img/BullFrog.gif b/img/BullFrog.gif new file mode 100644 index 0000000000000000000000000000000000000000..9794bb4b6333a6aa89573407f4f6420a17150aa0 GIT binary patch literal 1830 zcmV+>2if>XNk%w1VJ`q90QU_5f@nRBd{NWHthTI?b!k$zuA_8gJ-VW3jB`Y2SwZ^i zmuz7r(8tZti=W~7BhiGf#SQZs#PJH)AI zvYcw0g-_?sdfe5^>E+!1{rr)JORSxOcydczQ9PTBRAW>vT1_)sOe>FePwwNzn~GYK zc}0+WRApH+oQ`y?l1$UdyK7uDTv02^y_=MTRLZ-Eigi-n)WmFHMEK{9gnDE0?A&Zz zI`8Y|^Y7+~ie+?VNqlr$<=Vjh^{UguoScMJ;?%T!aaM+TP=s$y!>xky^6%y1+jLzp zX;m{-N-KP8Oa1)&rJZB-@#)&bcX3)fbYnNHqhy6`MNL8}+}YBTh+E>@&dR%?hI&c* z`Szxqbc1qJlZ|6kL@AqvU8Rp@_VMLpO)Qp*Q-yh1rHom7WJGjmM0i~_sF;0iR4c5U za?reVY*#yfa7dMkOvSsNtD9POWJI)^S&V#Osg`Jse?F6TJi@MVetBJDT{*6mUTRn^ zqLX8jgJb*q`ly|Rm3dCUvzwliTwqQz-_o~*bxu}HGhpvP&%MRDl!0|kbZ1ML zk%@d`HmjtVkbFylbVI$ReW#Ocf^tlMZa~Alt$1iVJ}@C%O*^)ueVl(zg=|5BZ$zb& zQc^!6poUPDen^jbNrG)ie0Wraa!L93^O1^eT1F&(Zc&ziO{J1r{QLRO%f{o_u!wX^ z%(ZQAU`_q;%9w&(k9R}!+k2jiZ0&Mu>Ju#IloaWG#4KI#W+5+}h6g z_3!`rzNL4ppNjqZ^#A?!TSzyvnqY);LW+b;hj2f+ zsDXxeL;wH(A^8LW000dDEC2ui051R|000R802>G#NU)&6g9sBUT*$DY!-ojHiLu}b zqQ!(<42ZA;j@`wN0@2hfvEW6wVzJN__yE$OI8Cykw zgkb@V7htYsVj+Qnfh0Z)KDfjq#irREL8B4v$}s7?k9d31`x2`m|C zoN%MV4W$yTj!gLV$=s`tKfEma27}I`6DMZO(B}`!2@)6}KtP~EgDheMX|22!IAj0%UTWCtoX8iGJ}=@1VFvr4`2f#s8dMHv`KDWp%s z9#&+Gwezq6f+{x>wDsAx5JaT{0|-3-qVx$16ay>*=#$cD+L>vkG=N#d$^so@dOExr zwvWmLBMY%Jz$;QH@dyQu(2&6i9oQmCE31sL2McOs0tqi7V9-Sy6r>RcDTIj7hXV^m zql5&eK+*^bplp#CaCopVh7zjSz)2=1*uYO6tgtf85>R}iNEb0Yv(O!C*wKO@jhyg; zBV|P4gAyiiLWvHPtYJfXoeX0@0)PO50W?`Ca=;wD=%SDj=8VAt8!bQ)MKLp^P=*^| zbmBt-KIqU0CjkTyiyIl}5GDyERA9vp3aFXT3O6{w#uAGdK*J0#97Dqb3v7`B3JJK8 zi5o&pf&my3ND#y;Lrh}I9E>vm)PpG|$kNFo$1E^I6vw#u=>k5?fQ1Hi)G>?+c$lCn z8A%ubOgcq4Bm+5zC_w?HTSO7a3pCK+$O}-QfWiW$Adre3Sx{jC83{nbPX-ZK^us)E z_@F^IG(-`_7NO|Ci3@vByG9+K!6KuB=CqjQiOuf5=)daj1U3n@dqS`^mD-z zTwL@+IRQvBf*gB{VMZ>6aNx^4=Mclq2pZgS!v=Gpf(R45#Nh=<0}#T83ro=9LmMif zq7FWdaKJ$#oAAN`E(+xT1HlHrSdtA$BLKh)1f(DUg=8#XlED?S_+g195Xj;|5r3RA zN(_T=0}>ohTwx3Vq#$kpCN^l1feJ^^5yvOkcwhwwZM?w?ES2;y_zKoM#DxpS&`|~e z?iiB-0;(7T3I%TX2Ac_#N;LrvXpp*ec8X2SkfGoT8 z6A4QKsgMRDsB|F7Ss%&3#3sIM63Z%D&;kyQfB-ryp#v8XgaFX64JJU~3BvHh7l6=% zAAlqqUtq#6HlT@jJb)T97{D3WaDf=qU?4dVML&#y1R}uWY*9f-4(M@!FMI(6G5iQ4 UdeDGK03nA!45APN2@((hJD>+aa{vGU literal 0 HcmV?d00001 diff --git a/racingFrogs-app.css b/racingFrogs-app.css index 2a53110..9eadf6c 100644 --- a/racingFrogs-app.css +++ b/racingFrogs-app.css @@ -12,3 +12,15 @@ display:inline-block; float:right; } +.winner-found { + font-size:large; + color:red; +} +.winner-off { + display:inline-block; + visibility:hidden; +} +.winner-on { + display:inline-block; + visibility:visible; +} diff --git a/racingFrogs-app.js b/racingFrogs-app.js index 2fee112..1c7b89f 100644 --- a/racingFrogs-app.js +++ b/racingFrogs-app.js @@ -3,24 +3,69 @@ app.controller('MainController', MainController); //No need to change anything above this line. function MainController() { - var vm = this; //instead of using this when refering to the controller, let's use vm. It will make things easier. + var vm = this; //instead of using this when referring to the controller, let's use vm. It will make things easier. vm.working = "Yes"; // Frog Races ---------------------------------------------------------------------------- + vm.winner = ""; vm.frogs = [ - { lane: 1, name: "Frank", position: 0 }, - { lane: 2, name: "Harry", position: 0 }, - { lane: 3, name: "Ed", position: 0 }, - { lane: 4, name: "Hank", position: 0 }, - { lane: 5, name: "Duane", position: 0 } + { lane: 1, name: "Frank", position: 0, picUrl: "img/BullFrog.gif" }, + { lane: 2, name: "Harry", position: 0, picUrl: "img/BullFrog.gif" }, + { lane: 3, name: "Eddie", position: 0, picUrl: "img/BullFrog.gif" }, + { lane: 4, name: "Duane", position: 0, picUrl: "img/BullFrog.gif" }, + { lane: 5, name: "Hank", position: 0, picUrl: "img/BullFrog.gif" } ]; vm.getCount = function () { return vm.frogs.length; }; - //for (var i = 0; i < vm.frogs.length; i++) { - // console.log(vm.frogs[i].name + " in lane " + vm.frogs[i].lane); - //} + + vm.getTrackWidth = function () { + var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; + //console.log("Track width is : " + raceTrackWidth); + return raceTrackWidth; + }; + + var winning = 0; + var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; + + vm.startRace = function () { + console.log("startRace function not working"); + //var startTime = Date.now(); + //var endTimeLimit = startTime + 100000; + //for (var w = startTime; w < endTimeLimit; w++) { + // vm.move(); + // if (winning >= raceTrackWidth) { + // break; + // } + // for (var t = 1; t <= 3; t++) { + // setTimeout(function (x) { return function () { console.log(x); }; }(t), 1000 * t); + // } + //} + } + + vm.move = function () { + if (winning < raceTrackWidth) { + for (var i = 0; i < vm.frogs.length; i++) { + var w = i + 1; + var posX = vm.frogs[i].position + Math.floor(Math.random() * 35); + vm.frogs[i].position = posX; + document.getElementById('frog' + w).style.left = posX + "px"; + if (winning < posX) { + winning = posX; + } + if (winning >= raceTrackWidth) { + vm.winner = " Winner is " + vm.frogs[i].name + " in lane " + vm.frogs[i].lane + " "; + break; + } + } + raceTrackWidth = document.getElementById('raceTrack').offsetWidth; + } + // TESTING A TIMER + //for (var t = 1; t <= 3; t++) { + // setTimeout(function (x) { return function () { console.log(x); }; }(t), 1000 * t); + //} + } // Fun with Joe and Bob panel ------------------------------------------------------------ vm.joe = new Guy("Joe", 100); diff --git a/racingFrogs-index.html b/racingFrogs-index.html index b21740c..40c267c 100644 --- a/racingFrogs-index.html +++ b/racingFrogs-index.html @@ -14,7 +14,7 @@
    Welcome to The Frog Races - You have {{vm.getCount() | number:0}} frogs ready to WIN!
    + You have {{vm.getCount() | number:0}} frogs ready to RACE!
    @@ -22,7 +22,7 @@ - @@ -31,14 +31,22 @@ - - + +
    | Frog + | START FINISH |
    {{frog.lane | number:0}}
    {{frog.name}}
    {{frog.name}}
    		 +
    + +
    +
    + Start Race + Move + Reset + {{vm.winner}}
    From 990844b41c88a4727d2277e0b4fbbda3dbe87f98 Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Tue, 29 Sep 2015 21:27:47 -0600 Subject: [PATCH 5/9] frogs racing now --- racingFrogs-app.js | 56 ++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/racingFrogs-app.js b/racingFrogs-app.js index 1c7b89f..01494b6 100644 --- a/racingFrogs-app.js +++ b/racingFrogs-app.js @@ -2,7 +2,7 @@ app.controller('MainController', MainController); //No need to change anything above this line. -function MainController() { +function MainController($timeout) { var vm = this; //instead of using this when referring to the controller, let's use vm. It will make things easier. vm.working = "Yes"; @@ -28,43 +28,45 @@ function MainController() { var winning = 0; var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; - - vm.startRace = function () { - console.log("startRace function not working"); - //var startTime = Date.now(); - //var endTimeLimit = startTime + 100000; - //for (var w = startTime; w < endTimeLimit; w++) { - // vm.move(); - // if (winning >= raceTrackWidth) { - // break; - // } - // for (var t = 1; t <= 3; t++) { - // setTimeout(function (x) { return function () { console.log(x); }; }(t), 1000 * t); - // } - //} - } + var itsDone = false; vm.move = function () { - if (winning < raceTrackWidth) { + if (!itsDone) { for (var i = 0; i < vm.frogs.length; i++) { - var w = i + 1; - var posX = vm.frogs[i].position + Math.floor(Math.random() * 35); + var posX = vm.frogs[i].position + Math.floor(Math.random() * 45); vm.frogs[i].position = posX; - document.getElementById('frog' + w).style.left = posX + "px"; - if (winning < posX) { - winning = posX; + document.getElementById('frog' + (i + 1)).style.left = posX + "px"; + if (winning < posX) { winning = posX; }; + if (winning >= raceTrackWidth) { + vm.winner = " Winner is " + vm.frogs[i].name + " in lane " + vm.frogs[i].lane + " "; + itsDone = true; + break; } + } + } + } + + vm.startRace = function () { + console.log("startRace function fired"); + winning = 0; + raceTrackWidth = document.getElementById('raceTrack').offsetWidth; + itsDone = false; + if (!itsDone) { + for (var i = 0; i < vm.frogs.length; i++) { + var posX = vm.frogs[i].position + Math.floor(Math.random() * 20); + vm.frogs[i].position = posX; + document.getElementById('frog' + (i + 1)).style.left = posX + "px"; + if (winning < posX) { winning = posX; }; if (winning >= raceTrackWidth) { vm.winner = " Winner is " + vm.frogs[i].name + " in lane " + vm.frogs[i].lane + " "; + itsDone = true; break; } } - raceTrackWidth = document.getElementById('raceTrack').offsetWidth; } - // TESTING A TIMER - //for (var t = 1; t <= 3; t++) { - // setTimeout(function (x) { return function () { console.log(x); }; }(t), 1000 * t); - //} + if (!itsDone) { + $timeout(vm.startRace, 70); + } } // Fun with Joe and Bob panel ------------------------------------------------------------ From a2bda94f28bc0c82cc3aed59575f1662cadd0f96 Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Wed, 30 Sep 2015 13:52:26 -0600 Subject: [PATCH 6/9] add/remove frogs functions and frog colors --- racingFrogs-app.css | 9 ++--- racingFrogs-app.js | 82 +++++++++++++++++++++++++----------------- racingFrogs-index.html | 23 ++++++++---- 3 files changed, 68 insertions(+), 46 deletions(-) diff --git a/racingFrogs-app.css b/racingFrogs-app.css index 9eadf6c..9b66131 100644 --- a/racingFrogs-app.css +++ b/racingFrogs-app.css @@ -16,11 +16,6 @@ font-size:large; color:red; } -.winner-off { - display:inline-block; - visibility:hidden; -} -.winner-on { - display:inline-block; - visibility:visible; +.under-button { + font-size:small; } diff --git a/racingFrogs-app.js b/racingFrogs-app.js index 01494b6..8e3869f 100644 --- a/racingFrogs-app.js +++ b/racingFrogs-app.js @@ -6,19 +6,46 @@ function MainController($timeout) { var vm = this; //instead of using this when referring to the controller, let's use vm. It will make things easier. vm.working = "Yes"; - // Frog Races ---------------------------------------------------------------------------- - vm.winner = ""; - vm.frogs = [ - { lane: 1, name: "Frank", position: 0, picUrl: "img/BullFrog.gif" }, - { lane: 2, name: "Harry", position: 0, picUrl: "img/BullFrog.gif" }, - { lane: 3, name: "Eddie", position: 0, picUrl: "img/BullFrog.gif" }, - { lane: 4, name: "Duane", position: 0, picUrl: "img/BullFrog.gif" }, - { lane: 5, name: "Hank", position: 0, picUrl: "img/BullFrog.gif" } + vm.frogSet = [ + { lane: 1, name: "Frank", position: 0, picUrl: "img/BullFrog.gif", color: "red" }, + { lane: 2, name: "Harry", position: 0, picUrl: "img/BullFrog.gif", color: "green" }, + { lane: 3, name: "Eddie", position: 0, picUrl: "img/BullFrog.gif", color: "maroon" }, + { lane: 4, name: "Duane", position: 0, picUrl: "img/BullFrog.gif", color: "blue" }, + { lane: 5, name: "Hank", position: 0, picUrl: "img/BullFrog.gif", color: "orange" }, + { lane: 6, name: "Drake", position: 0, picUrl: "img/BullFrog.gif", color: "indigo" }, + { lane: 7, name: "Gerik", position: 0, picUrl: "img/BullFrog.gif", color: "brown" }, + { lane: 8, name: "Monte", position: 0, picUrl: "img/BullFrog.gif", color: "purple" }, + { lane: 9, name: "Abel", position: 0, picUrl: "img/BullFrog.gif", color: "orangered" } ]; - vm.getCount = function () { - return vm.frogs.length; - }; + vm.frogs = []; + for (var i = 0; i < 6; i++) { + vm.frogs.push(vm.frogSet[i]); + } + + vm.winner = "You have " + vm.frogs.length + " frogs ready to RACE ! "; + + vm.addFrog = function () { + var a = vm.frogs.length + 1; + if (a > 9) { a = 9 }; + vm.frogs = []; + for (var i = 0; i < a; i++) { + vm.frogs.push(vm.frogSet[i]); + console.log("adding frogs " + i); + } + vm.newRace(); + } + + vm.removeFrog = function () { + var a = vm.frogs.length - 1; + if (a < 2) { a = 2 }; + vm.frogs = []; + for (var i = 0; i < a; i++) { + vm.frogs.push(vm.frogSet[i]); + console.log("removing frogs " + i); + } + vm.newRace(); + } vm.getTrackWidth = function () { var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; @@ -26,31 +53,20 @@ function MainController($timeout) { return raceTrackWidth; }; - var winning = 0; - var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; - var itsDone = false; - - vm.move = function () { - if (!itsDone) { - for (var i = 0; i < vm.frogs.length; i++) { - var posX = vm.frogs[i].position + Math.floor(Math.random() * 45); - vm.frogs[i].position = posX; - document.getElementById('frog' + (i + 1)).style.left = posX + "px"; - if (winning < posX) { winning = posX; }; - if (winning >= raceTrackWidth) { - vm.winner = " Winner is " + vm.frogs[i].name + " in lane " + vm.frogs[i].lane + " "; - itsDone = true; - break; - } - } + vm.newRace = function () { + vm.winner = ""; + for (var i = 0; i < vm.frogs.length; i++) { + vm.frogs[i].position = 0; + document.getElementById('frog' + (i + 1)).style.left = vm.frogs[i].position + "px"; + vm.winner = "You have " + vm.frogs.length + " frogs ready to RACE ! "; } } vm.startRace = function () { - console.log("startRace function fired"); - winning = 0; - raceTrackWidth = document.getElementById('raceTrack').offsetWidth; - itsDone = false; + vm.winner = "And they're off ! "; + var winning = 0; + var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; + var itsDone = false; if (!itsDone) { for (var i = 0; i < vm.frogs.length; i++) { var posX = vm.frogs[i].position + Math.floor(Math.random() * 20); @@ -58,7 +74,7 @@ function MainController($timeout) { document.getElementById('frog' + (i + 1)).style.left = posX + "px"; if (winning < posX) { winning = posX; }; if (winning >= raceTrackWidth) { - vm.winner = " Winner is " + vm.frogs[i].name + " in lane " + vm.frogs[i].lane + " "; + vm.winner = " Winner: " + vm.frogs[i].name + " wearing " + vm.frogs[i].color + " in lane " + vm.frogs[i].lane + " "; itsDone = true; break; } diff --git a/racingFrogs-index.html b/racingFrogs-index.html index 40c267c..6be0383 100644 --- a/racingFrogs-index.html +++ b/racingFrogs-index.html @@ -13,8 +13,16 @@
    - Welcome to The Frog Races - You have {{vm.getCount() | number:0}} frogs ready to RACE!
    +

    Welcome to The Frog Races

    + + + Add Frog
    (up to 9)     +     + + + Remove Frog
    (down to 2)     +     +


    @@ -31,10 +39,12 @@ - + @@ -43,10 +53,11 @@
    + + New Race Start Race - Move - Reset {{vm.winner}} +
    From 86332334b05f13feefdf940c4dd73ed38f0904cf Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Wed, 30 Sep 2015 18:26:28 -0600 Subject: [PATCH 7/9] class review --- racingFrogs-app.js | 61 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/racingFrogs-app.js b/racingFrogs-app.js index 8e3869f..be57277 100644 --- a/racingFrogs-app.js +++ b/racingFrogs-app.js @@ -85,6 +85,7 @@ function MainController($timeout) { } } + // Fun with Joe and Bob panel ------------------------------------------------------------ vm.joe = new Guy("Joe", 100); vm.bob = new Guy("Bob", 150); @@ -125,4 +126,62 @@ function MainController($timeout) { vm.bank += vm.bob.giveCash(5); } -} \ No newline at end of file +} + +// Betting Service is separate from Main Controller ================================= +app.service('BettingService', BettingService); +function BettingService() { + + function BettingService() { + var _races = {}; + var _raceId = 0; + this.registerRace = function () { + + } + this.getRace = function (reaceId) { + + } + var Race = function () { + this.id = _raceId; + this.tickets = 1300; + this.contestants = []; + this.open = true; + this.bets = {}; + _races[this.id] = this; + _raceId++; + } + } + +} // end of Betting Service ===================================================== + +//var roster = { +// players: {}, +// addPlayer: function (player) { +// if (player.name) { +// this.players[player.id] = player; +// reloadPlayerCards(); +// } else { +// alert("Unable to Add Player... likely missing a field or invalid data format."); +// } +// } +//} + +//var fullNFL = { +// players2: {}, +// addPlayer2: function (player2) { +// this.players2[player2.id] = player2; +// } +//} + +//// roster factory +//var Player = function (name, position, number, photo, team, status, byeweek, age, id) { +// this.name = name; +// this.position = position; +// this.number = number; +// this.photo = photo; +// this.team = team; +// this.status = status; +// this.byeweek = byeweek; +// this.age = age; +// this.id = id; +//} From 83ee652a38f8fdc7f5306d795ba6470b78727bd4 Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Sun, 4 Oct 2015 21:40:39 -0600 Subject: [PATCH 8/9] betting service partially developed, added partice heat races --- racingFrogs-app.css | 10 +++ racingFrogs-app.js | 161 +++++++++++++++++++++++++---------------- racingFrogs-index.html | 90 ++++++++++++++++------- 3 files changed, 171 insertions(+), 90 deletions(-) diff --git a/racingFrogs-app.css b/racingFrogs-app.css index 9b66131..74fce49 100644 --- a/racingFrogs-app.css +++ b/racingFrogs-app.css @@ -3,6 +3,12 @@ } .button-custom { background-color:lightgreen; + display:inline-block; +} +.button-custom-top { + background-color:lightgreen; + display:inline-block; + color:darkblue; } .float-left { display:inline-block; @@ -19,3 +25,7 @@ .under-button { font-size:small; } +.bet-history { + display:inline-block; + float:right; +} diff --git a/racingFrogs-app.js b/racingFrogs-app.js index be57277..1f274b4 100644 --- a/racingFrogs-app.js +++ b/racingFrogs-app.js @@ -2,7 +2,7 @@ app.controller('MainController', MainController); //No need to change anything above this line. -function MainController($timeout) { +function MainController(BettingService, $timeout) { var vm = this; //instead of using this when referring to the controller, let's use vm. It will make things easier. vm.working = "Yes"; @@ -18,12 +18,26 @@ function MainController($timeout) { { lane: 9, name: "Abel", position: 0, picUrl: "img/BullFrog.gif", color: "orangered" } ]; + // initial load of 6 frogs and no winner yet vm.frogs = []; for (var i = 0; i < 6; i++) { vm.frogs.push(vm.frogSet[i]); } - vm.winner = "You have " + vm.frogs.length + " frogs ready to RACE ! "; + var raceReady = false; + + for (var i = 0; i < 9; i++) { + vm.raceId = BettingService.registerRace(); + } + vm.races = BettingService.getAllRace(); + + vm.setFrogPosition = function () { + for (var i = 0; i < vm.frogs.length; i++) { + vm.frogs[i].position = 0; + document.getElementById('frog' + (i + 1)).style.left = vm.frogs[i].position + "px"; + vm.winner = "You have " + vm.frogs.length + " frogs ready to RACE ! "; + } + } vm.addFrog = function () { var a = vm.frogs.length + 1; @@ -31,9 +45,8 @@ function MainController($timeout) { vm.frogs = []; for (var i = 0; i < a; i++) { vm.frogs.push(vm.frogSet[i]); - console.log("adding frogs " + i); } - vm.newRace(); + vm.setFrogPosition(); } vm.removeFrog = function () { @@ -42,19 +55,29 @@ function MainController($timeout) { vm.frogs = []; for (var i = 0; i < a; i++) { vm.frogs.push(vm.frogSet[i]); - console.log("removing frogs " + i); } - vm.newRace(); + vm.setFrogPosition(); } vm.getTrackWidth = function () { - var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; - //console.log("Track width is : " + raceTrackWidth); + var raceTrackWidth = document.getElementById('raceTrack').offsetWidth - 50 ; + //console.log("Track width is : " + raceTrackWidth); in px return raceTrackWidth; }; + vm.practiceHeat = function () { + if (!raceReady) { + vm.winner = ""; + vm.setFrogPosition(); + raceReady = true; + vm.startRace(); + } + } + vm.newRace = function () { vm.winner = ""; + vm.races = BettingService.getAllRace(); + raceReady = true; for (var i = 0; i < vm.frogs.length; i++) { vm.frogs[i].position = 0; document.getElementById('frog' + (i + 1)).style.left = vm.frogs[i].position + "px"; @@ -63,25 +86,29 @@ function MainController($timeout) { } vm.startRace = function () { - vm.winner = "And they're off ! "; - var winning = 0; - var raceTrackWidth = document.getElementById('raceTrack').offsetWidth; - var itsDone = false; - if (!itsDone) { - for (var i = 0; i < vm.frogs.length; i++) { - var posX = vm.frogs[i].position + Math.floor(Math.random() * 20); - vm.frogs[i].position = posX; - document.getElementById('frog' + (i + 1)).style.left = posX + "px"; - if (winning < posX) { winning = posX; }; - if (winning >= raceTrackWidth) { - vm.winner = " Winner: " + vm.frogs[i].name + " wearing " + vm.frogs[i].color + " in lane " + vm.frogs[i].lane + " "; - itsDone = true; - break; + if (raceReady) { + vm.winner = "And they're off ! "; + var itsDone = false; + var winning = 0; + var raceTrackWidth = document.getElementById('raceTrack').offsetWidth - 50; + if (!itsDone) { + for (var i = 0; i < vm.frogs.length; i++) { + var posX = vm.frogs[i].position + Math.floor(Math.random() * 20); + vm.frogs[i].position = posX; + document.getElementById('frog' + (i + 1)).style.left = posX + "px"; + if (winning < posX) { winning = posX; }; + if (winning >= raceTrackWidth) { + vm.winner = " Winner: " + vm.frogs[i].name + " wearing " + vm.frogs[i].color + " in lane " + vm.frogs[i].lane + " "; + itsDone = true; + break; + } } } - } - if (!itsDone) { - $timeout(vm.startRace, 70); + if (!itsDone) { + $timeout(vm.startRace, 70); + } else { + raceReady = false; + } } } @@ -130,16 +157,53 @@ function MainController($timeout) { // Betting Service is separate from Main Controller ================================= app.service('BettingService', BettingService); + function BettingService() { - - function BettingService() { var _races = {}; var _raceId = 0; this.registerRace = function () { - + var race = new Race(); + return race.id; } - this.getRace = function (reaceId) { - + this.getAllRace = function () { + return _races; + } + this.getRace = function (raceId) { + return _races[raceId]; + } + this.addContestant = function (raceId, contestant) { + //Adds a frog to the race object remember to get the race first + //Also dont let frogs be added after the race has started. + } + this.getContestants = function (raceId) { + //just returns the contestants for a specified race + } + //Number raceId, String bettingOn, Boolean outcome, Number wager + this.placeBet = function (raceId, bettingOn, wager) { + /*this function is the one that gets called from your controller. + build the appropriate bet object fro the arguments and add it to the race. + consider ensuring that the raceId is an actual race object + validate the bettingOn contestant + pool the wages from the race + */ + } + this.closeRace = function (raceId) { + //No more bets please the race has started + } + this.setWinners = function (raceId, winners) { + //make sure winners can only be set once + } + function isValidBet(race, bet) { + var valid; + for (var i = 0; i < race.contestants.length; i++) { + //make sure the frog selected is actually in the race system Prevents Cheating + } + return valid; + } + function generateTicket(race, bet) { + //responsible for adding a bet to the specified race by its ticketNumber + //Don't forget to increase the ticketing count system + race.tickets++; } var Race = function () { this.id = _raceId; @@ -147,41 +211,10 @@ function BettingService() { this.contestants = []; this.open = true; this.bets = {}; + this.winner = {}; _races[this.id] = this; _raceId++; } - } -} // end of Betting Service ===================================================== - -//var roster = { -// players: {}, -// addPlayer: function (player) { -// if (player.name) { -// this.players[player.id] = player; -// reloadPlayerCards(); -// } else { -// alert("Unable to Add Player... likely missing a field or invalid data format."); -// } -// } -//} - -//var fullNFL = { -// players2: {}, -// addPlayer2: function (player2) { -// this.players2[player2.id] = player2; -// } -//} - -//// roster factory -//var Player = function (name, position, number, photo, team, status, byeweek, age, id) { -// this.name = name; -// this.position = position; -// this.number = number; -// this.photo = photo; -// this.team = team; -// this.status = status; -// this.byeweek = byeweek; -// this.age = age; -// this.id = id; -//} + } +// end of Betting Service ===================================================== diff --git a/racingFrogs-index.html b/racingFrogs-index.html index 6be0383..9ec3d2d 100644 --- a/racingFrogs-index.html +++ b/racingFrogs-index.html @@ -15,13 +15,14 @@

    Welcome to The Frog Races

    - + Add Frog
    (up to 9)         - + Remove Frog
    (down to 2)         + Practice
    Heat


    @@ -52,35 +53,72 @@

    Welcome to The Frog Races

    {{frog.lane | number:0}}
    {{frog.name}}
    		 + - {{frog.name}} +
    - +
    - - - New Race - Start Race - {{vm.winner}} - + {{vm.winner}}
    -
    +
    +
    +
    +

    Betting on the Races (under development)


    +
    +
    -
    -
    - Fun with Joe and Bob -
    -
    -

    - Joe has {{ vm.joe.cash | currency }} -

    -

    - Bob has {{ vm.bob.cash | currency }} -

    -

    - The bank has {{ vm.bank | currency }} -

    +
    + New Race +
    + +
    + + + + + + + + + + + + + + + + + + + + + +
    RaceOpenTicketsBetsWinnerContestants
    {{race.id + 1 | number:0}} {{race.open}}{{race.tickets | number:0}} {{race.bets}} {{race.winner}} {{race.contestants}}
    +
    + +
    +
    + Start Race + +
    -
    - Give $10 to Joe - Receive $5 from Bob + +
    +
    + Fun with Joe and Bob +
    +
    +

    + Joe has {{ vm.joe.cash | currency }} +

    +

    + Bob has {{ vm.bob.cash | currency }} +

    +

    + The bank has {{ vm.bank | currency }} +

    +
    +
    + Give $10 to Joe + Receive $5 from Bob +
    From ab0e8def1f74177d07ce3bb3146a87ab67b8de7c Mon Sep 17 00:00:00 2001 From: Mike Vickery Date: Mon, 5 Oct 2015 15:54:45 -0600 Subject: [PATCH 9/9] view added for betting service --- racingFrogs-app.css | 7 +++++++ racingFrogs-app.js | 39 ++++++++++++++++++++------------------- racingFrogs-index.html | 19 +++++++++++++------ 3 files changed, 40 insertions(+), 25 deletions(-) diff --git a/racingFrogs-app.css b/racingFrogs-app.css index 74fce49..6304efc 100644 --- a/racingFrogs-app.css +++ b/racingFrogs-app.css @@ -29,3 +29,10 @@ display:inline-block; float:right; } +#bet-box { + width:135px; + height:200px; + display:inline-block; + background-color:paleturquoise; + padding:5px; +} diff --git a/racingFrogs-app.js b/racingFrogs-app.js index 1f274b4..94a6c63 100644 --- a/racingFrogs-app.js +++ b/racingFrogs-app.js @@ -7,15 +7,15 @@ function MainController(BettingService, $timeout) { vm.working = "Yes"; vm.frogSet = [ - { lane: 1, name: "Frank", position: 0, picUrl: "img/BullFrog.gif", color: "red" }, - { lane: 2, name: "Harry", position: 0, picUrl: "img/BullFrog.gif", color: "green" }, - { lane: 3, name: "Eddie", position: 0, picUrl: "img/BullFrog.gif", color: "maroon" }, - { lane: 4, name: "Duane", position: 0, picUrl: "img/BullFrog.gif", color: "blue" }, - { lane: 5, name: "Hank", position: 0, picUrl: "img/BullFrog.gif", color: "orange" }, - { lane: 6, name: "Drake", position: 0, picUrl: "img/BullFrog.gif", color: "indigo" }, - { lane: 7, name: "Gerik", position: 0, picUrl: "img/BullFrog.gif", color: "brown" }, - { lane: 8, name: "Monte", position: 0, picUrl: "img/BullFrog.gif", color: "purple" }, - { lane: 9, name: "Abel", position: 0, picUrl: "img/BullFrog.gif", color: "orangered" } + { lane: 1, name: "Frank", posX: 0, picUrl: "img/BullFrog.gif", color: "red" }, + { lane: 2, name: "Harry", posX: 0, picUrl: "img/BullFrog.gif", color: "green" }, + { lane: 3, name: "Eddie", posX: 0, picUrl: "img/BullFrog.gif", color: "maroon" }, + { lane: 4, name: "Duane", posX: 0, picUrl: "img/BullFrog.gif", color: "blue" }, + { lane: 5, name: "Hank", posX: 0, picUrl: "img/BullFrog.gif", color: "orange" }, + { lane: 6, name: "Drake", posX: 0, picUrl: "img/BullFrog.gif", color: "indigo" }, + { lane: 7, name: "Gerik", posX: 0, picUrl: "img/BullFrog.gif", color: "brown" }, + { lane: 8, name: "Monte", posX: 0, picUrl: "img/BullFrog.gif", color: "purple" }, + { lane: 9, name: "Abel", posX: 0, picUrl: "img/BullFrog.gif", color: "orangered" } ]; // initial load of 6 frogs and no winner yet @@ -31,10 +31,10 @@ function MainController(BettingService, $timeout) { } vm.races = BettingService.getAllRace(); - vm.setFrogPosition = function () { + vm.setFrogposX = function () { for (var i = 0; i < vm.frogs.length; i++) { - vm.frogs[i].position = 0; - document.getElementById('frog' + (i + 1)).style.left = vm.frogs[i].position + "px"; + vm.frogs[i].posX = 0; + document.getElementById('frog' + (i + 1)).style.left = vm.frogs[i].posX + "px"; vm.winner = "You have " + vm.frogs.length + " frogs ready to RACE ! "; } } @@ -46,7 +46,7 @@ function MainController(BettingService, $timeout) { for (var i = 0; i < a; i++) { vm.frogs.push(vm.frogSet[i]); } - vm.setFrogPosition(); + vm.setFrogposX(); } vm.removeFrog = function () { @@ -56,7 +56,7 @@ function MainController(BettingService, $timeout) { for (var i = 0; i < a; i++) { vm.frogs.push(vm.frogSet[i]); } - vm.setFrogPosition(); + vm.setFrogposX(); } vm.getTrackWidth = function () { @@ -68,7 +68,7 @@ function MainController(BettingService, $timeout) { vm.practiceHeat = function () { if (!raceReady) { vm.winner = ""; - vm.setFrogPosition(); + vm.setFrogposX(); raceReady = true; vm.startRace(); } @@ -79,8 +79,8 @@ function MainController(BettingService, $timeout) { vm.races = BettingService.getAllRace(); raceReady = true; for (var i = 0; i < vm.frogs.length; i++) { - vm.frogs[i].position = 0; - document.getElementById('frog' + (i + 1)).style.left = vm.frogs[i].position + "px"; + vm.frogs[i].posX = 0; + document.getElementById('frog' + (i + 1)).style.left = vm.frogs[i].posX + "px"; vm.winner = "You have " + vm.frogs.length + " frogs ready to RACE ! "; } } @@ -93,8 +93,8 @@ function MainController(BettingService, $timeout) { var raceTrackWidth = document.getElementById('raceTrack').offsetWidth - 50; if (!itsDone) { for (var i = 0; i < vm.frogs.length; i++) { - var posX = vm.frogs[i].position + Math.floor(Math.random() * 20); - vm.frogs[i].position = posX; + var posX = vm.frogs[i].posX + Math.floor(Math.random() * 20); + vm.frogs[i].posX = posX; document.getElementById('frog' + (i + 1)).style.left = posX + "px"; if (winning < posX) { winning = posX; }; if (winning >= raceTrackWidth) { @@ -180,6 +180,7 @@ function BettingService() { } //Number raceId, String bettingOn, Boolean outcome, Number wager this.placeBet = function (raceId, bettingOn, wager) { + console.log("BettingService.placeBet has been called") /*this function is the one that gets called from your controller. build the appropriate bet object fro the arguments and add it to the race. consider ensuring that the raceId is an actual race object diff --git a/racingFrogs-index.html b/racingFrogs-index.html index 9ec3d2d..e880b2d 100644 --- a/racingFrogs-index.html +++ b/racingFrogs-index.html @@ -63,11 +63,18 @@

    Welcome to The Frog Races

    Betting on the Races (under development)


    - -
    - New Race +
    +
    + +

    Placing Your Bets
    Race must be open

    +

    Race:

    +

    Frog:

    +

    Wager:

    +
    +

    Place Bet

    +
    +
    -
    @@ -77,7 +84,7 @@

    Betting on the Races (under development)

    Tickets - + @@ -95,7 +102,7 @@

    Betting on the Races (under development)

    - Start Race + Run Next Race
    Bets WinnerContestantsContestants