From 1a6288e862fcde4922e387287d17dc402a7cdfb7 Mon Sep 17 00:00:00 2001 From: Akshika Mudgal <66902249+akshikamudgal@users.noreply.github.com> Date: Fri, 13 May 2022 21:36:53 +0530 Subject: [PATCH 1/5] Update app.js --- src/app.js | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/src/app.js b/src/app.js index cc43cc2..1a068eb 100644 --- a/src/app.js +++ b/src/app.js @@ -21,20 +21,39 @@ const PLAYERS = [ "Slingo" ]; -// initialize players with image and strength const initPlayers = (players) => { let detailedPlayers = []; // Create players using for loop // Type your code here + for (var i = 0; i < players.length; i++) { + detailedPlayers[i] = { + name: players[i], + strength: getRandomStrength(), + image: "./images/super-" + (i + 1) + ".png", + }; + if (i % 2 == 0) { + detailedPlayers[i].type = "hero"; + } else { + detailedPlayers[i].type = "villain"; + } return detailedPlayers; } + function herovillian(n) { + if (n % 2 == 0) { + return "hero"; + } else { + return "villain"; + } +} // getting random strength const getRandomStrength = () => { // Return a random integer (0,100] // Note: You can use Math.random() and Math.ceil() -} + let s = Math.ceil(Math.random() * (100 - 1) + 1); + return s; +}; const buildPlayers = (players, type) => { let fragment = ''; @@ -42,17 +61,15 @@ const buildPlayers = (players, type) => { // Loop through players and accumulate HTML template // depending of type of player(hero|villain) // Type your code here - - return fragment; -} + for (var i = 0; i < players.length; i++) { + if (players[i].type == type) { + fragment += `
${players[i].name}
${players[i].strength}
`; + } + } + return fragment; +}; // Display players in HTML const viewPlayers = (players) => { - - document.getElementById('heroes').innerHTML = buildPlayers(players, 'hero'); - document.getElementById('villains').innerHTML = buildPlayers(players, 'villain'); - -} - -window.onload = () => { + window.onload = () => { viewPlayers(initPlayers(PLAYERS)); -} \ No newline at end of file +} From 73cf473451eaa9275b0500941b592733c02f4fde Mon Sep 17 00:00:00 2001 From: Akshika Mudgal <66902249+akshikamudgal@users.noreply.github.com> Date: Fri, 13 May 2022 21:40:45 +0530 Subject: [PATCH 2/5] Update app.js --- src/app.js | 57 +++++++++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/src/app.js b/src/app.js index 1a068eb..1c16d4a 100644 --- a/src/app.js +++ b/src/app.js @@ -20,56 +20,39 @@ const PLAYERS = [ "Vader", "Slingo" ]; - const initPlayers = (players) => { let detailedPlayers = []; // Create players using for loop - // Type your code here - for (var i = 0; i < players.length; i++) { - detailedPlayers[i] = { - name: players[i], - strength: getRandomStrength(), - image: "./images/super-" + (i + 1) + ".png", - }; - if (i % 2 == 0) { - detailedPlayers[i].type = "hero"; - } else { - detailedPlayers[i].type = "villain"; - } + players.forEach((player, i) => { + detailedPlayers.push({ + name: player, + image: "images/super-" + (i + 1) + ".png", + strength: getRandomStrength(), + type: i % 2 == 0 ? "hero" : "villain" + }); + }) return detailedPlayers; } - function herovillian(n) { - if (n % 2 == 0) { - return "hero"; - } else { - return "villain"; - } -} - -// getting random strength const getRandomStrength = () => { // Return a random integer (0,100] // Note: You can use Math.random() and Math.ceil() - let s = Math.ceil(Math.random() * (100 - 1) + 1); - return s; + return Math.ceil(Math.random() * (100 - 1) + 1); }; - const buildPlayers = (players, type) => { let fragment = ''; // Loop through players and accumulate HTML template // depending of type of player(hero|villain) - // Type your code here - for (var i = 0; i < players.length; i++) { - if (players[i].type == type) { - fragment += `
${players[i].name}
${players[i].strength}
`; - } - } - return fragment; -}; -// Display players in HTML -const viewPlayers = (players) => { - window.onload = () => { - viewPlayers(initPlayers(PLAYERS)); + players.forEach((player) => { + fragment += ` +
+ +
${player.name}
+
${player.strength}
+
+ ` + }) + + return fragment; } From 1132d07fc765ba40a9271f97b32d49a6130be2ac Mon Sep 17 00:00:00 2001 From: Akshika Mudgal <66902249+akshikamudgal@users.noreply.github.com> Date: Fri, 13 May 2022 21:44:23 +0530 Subject: [PATCH 3/5] Update app.js --- src/app.js | 63 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/src/app.js b/src/app.js index 1c16d4a..5aa2582 100644 --- a/src/app.js +++ b/src/app.js @@ -20,39 +20,58 @@ const PLAYERS = [ "Vader", "Slingo" ]; -const initPlayers = (players) => { + const initPlayers = (players) => { let detailedPlayers = []; // Create players using for loop - players.forEach((player, i) => { - detailedPlayers.push({ - name: player, - image: "images/super-" + (i + 1) + ".png", + // Type your code here + for (var i = 0; i < players.length; i++) { + detailedPlayers[i] = { + name: players[i], strength: getRandomStrength(), - type: i % 2 == 0 ? "hero" : "villain" - }); - }) + image: "images/super-" + (i + 1) + ".png", + type: herovillian(i), + }; + } return detailedPlayers; } +function herovillian(n) { + if (n % 2 === 0) { + return "hero"; + } else { + return "villain"; + } +} + +// getting random strength const getRandomStrength = () => { // Return a random integer (0,100] // Note: You can use Math.random() and Math.ceil() - return Math.ceil(Math.random() * (100 - 1) + 1); -}; + return Math.ceil(Math.random() * 100); +} + const buildPlayers = (players, type) => { let fragment = ''; + for (var i = 0; i < players.length; i++) { + player = `
+ +
${players[i].name}
+
${players[i].strength}
+
`; + if (players[i].type === type) { + fragment += player; + } + // return fragment; + } + return fragment; +} +// Display players in HTML +const viewPlayers = (players) => { - // Loop through players and accumulate HTML template - // depending of type of player(hero|villain) - players.forEach((player) => { - fragment += ` -
- -
${player.name}
-
${player.strength}
-
- ` - }) + document.getElementById('heroes').innerHTML = buildPlayers(players, 'hero'); + document.getElementById('villains').innerHTML = buildPlayers(players, 'villain'); +} - return fragment; +window.onload = () => { + viewPlayers(initPlayers(PLAYERS)); } From d2271843829e4f6144545be8579955b0397beac8 Mon Sep 17 00:00:00 2001 From: Akshika Mudgal <66902249+akshikamudgal@users.noreply.github.com> Date: Fri, 13 May 2022 21:47:22 +0530 Subject: [PATCH 4/5] Update app.js --- src/app.js | 82 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/src/app.js b/src/app.js index 5aa2582..da659b1 100644 --- a/src/app.js +++ b/src/app.js @@ -21,57 +21,67 @@ const PLAYERS = [ "Slingo" ]; const initPlayers = (players) => { - let detailedPlayers = []; - // Create players using for loop - // Type your code here - for (var i = 0; i < players.length; i++) { - detailedPlayers[i] = { - name: players[i], - strength: getRandomStrength(), - image: "images/super-" + (i + 1) + ".png", - type: herovillian(i), - }; - } + let detailedPlayers = [] + // Create players using for loop + // Type your code here - return detailedPlayers; -} -function herovillian(n) { - if (n % 2 === 0) { - return "hero"; + for (let i = 0; i < players.length; i++) { + let obj = { + name: players[i], + strength: getRandomStrength(), + image: "images/super-" + (i + 1) + ".png", + } + if (i % 2 == 0) { + obj.type = "hero" } else { - return "villain"; + obj.type = "villain" } + + detailedPlayers.push(obj) + } + + return detailedPlayers } // getting random strength const getRandomStrength = () => { - // Return a random integer (0,100] - // Note: You can use Math.random() and Math.ceil() - return Math.ceil(Math.random() * 100); + // Return a random integer (0,100] + // Note: You can use Math.random() and Math.ceil() + + var i = parseInt(Math.random() * 100) + 1 + return i } const buildPlayers = (players, type) => { - let fragment = ''; - for (var i = 0; i < players.length; i++) { - player = `
- -
${players[i].name}
-
${players[i].strength}
-
`; - if (players[i].type === type) { - fragment += player; - } - // return fragment; + let fragment = "" + let fragment1 = "" + for (let i of players) { + fragment = ` +
+ +
${i.name}
+
${i.strength}
+
` + + if (i.type == type) { + fragment1 += fragment } - return fragment; + } + // Loop through players and accumulate HTML template + // depending of type of player(hero|villain) + // Type your code here + + return fragment1 } // Display players in HTML const viewPlayers = (players) => { - - document.getElementById('heroes').innerHTML = buildPlayers(players, 'hero'); - document.getElementById('villains').innerHTML = buildPlayers(players, 'villain'); + document.getElementById("heroes").innerHTML = buildPlayers(players, "hero") + document.getElementById("villains").innerHTML = buildPlayers( + players, + "villain" + ) } window.onload = () => { - viewPlayers(initPlayers(PLAYERS)); + viewPlayers(initPlayers(PLAYERS)) } From 3b5a0fc726ac4b49ca4301bdf94e91b5d5f1dc68 Mon Sep 17 00:00:00 2001 From: Akshika Mudgal <66902249+akshikamudgal@users.noreply.github.com> Date: Fri, 13 May 2022 21:48:22 +0530 Subject: [PATCH 5/5] Update index.html --- index.html | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/index.html b/index.html index 62790f2..d3aaa16 100644 --- a/index.html +++ b/index.html @@ -1,25 +1,22 @@ - - - - - + + + + Super Wars - - + + - +
-
-
-
-
-
-
+
+
+
- - - - + + +