Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple Fix #171

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Multiple Fix #171

wants to merge 5 commits into from

Conversation

tech62
Copy link
Contributor

@tech62 tech62 commented Nov 12, 2022

MatchesTable.vue :

  • Adding the name of the server where the match will be played
  • Adding a connect button
  • Fix the display of the team1 name wasn't show

MatchInfo.vue

  • Adding a connect button with the name of the server you will join

Translation.json

  • Adding multiple value in FR / EN relative to this update

Fix : Using a relationship to show the right TeamName in place of using match.team1_string and match.team2_string to keeping the information up-to-date

MatchesTable.vue :
- Adding the name of the server where the match will be played
- Adding a connect button
- Fix the display of the team1 name wasn't  show

MatchInfo.vue
- Adding a connect button with the name of the server you will join

Translation.json
- Adding multiple value in FR / EN relative to this update

Fix : Using a relationship to show the right TeamName in place of using match.team1_string and match.team2_string to keep the information up-to-date
@@ -140,11 +174,11 @@ export default {
(match.cancelled == 0 || match.cancelled == null) &&
match.start_time != null
) {
matchString = `Live, ${team1Score}:${team2Score} vs ${match.team2_string}`;
matchString = `Live, ${team1Score}:${team2Score} - ${match.team1_string} vs ${match.team2_string}`;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see what you mean. This was a design choice since both teams are already showing in the table. So Team 1 is always considered the "Home" team, so this is why it was always vs Team2. I'm not opposed, but how does this look/feel on smaller screens or mobile layout?

Copy link
Contributor Author

@tech62 tech62 Nov 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like this from my browser with mobile compatiblity.
We can add a column with the teams instead of displaying these info in the status
image

@@ -553,6 +557,8 @@
"Status": "Status",
"Server": "Serveur",
"Owner": "Propriétaire",
"ConnectButton": "Se connecter",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just DeepL in order to get the JP translations as well. Make sure it's included as well!

Copy link
Contributor Author

@tech62 tech62 Nov 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

English / French OK but i don't speak JP and can't maintain all the languages :/
I've updated the future translation.json

</div>
</template>

<template v-slot:item.connect="{ item }">
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe have a check only if the person is a super_admin/admin or is a part of the match to show the connect button. And maybe remove the button when the match is completed.

Copy link
Contributor Author

@tech62 tech62 Nov 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've add a v-if on the match.end_time to hide the connect and gotv button when the field isn't null.
Checking admin/superadmin not works actually, i've set my SteamID in the production.json, but no effect.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fairly certain that is a configuration issue. Please revert this change as it was working prior to by having the v-if on the template.

@PhlexPlexico
Copy link
Owner

Also, please continue to use the match specifically, or have it choose the Team name if it is not a pug, or the team exists :) that way the API would not need to be changed as much, either.

@tech62
Copy link
Contributor Author

tech62 commented Nov 12, 2022

Also, please continue to use the match specifically, or have it choose the Team name if it is not a pug, or the team exists :) that way the API would not need to be changed as much, either.

What is "pug" ?

Hide Connect & GOTV button when match is terminated
Adding JP values to previous modifications
Forget to translate "Forfeit Match"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants