fkranjec/TFTPaths
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes check, selected role and added 2 sinergies

Browse source
This commit is contained in:
Daniel Rodriguez 2019-08-20 18:06:55 +02:00
parent 7f1539ac11
commit 24629508dd
10 changed files with 193 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/assets/images/greencheck.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

165
app/src/common/constants.ts
View file

@ -11,7 +11,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Ahri',
@ -21,7 +22,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'AurelionSol',
@ -31,7 +33,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Anivia',
@ -41,7 +44,8 @@ export class Constants {
],
cost: 5,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Ashe',
@ -51,7 +55,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Akali',
@ -61,7 +66,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Brand',
@ -71,7 +77,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Braum',
@ -81,7 +88,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Blitzcrank',
@ -91,7 +99,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Chogath',
@ -101,7 +110,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Draven',
@ -111,7 +121,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Darius',
@ -121,7 +132,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
}
,
{
@ -132,7 +144,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Elise',
@ -142,7 +155,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Fiora',
@ -152,7 +166,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Gnar',
@ -163,7 +178,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Garen',
@ -173,7 +189,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Gangplank',
@ -184,7 +201,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Graves',
@ -194,7 +212,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Kayle',
@ -204,7 +223,8 @@ export class Constants {
],
cost: 5,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Karthus',
@ -214,7 +234,8 @@ export class Constants {
],
cost: 5,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Kennen',
@ -225,7 +246,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Katarina',
@ -235,7 +257,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Kindred',
@ -245,7 +268,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Kassadin',
@ -255,7 +279,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Khazix',
@ -265,7 +290,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Lissandra',
@ -275,7 +301,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Lucian',
@ -285,7 +312,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Lulu',
@ -295,7 +323,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Leona',
@ -305,7 +334,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'MissFortune',
@ -315,7 +345,8 @@ export class Constants {
],
cost: 5,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Mordekaiser',
@ -325,7 +356,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Morgana',
@ -335,7 +367,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Nidalee',
@ -345,7 +378,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Pyke',
@ -355,7 +389,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Poppy',
@ -365,7 +400,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Rengar',
@ -375,7 +411,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'RekSai',
@ -385,7 +422,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Swain',
@ -396,7 +434,8 @@ export class Constants {
],
cost: 5,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Sejuani',
@ -406,7 +445,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Shen',
@ -416,7 +456,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Shyvana',
@ -426,7 +467,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'TwistedFate',
@ -436,7 +478,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Tristana',
@ -446,7 +489,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Varus',
@ -456,7 +500,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Vayne',
@ -466,7 +511,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Veigar',
@ -476,7 +522,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Volibear',
@ -486,7 +533,8 @@ export class Constants {
],
cost: 3,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Warwick',
@ -496,7 +544,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Yasuo',
@ -506,7 +555,8 @@ export class Constants {
],
cost: 5,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Zed',
@ -516,7 +566,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Camille',
@ -526,7 +577,8 @@ export class Constants {
],
cost: 1,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Jayce',
@ -536,7 +588,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Jinx',
@ -546,7 +599,8 @@ export class Constants {
],
cost: 4,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
},
{
name: 'Vi',
@ -556,7 +610,8 @@ export class Constants {
],
cost: 2,
isSelected: false,
sinergy: false
sinergy: false,
sinergy2: false
}
];
public static championName = 'name';

9
app/src/components/home/home.component.html
View file

@ -9,8 +9,11 @@
[ngClass]="{
'selected': champion.isSelected,
'sinergy': champion.sinergy && !champion.isSelected,
'dark': !champion.isSelected && !champion.sinergy && !noChampSelected
}"></div>
'sinergy2': champion.sinergy2 && !champion.isSelected,
'dark': !champion.isSelected && !champion.sinergy && !champion.sinergy2 && !noChampSelected
}">
<img class="checkSelectedChampion"*ngIf="champion.isSelected" src="../../assets/images/greencheck.png">
</div>
<div class="rolesWrap">
<div *ngFor="let role of champion.roles" class="roles">
<img title="{{role}}" src="../../assets/images/{{role}}.png" alt="{{role}}">
@ -28,6 +31,8 @@
<input formControlName="teamSize" type="text" disabled/>
</label>
<button (click)="resetComposition()">Reset</button>
<span id="oneSinergy">1 sinergy</span>
<span id="twoSinergies">2 sinergies</span>
</form>
</div>
<div class="clear"></div>

