From 737629d0e269d25b5ee6a5f630ecfb2333963707 Mon Sep 17 00:00:00 2001 From: MaximusGitPrime <112101036+MaximusGitPrime@users.noreply.github.com> Date: Thu, 23 Feb 2023 21:14:02 +0200 Subject: [PATCH 1/4] Maxim Update controlts --- projectOffical/control.ts | 25 +++++++++++++++++++++++++ projectOffical/dist/control.js | 22 ++++++++++++++++++++++ projectOffical/dist/helpers.js | 13 +++++++++++++ projectOffical/helpers.ts | 16 ++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 projectOffical/control.ts create mode 100644 projectOffical/dist/control.js create mode 100644 projectOffical/dist/helpers.js create mode 100644 projectOffical/helpers.ts diff --git a/projectOffical/control.ts b/projectOffical/control.ts new file mode 100644 index 0000000..eb10ce2 --- /dev/null +++ b/projectOffical/control.ts @@ -0,0 +1,25 @@ +const bronzePack = document.querySelector(".bronzePack")! +bronzePack.addEventListener("click", openCard) + +function openCard(e){ + e.preventDefault() + console.log("Bronze Pack Func Activated"); + generateRandomNumbers() + for( let i = 0 ; i < 5 ; i++){ + const cardElement = document.createElement("div") + cardElement.classList.add("card") + cardElement.innerHTML = ` + + ` + console.log(cardElement); + + openedPackContainer.appendChild(cardElement) + + if(cardElement){ + cardElement.addEventListener("click" , ()=>{ + cardElement.classList.add("flipped") + }) + } +} + +} \ No newline at end of file diff --git a/projectOffical/dist/control.js b/projectOffical/dist/control.js new file mode 100644 index 0000000..9505546 --- /dev/null +++ b/projectOffical/dist/control.js @@ -0,0 +1,22 @@ +var bronzePack = document.querySelector(".bronzePack"); +bronzePack.addEventListener("click", openCard); +function openCard(e) { + e.preventDefault(); + console.log("Bronze Pack Func Activated"); + generateRandomNumbers(); + var _loop_1 = function (i) { + var cardElement = document.createElement("div"); + cardElement.classList.add("card"); + cardElement.innerHTML = "\n \n "; + console.log(cardElement); + openedPackContainer.appendChild(cardElement); + if (cardElement) { + cardElement.addEventListener("click", function () { + cardElement.classList.add("flipped"); + }); + } + }; + for (var i = 0; i < 5; i++) { + _loop_1(i); + } +} diff --git a/projectOffical/dist/helpers.js b/projectOffical/dist/helpers.js new file mode 100644 index 0000000..31e7526 --- /dev/null +++ b/projectOffical/dist/helpers.js @@ -0,0 +1,13 @@ +function generateRandomNumbers() { + console.log("random func activated"); + var numbers = []; + while (numbers.length < 5) { + var random = Math.floor(Math.random() * (30 - 0)) + 0; + if (!numbers.includes(random)) { + numbers.push(random); + } + } + return numbers; +} +var randomNumbers = generateRandomNumbers(); +console.log(randomNumbers); diff --git a/projectOffical/helpers.ts b/projectOffical/helpers.ts new file mode 100644 index 0000000..638715d --- /dev/null +++ b/projectOffical/helpers.ts @@ -0,0 +1,16 @@ + +function generateRandomNumbers() { + console.log("random func activated"); + + const numbers:any = []; + while (numbers.length < 5) { + const random = Math.floor(Math.random() * (30-0)) + 0; + if (!numbers.includes(random)) { + numbers.push(random); + } + } + return numbers; + } + let randomNumbers = generateRandomNumbers(); + console.log(randomNumbers); + From dd11c3c168d814183ab280e87532e56b00ae389f Mon Sep 17 00:00:00 2001 From: MaximusGitPrime <112101036+MaximusGitPrime@users.noreply.github.com> Date: Thu, 23 Feb 2023 23:00:48 +0200 Subject: [PATCH 2/4] Maxim Update controlts --- projectOffical/control.ts | 90 ++++++++++++++++++++++++++++++++-- projectOffical/dist/control.js | 76 ++++++++++++++++++++++++++-- projectOffical/dist/helpers.js | 15 ++++++ projectOffical/dist/model.js | 60 +++++++++++++++++++++++ projectOffical/helpers.ts | 19 +++++++ projectOffical/model.ts | 29 +++++++++++ 6 files changed, 283 insertions(+), 6 deletions(-) diff --git a/projectOffical/control.ts b/projectOffical/control.ts index eb10ce2..dc1f7b2 100644 --- a/projectOffical/control.ts +++ b/projectOffical/control.ts @@ -1,25 +1,109 @@ const bronzePack = document.querySelector(".bronzePack")! -bronzePack.addEventListener("click", openCard) +const silverPack = document.querySelector(".silverPack")! +const goldPack = document.querySelector(".goldPack")! +bronzePack.addEventListener("click", openBronzeCard) +silverPack.addEventListener("click", openSilverCard) +goldPack.addEventListener("click", openGoldCard) -function openCard(e){ +function openBronzeCard(e){ e.preventDefault() console.log("Bronze Pack Func Activated"); +<<<<<<< Updated upstream generateRandomNumbers() for( let i = 0 ; i < 5 ; i++){ +======= + + for( let i = 0 ; i < 4 ; i++){ +>>>>>>> Stashed changes const cardElement = document.createElement("div") cardElement.classList.add("card") cardElement.innerHTML = ` +<<<<<<< Updated upstream ` console.log(cardElement); +======= + ` +>>>>>>> Stashed changes + openedPackContainer.appendChild(cardElement) + + if(cardElement){ + cardElement.addEventListener("click" , ()=>{ + cardElement.classList.add("flipped") + }) + + } + openedPackContainer.appendChild(cardElement) +} +const cardRareElement = document.createElement("div") +cardRareElement.classList.add("card") +cardRareElement.innerHTML = ` + + ` + openedPackContainer.appendChild(cardRareElement) + if(cardRareElement){ + cardRareElement.addEventListener("click" , ()=>{ + cardRareElement.classList.add("flipped") + }) +} +} + +function openSilverCard(e){ + e.preventDefault() + console.log("Silver Pack Func Activated"); + + for( let i = 0 ; i < 3 ; i++){ + const cardElement = document.createElement("div") + cardElement.classList.add("card") + cardElement.innerHTML = ` + + ` openedPackContainer.appendChild(cardElement) if(cardElement){ cardElement.addEventListener("click" , ()=>{ cardElement.classList.add("flipped") }) + } + openedPackContainer.appendChild(cardElement) } +for(let i =0; i<2; i++){ +const cardRareElement = document.createElement("div") +cardRareElement.classList.add("card") +cardRareElement.innerHTML = ` + + ` -} \ No newline at end of file + openedPackContainer.appendChild(cardRareElement) + if(cardRareElement){ + cardRareElement.addEventListener("click" , ()=>{ + cardRareElement.classList.add("flipped") + + }) +} +} +} +function openGoldCard(e){ + e.preventDefault() + console.log("Gold Pack Func Activated"); + + for( let i = 0 ; i < 5 ; i++){ + const cardElement = document.createElement("div") + cardElement.classList.add("card") + cardElement.innerHTML = ` + + ` + openedPackContainer.appendChild(cardElement) + + if(cardElement){ + cardElement.addEventListener("click" , ()=>{ + cardElement.classList.add("flipped") + }) + + } + openedPackContainer.appendChild(cardElement) +} +} + \ No newline at end of file diff --git a/projectOffical/dist/control.js b/projectOffical/dist/control.js index 9505546..4cdaa6b 100644 --- a/projectOffical/dist/control.js +++ b/projectOffical/dist/control.js @@ -1,22 +1,92 @@ var bronzePack = document.querySelector(".bronzePack"); -bronzePack.addEventListener("click", openCard); -function openCard(e) { +var silverPack = document.querySelector(".silverPack"); +var goldPack = document.querySelector(".goldPack"); +bronzePack.addEventListener("click", openBronzeCard); +silverPack.addEventListener("click", openSilverCard); +goldPack.addEventListener("click", openGoldCard); +function openBronzeCard(e) { e.preventDefault(); console.log("Bronze Pack Func Activated"); generateRandomNumbers(); var _loop_1 = function (i) { var cardElement = document.createElement("div"); cardElement.classList.add("card"); +<<<<<<< Updated upstream cardElement.innerHTML = "\n \n "; console.log(cardElement); +======= + cardElement.innerHTML = "\n \n "; +>>>>>>> Stashed changes openedPackContainer.appendChild(cardElement); if (cardElement) { cardElement.addEventListener("click", function () { cardElement.classList.add("flipped"); }); } + openedPackContainer.appendChild(cardElement); }; - for (var i = 0; i < 5; i++) { + for (var i = 0; i < 4; i++) { _loop_1(i); } + var cardRareElement = document.createElement("div"); + cardRareElement.classList.add("card"); + cardRareElement.innerHTML = "\n \n "; + openedPackContainer.appendChild(cardRareElement); + if (cardRareElement) { + cardRareElement.addEventListener("click", function () { + cardRareElement.classList.add("flipped"); + }); + } +} +function openSilverCard(e) { + e.preventDefault(); + console.log("Silver Pack Func Activated"); + var _loop_2 = function (i) { + var cardElement = document.createElement("div"); + cardElement.classList.add("card"); + cardElement.innerHTML = "\n \n "; + openedPackContainer.appendChild(cardElement); + if (cardElement) { + cardElement.addEventListener("click", function () { + cardElement.classList.add("flipped"); + }); + } + openedPackContainer.appendChild(cardElement); + }; + for (var i = 0; i < 3; i++) { + _loop_2(i); + } + var _loop_3 = function (i) { + var cardRareElement = document.createElement("div"); + cardRareElement.classList.add("card"); + cardRareElement.innerHTML = "\n \n "; + openedPackContainer.appendChild(cardRareElement); + if (cardRareElement) { + cardRareElement.addEventListener("click", function () { + cardRareElement.classList.add("flipped"); + }); + } + }; + for (var i = 0; i < 2; i++) { + _loop_3(i); + } +} +function openGoldCard(e) { + e.preventDefault(); + console.log("Gold Pack Func Activated"); + var _loop_4 = function (i) { + var cardElement = document.createElement("div"); + cardElement.classList.add("card"); + cardElement.innerHTML = "\n \n "; + openedPackContainer.appendChild(cardElement); + if (cardElement) { + cardElement.addEventListener("click", function () { + cardElement.classList.add("flipped"); + }); + } + openedPackContainer.appendChild(cardElement); + }; + for (var i = 0; i < 5; i++) { + _loop_4(i); + } } diff --git a/projectOffical/dist/helpers.js b/projectOffical/dist/helpers.js index 31e7526..8c1fede 100644 --- a/projectOffical/dist/helpers.js +++ b/projectOffical/dist/helpers.js @@ -11,3 +11,18 @@ function generateRandomNumbers() { } var randomNumbers = generateRandomNumbers(); console.log(randomNumbers); +<<<<<<< Updated upstream +======= +function generateRandomNumbersRare() { + var numbers = []; + while (numbers.length < 5) { + var random = Math.floor(Math.random() * (24 - 0) + 0); + if (!numbers.includes(random)) { + numbers.push(random); + } + } + return numbers; +} +var rareRandomNumbers = generateRandomNumbersRare(); +console.log(rareRandomNumbers); +>>>>>>> Stashed changes diff --git a/projectOffical/dist/model.js b/projectOffical/dist/model.js index 7ce8458..eea18ca 100644 --- a/projectOffical/dist/model.js +++ b/projectOffical/dist/model.js @@ -7,6 +7,7 @@ var Card = /** @class */ (function () { } return Card; }()); +<<<<<<< Updated upstream var cards = [ new Card(1, "common", "./projectPhotos/1.PNG", "./projectPhotos/cardBack.PNG"), new Card(2, "common", "./projectPhotos/2.PNG", "./projectPhotos/cardBack.PNG"), @@ -38,6 +39,65 @@ var cards = [ new Card(28, "common", "./projectPhotos/28.PNG", "./projectPhotos/cardBack.PNG"), new Card(29, "common", "./projectPhotos/29.PNG", "./projectPhotos/cardBack.PNG"), new Card(30, "common", "./projectPhotos/30.PNG", "./projectPhotos/cardBack.PNG"), +======= +var commonCards = [ + new Card(1, "./projectPhotos/1.PNG"), + new Card(2, "./projectPhotos/2.PNG"), + new Card(3, "./projectPhotos/3.PNG"), + new Card(4, "./projectPhotos/4.PNG"), + new Card(5, "./projectPhotos/5.PNG"), + new Card(6, "./projectPhotos/6.PNG"), + new Card(7, "./projectPhotos/7.PNG"), + new Card(8, "./projectPhotos/8.PNG"), + new Card(9, "./projectPhotos/9.PNG"), + new Card(10, "./projectPhotos/10.PNG"), + new Card(11, "./projectPhotos/11.PNG"), + new Card(12, "./projectPhotos/12.PNG"), + new Card(13, "./projectPhotos/13.PNG"), + new Card(14, "./projectPhotos/14.PNG"), + new Card(15, "./projectPhotos/15.PNG"), + new Card(16, "./projectPhotos/16.PNG"), + new Card(17, "./projectPhotos/17.PNG"), + new Card(18, "./projectPhotos/18.PNG"), + new Card(19, "./projectPhotos/19.PNG"), + new Card(20, "./projectPhotos/20.PNG"), + new Card(21, "./projectPhotos/21.PNG"), + new Card(22, "./projectPhotos/22.PNG"), + new Card(23, "./projectPhotos/23.PNG"), + new Card(24, "./projectPhotos/24.PNG"), + new Card(25, "./projectPhotos/25.PNG"), + new Card(26, "./projectPhotos/26.PNG"), + new Card(27, "./projectPhotos/27.PNG"), + new Card(28, "./projectPhotos/28.PNG"), + new Card(29, "./projectPhotos/29.PNG"), + new Card(30, "./projectPhotos/30.PNG"), +]; +var rareCards = [ + new Card(31, "./projectPhotos/specials/31.PNG"), + new Card(32, "./projectPhotos/specials/32.PNG"), + new Card(33, "./projectPhotos/specials/33.PNG"), + new Card(34, "./projectPhotos/specials/34.PNG"), + new Card(35, "./projectPhotos/specials/35.PNG"), + new Card(36, "./projectPhotos/specials/36.PNG"), + new Card(37, "./projectPhotos/specials/37.PNG"), + new Card(38, "./projectPhotos/specials/38.PNG"), + new Card(39, "./projectPhotos/specials/39.PNG"), + new Card(40, "./projectPhotos/specials/40.PNG"), + new Card(41, "./projectPhotos/specials/41.PNG"), + new Card(42, "./projectPhotos/specials/42.PNG"), + new Card(43, "./projectPhotos/specials/43.PNG"), + new Card(44, "./projectPhotos/specials/44.PNG"), + new Card(45, "./projectPhotos/specials/45.PNG"), + new Card(46, "./projectPhotos/specials/46.PNG"), + new Card(47, "./projectPhotos/specials/47.PNG"), + new Card(48, "./projectPhotos/specials/48.PNG"), + new Card(49, "./projectPhotos/specials/49.PNG"), + new Card(50, "./projectPhotos/specials/50.PNG"), + new Card(51, "./projectPhotos/specials/51.PNG"), + new Card(52, "./projectPhotos/specials/52.PNG"), + new Card(53, "./projectPhotos/specials/53.PNG"), + new Card(54, "./projectPhotos/specials/54.PNG") +>>>>>>> Stashed changes ]; cards.forEach(function (card) { var cardElement = document.createElement("div"); diff --git a/projectOffical/helpers.ts b/projectOffical/helpers.ts index 638715d..17dd158 100644 --- a/projectOffical/helpers.ts +++ b/projectOffical/helpers.ts @@ -11,6 +11,25 @@ function generateRandomNumbers() { } return numbers; } +<<<<<<< Updated upstream let randomNumbers = generateRandomNumbers(); console.log(randomNumbers); +======= + const randomNumbers = generateRandomNumbers(); +console.log(randomNumbers); + + +function generateRandomNumbersRare() { + const numbers:any = []; + while (numbers.length < 5) { + const random = Math.floor(Math.random() * (24-0)+0); + if (!numbers.includes(random)) { + numbers.push(random); + } + } + return numbers; + } + const rareRandomNumbers = generateRandomNumbersRare(); +console.log(rareRandomNumbers); +>>>>>>> Stashed changes diff --git a/projectOffical/model.ts b/projectOffical/model.ts index 22d7356..eaa540f 100644 --- a/projectOffical/model.ts +++ b/projectOffical/model.ts @@ -46,6 +46,7 @@ const cards:Card[]=[ new Card(30,"common","./projectPhotos/30.PNG","./projectPhotos/cardBack.PNG"), ] +<<<<<<< Updated upstream cards.forEach((card)=>{ const cardElement = document.createElement("div") @@ -56,3 +57,31 @@ cards.forEach((card)=>{ ` }) +======= +const rareCards:Card[]=[ + new Card(31,"./projectPhotos/specials/31.PNG"), + new Card(32,"./projectPhotos/specials/32.PNG"), + new Card(33,"./projectPhotos/specials/33.PNG"), + new Card(34,"./projectPhotos/specials/34.PNG"), + new Card(35,"./projectPhotos/specials/35.PNG"), + new Card(36,"./projectPhotos/specials/36.PNG"), + new Card(37,"./projectPhotos/specials/37.PNG"), + new Card(38,"./projectPhotos/specials/38.PNG"), + new Card(39,"./projectPhotos/specials/39.PNG"), + new Card(40,"./projectPhotos/specials/40.PNG"), + new Card(41,"./projectPhotos/specials/41.PNG"), + new Card(42,"./projectPhotos/specials/42.PNG"), + new Card(43,"./projectPhotos/specials/43.PNG"), + new Card(44,"./projectPhotos/specials/44.PNG"), + new Card(45,"./projectPhotos/specials/45.PNG"), + new Card(46,"./projectPhotos/specials/46.PNG"), + new Card(47,"./projectPhotos/specials/47.PNG"), + new Card(48,"./projectPhotos/specials/48.PNG"), + new Card(49,"./projectPhotos/specials/49.PNG"), + new Card(50,"./projectPhotos/specials/50.PNG"), + new Card(51,"./projectPhotos/specials/51.PNG"), + new Card(52,"./projectPhotos/specials/52.PNG"), + new Card(53,"./projectPhotos/specials/53.PNG"), + new Card(54,"./projectPhotos/specials/54.PNG") +] +>>>>>>> Stashed changes From 14a6f22270779b5e6c52a9decca21540a866b13e Mon Sep 17 00:00:00 2001 From: MaximusGitPrime <112101036+MaximusGitPrime@users.noreply.github.com> Date: Thu, 23 Feb 2023 23:01:36 +0200 Subject: [PATCH 3/4] Maxim Update controlts --- projectOffical/helpers.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projectOffical/helpers.ts b/projectOffical/helpers.ts index 17dd158..e85fb4e 100644 --- a/projectOffical/helpers.ts +++ b/projectOffical/helpers.ts @@ -2,7 +2,7 @@ function generateRandomNumbers() { console.log("random func activated"); - const numbers:any = []; + let numbers:any = []; while (numbers.length < 5) { const random = Math.floor(Math.random() * (30-0)) + 0; if (!numbers.includes(random)) { From 458a9385e8a9a97fd6d0389cdeefb8f39307641b Mon Sep 17 00:00:00 2001 From: MaximusGitPrime <112101036+MaximusGitPrime@users.noreply.github.com> Date: Thu, 23 Feb 2023 23:03:54 +0200 Subject: [PATCH 4/4] test update --- Maxim/dist/helpers.js | 52 ++++++++++++++++++++++++++++++++++++ Maxim/helpers.ts | 62 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/Maxim/dist/helpers.js b/Maxim/dist/helpers.js index d990c94..77f20d6 100644 --- a/Maxim/dist/helpers.js +++ b/Maxim/dist/helpers.js @@ -12,3 +12,55 @@ function alertMsg() { } /////////////////////////////// var test = 0; +function openSilverCard(e) { + e.preventDefault(); + console.log("Silver Pack Func Activated"); + var _loop_1 = function (i) { + var cardElement = document.createElement("div"); + cardElement.classList.add("card"); + cardElement.innerHTML = "\n \n "; + openedPackContainer.appendChild(cardElement); + if (cardElement) { + cardElement.addEventListener("click", function () { + cardElement.classList.add("flipped"); + }); + } + openedPackContainer.appendChild(cardElement); + }; + for (var i = 0; i < 3; i++) { + _loop_1(i); + } + var _loop_2 = function (i) { + var cardRareElement = document.createElement("div"); + cardRareElement.classList.add("card"); + cardRareElement.innerHTML = "\n \n "; + openedPackContainer.appendChild(cardRareElement); + if (cardRareElement) { + cardRareElement.addEventListener("click", function () { + cardRareElement.classList.add("flipped"); + }); + } + }; + for (var i = 0; i < 2; i++) { + _loop_2(i); + } +} +function openGoldCard(e) { + e.preventDefault(); + console.log("Gold Pack Func Activated"); + var _loop_3 = function (i) { + var cardElement = document.createElement("div"); + cardElement.classList.add("card"); + cardElement.innerHTML = "\n \n "; + openedPackContainer.appendChild(cardElement); + if (cardElement) { + cardElement.addEventListener("click", function () { + cardElement.classList.add("flipped"); + }); + } + openedPackContainer.appendChild(cardElement); + }; + for (var i = 0; i < 5; i++) { + _loop_3(i); + } +} diff --git a/Maxim/helpers.ts b/Maxim/helpers.ts index b146631..99fc410 100644 --- a/Maxim/helpers.ts +++ b/Maxim/helpers.ts @@ -15,4 +15,64 @@ alert("No More Coins"); } /////////////////////////////// -const test = 0 \ No newline at end of file +const test = 0 + + + +function openSilverCard(e){ + e.preventDefault() + console.log("Silver Pack Func Activated"); + + for( let i = 0 ; i < 3 ; i++){ + const cardElement = document.createElement("div") + cardElement.classList.add("card") + cardElement.innerHTML = ` + + ` + openedPackContainer.appendChild(cardElement) + + if(cardElement){ + cardElement.addEventListener("click" , ()=>{ + cardElement.classList.add("flipped") + }) + + } + openedPackContainer.appendChild(cardElement) +} +for(let i =0; i<2; i++){ +const cardRareElement = document.createElement("div") +cardRareElement.classList.add("card") +cardRareElement.innerHTML = ` + + ` + + openedPackContainer.appendChild(cardRareElement) + if(cardRareElement){ + cardRareElement.addEventListener("click" , ()=>{ + cardRareElement.classList.add("flipped") + + }) +} +} +} +function openGoldCard(e){ + e.preventDefault() + console.log("Gold Pack Func Activated"); + + for( let i = 0 ; i < 5 ; i++){ + const cardElement = document.createElement("div") + cardElement.classList.add("card") + cardElement.innerHTML = ` + + ` + openedPackContainer.appendChild(cardElement) + + if(cardElement){ + cardElement.addEventListener("click" , ()=>{ + cardElement.classList.add("flipped") + }) + + } + openedPackContainer.appendChild(cardElement) +} +}