-
-
-
-
-
-
-
-
- {{ row.battletag }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ row.battletag }}
+
|
@@ -146,7 +135,7 @@ export default {
enemySortKey: '',
enemySortDir: 'desc',
- gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+ gametype: null,
gamemap: null,
season: null,
friendCancelTokenSource: null,
@@ -154,6 +143,7 @@ export default {
}
},
created(){
+ this.gametype = this.gametypedefault;
},
mounted() {
Promise.allSettled([
diff --git a/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue b/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue
index ffb4395b..6c2b8f93 100644
--- a/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue
+++ b/resources/js/components/Player/Heroes/PlayerHeroSingleStats.vue
@@ -5,7 +5,7 @@
-
+
@@ -197,6 +197,7 @@
regionsmap: Object,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
},
data(){
return {
@@ -283,6 +284,9 @@
}
},
created(){
+ if(this.gametypedefault && this.gametypedefault.length > 0){
+ this.modifiedgametype = this.gametypedefault[0];
+ }
},
mounted() {
this.getData();
diff --git a/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue b/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue
index 43eb20e5..1069b3ee 100644
--- a/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue
+++ b/resources/js/components/Player/Heroes/PlayerHeroesAllStats.vue
@@ -123,6 +123,7 @@ export default {
accountlevel: Number,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
},
data(){
return {
@@ -131,7 +132,7 @@ export default {
matchIsLoading: false,
cancelTokenSource: null,
infoText: "Select a hero below to view detailed stats for that hero. Use the search box above to filter the list of heroes. Or scroll down to the advanced section for table view.",
- gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+ gametype: null,
data: null,
sortKey: '',
sortDir: 'desc',
@@ -228,6 +229,7 @@ export default {
}
},
created(){
+ this.gametype = this.gametypedefault;
},
mounted() {
this.getData();
diff --git a/resources/js/components/Player/Maps/PlayerMapSingleStats.vue b/resources/js/components/Player/Maps/PlayerMapSingleStats.vue
index abecfafd..22117d74 100644
--- a/resources/js/components/Player/Maps/PlayerMapSingleStats.vue
+++ b/resources/js/components/Player/Maps/PlayerMapSingleStats.vue
@@ -6,7 +6,7 @@
-
+
@@ -120,6 +120,8 @@ export default {
mapobject: Object,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
+
},
data(){
return {
@@ -133,6 +135,9 @@ export default {
},
created(){
this.inputmap = this.map;
+ if(this.gametypedefault && this.gametypedefault.length > 0){
+ this.modifiedgametype = this.gametypedefault[0];
+ }
},
mounted() {
this.getData();
diff --git a/resources/js/components/Player/Maps/PlayerMapsAllStats.vue b/resources/js/components/Player/Maps/PlayerMapsAllStats.vue
index bc7f0a7d..fc658d7c 100644
--- a/resources/js/components/Player/Maps/PlayerMapsAllStats.vue
+++ b/resources/js/components/Player/Maps/PlayerMapsAllStats.vue
@@ -109,6 +109,8 @@ export default {
accountlevel: Number,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
+
},
data(){
return {
@@ -116,7 +118,7 @@ export default {
showOptions: false,
isLoading: false,
infoText: "Select a hero below to view detailed stats for that hero. Use the search box above to filter the list of heroes. Or scroll down to the advanced section for table view.",
- gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+ gametype: null,
data: null,
sortKey: '',
sortDir: 'desc',
@@ -212,6 +214,7 @@ export default {
}
},
created(){
+ this.gametype = this.gametypedefault;
},
mounted() {
this.getData();
diff --git a/resources/js/components/Player/PlayerMatchHistory.vue b/resources/js/components/Player/PlayerMatchHistory.vue
index 464d97ea..a005167a 100644
--- a/resources/js/components/Player/PlayerMatchHistory.vue
+++ b/resources/js/components/Player/PlayerMatchHistory.vue
@@ -118,6 +118,7 @@ export default {
regionsmap: Object,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
},
data(){
return {
@@ -131,10 +132,11 @@ export default {
season: null,
sortKey: '',
sortDir: 'desc',
- gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+ gametype: null,
}
},
created(){
+ this.gametype = this.gametypedefault;
},
mounted() {
this.getData(1);
diff --git a/resources/js/components/Player/PlayerMatchup.vue b/resources/js/components/Player/PlayerMatchup.vue
index e50cb108..38fdd714 100644
--- a/resources/js/components/Player/PlayerMatchup.vue
+++ b/resources/js/components/Player/PlayerMatchup.vue
@@ -83,13 +83,15 @@
region: String,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
+
},
data(){
return {
cancelTokenSource: null,
isLoading: false,
infotext: "Hero Matchups provide information on which heroes " + this.battletag + " is good with and against",
- gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+ gametype: null,
data: null,
sortKey: '',
sortDir: 'desc',
@@ -98,6 +100,8 @@
}
},
created(){
+ this.gametype = this.gametypedefault;
+
},
mounted() {
this.getData();
diff --git a/resources/js/components/Player/PlayerStats.vue b/resources/js/components/Player/PlayerStats.vue
index af42d313..0f2774bc 100644
--- a/resources/js/components/Player/PlayerStats.vue
+++ b/resources/js/components/Player/PlayerStats.vue
@@ -3,7 +3,7 @@
-
+
@@ -205,10 +205,11 @@
blizzid: String,
region: String,
season: Number,
- gametype: Array,
regionsmap: Object,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
+
},
data(){
return {
@@ -223,8 +224,11 @@
}
},
created(){
- this.modifiedgametype = this.gametype;
this.modifiedseason = this.season;
+
+ if(this.gametypedefault && this.gametypedefault.length > 0){
+ this.modifiedgametype = this.gametypedefault[0];
+ }
},
mounted() {
if(this.settinghero){
diff --git a/resources/js/components/Player/PlayerTalents.vue b/resources/js/components/Player/PlayerTalents.vue
index 8823401d..843c23d9 100644
--- a/resources/js/components/Player/PlayerTalents.vue
+++ b/resources/js/components/Player/PlayerTalents.vue
@@ -62,12 +62,14 @@ export default {
regionsmap: Object,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
+
},
data(){
return {
cancelTokenSource: null,
isLoading: false,
- gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+ gametype: null,
selectedHero: null,
data: null,
talentdetaildata: null,
@@ -78,6 +80,7 @@ export default {
}
},
created(){
+ this.gametype = this.gametypedefault;
},
mounted() {
if(this.inputhero){
diff --git a/resources/js/components/Player/Roles/PlayerRoleSingleStats.vue b/resources/js/components/Player/Roles/PlayerRoleSingleStats.vue
index a59b1017..6d3a3326 100644
--- a/resources/js/components/Player/Roles/PlayerRoleSingleStats.vue
+++ b/resources/js/components/Player/Roles/PlayerRoleSingleStats.vue
@@ -7,7 +7,7 @@
-
+
@@ -141,6 +141,8 @@
regionsmap: Object,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
+
},
data(){
return {
@@ -154,6 +156,9 @@
},
created(){
this.inputrole = this.hero;
+ if(this.gametypedefault && this.gametypedefault.length > 0){
+ this.modifiedgametype = this.gametypedefault[0];
+ }
},
mounted() {
this.getData();
diff --git a/resources/js/components/Player/Roles/PlayerRolesAllStats.vue b/resources/js/components/Player/Roles/PlayerRolesAllStats.vue
index 97908064..6d93389f 100644
--- a/resources/js/components/Player/Roles/PlayerRolesAllStats.vue
+++ b/resources/js/components/Player/Roles/PlayerRolesAllStats.vue
@@ -105,6 +105,8 @@
accountlevel: Number,
isPatreon: Boolean,
patreonUser: Boolean,
+ gametypedefault: Array,
+
},
data(){
return {
@@ -112,7 +114,7 @@
showOptions: false,
isLoading: false,
infoText: "Select a hero below to view detailed stats for that hero. Use the search box above to filter the list of heroes. Or scroll down to the advanced section for table view.",
- gametype: ["qm", "ud", "hl", "tl", "sl", "ar"],
+ gametype: null,
data: null,
sortKey: '',
sortDir: 'desc',
@@ -208,6 +210,7 @@
}
},
created(){
+ this.gametype = this.gametypedefault;
},
mounted() {
this.getData();
diff --git a/resources/js/components/Profile/ProfileSettings.vue b/resources/js/components/Profile/ProfileSettings.vue
index 47a394eb..9d9dabd8 100644
--- a/resources/js/components/Profile/ProfileSettings.vue
+++ b/resources/js/components/Profile/ProfileSettings.vue
@@ -10,7 +10,7 @@
:text="'Game Type'"
@dropdown-closed="saveSettings()"
@input-changed="handleInputChange"
- :defaultValue="defaultGameType"
+ :defaultValue="defaultMultiGameType"
:trackclosure="true"
>
@@ -19,7 +19,7 @@
Default Game Type:
-
-
+
@@ -102,6 +102,7 @@ export default {
return {
userhero: null,
usergametype: null,
+ usermultigametype: null,
advancedfilteringoptions: [
{ code: 'true', name: 'Show' },
{ code: 'false', name: "Don't Show" }
@@ -122,9 +123,7 @@ export default {
this.accountVisibility = "false";
}
- console.log(this.defaultBuiltType);
-
-
+ console.log(this.user.user_settings);
},
mounted() {
this.advancedfiltering = this.defaultAdvancedFiltering;
@@ -132,34 +131,40 @@ export default {
computed: {
defaultHero(){
if (this.user.user_settings.length > 0){
- let hero = this.user.user_settings.find(item => item.setting === 'hero').value;
- return hero ? hero : null;
+ let hero = this.user.user_settings.find(item => item.setting === 'hero');
+ return hero ? hero.value : null;
}
return null;
},
- defaultGameType() {
+ defaultMultiGameType() {
if (this.user.user_settings.length > 0) {
- let gameType = this.user.user_settings.find(item => item.setting === 'game_type').value;
-
- // Check if gameType is truthy and not an empty string
- if (gameType && gameType.trim() !== '') {
- // Split the comma-separated values into an array
- return gameType.split(',').map(value => value.trim());
+ let multiGameTypes = this.user.user_settings.find(item => item.setting === 'multi_game_type');
+ let gameTypes = multiGameTypes ? multiGameTypes.value : null;
+
+ if (gameTypes && gameTypes.trim() !== '') {
+ return gameTypes.split(',').map(value => value.trim());
}
}
- return null;
+ return ["sl"];
+ },
+ defaultGameType() {
+ if (this.user.user_settings.length > 0) {
+ let gameTypeSetting = this.user.user_settings.find(item => item.setting === 'game_type');
+ return gameTypeSetting ? gameTypeSetting.value : null;
+ }
+ return "sl";
},
defaultBuildType(){
if (this.user.user_settings.length > 0){
- let buildtype = this.user.user_settings.find(item => item.setting === 'talentbuildtype').value;
- return buildtype ? buildtype : null;
+ let buildtype = this.user.user_settings.find(item => item.setting === 'talentbuildtype');
+ return buildtype ? buildtype.value : null;
}
return this.filters.talent_build_types[0].code;
},
defaultAdvancedFiltering(){
if (this.user.user_settings.length > 0){
- let advancedfiltering = this.user.user_settings.find(item => item.setting === 'advancedfiltering').value;
- return advancedfiltering ? advancedfiltering : 'false';
+ let advancedfiltering = this.user.user_settings.find(item => item.setting === 'advancedfiltering');
+ return advancedfiltering ? advancedfiltering.value : 'false';
}
return "false";
},
@@ -173,6 +178,7 @@ export default {
userid: this.user.battlenet_accounts_id,
userhero: this.userhero,
usergametype: this.usergametype,
+ usermultigametype: this.usermultigametype,
advancedfiltering: this.advancedfiltering,
talentbuildtype: this.talentBuildType,
});
@@ -180,6 +186,7 @@ export default {
}catch(error){
//Do something here
}
+
},
async setAccountVisbility(){
try{
@@ -201,11 +208,13 @@ export default {
this.accountVisibility = eventPayload.value;
}else if(eventPayload.field == "Talent Build Type"){
this.talentBuildType = eventPayload.value;
+ }else if(eventPayload.field == "Game Type"){
+ this.usergametype = eventPayload.value;
}
} else if(eventPayload.type === 'multi') {
if(eventPayload.field == "Game Type"){
- this.usergametype = eventPayload.value;
+ this.usermultigametype = eventPayload.value;
}
}
},
diff --git a/resources/views/Player/Heroes/allHeroesData.blade.php b/resources/views/Player/Heroes/allHeroesData.blade.php
index 5a9a4b3e..85c93d5a 100644
--- a/resources/views/Player/Heroes/allHeroesData.blade.php
+++ b/resources/views/Player/Heroes/allHeroesData.blade.php
@@ -12,5 +12,7 @@
:regionsmap="{{ json_encode($regions) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/Player/Heroes/singleHeroData.blade.php b/resources/views/Player/Heroes/singleHeroData.blade.php
index 20b99728..90a06be0 100644
--- a/resources/views/Player/Heroes/singleHeroData.blade.php
+++ b/resources/views/Player/Heroes/singleHeroData.blade.php
@@ -13,5 +13,7 @@
:heroobject="{{ json_encode($heroObject) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/Player/Maps/allMapData.blade.php b/resources/views/Player/Maps/allMapData.blade.php
index fc10a750..28456eb1 100644
--- a/resources/views/Player/Maps/allMapData.blade.php
+++ b/resources/views/Player/Maps/allMapData.blade.php
@@ -13,5 +13,7 @@
:regionsmap="{{ json_encode($regions) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/Player/Maps/singleMapData.blade.php b/resources/views/Player/Maps/singleMapData.blade.php
index 8a39c597..650eb6d4 100644
--- a/resources/views/Player/Maps/singleMapData.blade.php
+++ b/resources/views/Player/Maps/singleMapData.blade.php
@@ -14,5 +14,7 @@
:regionsmap="{{ json_encode($regions) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/Player/Roles/allRoleData.blade.php b/resources/views/Player/Roles/allRoleData.blade.php
index a15b6c2f..87f7a9a0 100644
--- a/resources/views/Player/Roles/allRoleData.blade.php
+++ b/resources/views/Player/Roles/allRoleData.blade.php
@@ -12,5 +12,7 @@
:regionsmap="{{ json_encode($regions) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/Player/Roles/singleRoleData.blade.php b/resources/views/Player/Roles/singleRoleData.blade.php
index 33a2d4b8..2da0b295 100644
--- a/resources/views/Player/Roles/singleRoleData.blade.php
+++ b/resources/views/Player/Roles/singleRoleData.blade.php
@@ -12,5 +12,7 @@
:regionsmap="{{ json_encode($regions) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/Player/matchupData.blade.php b/resources/views/Player/matchupData.blade.php
index b3bbb925..bbdbd09b 100644
--- a/resources/views/Player/matchupData.blade.php
+++ b/resources/views/Player/matchupData.blade.php
@@ -10,5 +10,7 @@
:region="{{ json_encode($region) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/Player/player.blade.php b/resources/views/Player/player.blade.php
index a3961b00..e5644928 100644
--- a/resources/views/Player/player.blade.php
+++ b/resources/views/Player/player.blade.php
@@ -10,7 +10,7 @@
:region="{{ json_encode($region) }}"
:filters="{{ json_encode($filters) }}"
:season="{{ json_encode($season) }}"
- :gametype="{{ json_encode($game_type) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
:regionsmap="{{ json_encode($regions) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
diff --git a/resources/views/Player/talentData.blade.php b/resources/views/Player/talentData.blade.php
index a2a52f17..aa3d5ade 100644
--- a/resources/views/Player/talentData.blade.php
+++ b/resources/views/Player/talentData.blade.php
@@ -14,5 +14,7 @@
:regionsmap="{{ json_encode($regions) }}"
:is-patreon="{{ json_encode($patreon) }}"
:patreon-user="{{ json_encode(session('patreonSubscriberAdFree')) }}"
+ :gametypedefault="{{ json_encode($gametypedefault) }}"
+
>
@endsection
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4d1ac800..928f29fe 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -32,7 +32,7 @@ function gtag(){dataLayer.push(arguments);}
Site has not been styled for mobile yet.
Patreon subscribers please log in and link your Patreon account as we migrate to new site flair and ad-free infrastructure.
- {{ session('headeralert') }}
+
|