27
app/src/components/home/home.component.scss
View file

@ -17,6 +17,7 @@
color: white;
}
}
button {
-webkit-border-radius: 4;
-moz-border-radius: 4;
@ -26,6 +27,19 @@
padding: 10px 20px 10px 20px;
text-decoration: none;
}
#oneSinergy {
color: #5c7edec7;
margin: 0% 0.5% 0% 1%;
font-weight: bold;
}
#twoSinergies {
color: #b7de5cc7;
margin: 0% 0% 0% 0.5%;
font-weight: bold;
}
}
#champions{
@ -68,6 +82,12 @@
height: 4em;
background-size: cover;
background-position: center;
.checkSelectedChampion{
float: right;
margin: -15% -15% 0% 0%;
}
}
.rolesWrap{
@ -100,6 +120,12 @@
box-shadow: inset 0 0 0 3px #5c7edec7;
}
.sinergy2{
-webkit-box-shadow: inset 0 0 0 3px #b7de5cc7;
-moz-box-shadow: inset 0 0 0 3px #b7de5cc7;
box-shadow: inset 0 0 0 3px #b7de5cc7;
}
.dark {
opacity: 0.3;
}
@ -117,6 +143,7 @@
display: flex;
align-items: center;
justify-content: center;
margin-top: 1%;
.roleSelectedRoles{
float: left;

72
app/src/components/home/home.component.ts
View file

@ -106,28 +106,32 @@ export class HomeComponent implements OnInit {
* @param role name of role
*/
selectRole(role) {
this.resetComposition();
this.selectedRole = role;
let countChampions = 0;
this.champions.map( champion => {
if (_.indexOf(champion.roles, role) !== -1) {
champion.isSelected = true;
countChampions++;
this.championsPool.push(champion);
champion.roles.forEach( rol => {
this.rolesCount[rol]++;
});
}
return champion;
});
this.updatePool();
this.updateSinergies();
this.teamSize = countChampions;
this.formFilters.patchValue({
teamSize: this.teamSize
});
this.getBonus();
this.noChampSelected = false;
if (role !== this.selectedRole) {
this.resetComposition();
this.selectedRole = role;
let countChampions = 0;
this.champions.map( champion => {
if (_.indexOf(champion.roles, role) !== -1) {
champion.isSelected = true;
countChampions++;
this.championsPool.push(champion);
champion.roles.forEach( rol => {
this.rolesCount[rol]++;
});
}
return champion;
});
this.updatePool();
this.updateSinergies();
this.teamSize = countChampions;
this.formFilters.patchValue({
teamSize: this.teamSize
});
this.getBonus();
this.noChampSelected = false;
} else {
this.resetComposition();
}
}
/**
@ -162,15 +166,26 @@ export class HomeComponent implements OnInit {
*/
updateSinergies() {
this.champions.map(champion => {
return champion.sinergy = false;
champion.sinergy2 = false;
return champion.sinergy = false;
});
this.rolesPool.forEach( role => {
this.champions.map(champion => {
if (_.indexOf(champion.roles, role) !== -1 ) {
return champion.sinergy = true;
this.champions.map(champion => {
let countRoles = 0;
this.rolesPool.forEach( role => {
if (_.indexOf(champion.roles, role) !== -1 ) {
countRoles++;
}
});
switch (countRoles) {
case 1:
return champion.sinergy = true;
break;
case 2:
return champion.sinergy2 = true;
break;
}
});
});
}
/**
@ -197,6 +212,7 @@ export class HomeComponent implements OnInit {
this.teamSize = 0;
this.champions.map(champion => {
champion.sinergy = false;
champion.sinergy2 = false;
champion.isSelected = false;
return champion;
});

3
app/src/models/champion.ts
View file

@ -4,6 +4,7 @@ export class Champion {
public roles: string[],
public cost: number,
public isSelected: boolean,
public sinergy: boolean
public sinergy: boolean,
public sinergy2: boolean
) {}
}