From eb0c735f3798de01d78ca2aa0034e04a75c75f9a Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sat, 24 Mar 2018 11:12:51 -0400 Subject: [PATCH 01/10] first commit --- .vscode/settings.json | 2 ++ js/app.js | 0 ts/app.js | 0 ts/app.ts | 1 + tsconfig.json | 17 +++++++++++++++++ 5 files changed, 20 insertions(+) create mode 100644 .vscode/settings.json create mode 100644 js/app.js create mode 100644 ts/app.js create mode 100644 ts/app.ts create mode 100644 tsconfig.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..7a73a41b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/js/app.js b/js/app.js new file mode 100644 index 00000000..e69de29b diff --git a/ts/app.js b/ts/app.js new file mode 100644 index 00000000..e69de29b diff --git a/ts/app.ts b/ts/app.ts new file mode 100644 index 00000000..02525d0f --- /dev/null +++ b/ts/app.ts @@ -0,0 +1 @@ +console.log("test"); \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 00000000..d67ecc0b --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "module": "system", + "noImplicitAny": true, + "removeComments": true, + "preserveConstEnums": true, + "outFile": "./built/local/tsc.js", + "sourceMap": true + }, + "include": [ + "src/**/*" + ], + "exclude": [ + "node_modules", + "**/*.spec.ts" + ] +} \ No newline at end of file From a1cdda821610dce4e245085d5c21e198f9ff1bf7 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sun, 25 Mar 2018 11:26:54 -0400 Subject: [PATCH 02/10] committing progress so far, can write to display text box in website, testing calling methods between different files/modules --- index.html | 12 +++++++----- js/app.js | 33 +++++++++++++++++++++++++++++++++ js/app.js.map | 1 + testButton.ts | 0 ts/app.js | 26 ++++++++++++++++++++++++++ ts/app.ts | 39 ++++++++++++++++++++++++++++++++++++++- ts/sumTwoNumbers.js | 8 ++++++++ ts/sumTwoNumbers.ts | 12 ++++++++++++ tsconfig.json | 4 ++-- 9 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 js/app.js.map create mode 100644 testButton.ts create mode 100644 ts/sumTwoNumbers.js create mode 100644 ts/sumTwoNumbers.ts diff --git a/index.html b/index.html index d2c3c254..dbb169cf 100644 --- a/index.html +++ b/index.html @@ -20,12 +20,14 @@

TypeScript Casino

-
- - -
+
+ + +
- + + + diff --git a/js/app.js b/js/app.js index e69de29b..d34b7930 100644 --- a/js/app.js +++ b/js/app.js @@ -0,0 +1,33 @@ +var Student = (function () { + function Student(firstName, middleInitial, lastName) { + this.firstName = firstName; + this.middleInitial = middleInitial; + this.lastName = lastName; + this.fullName = firstName + " " + middleInitial + " " + lastName; + } + return Student; +}()); +function greeter(person) { + return "Hello, " + person.firstName + " " + person.lastName; +} +var user = new Student("Luis", "J.", "Romero;"); +var submitInput = document.getElementById("user_input"); +var newString = submitInput.value; +var userInput0 = prompt("Please enter something: ", "type0"); +var userInput1 = prompt("Please enter something: ", "type1"); +console.log(userInput0); +console.log(userInput1); +document.getElementById("display").innerHTML = + "

Blackjack


" + + user.fullName + + "

User input: " + userInput0 + "

" + + "

User input: " + userInput1 + "

"; +function sumTwoNumbers(num1, num2) { + return num1 + num2; +} +var num1 = 1; +var num2 = 2; +var sum = sumTwoNumbers(num1, num2); +console.log("My sum is: " + sum); +var test = prompt("type something: ", ""); +//# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map new file mode 100644 index 00000000..fd980234 --- /dev/null +++ b/js/app.js.map @@ -0,0 +1 @@ +{"version":3,"file":"app.js","sourceRoot":"","sources":["../testButton.ts","../ts/app.ts","../ts/sumTwoNumbers.ts"],"names":[],"mappings":"ACEA;IAEI,iBAAmB,SAAiB,EAAS,aAAqB,EAAS,QAAgB;QAAxE,cAAS,GAAT,SAAS,CAAQ;QAAS,kBAAa,GAAb,aAAa,CAAQ;QAAS,aAAQ,GAAR,QAAQ,CAAQ;QACvF,IAAI,CAAC,QAAQ,GAAG,SAAS,GAAG,GAAG,GAAG,aAAa,GAAG,GAAG,GAAG,QAAQ,CAAC;IACrE,CAAC;IACL,cAAC;AAAD,CAAC,AALD,IAKC;AAOD,iBAAiB,MAAc;IAC3B,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,GAAI,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;AACjE,CAAC;AAED,IAAI,IAAI,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;AAEhD,IAAI,WAAW,GAAuC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AAC5F,IAAI,SAAS,GAAW,WAAW,CAAC,KAAK,CAAC;AAE1C,IAAI,UAAU,GAAG,MAAM,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;AAC7D,IAAI,UAAU,GAAG,MAAM,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;AAE7D,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACxB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAExB,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,SAAS;IAC5C,wBAAwB;QACxB,IAAI,CAAC,QAAQ;QACb,kBAAkB,GAAG,UAAU,GAAG,OAAO;QACzC,kBAAkB,GAAG,UAAU,GAAG,OAAO,CAAC;ACjC1C,uBAAuB,IAAY,EAAE,IAAY;IACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED,IAAI,IAAI,GAAW,CAAC,CAAC;AACrB,IAAI,IAAI,GAAW,CAAC,CAAC;AAErB,IAAI,GAAG,GAAW,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAE5C,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC;AAEjC,IAAI,IAAI,GAAW,MAAM,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC"} \ No newline at end of file diff --git a/testButton.ts b/testButton.ts new file mode 100644 index 00000000..e69de29b diff --git a/ts/app.js b/ts/app.js index e69de29b..f500e021 100644 --- a/ts/app.js +++ b/ts/app.js @@ -0,0 +1,26 @@ +// import { sumTwoNumbers } from "./sumTwoNumbers"; +var Student = /** @class */ (function () { + function Student(firstName, middleInitial, lastName) { + this.firstName = firstName; + this.middleInitial = middleInitial; + this.lastName = lastName; + this.fullName = firstName + " " + middleInitial + " " + lastName; + } + return Student; +}()); +function greeter(person) { + return "Hello, " + person.firstName + " " + person.lastName; +} +var user = new Student("Luis", "J.", "Romero;"); +var submitInput = document.getElementById("user_input").nodeValue; +var userInput0 = prompt("Please enter something: ", "type0"); +var userInput1 = prompt("Please enter something: ", "type1"); +console.log(userInput0); +console.log(userInput1); +document.getElementById("display").innerHTML = + "

Blackjack


" + + user.fullName + + "

User input: " + userInput0 + "

" + + "

User input: " + userInput1 + "

"; +// let num: number = sumTwoNumbers(1, 2); +// console.log(num); diff --git a/ts/app.ts b/ts/app.ts index 02525d0f..c20f0318 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -1 +1,38 @@ -console.log("test"); \ No newline at end of file +// import { sumTwoNumbers } from "./sumTwoNumbers"; + +class Student { + fullName: string; + constructor(public firstName: string, public middleInitial: string, public lastName: string) { + this.fullName = firstName + " " + middleInitial + " " + lastName; + } +} + +interface Person { + firstName: string; + lastName: string; +} + +function greeter(person: Person) { + return "Hello, " + person.firstName + " " + person.lastName; +} + +let user = new Student("Luis", "J.", "Romero;"); + +let submitInput: HTMLInputElement = document.getElementById("user_input"); +let newString: string = submitInput.value; + +let userInput0 = prompt("Please enter something: ", "type0"); +let userInput1 = prompt("Please enter something: ", "type1"); + +console.log(userInput0); +console.log(userInput1); + +document.getElementById("display").innerHTML = +"

Blackjack


" + +user.fullName + +"

User input: " + userInput0 + "

" + +"

User input: " + userInput1 + "

"; + + +// let num: number = sumTwoNumbers(1, 2); +// console.log(num); \ No newline at end of file diff --git a/ts/sumTwoNumbers.js b/ts/sumTwoNumbers.js new file mode 100644 index 00000000..a0a2ef89 --- /dev/null +++ b/ts/sumTwoNumbers.js @@ -0,0 +1,8 @@ +function sumTwoNumbers(num1, num2) { + return num1 + num2; +} +var num1 = 1; +var num2 = 2; +var sum = sumTwoNumbers(num1, num2); +console.log("My sum is: " + sum); +var test = prompt("type something: ", ""); diff --git a/ts/sumTwoNumbers.ts b/ts/sumTwoNumbers.ts new file mode 100644 index 00000000..523cb612 --- /dev/null +++ b/ts/sumTwoNumbers.ts @@ -0,0 +1,12 @@ +function sumTwoNumbers(num1: number, num2: number) { + return num1 + num2; +} + +var num1: number = 1; +var num2: number = 2; + +var sum: number = sumTwoNumbers(num1, num2); + +console.log("My sum is: " + sum); + +var test: string = prompt("type something: ", ""); \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index d67ecc0b..0d6f1485 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,11 +4,11 @@ "noImplicitAny": true, "removeComments": true, "preserveConstEnums": true, - "outFile": "./built/local/tsc.js", + "outFile": "./js/app.js", "sourceMap": true }, "include": [ - "src/**/*" + "./**/*" ], "exclude": [ "node_modules", From ab3d2b8704d0b786a73b9c03614d81c13f7ce7d2 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sun, 25 Mar 2018 15:11:21 -0400 Subject: [PATCH 03/10] UserInterface button text input working --- js/app.js | 147 +++++++++++++++++++++++++++++++++++++++------- js/app.js.map | 2 +- testButton.js | 24 ++++++++ testButton.ts | 25 ++++++++ ts/app.js | 70 ++++++++++++++-------- ts/app.ts | 76 ++++++++++++++---------- ts/previousApp.ts | 89 ++++++++++++++++++++++++++++ tsconfig.json | 7 ++- 8 files changed, 361 insertions(+), 79 deletions(-) create mode 100644 testButton.js create mode 100644 ts/previousApp.ts diff --git a/js/app.js b/js/app.js index d34b7930..3cfe3b01 100644 --- a/js/app.js +++ b/js/app.js @@ -1,27 +1,130 @@ -var Student = (function () { - function Student(firstName, middleInitial, lastName) { - this.firstName = firstName; - this.middleInitial = middleInitial; - this.lastName = lastName; - this.fullName = firstName + " " + middleInitial + " " + lastName; +constructor(); +{ + this.chooseGame = this.chooseGame.bind(this); +} +start(); +{ + UI.display("What game do you want to play?"); + UI.display("Black Jack or Go Fish?"); + UI.button.addEventListener("click", this.chooseGame); +} +chooseGame(); +void { + UI: .button.removeEventListener("click", this.chooseGame), + if: function (UI, lastInput) { } +} === "Black Jack"; +{ + BlackJack.start(); +} +if (UI.lastInput === "Go Fish") { + GoFish.start(); +} +else { + UI.button.addEventListener("click", this.chooseGame); +} +var UserInterface = (function () { + function UserInterface() { + var _this = this; + this.userInput = document.getElementById('user_input'); + this.window = document.getElementById('display'); + this.button = document.getElementById('submit'); + this.button.addEventListener("click", function (e) { _this._lastInput = _this.userInput.value; }); + this.button.addEventListener("click", function (e) { return console.log(_this._lastInput); }); + this.button.addEventListener("click", function (e) { _this.userInput.value = ''; }); + this.chooseGame = this.chooseGame.bind(this); } - return Student; + UserInterface.prototype.display = function (input) { + this.window.innerText += input + '\n'; + }; + UserInterface.prototype.clearScreen = function () { + this.window.innerText = ''; + }; + UserInterface.prototype.lastInput = function () { + return this._lastInput; + }; + UserInterface.prototype.start = function () { + var _this = this; + this.display("What game do you want to play?"); + this.display("Black Jack or Go Fish?"); + this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); + }; + UserInterface.prototype.chooseGame = function () { + var _this = this; + this.button.removeEventListener("click", function (e) { return _this.chooseGame(); }); + if (this.lastInput() === "Black Jack") { + this.display("Black Jack worked"); + } + else if (this.lastInput() === "Go Fish") { + this.display("Go Fish worked"); + } + else { + this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); + } + }; + return UserInterface; }()); -function greeter(person) { - return "Hello, " + person.firstName + " " + person.lastName; -} -var user = new Student("Luis", "J.", "Romero;"); -var submitInput = document.getElementById("user_input"); -var newString = submitInput.value; -var userInput0 = prompt("Please enter something: ", "type0"); -var userInput1 = prompt("Please enter something: ", "type1"); -console.log(userInput0); -console.log(userInput1); -document.getElementById("display").innerHTML = - "

Blackjack


" + - user.fullName + - "

User input: " + userInput0 + "

" + - "

User input: " + userInput1 + "

"; +var UI = new UserInterface(); +UI.start(); +var UI = (function () { + function UI() { + UI.button.addEventListener("click", function (e) { UI._lastInput = UI.userInput.value; }); + UI.button.addEventListener("click", function (e) { return console.log(UI._lastInput); }); + UI.button.addEventListener("click", function (e) { UI.userInput.value = ''; }); + } + UI.display = function (input) { + this.window.innerText += input + '\n'; + }; + UI.clearScreen = function () { + this.window.innerText = ''; + }; + Object.defineProperty(UI, "Instance", { + get: function () { + return this._instance || (this._instance = new UI()); + }, + enumerable: true, + configurable: true + }); + Object.defineProperty(UI, "lastInput", { + get: function () { + return this._lastInput; + }, + enumerable: true, + configurable: true + }); + UI.userInput = document.getElementById('user_input'); + UI.window = document.getElementById('display'); + UI.button = document.getElementById('submit'); + return UI; +}()); +var Choose = (function () { + function Choose() { + this.chooseGame = this.chooseGame.bind(this); + } + Choose.prototype.start = function () { + var _this = this; + UI.display("What game do you want to play?"); + UI.display("Black Jack or Go Fish?"); + UI.button.addEventListener("click", function (e) { return _this.chooseGame; }); + }; + Choose.prototype.chooseGame = function () { + var _this = this; + UI.button.removeEventListener("click", function (e) { return _this.chooseGame; }); + if (UI.lastInput === "Black Jack") { + UI.display("Black Jack worked"); + } + else if (UI.lastInput === "Go Fish") { + UI.display("Go Fish worked"); + } + else { + UI.button.addEventListener("click", function (e) { return _this.chooseGame; }); + } + }; + return Choose; +}()); +UI; +UI.display("text from display method"); +var chooseGame = new Choose(); +chooseGame.chooseGame(); function sumTwoNumbers(num1, num2) { return num1 + num2; } diff --git a/js/app.js.map b/js/app.js.map index fd980234..9ff2ad1d 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../testButton.ts","../ts/app.ts","../ts/sumTwoNumbers.ts"],"names":[],"mappings":"ACEA;IAEI,iBAAmB,SAAiB,EAAS,aAAqB,EAAS,QAAgB;QAAxE,cAAS,GAAT,SAAS,CAAQ;QAAS,kBAAa,GAAb,aAAa,CAAQ;QAAS,aAAQ,GAAR,QAAQ,CAAQ;QACvF,IAAI,CAAC,QAAQ,GAAG,SAAS,GAAG,GAAG,GAAG,aAAa,GAAG,GAAG,GAAG,QAAQ,CAAC;IACrE,CAAC;IACL,cAAC;AAAD,CAAC,AALD,IAKC;AAOD,iBAAiB,MAAc;IAC3B,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,GAAI,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;AACjE,CAAC;AAED,IAAI,IAAI,GAAG,IAAI,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;AAEhD,IAAI,WAAW,GAAuC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;AAC5F,IAAI,SAAS,GAAW,WAAW,CAAC,KAAK,CAAC;AAE1C,IAAI,UAAU,GAAG,MAAM,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;AAC7D,IAAI,UAAU,GAAG,MAAM,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;AAE7D,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACxB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AAExB,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,SAAS;IAC5C,wBAAwB;QACxB,IAAI,CAAC,QAAQ;QACb,kBAAkB,GAAG,UAAU,GAAG,OAAO;QACzC,kBAAkB,GAAG,UAAU,GAAG,OAAO,CAAC;ACjC1C,uBAAuB,IAAY,EAAE,IAAY;IACzC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED,IAAI,IAAI,GAAW,CAAC,CAAC;AACrB,IAAI,IAAI,GAAW,CAAC,CAAC;AAErB,IAAI,GAAG,GAAW,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAE5C,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC;AAEjC,IAAI,IAAI,GAAW,MAAM,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../testButton.ts","../ts/app.ts","../ts/previousApp.ts","../ts/sumTwoNumbers.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/testButton.js b/testButton.js new file mode 100644 index 00000000..2af0168b --- /dev/null +++ b/testButton.js @@ -0,0 +1,24 @@ +constructor(); +{ + this.chooseGame = this.chooseGame.bind(this); +} +start(); +{ + UI.display("What game do you want to play?"); + UI.display("Black Jack or Go Fish?"); + UI.button.addEventListener("click", this.chooseGame); +} +chooseGame(); +void { + UI: .button.removeEventListener("click", this.chooseGame), + "if": function (UI, lastInput) { } +} === "Black Jack"; +{ + BlackJack.start(); +} +if (UI.lastInput === "Go Fish") { + GoFish.start(); +} +else { + UI.button.addEventListener("click", this.chooseGame); +} diff --git a/testButton.ts b/testButton.ts index e69de29b..078fd4f0 100644 --- a/testButton.ts +++ b/testButton.ts @@ -0,0 +1,25 @@ +constructor(){ + this.chooseGame = this.chooseGame.bind(this); +} + +start() { + UI.display("What game do you want to play?"); + UI.display("Black Jack or Go Fish?"); + UI.button.addEventListener("click", this.chooseGame); +} + + chooseGame(): void { + UI.button.removeEventListener("click", this.chooseGame); + if (UI.lastInput === "Black Jack") { + + BlackJack.start(); + + } + else if (UI.lastInput === "Go Fish") { + GoFish.start(); + + } + else { + UI.button.addEventListener("click", this.chooseGame); + } +} \ No newline at end of file diff --git a/ts/app.js b/ts/app.js index f500e021..c915aae2 100644 --- a/ts/app.js +++ b/ts/app.js @@ -1,26 +1,48 @@ -// import { sumTwoNumbers } from "./sumTwoNumbers"; -var Student = /** @class */ (function () { - function Student(firstName, middleInitial, lastName) { - this.firstName = firstName; - this.middleInitial = middleInitial; - this.lastName = lastName; - this.fullName = firstName + " " + middleInitial + " " + lastName; +var UserInterface = /** @class */ (function () { + // private static _instance: UI; + function UserInterface() { + var _this = this; + this.userInput = document.getElementById('user_input'); + this.window = document.getElementById('display'); + this.button = document.getElementById('submit'); + this.button.addEventListener("click", function (e) { _this._lastInput = _this.userInput.value; }); + this.button.addEventListener("click", function (e) { return console.log(_this._lastInput); }); + this.button.addEventListener("click", function (e) { _this.userInput.value = ''; }); + this.chooseGame = this.chooseGame.bind(this); } - return Student; + UserInterface.prototype.display = function (input) { + this.window.innerText += input + '\n'; + }; + UserInterface.prototype.clearScreen = function () { + this.window.innerText = ''; + }; + // public static get Instance(): UI { + // return this._instance || (this._instance = new UI()); + // } + UserInterface.prototype.lastInput = function () { + return this._lastInput; + }; + UserInterface.prototype.start = function () { + var _this = this; + this.display("What game do you want to play?"); + this.display("Black Jack or Go Fish?"); + this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); + }; + UserInterface.prototype.chooseGame = function () { + var _this = this; + this.button.removeEventListener("click", function (e) { return _this.chooseGame(); }); + if (this.lastInput() === "Black Jack") { + this.display("Black Jack worked"); + } + else if (this.lastInput() === "Go Fish") { + this.display("Go Fish worked"); + } + else { + this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); + } + }; + return UserInterface; }()); -function greeter(person) { - return "Hello, " + person.firstName + " " + person.lastName; -} -var user = new Student("Luis", "J.", "Romero;"); -var submitInput = document.getElementById("user_input").nodeValue; -var userInput0 = prompt("Please enter something: ", "type0"); -var userInput1 = prompt("Please enter something: ", "type1"); -console.log(userInput0); -console.log(userInput1); -document.getElementById("display").innerHTML = - "

Blackjack


" + - user.fullName + - "

User input: " + userInput0 + "

" + - "

User input: " + userInput1 + "

"; -// let num: number = sumTwoNumbers(1, 2); -// console.log(num); +var UI = new UserInterface(); +UI.start(); +// UI.chooseGame(); diff --git a/ts/app.ts b/ts/app.ts index c20f0318..0fecc5bc 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -1,38 +1,54 @@ -// import { sumTwoNumbers } from "./sumTwoNumbers"; - -class Student { - fullName: string; - constructor(public firstName: string, public middleInitial: string, public lastName: string) { - this.fullName = firstName + " " + middleInitial + " " + lastName; +class UserInterface { + public userInput: HTMLInputElement = document.getElementById('user_input'); + public window: HTMLDivElement = document.getElementById('display'); + public button: HTMLDivElement = document.getElementById('submit'); + public _lastInput: string; + // private static _instance: UI; + + constructor() { + this.button.addEventListener("click", (e: Event) => { this._lastInput = this.userInput.value }); + this.button.addEventListener("click", (e:Event) => console.log(this._lastInput)); + this.button.addEventListener("click", (e: Event) => { this.userInput.value = '' }); + this.chooseGame = this.chooseGame.bind(this); } -} - -interface Person { - firstName: string; - lastName: string; -} - -function greeter(person: Person) { - return "Hello, " + person.firstName + " " + person.lastName; -} -let user = new Student("Luis", "J.", "Romero;"); + display(input: string): void { + this.window.innerText += input + '\n'; + } -let submitInput: HTMLInputElement = document.getElementById("user_input"); -let newString: string = submitInput.value; + clearScreen(): void { + this.window.innerText = ''; + } -let userInput0 = prompt("Please enter something: ", "type0"); -let userInput1 = prompt("Please enter something: ", "type1"); + // public static get Instance(): UI { + // return this._instance || (this._instance = new UI()); + // } -console.log(userInput0); -console.log(userInput1); + lastInput(): string { + return this._lastInput; + } -document.getElementById("display").innerHTML = -"

Blackjack


" + -user.fullName + -"

User input: " + userInput0 + "

" + -"

User input: " + userInput1 + "

