Doble/LeagueStats
1
0
Fork 0
mirror of https://github.com/vkaelin/LeagueStats.git synced 2026-03-25 12:57:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: compare summonerId or accountId instead of summonerNames in vue

Browse source
This commit is contained in:
Valentin Kaelin 2020-01-20 21:54:04 +01:00
parent bd9ec8f343
commit 4a0a76686e
4 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
client/src/components/Match/DetailedMatch.vue
View file

@ -26,7 +26,7 @@
</template> </template>
<script> <script>
import { compareSummonernames } from '@/helpers/functions.js' import { mapState } from 'vuex'
import DetailedMatchGlobalStats from '@/components/Match/DetailedMatchGlobalStats.vue' import DetailedMatchGlobalStats from '@/components/Match/DetailedMatchGlobalStats.vue'
import DetailedMatchTeam from '@/components/Match/DetailedMatchTeam.vue' import DetailedMatchTeam from '@/components/Match/DetailedMatchTeam.vue'
import SwitchToggle from '@/components/SwitchToggle.vue' import SwitchToggle from '@/components/SwitchToggle.vue'
@ -50,11 +50,14 @@ export default {
computed: { computed: {
allyTeam() { allyTeam() {
return this.data.blueTeam.players.some(p => compareSummonernames(p.name, this.$route.params.name)) ? this.data.blueTeam : this.data.redTeam return this.data.blueTeam.players.some(p => p.summonerId === this.account.id) ? this.data.blueTeam : this.data.redTeam
}, },
enemyTeam() { enemyTeam() {
return this.data.blueTeam.players.some(p => compareSummonernames(p.name, this.$route.params.name)) ? this.data.redTeam : this.data.blueTeam return this.data.blueTeam.players.some(p => p.summonerId === this.account.id) ? this.data.redTeam : this.data.blueTeam
} },
...mapState({
account: state => state.summoner.basic.account
}),
} }
} }
</script> </script>

5
client/src/components/Match/DetailedMatchTeam.vue
View file

@ -124,7 +124,7 @@
<router-link <router-link
v-if="player.firstSum" v-if="player.firstSum"
:to="{ name: 'summoner', params: { region: $route.params.region, name: player.name }}" :to="{ name: 'summoner', params: { region: $route.params.region, name: player.name }}"
:class="{'font-semibold text-yellow-400': compareSummonernames($route.params.name, player.name)}" :class="{'font-semibold text-yellow-400': account.id === player.summonerId}"
class="w-22 text-xs text-white text-left overflow-hidden text-overflow whitespace-no-wrap hover:text-blue-200" class="w-22 text-xs text-white text-left overflow-hidden text-overflow whitespace-no-wrap hover:text-blue-200"
>{{ player.name }}</router-link> >{{ player.name }}</router-link>
<div <div
@ -198,7 +198,6 @@
<script> <script>
import { mapState } from 'vuex' import { mapState } from 'vuex'
import { compareSummonernames } from '@/helpers/functions.js'
import DotsLoader from '@/components/DotsLoader' import DotsLoader from '@/components/DotsLoader'
import Dropdown from '@/components/Dropdown' import Dropdown from '@/components/Dropdown'
import MatchItems from '@/components/Match/MatchItems' import MatchItems from '@/components/Match/MatchItems'
@ -230,6 +229,7 @@ export default {
return this.percentSettings ? 'percentStats' : 'stats' return this.percentSettings ? 'percentStats' : 'stats'
}, },
...mapState({ ...mapState({
account: state => state.summoner.basic.account,
percentSettings: state => state.settings.percent percentSettings: state => state.settings.percent
}), }),
}, },
@ -251,7 +251,6 @@ export default {
roundStats(value) { roundStats(value) {
return this.percentSettings ? value : this.$options.filters.kilo(value) return this.percentSettings ? value : this.$options.filters.kilo(value)
}, },
compareSummonernames,
} }
} }
</script> </script>

8
client/src/components/Match/Match.vue
View file

@ -102,7 +102,7 @@
class="ml-4 flex items-center leading-none" class="ml-4 flex items-center leading-none"
> >
<div <div
:class="isSummonerProfile(ally.name)" :class="isSummonerProfile(ally.account_id)"
class="w-16 text-right overflow-hidden text-overflow whitespace-no-wrap text-xs text-blue-200 font-medium" class="w-16 text-right overflow-hidden text-overflow whitespace-no-wrap text-xs text-blue-200 font-medium"
>{{ ally.name }}</div> >{{ ally.name }}</div>
<div <div
@ -151,7 +151,6 @@
<script> <script>
import { mapActions, mapState, mapGetters } from 'vuex' import { mapActions, mapState, mapGetters } from 'vuex'
import { compareSummonernames } from '@/helpers/functions.js'
import Dropdown from '@/components/Dropdown' import Dropdown from '@/components/Dropdown'
import DetailedMatch from '@/components/Match/DetailedMatch' import DetailedMatch from '@/components/Match/DetailedMatch'
import MatchItems from '@/components/Match/MatchItems' import MatchItems from '@/components/Match/MatchItems'
@ -180,6 +179,7 @@ export default {
computed: { computed: {
...mapState({ ...mapState({
account: state => state.summoner.basic.account,
roles: state => state.roles roles: state => state.roles
}), }),
...mapGetters('detailedMatch', ['getMatchDetails']), ...mapGetters('detailedMatch', ['getMatchDetails']),
@ -193,9 +193,9 @@ export default {
this.matchDetails(this.data.gameId) this.matchDetails(this.data.gameId)
} }
}, },
isSummonerProfile(allyName) { isSummonerProfile(account_id) {
return { return {
'font-bold': compareSummonernames(this.$route.params.name, allyName) 'font-bold': this.account.accountId === account_id
} }
}, },
...mapActions('detailedMatch', ['matchDetails']), ...mapActions('detailedMatch', ['matchDetails']),

9
client/src/helpers/functions.js
View file

@ -25,12 +25,3 @@ export function timeDifference(previous) {
return day + '.' + month + '.' + oldDate.getFullYear().toString().substr(-2) return day + '.' + month + '.' + oldDate.getFullYear().toString().substr(-2)
} }
} }
/**
* Check if 2 summoner names are the same
* @param a : first summoner name
* @param b : second summoner name
*/
export function compareSummonernames(a, b) {
return a.toLowerCase().replace(/ /g, '') === b.toLowerCase().replace(/ /g, '')
}