Skip to content

Commit

Permalink
Merge pull request #87 from versx/custom_pvp_leagues
Browse files Browse the repository at this point in the history
Add custom pvp leagues support
  • Loading branch information
versx authored Jun 20, 2022
2 parents 9b577a9 + 7a4a76c commit baf70e6
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 7 deletions.
7 changes: 7 additions & 0 deletions src/config.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,12 @@
},
"map": "",
"paypal": ""
},
"pvp": {
"leagues": [
"Little",
"Great",
"Ultra"
]
}
}
8 changes: 3 additions & 5 deletions src/data/default.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ data.genders = [
{ 'id': 'm', 'name': 'Male' },
{ 'id': 'f', 'name': 'Female', }
];
data.leagues = [
{ 'id': 'great', 'name': 'Great' },
{ 'id': 'ultra', 'name': 'Ultra' },
//{ 'id': 'master', 'name': 'Master' },
];
data.leagues = config.pvp.leagues.map(league => {
return { 'name': league };
});
data.icon_styles = config.iconStyles;
data.enable_geofence_roles = config.enableGeofenceRoles;
data.hide_phone_number = config.hidePhoneNumber;
Expand Down
2 changes: 1 addition & 1 deletion src/views/pvp/edit.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<br>
<div class="w-75" style="float: none; margin: 0 auto;">
<div class="alert alert-info" style="float: none; margin: 0 auto;">
<div><strong>{{Description}}:</strong> PvP subscriptions are based on the desired final PvP ranked Pokemon and not the wild Pokemon found.</div>
<div><strong>{{Description}}:</strong> PvP subscriptions can be based on the desired final PvP ranked Pokemon or the wild Pokemon found.</div>
</div>
<br>
<form action="/api/pvp/edit/{{id}}" method="post">
Expand Down
2 changes: 1 addition & 1 deletion src/views/pvp/new.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<br>
<div class="w-75" style="float: none; margin: 0 auto;">
<div class="alert alert-info" style="float: none; margin: 0 auto;">
<div><strong>{{Description}}:</strong> PvP subscriptions are based on the desired final PvP ranked Pokemon and not the wild Pokemon found.</div>
<div><strong>{{Description}}:</strong> PvP subscriptions can be based on the desired final PvP ranked Pokemon or the wild Pokemon found.</div>
</div>
<br>
<form action="/api/pvp/new" method="post">
Expand Down

0 comments on commit baf70e6

Please sign in to comment.