"; + start() { + this.display("What game do you want to play?"); + this.display("Black Jack or Go Fish?"); + this.button.addEventListener("click", (e:Event) => this.chooseGame()); + } + + chooseGame(): void { + this.button.removeEventListener("click", (e:Event) => this.chooseGame()); + if (this.lastInput() === "Black Jack") { + this.display("Black Jack worked"); + } + else if (this.lastInput() === "Go Fish") { + this.display("Go Fish worked"); + } + else { + this.button.addEventListener("click", (e:Event) => this.chooseGame()); + } + } +} -// let num: number = sumTwoNumbers(1, 2); -// console.log(num); \ No newline at end of file +let UI: UserInterface = new UserInterface(); +UI.start(); +// UI.chooseGame(); diff --git a/ts/previousApp.ts b/ts/previousApp.ts new file mode 100644 index 00000000..189529cc --- /dev/null +++ b/ts/previousApp.ts @@ -0,0 +1,89 @@ +// import { sumTwoNumbers } from "./sumTwoNumbers"; + +// class Student { +// fullName: string; +// constructor(public firstName: string, public middleInitial: string, public lastName: string) { +// this.fullName = firstName + " " + middleInitial + " " + lastName; +// } +// } + +// interface Person { +// firstName: string; +// lastName: string; +// } + +// function greeter(person: Person) { +// return "Hello, " + person.firstName + " " + person.lastName; +// } + +// let user: Student = new Student("Luis", "J.", "Romero"); + +class UI { + static userInput: HTMLInputElement = document.getElementById('user_input'); + static window: HTMLDivElement = document.getElementById('display'); + static button: HTMLDivElement = document.getElementById('submit'); + static _lastInput: any; + private static _instance: UI; + + private constructor() { + UI.button.addEventListener("click", (e: Event) => { UI._lastInput = UI.userInput.value }); + UI.button.addEventListener("click", (e:Event) => console.log(UI._lastInput)); + UI.button.addEventListener("click", (e: Event) => { UI.userInput.value = '' }); + } + + static display(input: string): void { + this.window.innerText += input + '\n'; + } + + static clearScreen(): void { + this.window.innerText = ''; + } + + public static get Instance(): UI { + return this._instance || (this._instance = new UI()); + } + + public static get lastInput(): any { + return this._lastInput; + } + +} + +// let userInput0 = prompt("Please enter something: ", "type0"); +// let userInput1 = prompt("Please enter something: ", "type1"); +// console.log(userInput0); +// console.log(userInput1); + +class Choose { + constructor(){ + this.chooseGame = this.chooseGame.bind(this); + } + + start() { + UI.display("What game do you want to play?"); + UI.display("Black Jack or Go Fish?"); + UI.button.addEventListener("click", (e:Event) => this.chooseGame); + } + + chooseGame(): void { + UI.button.removeEventListener("click", (e:Event) => this.chooseGame); + if (UI.lastInput === "Black Jack") { + UI.display("Black Jack worked"); + } + else if (UI.lastInput === "Go Fish") { + UI.display("Go Fish worked"); + } + else { + UI.button.addEventListener("click", (e:Event) => this.chooseGame); + } + } +} + +UI; +UI.display("text from display method"); +let chooseGame: Choose = new Choose(); +// chooseGame.start(); +chooseGame.chooseGame(); + +// let num: number = sumTwoNumbers(1, 2); +// console.log(num); \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 0d6f1485..75a50f02 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,11 +1,14 @@ -{ +{ + "compileOnSave": true, "compilerOptions": { "module": "system", "noImplicitAny": true, "removeComments": true, "preserveConstEnums": true, "outFile": "./js/app.js", - "sourceMap": true + "sourceMap": true, + "target": "es5", + "watch": true }, "include": [ "./**/*" From d11312d9204675aec05d2ace55fb1b5514758b57 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sun, 25 Mar 2018 15:17:43 -0400 Subject: [PATCH 04/10] cleaning up files --- js/app.js | 68 -------------------- js/app.js.map | 2 +- testButton.js | 24 ------- testButton.ts | 25 -------- ts/app.js | 1 - ts/app.ts | 1 - ts/previousApp.ts | 152 +++++++++++++++++++++++--------------------- ts/sumTwoNumbers.js | 8 --- ts/sumTwoNumbers.ts | 12 ---- 9 files changed, 79 insertions(+), 214 deletions(-) delete mode 100644 testButton.js delete mode 100644 testButton.ts delete mode 100644 ts/sumTwoNumbers.js delete mode 100644 ts/sumTwoNumbers.ts diff --git a/js/app.js b/js/app.js index 3cfe3b01..4e7939e0 100644 --- a/js/app.js +++ b/js/app.js @@ -65,72 +65,4 @@ var UserInterface = (function () { }()); var UI = new UserInterface(); UI.start(); -var UI = (function () { - function UI() { - UI.button.addEventListener("click", function (e) { UI._lastInput = UI.userInput.value; }); - UI.button.addEventListener("click", function (e) { return console.log(UI._lastInput); }); - UI.button.addEventListener("click", function (e) { UI.userInput.value = ''; }); - } - UI.display = function (input) { - this.window.innerText += input + '\n'; - }; - UI.clearScreen = function () { - this.window.innerText = ''; - }; - Object.defineProperty(UI, "Instance", { - get: function () { - return this._instance || (this._instance = new UI()); - }, - enumerable: true, - configurable: true - }); - Object.defineProperty(UI, "lastInput", { - get: function () { - return this._lastInput; - }, - enumerable: true, - configurable: true - }); - UI.userInput = document.getElementById('user_input'); - UI.window = document.getElementById('display'); - UI.button = document.getElementById('submit'); - return UI; -}()); -var Choose = (function () { - function Choose() { - this.chooseGame = this.chooseGame.bind(this); - } - Choose.prototype.start = function () { - var _this = this; - UI.display("What game do you want to play?"); - UI.display("Black Jack or Go Fish?"); - UI.button.addEventListener("click", function (e) { return _this.chooseGame; }); - }; - Choose.prototype.chooseGame = function () { - var _this = this; - UI.button.removeEventListener("click", function (e) { return _this.chooseGame; }); - if (UI.lastInput === "Black Jack") { - UI.display("Black Jack worked"); - } - else if (UI.lastInput === "Go Fish") { - UI.display("Go Fish worked"); - } - else { - UI.button.addEventListener("click", function (e) { return _this.chooseGame; }); - } - }; - return Choose; -}()); -UI; -UI.display("text from display method"); -var chooseGame = new Choose(); -chooseGame.chooseGame(); -function sumTwoNumbers(num1, num2) { - return num1 + num2; -} -var num1 = 1; -var num2 = 2; -var sum = sumTwoNumbers(num1, num2); -console.log("My sum is: " + sum); -var test = prompt("type something: ", ""); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index 9ff2ad1d..c0cab316 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../testButton.ts","../ts/app.ts","../ts/previousApp.ts","../ts/sumTwoNumbers.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../testButton.ts","../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/testButton.js b/testButton.js deleted file mode 100644 index 2af0168b..00000000 --- a/testButton.js +++ /dev/null @@ -1,24 +0,0 @@ -constructor(); -{ - this.chooseGame = this.chooseGame.bind(this); -} -start(); -{ - UI.display("What game do you want to play?"); - UI.display("Black Jack or Go Fish?"); - UI.button.addEventListener("click", this.chooseGame); -} -chooseGame(); -void { - UI: .button.removeEventListener("click", this.chooseGame), - "if": function (UI, lastInput) { } -} === "Black Jack"; -{ - BlackJack.start(); -} -if (UI.lastInput === "Go Fish") { - GoFish.start(); -} -else { - UI.button.addEventListener("click", this.chooseGame); -} diff --git a/testButton.ts b/testButton.ts deleted file mode 100644 index 078fd4f0..00000000 --- a/testButton.ts +++ /dev/null @@ -1,25 +0,0 @@ -constructor(){ - this.chooseGame = this.chooseGame.bind(this); -} - -start() { - UI.display("What game do you want to play?"); - UI.display("Black Jack or Go Fish?"); - UI.button.addEventListener("click", this.chooseGame); -} - - chooseGame(): void { - UI.button.removeEventListener("click", this.chooseGame); - if (UI.lastInput === "Black Jack") { - - BlackJack.start(); - - } - else if (UI.lastInput === "Go Fish") { - GoFish.start(); - - } - else { - UI.button.addEventListener("click", this.chooseGame); - } -} \ No newline at end of file diff --git a/ts/app.js b/ts/app.js index c915aae2..380f45f1 100644 --- a/ts/app.js +++ b/ts/app.js @@ -45,4 +45,3 @@ var UserInterface = /** @class */ (function () { }()); var UI = new UserInterface(); UI.start(); -// UI.chooseGame(); diff --git a/ts/app.ts b/ts/app.ts index 0fecc5bc..8c55ef0f 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -51,4 +51,3 @@ class UserInterface { let UI: UserInterface = new UserInterface(); UI.start(); -// UI.chooseGame(); diff --git a/ts/previousApp.ts b/ts/previousApp.ts index 189529cc..d44c6e87 100644 --- a/ts/previousApp.ts +++ b/ts/previousApp.ts @@ -1,89 +1,93 @@ -// import { sumTwoNumbers } from "./sumTwoNumbers"; +//IGNORE THIS FILE -// class Student { -// fullName: string; -// constructor(public firstName: string, public middleInitial: string, public lastName: string) { -// this.fullName = firstName + " " + middleInitial + " " + lastName; -// } -// } +// namespace commoname; -// interface Person { -// firstName: string; -// lastName: string; -// } +// // import { sumTwoNumbers } from "./sumTwoNumbers"; -// function greeter(person: Person) { -// return "Hello, " + person.firstName + " " + person.lastName; -// } +// // class Student { +// // fullName: string; +// // constructor(public firstName: string, public middleInitial: string, public lastName: string) { +// // this.fullName = firstName + " " + middleInitial + " " + lastName; +// // } +// // } -// let user: Student = new Student("Luis", "J.", "Romero"); +// // interface Person { +// // firstName: string; +// // lastName: string; +// // } -class UI { - static userInput: HTMLInputElement = document.getElementById('user_input'); - static window: HTMLDivElement = document.getElementById('display'); - static button: HTMLDivElement = document.getElementById('submit'); - static _lastInput: any; - private static _instance: UI; +// // function greeter(person: Person) { +// // return "Hello, " + person.firstName + " " + person.lastName; +// // } - private constructor() { - UI.button.addEventListener("click", (e: Event) => { UI._lastInput = UI.userInput.value }); - UI.button.addEventListener("click", (e:Event) => console.log(UI._lastInput)); - UI.button.addEventListener("click", (e: Event) => { UI.userInput.value = '' }); - } +// // let user: Student = new Student("Luis", "J.", "Romero"); - static display(input: string): void { - this.window.innerText += input + '\n'; - } +// class UI { +// static userInput: HTMLInputElement = document.getElementById('user_input'); +// static window: HTMLDivElement = document.getElementById('display'); +// static button: HTMLDivElement = document.getElementById('submit'); +// static _lastInput: any; +// private static _instance: UI; - static clearScreen(): void { - this.window.innerText = ''; - } +// private constructor() { +// UI.button.addEventListener("click", (e: Event) => { UI._lastInput = UI.userInput.value }); +// UI.button.addEventListener("click", (e:Event) => console.log(UI._lastInput)); +// UI.button.addEventListener("click", (e: Event) => { UI.userInput.value = '' }); +// } + +// static display(input: string): void { +// this.window.innerText += input + '\n'; +// } + +// static clearScreen(): void { +// this.window.innerText = ''; +// } - public static get Instance(): UI { - return this._instance || (this._instance = new UI()); - } +// public static get Instance(): UI { +// return this._instance || (this._instance = new UI()); +// } - public static get lastInput(): any { - return this._lastInput; - } +// public static get lastInput(): any { +// return this._lastInput; +// } -} +// } -// let userInput0 = prompt("Please enter something: ", "type0"); -// let userInput1 = prompt("Please enter something: ", "type1"); -// console.log(userInput0); -// console.log(userInput1); +// // let userInput0 = prompt("Please enter something: ", "type0"); +// // let userInput1 = prompt("Please enter something: ", "type1"); +// // console.log(userInput0); +// // console.log(userInput1); -class Choose { - constructor(){ - this.chooseGame = this.chooseGame.bind(this); - } +// class Choose { +// constructor(){ +// this.chooseGame = this.chooseGame.bind(this); +// } - start() { - UI.display("What game do you want to play?"); - UI.display("Black Jack or Go Fish?"); - UI.button.addEventListener("click", (e:Event) => this.chooseGame); - } +// start() { +// UI.display("What game do you want to play?"); +// UI.display("Black Jack or Go Fish?"); +// } +// UI.button.addEventListener("click", (e:Event) => this.chooseGame); - chooseGame(): void { - UI.button.removeEventListener("click", (e:Event) => this.chooseGame); - if (UI.lastInput === "Black Jack") { - UI.display("Black Jack worked"); - } - else if (UI.lastInput === "Go Fish") { - UI.display("Go Fish worked"); - } - else { - UI.button.addEventListener("click", (e:Event) => this.chooseGame); - } - } -} - -UI; -UI.display("text from display method"); -let chooseGame: Choose = new Choose(); -// chooseGame.start(); -chooseGame.chooseGame(); - -// let num: number = sumTwoNumbers(1, 2); -// console.log(num); \ No newline at end of file +// chooseGame(): void { +// UI.button.removeEventListener("click", (e:Event) => this.chooseGame); +// if (UI.lastInput === "Black Jack") { +// UI.display("Black Jack worked"); +// } +// else if (UI.lastInput === "Go Fish") { +// UI.display("Go Fish worked"); +// } +// else { +// UI.button.addEventListener("click", (e:Event) => this.chooseGame); +// } +// } +// } + +// UI; +// UI.display("text from display method"); +// let chooseGame: Choose = new Choose(); +// // chooseGame.start(); +// chooseGame.chooseGame(); + +// // let num: number = sumTwoNumbers(1, 2); +// // console.log(num); \ No newline at end of file diff --git a/ts/sumTwoNumbers.js b/ts/sumTwoNumbers.js deleted file mode 100644 index a0a2ef89..00000000 --- a/ts/sumTwoNumbers.js +++ /dev/null @@ -1,8 +0,0 @@ -function sumTwoNumbers(num1, num2) { - return num1 + num2; -} -var num1 = 1; -var num2 = 2; -var sum = sumTwoNumbers(num1, num2); -console.log("My sum is: " + sum); -var test = prompt("type something: ", ""); diff --git a/ts/sumTwoNumbers.ts b/ts/sumTwoNumbers.ts deleted file mode 100644 index 523cb612..00000000 --- a/ts/sumTwoNumbers.ts +++ /dev/null @@ -1,12 +0,0 @@ -function sumTwoNumbers(num1: number, num2: number) { - return num1 + num2; -} - -var num1: number = 1; -var num2: number = 2; - -var sum: number = sumTwoNumbers(num1, num2); - -console.log("My sum is: " + sum); - -var test: string = prompt("type something: ", ""); \ No newline at end of file From d1ca44986876cce4ebc0388a7310b0715c56487a Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sun, 25 Mar 2018 17:24:46 -0400 Subject: [PATCH 05/10] created enum Suit --- js/app.js | 54 +++++++++++++++++++++------------------------------ js/app.js.map | 2 +- ts/app.js | 39 +++++++++++++++++++++++++------------ ts/app.ts | 47 +++++++++++++++++++++++++++++--------------- 4 files changed, 81 insertions(+), 61 deletions(-) diff --git a/js/app.js b/js/app.js index 4e7939e0..15f8202e 100644 --- a/js/app.js +++ b/js/app.js @@ -1,27 +1,3 @@ -constructor(); -{ - this.chooseGame = this.chooseGame.bind(this); -} -start(); -{ - UI.display("What game do you want to play?"); - UI.display("Black Jack or Go Fish?"); - UI.button.addEventListener("click", this.chooseGame); -} -chooseGame(); -void { - UI: .button.removeEventListener("click", this.chooseGame), - if: function (UI, lastInput) { } -} === "Black Jack"; -{ - BlackJack.start(); -} -if (UI.lastInput === "Go Fish") { - GoFish.start(); -} -else { - UI.button.addEventListener("click", this.chooseGame); -} var UserInterface = (function () { function UserInterface() { var _this = this; @@ -31,7 +7,6 @@ var UserInterface = (function () { this.button.addEventListener("click", function (e) { _this._lastInput = _this.userInput.value; }); this.button.addEventListener("click", function (e) { return console.log(_this._lastInput); }); this.button.addEventListener("click", function (e) { _this.userInput.value = ''; }); - this.chooseGame = this.chooseGame.bind(this); } UserInterface.prototype.display = function (input) { this.window.innerText += input + '\n'; @@ -44,18 +19,18 @@ var UserInterface = (function () { }; UserInterface.prototype.start = function () { var _this = this; - this.display("What game do you want to play?"); - this.display("Black Jack or Go Fish?"); + this.display("Do you want to play Blackjack? (y/n)"); this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); }; UserInterface.prototype.chooseGame = function () { var _this = this; - this.button.removeEventListener("click", function (e) { return _this.chooseGame(); }); - if (this.lastInput() === "Black Jack") { - this.display("Black Jack worked"); + if (this.lastInput() === "y") { + this.clearScreen(); + this.display("Ok, let's play Blackjack."); } - else if (this.lastInput() === "Go Fish") { - this.display("Go Fish worked"); + else if (this.lastInput() === "n") { + this.clearScreen(); + this.display("All right, good-bye. Live your best life."); } else { this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); @@ -63,6 +38,21 @@ var UserInterface = (function () { }; return UserInterface; }()); +var MathOps = (function () { + function MathOps() { + } + MathOps.sum = function (number1, number2) { + return (number1 + number2); + }; + return MathOps; +}()); +var Suit; +(function (Suit) { + Suit["CLUBS"] = "clubs"; + Suit["DIAMONDS"] = "diamonds"; + Suit["HEARTS"] = "hearts"; + Suit["SPADES"] = "spades"; +})(Suit || (Suit = {})); var UI = new UserInterface(); UI.start(); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index c0cab316..e9d6b313 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../testButton.ts","../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"AAAA;IAMI;QAAA,iBAKC;QAVM,cAAS,GAAuC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACtF,WAAM,GAAmC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC5E,WAAM,GAAmC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAI9E,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAO,KAAI,CAAC,UAAU,GAAG,KAAI,CAAC,SAAS,CAAC,KAAK,CAAA,CAAC,CAAC,CAAC,CAAC;QAChG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAO,IAAK,OAAA,OAAO,CAAC,GAAG,CAAC,KAAI,CAAC,UAAU,CAAC,EAA5B,CAA4B,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAO,KAAI,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC;IAEvF,CAAC;IAED,+BAAO,GAAP,UAAQ,KAAU;QACd,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,GAAG,IAAI,CAAC;IAC1C,CAAC;IAED,mCAAW,GAAX;QACI,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,iCAAS,GAAT;QACI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,6BAAK,GAAL;QAAA,iBAGC;QAFG,IAAI,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAO,IAAK,OAAA,KAAI,CAAC,UAAU,EAAE,EAAjB,CAAiB,CAAC,CAAC;IAC1E,CAAC;IAED,kCAAU,GAAV;QAAA,iBAgBC;QAdG,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAE9C,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;QAE9D,CAAC;QACD,IAAI,CAAC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAO,IAAK,OAAA,KAAI,CAAC,UAAU,EAAE,EAAjB,CAAiB,CAAC,CAAC;QAE1E,CAAC;IACL,CAAC;IAEL,oBAAC;AAAD,CAAC,AAhDD,IAgDC;AAED;IACI;IACA,CAAC;IAEM,WAAG,GAAV,UAAW,OAAe,EAAE,OAAe;QACvC,MAAM,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;IAC/B,CAAC;IACL,cAAC;AAAD,CAAC,AAPD,IAOC;AAED,IAAK,IAKJ;AALD,WAAK,IAAI;IACL,uBAAe,CAAA;IACf,6BAAqB,CAAA;IACrB,yBAAiB,CAAA;IACjB,yBAAiB,CAAA;AACrB,CAAC,EALI,IAAI,KAAJ,IAAI,QAKR;AAED,IAAI,EAAE,GAAkB,IAAI,aAAa,EAAE,CAAC;AAC5C,EAAE,CAAC,KAAK,EAAE,CAAC"} \ No newline at end of file diff --git a/ts/app.js b/ts/app.js index 380f45f1..4d077b44 100644 --- a/ts/app.js +++ b/ts/app.js @@ -1,5 +1,4 @@ var UserInterface = /** @class */ (function () { - // private static _instance: UI; function UserInterface() { var _this = this; this.userInput = document.getElementById('user_input'); @@ -8,7 +7,7 @@ var UserInterface = /** @class */ (function () { this.button.addEventListener("click", function (e) { _this._lastInput = _this.userInput.value; }); this.button.addEventListener("click", function (e) { return console.log(_this._lastInput); }); this.button.addEventListener("click", function (e) { _this.userInput.value = ''; }); - this.chooseGame = this.chooseGame.bind(this); + // this.chooseGame = this.chooseGame.bind(this); } UserInterface.prototype.display = function (input) { this.window.innerText += input + '\n'; @@ -16,32 +15,48 @@ var UserInterface = /** @class */ (function () { UserInterface.prototype.clearScreen = function () { this.window.innerText = ''; }; - // public static get Instance(): UI { - // return this._instance || (this._instance = new UI()); - // } UserInterface.prototype.lastInput = function () { return this._lastInput; }; UserInterface.prototype.start = function () { var _this = this; - this.display("What game do you want to play?"); - this.display("Black Jack or Go Fish?"); + this.display("Do you want to play Blackjack? (y/n)"); this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); }; UserInterface.prototype.chooseGame = function () { var _this = this; - this.button.removeEventListener("click", function (e) { return _this.chooseGame(); }); - if (this.lastInput() === "Black Jack") { - this.display("Black Jack worked"); + // this.button.removeEventListener("click", (e:Event) => this.chooseGame()); + if (this.lastInput() === "y") { + this.clearScreen(); + this.display("Ok, let's play Blackjack."); + // this.button.removeEventListener("click", (e:Event) => this.chooseGame()); } - else if (this.lastInput() === "Go Fish") { - this.display("Go Fish worked"); + else if (this.lastInput() === "n") { + this.clearScreen(); + this.display("All right, good-bye. Live your best life."); + // this.button.removeEventListener("click", (e:Event) => this.chooseGame()); } else { this.button.addEventListener("click", function (e) { return _this.chooseGame(); }); + // this.display("Please try again"); } }; return UserInterface; }()); +var MathOps = /** @class */ (function () { + function MathOps() { + } + MathOps.sum = function (number1, number2) { + return (number1 + number2); + }; + return MathOps; +}()); +var Suit; +(function (Suit) { + Suit["CLUBS"] = "clubs"; + Suit["DIAMONDS"] = "diamonds"; + Suit["HEARTS"] = "hearts"; + Suit["SPADES"] = "spades"; +})(Suit || (Suit = {})); var UI = new UserInterface(); UI.start(); diff --git a/ts/app.ts b/ts/app.ts index 8c55ef0f..5001855f 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -2,17 +2,16 @@ class UserInterface { public userInput: HTMLInputElement = document.getElementById('user_input'); public window: HTMLDivElement = document.getElementById('display'); public button: HTMLDivElement = document.getElementById('submit'); - public _lastInput: string; - // private static _instance: UI; + public _lastInput: any; constructor() { this.button.addEventListener("click", (e: Event) => { this._lastInput = this.userInput.value }); this.button.addEventListener("click", (e:Event) => console.log(this._lastInput)); this.button.addEventListener("click", (e: Event) => { this.userInput.value = '' }); - this.chooseGame = this.chooseGame.bind(this); + // this.chooseGame = this.chooseGame.bind(this); } - display(input: string): void { + display(input: any): void { this.window.innerText += input + '\n'; } @@ -20,34 +19,50 @@ class UserInterface { this.window.innerText = ''; } - // public static get Instance(): UI { - // return this._instance || (this._instance = new UI()); - // } - - lastInput(): string { + lastInput(): any { return this._lastInput; } start() { - this.display("What game do you want to play?"); - this.display("Black Jack or Go Fish?"); + this.display("Do you want to play Blackjack? (y/n)"); this.button.addEventListener("click", (e:Event) => this.chooseGame()); } chooseGame(): void { - this.button.removeEventListener("click", (e:Event) => this.chooseGame()); - if (this.lastInput() === "Black Jack") { - this.display("Black Jack worked"); + // this.button.removeEventListener("click", (e:Event) => this.chooseGame()); + if (this.lastInput() === "y") { + this.clearScreen(); + this.display("Ok, let's play Blackjack."); + // this.button.removeEventListener("click", (e:Event) => this.chooseGame()); } - else if (this.lastInput() === "Go Fish") { - this.display("Go Fish worked"); + else if (this.lastInput() === "n") { + this.clearScreen(); + this.display("All right, good-bye. Live your best life."); + // this.button.removeEventListener("click", (e:Event) => this.chooseGame()); } else { this.button.addEventListener("click", (e:Event) => this.chooseGame()); + // this.display("Please try again"); } } } +class MathOps { + constructor() { + } + + static sum(number1: number, number2: number): number { + return (number1 + number2); + } +} + +enum Suit { + CLUBS = "clubs", + DIAMONDS = "diamonds", + HEARTS = "hearts", + SPADES = "spades" +} + let UI: UserInterface = new UserInterface(); UI.start(); From 50ab060d90dbd4fe96827030ff8b4d813bcda3c8 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sun, 25 Mar 2018 17:33:10 -0400 Subject: [PATCH 06/10] added a string enum for suits, and another unicode enum for suits --- js/app.js | 26 +++++++++++++++++++------- js/app.js.map | 2 +- ts/app.js | 41 ++++++++++++++++++++++++++++++++++------- ts/app.ts | 31 ++++++++++++++++++++++++++++++- 4 files changed, 84 insertions(+), 16 deletions(-) diff --git a/js/app.js b/js/app.js index 15f8202e..5d5f4771 100644 --- a/js/app.js +++ b/js/app.js @@ -46,13 +46,25 @@ var MathOps = (function () { }; return MathOps; }()); -var Suit; -(function (Suit) { - Suit["CLUBS"] = "clubs"; - Suit["DIAMONDS"] = "diamonds"; - Suit["HEARTS"] = "hearts"; - Suit["SPADES"] = "spades"; -})(Suit || (Suit = {})); +var SuitString; +(function (SuitString) { + SuitString["CLUBS"] = "clubs"; + SuitString["DIAMONDS"] = "diamonds"; + SuitString["HEARTS"] = "hearts"; + SuitString["SPADES"] = "spades"; +})(SuitString || (SuitString = {})); +var SuitUnicode; +(function (SuitUnicode) { + SuitUnicode["CLUBS"] = "\u2663"; + SuitUnicode["DIAMONDS"] = "\u2666"; + SuitUnicode["HEARTS"] = "\u2665"; + SuitUnicode["SPADES"] = "\u2660"; +})(SuitUnicode || (SuitUnicode = {})); var UI = new UserInterface(); UI.start(); +UI.display(SuitString.CLUBS); +UI.display(SuitUnicode.CLUBS); +UI.display(SuitUnicode.DIAMONDS); +UI.display(SuitUnicode.HEARTS); +UI.display(SuitUnicode.SPADES); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index e9d6b313..53a241e2 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"AAAA;IAMI;QAAA,iBAKC;QAVM,cAAS,GAAuC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;QACtF,WAAM,GAAmC,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC5E,WAAM,GAAmC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAI9E,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAO,KAAI,CAAC,UAAU,GAAG,KAAI,CAAC,SAAS,CAAC,KAAK,CAAA,CAAC,CAAC,CAAC,CAAC;QAChG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAO,IAAK,OAAA,OAAO,CAAC,GAAG,CAAC,KAAI,CAAC,UAAU,CAAC,EAA5B,CAA4B,CAAC,CAAC;QACjF,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAQ,IAAO,KAAI,CAAC,SAAS,CAAC,KAAK,GAAG,EAAE,CAAA,CAAC,CAAC,CAAC,CAAC;IAEvF,CAAC;IAED,+BAAO,GAAP,UAAQ,KAAU;QACd,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,KAAK,GAAG,IAAI,CAAC;IAC1C,CAAC;IAED,mCAAW,GAAX;QACI,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,iCAAS,GAAT;QACI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,6BAAK,GAAL;QAAA,iBAGC;QAFG,IAAI,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAO,IAAK,OAAA,KAAI,CAAC,UAAU,EAAE,EAAjB,CAAiB,CAAC,CAAC;IAC1E,CAAC;IAED,kCAAU,GAAV;QAAA,iBAgBC;QAdG,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAC3B,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;QAE9C,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IAAI,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;QAE9D,CAAC;QACD,IAAI,CAAC,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,UAAC,CAAO,IAAK,OAAA,KAAI,CAAC,UAAU,EAAE,EAAjB,CAAiB,CAAC,CAAC;QAE1E,CAAC;IACL,CAAC;IAEL,oBAAC;AAAD,CAAC,AAhDD,IAgDC;AAED;IACI;IACA,CAAC;IAEM,WAAG,GAAV,UAAW,OAAe,EAAE,OAAe;QACvC,MAAM,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC;IAC/B,CAAC;IACL,cAAC;AAAD,CAAC,AAPD,IAOC;AAED,IAAK,IAKJ;AALD,WAAK,IAAI;IACL,uBAAe,CAAA;IACf,6BAAqB,CAAA;IACrB,yBAAiB,CAAA;IACjB,yBAAiB,CAAA;AACrB,CAAC,EALI,IAAI,KAAJ,IAAI,QAKR;AAED,IAAI,EAAE,GAAkB,IAAI,aAAa,EAAE,CAAC;AAC5C,EAAE,CAAC,KAAK,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/ts/app.js b/ts/app.js index 4d077b44..7f310809 100644 --- a/ts/app.js +++ b/ts/app.js @@ -51,12 +51,39 @@ var MathOps = /** @class */ (function () { }; return MathOps; }()); -var Suit; -(function (Suit) { - Suit["CLUBS"] = "clubs"; - Suit["DIAMONDS"] = "diamonds"; - Suit["HEARTS"] = "hearts"; - Suit["SPADES"] = "spades"; -})(Suit || (Suit = {})); +var SuitString; +(function (SuitString) { + SuitString["CLUBS"] = "clubs"; + SuitString["DIAMONDS"] = "diamonds"; + SuitString["HEARTS"] = "hearts"; + SuitString["SPADES"] = "spades"; +})(SuitString || (SuitString = {})); +var SuitUnicode; +(function (SuitUnicode) { + SuitUnicode["CLUBS"] = "\u2663"; + SuitUnicode["DIAMONDS"] = "\u2666"; + SuitUnicode["HEARTS"] = "\u2665"; + SuitUnicode["SPADES"] = "\u2660"; +})(SuitUnicode || (SuitUnicode = {})); +// enum Rank { +// DEUCE(2,"2"), +// THREE(3,"3"), +// FOUR(4,"4"), +// FIVE(5,"5"), +// SIX(6,"6"), +// SEVEN(7,"7"), +// EIGHT(8,"8"), +// NINE(9,"9"), +// TEN(10,"10"), +// JACK(11,"J"), +// QUEEN(12,"Q"), +// KING(13,"K"), +// ACE(1,"A"); +// } var UI = new UserInterface(); UI.start(); +UI.display(SuitString.CLUBS); +UI.display(SuitUnicode.CLUBS); +UI.display(SuitUnicode.DIAMONDS); +UI.display(SuitUnicode.HEARTS); +UI.display(SuitUnicode.SPADES); diff --git a/ts/app.ts b/ts/app.ts index 5001855f..b10e159a 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -57,12 +57,41 @@ class MathOps { } } -enum Suit { +enum SuitString { CLUBS = "clubs", DIAMONDS = "diamonds", HEARTS = "hearts", SPADES = "spades" } +enum SuitUnicode { + CLUBS = "\u2663", + DIAMONDS = "\u2666", + HEARTS = "\u2665", + SPADES = "\u2660" +} + +// enum Rank { +// DEUCE(2,"2"), +// THREE(3,"3"), +// FOUR(4,"4"), +// FIVE(5,"5"), +// SIX(6,"6"), +// SEVEN(7,"7"), +// EIGHT(8,"8"), +// NINE(9,"9"), +// TEN(10,"10"), +// JACK(11,"J"), +// QUEEN(12,"Q"), +// KING(13,"K"), +// ACE(1,"A"); +// } + let UI: UserInterface = new UserInterface(); UI.start(); +UI.display(SuitString.CLUBS); +UI.display(SuitUnicode.CLUBS); +UI.display(SuitUnicode.DIAMONDS); +UI.display(SuitUnicode.HEARTS); +UI.display(SuitUnicode.SPADES); + From 804f84a91870ce07c99205c74af42ec0ef9a0a54 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sun, 25 Mar 2018 17:39:09 -0400 Subject: [PATCH 07/10] added classes for rank strings and rank integers --- js/app.js | 32 ++++++++++++++++++++++++++++++++ js/app.js.map | 2 +- ts/app.js | 47 ++++++++++++++++++++++++++++++++--------------- ts/app.ts | 46 +++++++++++++++++++++++++++++++--------------- 4 files changed, 96 insertions(+), 31 deletions(-) diff --git a/js/app.js b/js/app.js index 5d5f4771..898dc480 100644 --- a/js/app.js +++ b/js/app.js @@ -60,6 +60,38 @@ var SuitUnicode; SuitUnicode["HEARTS"] = "\u2665"; SuitUnicode["SPADES"] = "\u2660"; })(SuitUnicode || (SuitUnicode = {})); +var RankInteger; +(function (RankInteger) { + RankInteger[RankInteger["DEUCE"] = 2] = "DEUCE"; + RankInteger[RankInteger["THREE"] = 3] = "THREE"; + RankInteger[RankInteger["FOUR"] = 4] = "FOUR"; + RankInteger[RankInteger["FIVE"] = 5] = "FIVE"; + RankInteger[RankInteger["SIX"] = 6] = "SIX"; + RankInteger[RankInteger["SEVEN"] = 7] = "SEVEN"; + RankInteger[RankInteger["EIGHT"] = 8] = "EIGHT"; + RankInteger[RankInteger["NINE"] = 9] = "NINE"; + RankInteger[RankInteger["TEN"] = 10] = "TEN"; + RankInteger[RankInteger["JACK"] = 11] = "JACK"; + RankInteger[RankInteger["QUEEN"] = 12] = "QUEEN"; + RankInteger[RankInteger["KING"] = 13] = "KING"; + RankInteger[RankInteger["ACE"] = 1] = "ACE"; +})(RankInteger || (RankInteger = {})); +var RankString; +(function (RankString) { + RankString["DEUCE"] = "2"; + RankString["THREE"] = "3"; + RankString["FOUR"] = "4"; + RankString["FIVE"] = "5"; + RankString["SIX"] = "6"; + RankString["SEVEN"] = "7"; + RankString["EIGHT"] = "8"; + RankString["NINE"] = "9"; + RankString["TEN"] = "10"; + RankString["JACK"] = "J"; + RankString["QUEEN"] = "Q"; + RankString["KING"] = "K"; + RankString["ACE"] = "A"; +})(RankString || (RankString = {})); var UI = new UserInterface(); UI.start(); UI.display(SuitString.CLUBS); diff --git a/js/app.js.map b/js/app.js.map index 53a241e2..b696903a 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/ts/app.js b/ts/app.js index 7f310809..73fc2f8b 100644 --- a/ts/app.js +++ b/ts/app.js @@ -65,21 +65,38 @@ var SuitUnicode; SuitUnicode["HEARTS"] = "\u2665"; SuitUnicode["SPADES"] = "\u2660"; })(SuitUnicode || (SuitUnicode = {})); -// enum Rank { -// DEUCE(2,"2"), -// THREE(3,"3"), -// FOUR(4,"4"), -// FIVE(5,"5"), -// SIX(6,"6"), -// SEVEN(7,"7"), -// EIGHT(8,"8"), -// NINE(9,"9"), -// TEN(10,"10"), -// JACK(11,"J"), -// QUEEN(12,"Q"), -// KING(13,"K"), -// ACE(1,"A"); -// } +var RankInteger; +(function (RankInteger) { + RankInteger[RankInteger["DEUCE"] = 2] = "DEUCE"; + RankInteger[RankInteger["THREE"] = 3] = "THREE"; + RankInteger[RankInteger["FOUR"] = 4] = "FOUR"; + RankInteger[RankInteger["FIVE"] = 5] = "FIVE"; + RankInteger[RankInteger["SIX"] = 6] = "SIX"; + RankInteger[RankInteger["SEVEN"] = 7] = "SEVEN"; + RankInteger[RankInteger["EIGHT"] = 8] = "EIGHT"; + RankInteger[RankInteger["NINE"] = 9] = "NINE"; + RankInteger[RankInteger["TEN"] = 10] = "TEN"; + RankInteger[RankInteger["JACK"] = 11] = "JACK"; + RankInteger[RankInteger["QUEEN"] = 12] = "QUEEN"; + RankInteger[RankInteger["KING"] = 13] = "KING"; + RankInteger[RankInteger["ACE"] = 1] = "ACE"; +})(RankInteger || (RankInteger = {})); +var RankString; +(function (RankString) { + RankString["DEUCE"] = "2"; + RankString["THREE"] = "3"; + RankString["FOUR"] = "4"; + RankString["FIVE"] = "5"; + RankString["SIX"] = "6"; + RankString["SEVEN"] = "7"; + RankString["EIGHT"] = "8"; + RankString["NINE"] = "9"; + RankString["TEN"] = "10"; + RankString["JACK"] = "J"; + RankString["QUEEN"] = "Q"; + RankString["KING"] = "K"; + RankString["ACE"] = "A"; +})(RankString || (RankString = {})); var UI = new UserInterface(); UI.start(); UI.display(SuitString.CLUBS); diff --git a/ts/app.ts b/ts/app.ts index b10e159a..3f61cc9e 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -71,21 +71,37 @@ enum SuitUnicode { SPADES = "\u2660" } -// enum Rank { -// DEUCE(2,"2"), -// THREE(3,"3"), -// FOUR(4,"4"), -// FIVE(5,"5"), -// SIX(6,"6"), -// SEVEN(7,"7"), -// EIGHT(8,"8"), -// NINE(9,"9"), -// TEN(10,"10"), -// JACK(11,"J"), -// QUEEN(12,"Q"), -// KING(13,"K"), -// ACE(1,"A"); -// } +enum RankInteger { + DEUCE = 2, + THREE = 3, + FOUR = 4, + FIVE = 5, + SIX = 6, + SEVEN = 7, + EIGHT = 8, + NINE = 9, + TEN = 10, + JACK = 11, + QUEEN = 12, + KING = 13, + ACE = 1 +} + +enum RankString { + DEUCE = "2", + THREE = "3", + FOUR = "4", + FIVE = "5", + SIX = "6", + SEVEN = "7", + EIGHT = "8", + NINE = "9", + TEN = "10", + JACK = "J", + QUEEN = "Q", + KING = "K", + ACE = "A" +} let UI: UserInterface = new UserInterface(); UI.start(); From 0ad6c5ca20501cba722ab18954e5f1aa68de1800 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Sun, 25 Mar 2018 19:37:32 -0400 Subject: [PATCH 08/10] card class is working, together with rank enums(2), and suit enum --- js/app.js | 68 ++++++++++++++++++------------------- js/app.js.map | 2 +- ts/app.js | 86 ++++++++++++++++++++++++++++------------------- ts/app.ts | 67 +++++++++++++++++++++++++----------- ts/previousApp.js | 74 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 207 insertions(+), 90 deletions(-) create mode 100644 ts/previousApp.js diff --git a/js/app.js b/js/app.js index 898dc480..69e3f1ce 100644 --- a/js/app.js +++ b/js/app.js @@ -46,36 +46,22 @@ var MathOps = (function () { }; return MathOps; }()); -var SuitString; -(function (SuitString) { - SuitString["CLUBS"] = "clubs"; - SuitString["DIAMONDS"] = "diamonds"; - SuitString["HEARTS"] = "hearts"; - SuitString["SPADES"] = "spades"; -})(SuitString || (SuitString = {})); -var SuitUnicode; -(function (SuitUnicode) { - SuitUnicode["CLUBS"] = "\u2663"; - SuitUnicode["DIAMONDS"] = "\u2666"; - SuitUnicode["HEARTS"] = "\u2665"; - SuitUnicode["SPADES"] = "\u2660"; -})(SuitUnicode || (SuitUnicode = {})); -var RankInteger; -(function (RankInteger) { - RankInteger[RankInteger["DEUCE"] = 2] = "DEUCE"; - RankInteger[RankInteger["THREE"] = 3] = "THREE"; - RankInteger[RankInteger["FOUR"] = 4] = "FOUR"; - RankInteger[RankInteger["FIVE"] = 5] = "FIVE"; - RankInteger[RankInteger["SIX"] = 6] = "SIX"; - RankInteger[RankInteger["SEVEN"] = 7] = "SEVEN"; - RankInteger[RankInteger["EIGHT"] = 8] = "EIGHT"; - RankInteger[RankInteger["NINE"] = 9] = "NINE"; - RankInteger[RankInteger["TEN"] = 10] = "TEN"; - RankInteger[RankInteger["JACK"] = 11] = "JACK"; - RankInteger[RankInteger["QUEEN"] = 12] = "QUEEN"; - RankInteger[RankInteger["KING"] = 13] = "KING"; - RankInteger[RankInteger["ACE"] = 1] = "ACE"; -})(RankInteger || (RankInteger = {})); +var RankNumber; +(function (RankNumber) { + RankNumber[RankNumber["DEUCE"] = 2] = "DEUCE"; + RankNumber[RankNumber["THREE"] = 3] = "THREE"; + RankNumber[RankNumber["FOUR"] = 4] = "FOUR"; + RankNumber[RankNumber["FIVE"] = 5] = "FIVE"; + RankNumber[RankNumber["SIX"] = 6] = "SIX"; + RankNumber[RankNumber["SEVEN"] = 7] = "SEVEN"; + RankNumber[RankNumber["EIGHT"] = 8] = "EIGHT"; + RankNumber[RankNumber["NINE"] = 9] = "NINE"; + RankNumber[RankNumber["TEN"] = 10] = "TEN"; + RankNumber[RankNumber["JACK"] = 11] = "JACK"; + RankNumber[RankNumber["QUEEN"] = 12] = "QUEEN"; + RankNumber[RankNumber["KING"] = 13] = "KING"; + RankNumber[RankNumber["ACE"] = 1] = "ACE"; +})(RankNumber || (RankNumber = {})); var RankString; (function (RankString) { RankString["DEUCE"] = "2"; @@ -92,11 +78,25 @@ var RankString; RankString["KING"] = "K"; RankString["ACE"] = "A"; })(RankString || (RankString = {})); +var SuitString; +(function (SuitString) { + SuitString["CLUBS"] = "clubs"; + SuitString["DIAMONDS"] = "diamonds"; + SuitString["HEARTS"] = "hearts"; + SuitString["SPADES"] = "spades"; +})(SuitString || (SuitString = {})); +var SuitSymbol; +(function (SuitSymbol) { + SuitSymbol["CLUBS"] = "\u2663"; + SuitSymbol["DIAMONDS"] = "\u2666"; + SuitSymbol["HEARTS"] = "\u2665"; + SuitSymbol["SPADES"] = "\u2660"; +})(SuitSymbol || (SuitSymbol = {})); var UI = new UserInterface(); UI.start(); UI.display(SuitString.CLUBS); -UI.display(SuitUnicode.CLUBS); -UI.display(SuitUnicode.DIAMONDS); -UI.display(SuitUnicode.HEARTS); -UI.display(SuitUnicode.SPADES); +UI.display(SuitSymbol.CLUBS); +UI.display(SuitSymbol.DIAMONDS); +UI.display(SuitSymbol.HEARTS); +UI.display(SuitSymbol.SPADES); //# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/js/app.js.map b/js/app.js.map index b696903a..a0fcdcac 100644 --- a/js/app.js.map +++ b/js/app.js.map @@ -1 +1 @@ -{"version":3,"file":"app.js","sourceRoot":"","sources":["../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"app.js","sourceRoot":"","sources":["../ts/app.ts","../ts/previousApp.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/ts/app.js b/ts/app.js index 73fc2f8b..51ca70b8 100644 --- a/ts/app.js +++ b/ts/app.js @@ -51,36 +51,22 @@ var MathOps = /** @class */ (function () { }; return MathOps; }()); -var SuitString; -(function (SuitString) { - SuitString["CLUBS"] = "clubs"; - SuitString["DIAMONDS"] = "diamonds"; - SuitString["HEARTS"] = "hearts"; - SuitString["SPADES"] = "spades"; -})(SuitString || (SuitString = {})); -var SuitUnicode; -(function (SuitUnicode) { - SuitUnicode["CLUBS"] = "\u2663"; - SuitUnicode["DIAMONDS"] = "\u2666"; - SuitUnicode["HEARTS"] = "\u2665"; - SuitUnicode["SPADES"] = "\u2660"; -})(SuitUnicode || (SuitUnicode = {})); -var RankInteger; -(function (RankInteger) { - RankInteger[RankInteger["DEUCE"] = 2] = "DEUCE"; - RankInteger[RankInteger["THREE"] = 3] = "THREE"; - RankInteger[RankInteger["FOUR"] = 4] = "FOUR"; - RankInteger[RankInteger["FIVE"] = 5] = "FIVE"; - RankInteger[RankInteger["SIX"] = 6] = "SIX"; - RankInteger[RankInteger["SEVEN"] = 7] = "SEVEN"; - RankInteger[RankInteger["EIGHT"] = 8] = "EIGHT"; - RankInteger[RankInteger["NINE"] = 9] = "NINE"; - RankInteger[RankInteger["TEN"] = 10] = "TEN"; - RankInteger[RankInteger["JACK"] = 11] = "JACK"; - RankInteger[RankInteger["QUEEN"] = 12] = "QUEEN"; - RankInteger[RankInteger["KING"] = 13] = "KING"; - RankInteger[RankInteger["ACE"] = 1] = "ACE"; -})(RankInteger || (RankInteger = {})); +var RankNumber; +(function (RankNumber) { + RankNumber[RankNumber["DEUCE"] = 2] = "DEUCE"; + RankNumber[RankNumber["THREE"] = 3] = "THREE"; + RankNumber[RankNumber["FOUR"] = 4] = "FOUR"; + RankNumber[RankNumber["FIVE"] = 5] = "FIVE"; + RankNumber[RankNumber["SIX"] = 6] = "SIX"; + RankNumber[RankNumber["SEVEN"] = 7] = "SEVEN"; + RankNumber[RankNumber["EIGHT"] = 8] = "EIGHT"; + RankNumber[RankNumber["NINE"] = 9] = "NINE"; + RankNumber[RankNumber["TEN"] = 10] = "TEN"; + RankNumber[RankNumber["JACK"] = 11] = "JACK"; + RankNumber[RankNumber["QUEEN"] = 12] = "QUEEN"; + RankNumber[RankNumber["KING"] = 13] = "KING"; + RankNumber[RankNumber["ACE"] = 1] = "ACE"; +})(RankNumber || (RankNumber = {})); var RankString; (function (RankString) { RankString["DEUCE"] = "2"; @@ -97,10 +83,40 @@ var RankString; RankString["KING"] = "K"; RankString["ACE"] = "A"; })(RankString || (RankString = {})); +var SuitString; +(function (SuitString) { + SuitString["CLUBS"] = "clubs"; + SuitString["DIAMONDS"] = "diamonds"; + SuitString["HEARTS"] = "hearts"; + SuitString["SPADES"] = "spades"; +})(SuitString || (SuitString = {})); +var SuitSymbol; +(function (SuitSymbol) { + SuitSymbol["CLUBS"] = "\u2663"; + SuitSymbol["DIAMONDS"] = "\u2666"; + SuitSymbol["HEARTS"] = "\u2665"; + SuitSymbol["SPADES"] = "\u2660"; +})(SuitSymbol || (SuitSymbol = {})); +var Card = /** @class */ (function () { + function Card(suitSymbol, rankNumber, rankString) { + this.suitSymbol = suitSymbol; + this.rankNumber = rankNumber; + this.rankString = rankString; + } + Card.prototype.getSuitSymbol = function () { + return this.suitSymbol; + }; + Card.prototype.getRankNumber = function () { + return this.rankNumber; + }; + Card.prototype.getRankString = function () { + return this.rankString; + }; + Card.prototype.toString = function () { + return this.suitSymbol + this.rankString; + }; + return Card; +}()); var UI = new UserInterface(); +var card = new Card(SuitSymbol.HEARTS, RankNumber.KING, RankString.KING); UI.start(); -UI.display(SuitString.CLUBS); -UI.display(SuitUnicode.CLUBS); -UI.display(SuitUnicode.DIAMONDS); -UI.display(SuitUnicode.HEARTS); -UI.display(SuitUnicode.SPADES); diff --git a/ts/app.ts b/ts/app.ts index 3f61cc9e..408d4a85 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -57,21 +57,7 @@ class MathOps { } } -enum SuitString { - CLUBS = "clubs", - DIAMONDS = "diamonds", - HEARTS = "hearts", - SPADES = "spades" -} - -enum SuitUnicode { - CLUBS = "\u2663", - DIAMONDS = "\u2666", - HEARTS = "\u2665", - SPADES = "\u2660" -} - -enum RankInteger { +enum RankNumber { DEUCE = 2, THREE = 3, FOUR = 4, @@ -103,11 +89,52 @@ enum RankString { ACE = "A" } +enum SuitString { + CLUBS = "clubs", + DIAMONDS = "diamonds", + HEARTS = "hearts", + SPADES = "spades" +} + +enum SuitSymbol { + CLUBS = "\u2663", + DIAMONDS = "\u2666", + HEARTS = "\u2665", + SPADES = "\u2660" +} + +class Card { + private suitSymbol: SuitSymbol; + private rankNumber: RankNumber; + private rankString: RankString; + + constructor(suitSymbol: SuitSymbol, rankNumber: RankNumber, rankString: RankString) { + this.suitSymbol = suitSymbol; + this.rankNumber = rankNumber; + this.rankString = rankString; + } + + getSuitSymbol(): string { + return this.suitSymbol; + } + + getRankNumber(): number { + return this.rankNumber; + } + + getRankString(): string { + return this.rankString; + } + + toString(): string { + return this.suitSymbol + this.rankString; + } +} + let UI: UserInterface = new UserInterface(); +let card: Card = new Card(SuitSymbol.HEARTS, RankNumber.KING, RankString.KING); + UI.start(); -UI.display(SuitString.CLUBS); -UI.display(SuitUnicode.CLUBS); -UI.display(SuitUnicode.DIAMONDS); -UI.display(SuitUnicode.HEARTS); -UI.display(SuitUnicode.SPADES); + + diff --git a/ts/previousApp.js b/ts/previousApp.js new file mode 100644 index 00000000..4c35ca7f --- /dev/null +++ b/ts/previousApp.js @@ -0,0 +1,74 @@ +//IGNORE THIS FILE +// namespace commoname; +// // import { sumTwoNumbers } from "./sumTwoNumbers"; +// // class Student { +// // fullName: string; +// // constructor(public firstName: string, public middleInitial: string, public lastName: string) { +// // this.fullName = firstName + " " + middleInitial + " " + lastName; +// // } +// // } +// // interface Person { +// // firstName: string; +// // lastName: string; +// // } +// // function greeter(person: Person) { +// // return "Hello, " + person.firstName + " " + person.lastName; +// // } +// // let user: Student = new Student("Luis", "J.", "Romero"); +// class UI { +// static userInput: HTMLInputElement = document.getElementById('user_input'); +// static window: HTMLDivElement = document.getElementById('display'); +// static button: HTMLDivElement = document.getElementById('submit'); +// static _lastInput: any; +// private static _instance: UI; +// private constructor() { +// UI.button.addEventListener("click", (e: Event) => { UI._lastInput = UI.userInput.value }); +// UI.button.addEventListener("click", (e:Event) => console.log(UI._lastInput)); +// UI.button.addEventListener("click", (e: Event) => { UI.userInput.value = '' }); +// } +// static display(input: string): void { +// this.window.innerText += input + '\n'; +// } +// static clearScreen(): void { +// this.window.innerText = ''; +// } +// public static get Instance(): UI { +// return this._instance || (this._instance = new UI()); +// } +// public static get lastInput(): any { +// return this._lastInput; +// } +// } +// // let userInput0 = prompt("Please enter something: ", "type0"); +// // let userInput1 = prompt("Please enter something: ", "type1"); +// // console.log(userInput0); +// // console.log(userInput1); +// class Choose { +// constructor(){ +// this.chooseGame = this.chooseGame.bind(this); +// } +// start() { +// UI.display("What game do you want to play?"); +// UI.display("Black Jack or Go Fish?"); +// } +// UI.button.addEventListener("click", (e:Event) => this.chooseGame); +// chooseGame(): void { +// UI.button.removeEventListener("click", (e:Event) => this.chooseGame); +// if (UI.lastInput === "Black Jack") { +// UI.display("Black Jack worked"); +// } +// else if (UI.lastInput === "Go Fish") { +// UI.display("Go Fish worked"); +// } +// else { +// UI.button.addEventListener("click", (e:Event) => this.chooseGame); +// } +// } +// } +// UI; +// UI.display("text from display method"); +// let chooseGame: Choose = new Choose(); +// // chooseGame.start(); +// chooseGame.chooseGame(); +// // let num: number = sumTwoNumbers(1, 2); +// // console.log(num); From 5ddeb917fa6f91f651f7c871a4af7893f6ef5a82 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Mon, 26 Mar 2018 08:23:01 -0400 Subject: [PATCH 09/10] having trouble with enum classes, remaking them as singletons --- ts/app.js | 160 +++++++++++++++++++++++++++----------------- ts/app.ts | 173 +++++++++++++++++++++++++++++++----------------- ts/enums | 45 +++++++++++++ ts/singleton.ts | 53 +++++++++++++++ 4 files changed, 310 insertions(+), 121 deletions(-) create mode 100644 ts/enums create mode 100644 ts/singleton.ts diff --git a/ts/app.js b/ts/app.js index 51ca70b8..4737f747 100644 --- a/ts/app.js +++ b/ts/app.js @@ -51,72 +51,110 @@ var MathOps = /** @class */ (function () { }; return MathOps; }()); -var RankNumber; -(function (RankNumber) { - RankNumber[RankNumber["DEUCE"] = 2] = "DEUCE"; - RankNumber[RankNumber["THREE"] = 3] = "THREE"; - RankNumber[RankNumber["FOUR"] = 4] = "FOUR"; - RankNumber[RankNumber["FIVE"] = 5] = "FIVE"; - RankNumber[RankNumber["SIX"] = 6] = "SIX"; - RankNumber[RankNumber["SEVEN"] = 7] = "SEVEN"; - RankNumber[RankNumber["EIGHT"] = 8] = "EIGHT"; - RankNumber[RankNumber["NINE"] = 9] = "NINE"; - RankNumber[RankNumber["TEN"] = 10] = "TEN"; - RankNumber[RankNumber["JACK"] = 11] = "JACK"; - RankNumber[RankNumber["QUEEN"] = 12] = "QUEEN"; - RankNumber[RankNumber["KING"] = 13] = "KING"; - RankNumber[RankNumber["ACE"] = 1] = "ACE"; -})(RankNumber || (RankNumber = {})); -var RankString; -(function (RankString) { - RankString["DEUCE"] = "2"; - RankString["THREE"] = "3"; - RankString["FOUR"] = "4"; - RankString["FIVE"] = "5"; - RankString["SIX"] = "6"; - RankString["SEVEN"] = "7"; - RankString["EIGHT"] = "8"; - RankString["NINE"] = "9"; - RankString["TEN"] = "10"; - RankString["JACK"] = "J"; - RankString["QUEEN"] = "Q"; - RankString["KING"] = "K"; - RankString["ACE"] = "A"; -})(RankString || (RankString = {})); -var SuitString; -(function (SuitString) { - SuitString["CLUBS"] = "clubs"; - SuitString["DIAMONDS"] = "diamonds"; - SuitString["HEARTS"] = "hearts"; - SuitString["SPADES"] = "spades"; -})(SuitString || (SuitString = {})); -var SuitSymbol; -(function (SuitSymbol) { - SuitSymbol["CLUBS"] = "\u2663"; - SuitSymbol["DIAMONDS"] = "\u2666"; - SuitSymbol["HEARTS"] = "\u2665"; - SuitSymbol["SPADES"] = "\u2660"; -})(SuitSymbol || (SuitSymbol = {})); -var Card = /** @class */ (function () { - function Card(suitSymbol, rankNumber, rankString) { - this.suitSymbol = suitSymbol; - this.rankNumber = rankNumber; - this.rankString = rankString; +var RankNumber = /** @class */ (function () { + function RankNumber() { } - Card.prototype.getSuitSymbol = function () { - return this.suitSymbol; + RankNumber.getInstance = function () { + if (this._INSTANCE === null) { + this._INSTANCE = new RankNumber(); + } + return this._INSTANCE; + }; + RankNumber.getRankNumbers = function () { + return this.rankNumbers; + }; + RankNumber.rankNumbers = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; + return RankNumber; +}()); +var RankString = /** @class */ (function () { + function RankString() { + } + RankString.getInstance = function () { + if (this._INSTANCE === null) { + this._INSTANCE = new RankString(); + } + return this._INSTANCE; + }; + RankString.getRankStrings = function () { + return this.rankStrings; }; - Card.prototype.getRankNumber = function () { - return this.rankNumber; + RankString.rankStrings = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; + return RankString; +}()); +var SuitString = /** @class */ (function () { + function SuitString() { + } + SuitString.getInstance = function () { + if (this._INSTANCE === null) { + this._INSTANCE = new SuitString(); + } + return this._INSTANCE; + }; + SuitString.getRankStrings = function () { + return this.suitStrings; }; - Card.prototype.getRankString = function () { - return this.rankString; + SuitString.suitStrings = ["clubs", "diamonds", "hearts", "spades"]; + return SuitString; +}()); +var SuitSymbol = /** @class */ (function () { + function SuitSymbol() { + } + SuitSymbol.getInstance = function () { + if (this._INSTANCE === null) { + this._INSTANCE = new SuitSymbol(); + } + return this._INSTANCE; }; - Card.prototype.toString = function () { - return this.suitSymbol + this.rankString; + SuitSymbol.getSuitSymbols = function () { + return this.suitSymbols; }; - return Card; + SuitSymbol.suitSymbols = ["\u2663", "\u2666", "\u2665", "\u2660"]; + return SuitSymbol; }()); +// class Card { +// private rankNumber: RankNumber; +// private rankString: RankString; +// private suitSymbol: SuitSymbol; +// constructor(rankNumber: RankNumber, rankString: RankString, suitSymbol: SuitSymbol) { +// this.rankNumber = rankNumber; +// this.rankString = rankString; +// this.suitSymbol = suitSymbol; +// } +// getRankNumber(): number { +// return this.rankNumber; +// } +// getRankString(): string { +// return this.rankString; +// } +// getSuitSymbol(): string { +// return this.suitSymbol; +// } +// toString(): string { +// return this.rankString + this.suitSymbol; +// } +// } +// class Deck { +// private deck: Card[]; +// private rankNumbers = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; +// private rankStrings = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; +// private suitSymbols = ["\u2663", "\u2666", "\u2665", "\u2660"]; +// constructor() { +// this.deck = []; +// for (let i = 0; i < 4; i++) { +// for (let j = 0; j < 13; j++) { +// this.deck.push(new Card(this.rankNumbers[j], this.rankStrings[j], this.suitSymbols[i]); +// } +// } +// } +// getDeck(): Card[] { +// return this.deck; +// } +// } var UI = new UserInterface(); -var card = new Card(SuitSymbol.HEARTS, RankNumber.KING, RankString.KING); +// let card: Card = new Card(RankNumber.ACE, RankString.ACE, SuitSymbol.HEARTS); +// let deck: Deck = new Deck(); UI.start(); +var myNum = RankNumber.getRankNumbers()[12]; +UI.display(RankNumber.getRankNumbers()[0]); +UI.display(myNum); +// UI.display(card.toString()); diff --git a/ts/app.ts b/ts/app.ts index 408d4a85..00dba61f 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -52,89 +52,142 @@ class MathOps { constructor() { } - static sum(number1: number, number2: number): number { + public static sum(number1: number, number2: number): number { return (number1 + number2); } } -enum RankNumber { - DEUCE = 2, - THREE = 3, - FOUR = 4, - FIVE = 5, - SIX = 6, - SEVEN = 7, - EIGHT = 8, - NINE = 9, - TEN = 10, - JACK = 11, - QUEEN = 12, - KING = 13, - ACE = 1 -} +class RankNumber { + private static _INSTANCE: RankNumber; + private static rankNumbers: number[] = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; -enum RankString { - DEUCE = "2", - THREE = "3", - FOUR = "4", - FIVE = "5", - SIX = "6", - SEVEN = "7", - EIGHT = "8", - NINE = "9", - TEN = "10", - JACK = "J", - QUEEN = "Q", - KING = "K", - ACE = "A" -} + private constructor() { + } -enum SuitString { - CLUBS = "clubs", - DIAMONDS = "diamonds", - HEARTS = "hearts", - SPADES = "spades" + public static getInstance(): RankNumber { + if (this._INSTANCE === null) { + this._INSTANCE = new RankNumber(); + } + return this._INSTANCE; + } + + public static getRankNumbers(): number[] { + return this.rankNumbers; + } } -enum SuitSymbol { - CLUBS = "\u2663", - DIAMONDS = "\u2666", - HEARTS = "\u2665", - SPADES = "\u2660" +class RankString { + private static _INSTANCE: RankString; + private static rankStrings: string[] = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; + + private constructor() { + } + + public static getInstance(): RankString { + if (this._INSTANCE === null) { + this._INSTANCE = new RankString(); + } + return this._INSTANCE; + } + + public static getRankStrings(): string[] { + return this.rankStrings; + } } -class Card { - private suitSymbol: SuitSymbol; - private rankNumber: RankNumber; - private rankString: RankString; +class SuitString { + private static _INSTANCE: SuitString; + private static suitStrings: string[] = ["clubs", "diamonds", "hearts", "spades"]; - constructor(suitSymbol: SuitSymbol, rankNumber: RankNumber, rankString: RankString) { - this.suitSymbol = suitSymbol; - this.rankNumber = rankNumber; - this.rankString = rankString; + private constructor() { } - getSuitSymbol(): string { - return this.suitSymbol; + public static getInstance() { + if (this._INSTANCE === null) { + this._INSTANCE = new SuitString(); + } + return this._INSTANCE; } - getRankNumber(): number { - return this.rankNumber; + public static getRankStrings(): string[] { + return this.suitStrings; } +} + +class SuitSymbol { + private static _INSTANCE: SuitSymbol; + private static suitSymbols: string[] = ["\u2663", "\u2666", "\u2665", "\u2660"]; - getRankString(): string { - return this.rankString; + private constructor() { } - toString(): string { - return this.suitSymbol + this.rankString; + public static getInstance() { + if (this._INSTANCE === null) { + this._INSTANCE = new SuitSymbol(); + } + return this._INSTANCE; + } + + public static getSuitSymbols(): string[] { + return this.suitSymbols; } } +// class Card { +// private rankNumber: RankNumber; +// private rankString: RankString; +// private suitSymbol: SuitSymbol; + +// constructor(rankNumber: RankNumber, rankString: RankString, suitSymbol: SuitSymbol) { +// this.rankNumber = rankNumber; +// this.rankString = rankString; +// this.suitSymbol = suitSymbol; +// } + +// getRankNumber(): number { +// return this.rankNumber; +// } + +// getRankString(): string { +// return this.rankString; +// } + +// getSuitSymbol(): string { +// return this.suitSymbol; +// } + +// toString(): string { +// return this.rankString + this.suitSymbol; +// } +// } + +// class Deck { +// private deck: Card[]; +// private rankNumbers = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; +// private rankStrings = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; +// private suitSymbols = ["\u2663", "\u2666", "\u2665", "\u2660"]; + +// constructor() { +// this.deck = []; +// for (let i = 0; i < 4; i++) { +// for (let j = 0; j < 13; j++) { +// this.deck.push(new Card(this.rankNumbers[j], this.rankStrings[j], this.suitSymbols[i]); +// } +// } +// } + +// getDeck(): Card[] { +// return this.deck; +// } +// } + let UI: UserInterface = new UserInterface(); -let card: Card = new Card(SuitSymbol.HEARTS, RankNumber.KING, RankString.KING); +// let card: Card = new Card(RankNumber.ACE, RankString.ACE, SuitSymbol.HEARTS); +// let deck: Deck = new Deck(); UI.start(); - - +let myNum: number = RankNumber.getRankNumbers()[12]; +UI.display(RankNumber.getRankNumbers()[0]); +UI.display(myNum); +// UI.display(card.toString()); diff --git a/ts/enums b/ts/enums new file mode 100644 index 00000000..748b3e77 --- /dev/null +++ b/ts/enums @@ -0,0 +1,45 @@ +enum RankNumber { + DEUCE = 2, + THREE = 3, + FOUR = 4, + FIVE = 5, + SIX = 6, + SEVEN = 7, + EIGHT = 8, + NINE = 9, + TEN = 10, + JACK = 11, + QUEEN = 12, + KING = 13, + ACE = 1 +} + +enum RankString { + DEUCE = "2", + THREE = "3", + FOUR = "4", + FIVE = "5", + SIX = "6", + SEVEN = "7", + EIGHT = "8", + NINE = "9", + TEN = "10", + JACK = "J", + QUEEN = "Q", + KING = "K", + ACE = "A" +} + +enum SuitString { + CLUBS = "clubs", + DIAMONDS = "diamonds", + HEARTS = "hearts", + SPADES = "spades" +} + +enum SuitSymbol { + CLUBS = "\u2663", + DIAMONDS = "\u2666", + HEARTS = "\u2665", + SPADES = "\u2660" +} \ No newline at end of file diff --git a/ts/singleton.ts b/ts/singleton.ts new file mode 100644 index 00000000..f5603c26 --- /dev/null +++ b/ts/singleton.ts @@ -0,0 +1,53 @@ +class UI_Singleton { + static userInput = document.getElementById("user_input"); + static window = document.getElementById('display'); + static button = document.getElementById('submit'); + static _lastInput: any; + private static _instance: UI_Singleton; + + private constructor() { + UI_Singleton.button.addEventListener("click", (e: Event) => { UI_Singleton._lastInput = UI_Singleton.userInput.value }); + UI_Singleton.button.addEventListener("click", (e: Event) => { UI_Singleton.userInput.value = '' }); + } + + static display(input: string): void { + this.window.innerText += input + '\n'; + } + + static clearScreen(): void { + this.window.innerText = ''; + } + + public static get Instance(): UI_Singleton { + return this._instance || (this._instance = new UI_Singleton()); + } + + public static get lastInput(): any { + return this._lastInput; + } + +} + +class Singleton { + static anyVariable: any = "anyValue"; + private static _INSTANCE: Singleton; + + private constructor() { + } + + static someMethod(input: string): void { + } + + static someMethod2(): any { + return null; + } + + public static getInstance(): Singleton { + return this._INSTANCE; + } + + public static getField(): any { + return this.anyVariable; + } + +} From ade36b57dbaafbdab257e1f5cdd4867ac3436727 Mon Sep 17 00:00:00 2001 From: Luis Romero Date: Mon, 26 Mar 2018 09:22:38 -0400 Subject: [PATCH 10/10] I made a deck (exclamation mark) --- ts/app.js | 142 ++++++++++++++++++++------------------- ts/app.ts | 198 ++++++++++++++++++++++++++---------------------------- 2 files changed, 169 insertions(+), 171 deletions(-) diff --git a/ts/app.js b/ts/app.js index 4737f747..26039680 100644 --- a/ts/app.js +++ b/ts/app.js @@ -9,15 +9,9 @@ var UserInterface = /** @class */ (function () { this.button.addEventListener("click", function (e) { _this.userInput.value = ''; }); // this.chooseGame = this.chooseGame.bind(this); } - UserInterface.prototype.display = function (input) { - this.window.innerText += input + '\n'; - }; - UserInterface.prototype.clearScreen = function () { - this.window.innerText = ''; - }; - UserInterface.prototype.lastInput = function () { - return this._lastInput; - }; + UserInterface.prototype.display = function (input) { this.window.innerText += input + '\n'; }; + UserInterface.prototype.clearScreen = function () { this.window.innerText = ''; }; + UserInterface.prototype.lastInput = function () { return this._lastInput; }; UserInterface.prototype.start = function () { var _this = this; this.display("Do you want to play Blackjack? (y/n)"); @@ -46,9 +40,7 @@ var UserInterface = /** @class */ (function () { var MathOps = /** @class */ (function () { function MathOps() { } - MathOps.sum = function (number1, number2) { - return (number1 + number2); - }; + MathOps.sum = function (number1, number2) { return (number1 + number2); }; return MathOps; }()); var RankNumber = /** @class */ (function () { @@ -60,9 +52,20 @@ var RankNumber = /** @class */ (function () { } return this._INSTANCE; }; - RankNumber.getRankNumbers = function () { - return this.rankNumbers; - }; + RankNumber.getRankNumbers = function () { return this.rankNumbers; }; + RankNumber.DEUCE = function () { return this.rankNumbers[0]; }; + RankNumber.THREE = function () { return this.rankNumbers[1]; }; + RankNumber.FOUR = function () { return this.rankNumbers[2]; }; + RankNumber.FIVE = function () { return this.rankNumbers[3]; }; + RankNumber.SIX = function () { return this.rankNumbers[4]; }; + RankNumber.SEVEN = function () { return this.rankNumbers[5]; }; + RankNumber.EIGHT = function () { return this.rankNumbers[6]; }; + RankNumber.NINE = function () { return this.rankNumbers[7]; }; + RankNumber.TEN = function () { return this.rankNumbers[8]; }; + RankNumber.JACK = function () { return this.rankNumbers[9]; }; + RankNumber.QUEEN = function () { return this.rankNumbers[10]; }; + RankNumber.KING = function () { return this.rankNumbers[11]; }; + RankNumber.ACE = function () { return this.rankNumbers[12]; }; RankNumber.rankNumbers = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; return RankNumber; }()); @@ -75,9 +78,20 @@ var RankString = /** @class */ (function () { } return this._INSTANCE; }; - RankString.getRankStrings = function () { - return this.rankStrings; - }; + RankString.getRankStrings = function () { return this.rankStrings; }; + RankString.DEUCE = function () { return this.rankStrings[0]; }; + RankString.THREE = function () { return this.rankStrings[1]; }; + RankString.FOUR = function () { return this.rankStrings[2]; }; + RankString.FIVE = function () { return this.rankStrings[3]; }; + RankString.SIX = function () { return this.rankStrings[4]; }; + RankString.SEVEN = function () { return this.rankStrings[5]; }; + RankString.EIGHT = function () { return this.rankStrings[6]; }; + RankString.NINE = function () { return this.rankStrings[7]; }; + RankString.TEN = function () { return this.rankStrings[8]; }; + RankString.JACK = function () { return this.rankStrings[9]; }; + RankString.QUEEN = function () { return this.rankStrings[10]; }; + RankString.KING = function () { return this.rankStrings[11]; }; + RankString.ACE = function () { return this.rankStrings[12]; }; RankString.rankStrings = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; return RankString; }()); @@ -90,9 +104,11 @@ var SuitString = /** @class */ (function () { } return this._INSTANCE; }; - SuitString.getRankStrings = function () { - return this.suitStrings; - }; + SuitString.getSuitStrings = function () { return this.suitStrings; }; + SuitString.CLUBS = function () { return this.suitStrings[0]; }; + SuitString.DIAMONDS = function () { return this.suitStrings[1]; }; + SuitString.HEARTS = function () { return this.suitStrings[2]; }; + SuitString.SPADES = function () { return this.suitStrings[3]; }; SuitString.suitStrings = ["clubs", "diamonds", "hearts", "spades"]; return SuitString; }()); @@ -105,56 +121,44 @@ var SuitSymbol = /** @class */ (function () { } return this._INSTANCE; }; - SuitSymbol.getSuitSymbols = function () { - return this.suitSymbols; - }; + SuitSymbol.getSuitSymbols = function () { return this.suitSymbols; }; + SuitSymbol.CLUBS = function () { return this.suitSymbols[0]; }; + SuitSymbol.DIAMONDS = function () { return this.suitSymbols[1]; }; + SuitSymbol.HEARTS = function () { return this.suitSymbols[2]; }; + SuitSymbol.SPADES = function () { return this.suitSymbols[3]; }; SuitSymbol.suitSymbols = ["\u2663", "\u2666", "\u2665", "\u2660"]; return SuitSymbol; }()); -// class Card { -// private rankNumber: RankNumber; -// private rankString: RankString; -// private suitSymbol: SuitSymbol; -// constructor(rankNumber: RankNumber, rankString: RankString, suitSymbol: SuitSymbol) { -// this.rankNumber = rankNumber; -// this.rankString = rankString; -// this.suitSymbol = suitSymbol; -// } -// getRankNumber(): number { -// return this.rankNumber; -// } -// getRankString(): string { -// return this.rankString; -// } -// getSuitSymbol(): string { -// return this.suitSymbol; -// } -// toString(): string { -// return this.rankString + this.suitSymbol; -// } -// } -// class Deck { -// private deck: Card[]; -// private rankNumbers = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; -// private rankStrings = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; -// private suitSymbols = ["\u2663", "\u2666", "\u2665", "\u2660"]; -// constructor() { -// this.deck = []; -// for (let i = 0; i < 4; i++) { -// for (let j = 0; j < 13; j++) { -// this.deck.push(new Card(this.rankNumbers[j], this.rankStrings[j], this.suitSymbols[i]); -// } -// } -// } -// getDeck(): Card[] { -// return this.deck; -// } -// } +var Card = /** @class */ (function () { + function Card(rankNumber, rankString, suitSymbol, suitString) { + this.rankNumber = rankNumber; + this.rankString = rankString; + this.suitSymbol = suitSymbol; + this.suitString = suitString; + } + Card.prototype.getRankNumber = function () { return this.rankNumber; }; + Card.prototype.getRankString = function () { return this.rankString; }; + Card.prototype.getSuitSymbol = function () { return this.suitSymbol; }; + Card.prototype.getSuitString = function () { return this.suitString; }; + Card.prototype.toString = function () { return this.rankString + this.suitSymbol; }; + return Card; +}()); +var Deck = /** @class */ (function () { + function Deck() { + this.deck = []; + for (var i = 0; i < 4; i++) { + for (var j = 0; j < 13; j++) { + this.deck.push(new Card(RankNumber.getRankNumbers()[j], RankString.getRankStrings()[j], SuitSymbol.getSuitSymbols()[i], SuitString.getSuitStrings()[i])); + } + } + } + Deck.prototype.getDeck = function () { return this.deck; }; + return Deck; +}()); var UI = new UserInterface(); -// let card: Card = new Card(RankNumber.ACE, RankString.ACE, SuitSymbol.HEARTS); -// let deck: Deck = new Deck(); +var card = new Card(RankNumber.KING(), RankString.KING(), SuitSymbol.SPADES(), SuitString.SPADES()); +var deck = new Deck(); UI.start(); -var myNum = RankNumber.getRankNumbers()[12]; -UI.display(RankNumber.getRankNumbers()[0]); -UI.display(myNum); -// UI.display(card.toString()); +UI.display(RankNumber.DEUCE()); +UI.display(card.toString()); +UI.display(deck.getDeck()[12]); diff --git a/ts/app.ts b/ts/app.ts index 00dba61f..e48cde93 100644 --- a/ts/app.ts +++ b/ts/app.ts @@ -11,17 +11,9 @@ class UserInterface { // this.chooseGame = this.chooseGame.bind(this); } - display(input: any): void { - this.window.innerText += input + '\n'; - } - - clearScreen(): void { - this.window.innerText = ''; - } - - lastInput(): any { - return this._lastInput; - } + display(input: any): void { this.window.innerText += input + '\n'; } + clearScreen(): void { this.window.innerText = ''; } + lastInput(): any { return this._lastInput; } start() { this.display("Do you want to play Blackjack? (y/n)"); @@ -45,149 +37,151 @@ class UserInterface { // this.display("Please try again"); } } - } class MathOps { - constructor() { - } - - public static sum(number1: number, number2: number): number { - return (number1 + number2); - } + constructor() {} + public static sum(number1: number, number2: number): number { return (number1 + number2); } } class RankNumber { private static _INSTANCE: RankNumber; private static rankNumbers: number[] = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; - private constructor() { - } + private constructor() {} public static getInstance(): RankNumber { - if (this._INSTANCE === null) { - this._INSTANCE = new RankNumber(); - } + if (this._INSTANCE === null) { this._INSTANCE = new RankNumber(); } return this._INSTANCE; } - public static getRankNumbers(): number[] { - return this.rankNumbers; - } + public static getRankNumbers(): number[] { return this.rankNumbers; } + + public static DEUCE(): number { return this.rankNumbers[0]; } + public static THREE(): number { return this.rankNumbers[1]; } + public static FOUR(): number { return this.rankNumbers[2]; } + public static FIVE(): number { return this.rankNumbers[3]; } + public static SIX(): number { return this.rankNumbers[4]; } + public static SEVEN(): number { return this.rankNumbers[5]; } + public static EIGHT(): number { return this.rankNumbers[6]; } + public static NINE(): number { return this.rankNumbers[7]; } + public static TEN(): number { return this.rankNumbers[8]; } + public static JACK(): number { return this.rankNumbers[9]; } + public static QUEEN(): number { return this.rankNumbers[10]; } + public static KING(): number { return this.rankNumbers[11]; } + public static ACE(): number { return this.rankNumbers[12]; } } class RankString { private static _INSTANCE: RankString; private static rankStrings: string[] = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; - private constructor() { - } + private constructor() {} public static getInstance(): RankString { - if (this._INSTANCE === null) { - this._INSTANCE = new RankString(); - } + if (this._INSTANCE === null) { this._INSTANCE = new RankString(); } return this._INSTANCE; } - public static getRankStrings(): string[] { - return this.rankStrings; - } + public static getRankStrings(): string[] { return this.rankStrings; } + + public static DEUCE(): string { return this.rankStrings[0]; } + public static THREE(): string { return this.rankStrings[1]; } + public static FOUR(): string { return this.rankStrings[2]; } + public static FIVE(): string { return this.rankStrings[3]; } + public static SIX(): string { return this.rankStrings[4]; } + public static SEVEN(): string { return this.rankStrings[5]; } + public static EIGHT(): string { return this.rankStrings[6]; } + public static NINE(): string { return this.rankStrings[7]; } + public static TEN(): string { return this.rankStrings[8]; } + public static JACK(): string { return this.rankStrings[9]; } + public static QUEEN(): string { return this.rankStrings[10]; } + public static KING(): string { return this.rankStrings[11]; } + public static ACE(): string { return this.rankStrings[12]; } } class SuitString { private static _INSTANCE: SuitString; private static suitStrings: string[] = ["clubs", "diamonds", "hearts", "spades"]; - private constructor() { - } + private constructor() {} public static getInstance() { - if (this._INSTANCE === null) { - this._INSTANCE = new SuitString(); - } + if (this._INSTANCE === null) { this._INSTANCE = new SuitString(); } return this._INSTANCE; } - public static getRankStrings(): string[] { - return this.suitStrings; - } + public static getSuitStrings(): string[] { return this.suitStrings; } + + public static CLUBS(): string { return this.suitStrings[0]; } + public static DIAMONDS(): string { return this.suitStrings[1]; } + public static HEARTS(): string { return this.suitStrings[2]; } + public static SPADES(): string { return this.suitStrings[3]; } } class SuitSymbol { private static _INSTANCE: SuitSymbol; private static suitSymbols: string[] = ["\u2663", "\u2666", "\u2665", "\u2660"]; - private constructor() { - } + private constructor() {} public static getInstance() { - if (this._INSTANCE === null) { - this._INSTANCE = new SuitSymbol(); - } + if (this._INSTANCE === null) { this._INSTANCE = new SuitSymbol(); } return this._INSTANCE; } - public static getSuitSymbols(): string[] { - return this.suitSymbols; + public static getSuitSymbols(): string[] { return this.suitSymbols; } + + public static CLUBS(): string { return this.suitSymbols[0]; } + public static DIAMONDS(): string { return this.suitSymbols[1]; } + public static HEARTS(): string { return this.suitSymbols[2]; } + public static SPADES(): string { return this.suitSymbols[3]; } +} + +class Card { + private rankNumber: number; + private rankString: string; + private suitSymbol: string; + private suitString: string; + + constructor(rankNumber: number, rankString: string, suitSymbol: string, suitString: string) { + this.rankNumber = rankNumber; + this.rankString = rankString; + this.suitSymbol = suitSymbol; + this.suitString = suitString; } + + getRankNumber(): number { return this.rankNumber; } + getRankString(): string { return this.rankString; } + getSuitSymbol(): string { return this.suitSymbol; } + getSuitString(): string { return this.suitString; } + toString(): string { return this.rankString + this.suitSymbol; } } -// class Card { -// private rankNumber: RankNumber; -// private rankString: RankString; -// private suitSymbol: SuitSymbol; - -// constructor(rankNumber: RankNumber, rankString: RankString, suitSymbol: SuitSymbol) { -// this.rankNumber = rankNumber; -// this.rankString = rankString; -// this.suitSymbol = suitSymbol; -// } - -// getRankNumber(): number { -// return this.rankNumber; -// } - -// getRankString(): string { -// return this.rankString; -// } - -// getSuitSymbol(): string { -// return this.suitSymbol; -// } - -// toString(): string { -// return this.rankString + this.suitSymbol; -// } -// } - -// class Deck { -// private deck: Card[]; -// private rankNumbers = [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 1]; -// private rankStrings = ["2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K", "A"]; -// private suitSymbols = ["\u2663", "\u2666", "\u2665", "\u2660"]; - -// constructor() { -// this.deck = []; -// for (let i = 0; i < 4; i++) { -// for (let j = 0; j < 13; j++) { -// this.deck.push(new Card(this.rankNumbers[j], this.rankStrings[j], this.suitSymbols[i]); -// } -// } -// } - -// getDeck(): Card[] { -// return this.deck; -// } -// } +class Deck { + private deck: Card[]; + + constructor() { + this.deck = []; + for (let i = 0; i < 4; i++) { + for (let j = 0; j < 13; j++) { + this.deck.push(new Card(RankNumber.getRankNumbers()[j], + RankString.getRankStrings()[j], + SuitSymbol.getSuitSymbols()[i], + SuitString.getSuitStrings()[i])); + } + } + } + + getDeck(): Card[] { return this.deck; } +} let UI: UserInterface = new UserInterface(); -// let card: Card = new Card(RankNumber.ACE, RankString.ACE, SuitSymbol.HEARTS); -// let deck: Deck = new Deck(); +let card: Card = new Card(RankNumber.KING(), RankString.KING(), SuitSymbol.SPADES(), SuitString.SPADES()); +let deck: Deck = new Deck(); UI.start(); -let myNum: number = RankNumber.getRankNumbers()[12]; -UI.display(RankNumber.getRankNumbers()[0]); -UI.display(myNum); -// UI.display(card.toString()); +UI.display(RankNumber.DEUCE()); +UI.display(card.toString()); +UI.display(deck.getDeck()[12]);