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

fix(buttons): correct icon slots #759

Merged
merged 2 commits into from
Aug 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
type="button"
@click.prevent="onClickFromParametersButton"
>
<FontAwesomeIcon
icon="gear"
/>
<template #icon>
<FontAwesomeIcon
icon="gear"
/>
</template>
</PrimeVueButton>

<PrimeVueMenu
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
:data-testid="`recipient-role-additional-cards-multi-select-remove-${value.roleName}-for-${recipientRoleName}`"
@click.stop="onClickFromRemoveAdditionalCardButton(value)"
>
<FontAwesomeIcon icon="times"/>
<template #icon>
<FontAwesomeIcon icon="times"/>
</template>
</PrimeVueButton>
</template>
</PrimeVueMultiSelect>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@
<PrimeVueButton
class="random-composition-button"
:disabled="isButtonDisabled"
:label="buttonLabel"
:loading="isLoadingGetRandomGameComposition"
raised
severity="secondary"
:size="buttonSize"
type="button"
@click.prevent="onClickFromRandomCompositionButton"
>
<FontAwesomeIcon
icon="random"
/>

<span>
{{ buttonLabel }}
</span>
<template #icon>
<FontAwesomeIcon
icon="random"
/>
</template>
</PrimeVueButton>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@
id="game-lobby-start-game-button"
class="!h-full !px-6 !py-4 start-game-button"
:disabled="isButtonDisabled"
:label="$t('components.GameLobbyStartGameButton.startGame')"
:loading="isLoadingCreateGame"
raised
size="large"
type="button"
@click.prevent="onClickFromStartGameButton"
>
<FontAwesomeIcon
icon="play"
/>

<span>
{{ $t("components.GameLobbyStartGameButton.startGame") }}
</span>
<template #icon>
<FontAwesomeIcon
icon="play"
/>
</template>
</PrimeVueButton>

<GameLobbyStartGameConfirmDialog
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,35 @@
<div class="flex gap-2 items-center justify-between w-full">
<PrimeVueButton
id="cancel-button"
:label="$t('shared.actions.cancel')"
severity="secondary"
size="small"
@click.prevent="onRejectStartGame"
>
<FontAwesomeIcon
class="me-2"
icon="times"
/>

<span id="cancel-button-text">
{{ $t("shared.actions.cancel") }}
</span>
<template #icon>
<FontAwesomeIcon
class="me-2"
icon="times"
/>
</template>
</PrimeVueButton>

<PrimeVueButton
id="confirm-button"
class="!transition-all"
:class="confirmButtonClasses"
:label="confirmButtonText"
severity="secondary"
size="small"
@click.prevent="onConfirmStartGame"
>
<FontAwesomeIcon
id="confirm-button-icon"
:class="confirmButtonIconAndClasses.iconClass"
:icon="confirmButtonIconAndClasses.icon"
/>

<span id="confirm-button-text">
{{ confirmButtonText }}
</span>
<template #icon>
<FontAwesomeIcon
id="confirm-button-icon"
:class="confirmButtonIconAndClasses.iconClass"
:icon="confirmButtonIconAndClasses.icon"
/>
</template>
</PrimeVueButton>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<FontAwesomeIcon
v-if="!areAdditionalCardsSetForAdditionalCardsDependantRoles"
id="additional-cards-not-set-warning-icon"
beat
icon="exclamation-circle"
/>
</PrimeVueButton>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<template>
<PrimeVueButton
id="game-lobby-header-options-button"
:label="$t('components.GameLobbyHeaderOptionButton.gameOptions')"
:pt="{ 'root': '!border-sky-600' }"
severity="info"
size="small"
@click.prevent="onClickFromGameOptionsButton"
>
<FontAwesomeIcon
icon="sliders"
/>

<span>
{{ $t("components.GameLobbyHeaderOptionButton.gameOptions") }}
</span>
<template #icon>
<FontAwesomeIcon
icon="sliders"
/>
</template>
</PrimeVueButton>
</template>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<template>
<PrimeVueButton
id="game-lobby-header-position-coordinator-button"
:label="$t('components.GameLobbyHeaderPositionCoordinatorButton.positionCoordinator')"
:pt="{ 'root': '!border-sky-600' }"
severity="info"
size="small"
@click.prevent="onClickFromGamePositionCoordinatorButton"
>
<FontAwesomeIcon
class="animate__animated animate__heartBeat animate__slow"
icon="users"
/>

<span>
{{ $t('components.GameLobbyHeaderPositionCoordinatorButton.positionCoordinator') }}
</span>
<template #icon>
<FontAwesomeIcon
class="animate__animated animate__heartBeat animate__slow"
icon="users"
/>
</template>
</PrimeVueButton>
</template>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@
<PrimeVueButton
id="add-player-button"
:disabled="isAddButtonDisabled"
:label="$t('shared.actions.add')"
severity="primary"
type="submit"
>
<FontAwesomeIcon icon="plus"/>

<span class="me-3">
{{ $t("shared.actions.add") }}
</span>
<template #icon>
<FontAwesomeIcon icon="plus"/>
</template>
</PrimeVueButton>
</PrimeVueInputGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@
type="button"
@click.prevent="onClickFromRemovePlayerButton"
>
<FontAwesomeIcon
class="fa-2x"
icon="minus"
/>
<template #icon>
<FontAwesomeIcon
class="fa-2x"
icon="minus"
/>
</template>
</PrimeVueButton>

<PlayerCard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@

<PrimeVueButton
id="show-game-history-button"
:label="showGameHistoryTextButton"
:loading="!gameHistoryRecords.length"
severity="help"
@click="onClickFromShowHistoryButton"
>
<FontAwesomeIcon
icon="clock-rotate-left"
/>

<span>
{{ showGameHistoryTextButton }}
</span>
<template #icon>
<FontAwesomeIcon
icon="clock-rotate-left"
/>
</template>
</PrimeVueButton>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,14 @@
id="create-new-game-button"
ref="createNewGameButton"
class="p-button p-button-raised"
:label="$t('components.GameOverActions.createAnotherGame')"
@click="onClickFromCreateNewGameButton"
>
<FontAwesomeIcon
class="me-2"
icon="play-circle"
/>

<span id="create-new-game-button-text">
{{ $t('components.GameOverActions.createAnotherGame') }}
</span>
<template #icon>
<FontAwesomeIcon
icon="play-circle"
/>
</template>
</PrimeVueButton>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,18 @@
id="make-play-button"
class="uppercase w-full"
:disabled="isButtonDisabled"
:label="$t('components.GamePlaygroundFooterMakePlayButton.makePlay')"
:loading="isLoadingMakePlay"
raised
severity="primary"
type="button"
@click.prevent="onClickFromMakePlayButton"
>
<FontAwesomeIcon
icon="play"
/>

<span>
{{ $t("components.GamePlaygroundFooterMakePlayButton.makePlay") }}
</span>
<template #icon>
<FontAwesomeIcon
icon="play"
/>
</template>
</PrimeVueButton>
</div>
</template>
Expand Down
Binary file modified tests/acceptance/screenshots/darwin/About Page.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Cupid charms Playground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Fox sniffs Playground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Game Phase Event.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Game Starts Event.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Game canceled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Game not found.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Game won by Angel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Game won by Lovers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/acceptance/screenshots/darwin/Game won by Pied Piper.png
Binary file modified tests/acceptance/screenshots/darwin/Game won by Villagers.png
Binary file modified tests/acceptance/screenshots/darwin/Game won by Werewolves.png
Binary file modified tests/acceptance/screenshots/darwin/Game won by nobody.png
Binary file modified tests/acceptance/screenshots/darwin/Hunter shoots Playground.png
Binary file modified tests/acceptance/screenshots/darwin/Seer looks Playground.png
Binary file modified tests/acceptance/screenshots/darwin/Werewolves eat Playground.png
Binary file modified tests/acceptance/screenshots/linux/About Page.png
Binary file modified tests/acceptance/screenshots/linux/Cupid charms Playground.png
Binary file modified tests/acceptance/screenshots/linux/Fox sniffs Playground.png
Binary file modified tests/acceptance/screenshots/linux/Game Phase Event.png
Binary file modified tests/acceptance/screenshots/linux/Game Starts Event.png
Binary file modified tests/acceptance/screenshots/linux/Game canceled.png
Binary file modified tests/acceptance/screenshots/linux/Game not found.png
Binary file modified tests/acceptance/screenshots/linux/Game won by Angel.png
Binary file modified tests/acceptance/screenshots/linux/Game won by Lovers.png
Binary file modified tests/acceptance/screenshots/linux/Game won by Pied Piper.png
Binary file modified tests/acceptance/screenshots/linux/Game won by Villagers.png
Binary file modified tests/acceptance/screenshots/linux/Game won by Werewolves.png
Binary file modified tests/acceptance/screenshots/linux/Game won by White Werewolf.png
Binary file modified tests/acceptance/screenshots/linux/Game won by nobody.png
Binary file modified tests/acceptance/screenshots/linux/Hunter shoots Playground.png
Binary file modified tests/acceptance/screenshots/linux/Seer looks Playground.png
Binary file modified tests/acceptance/screenshots/linux/Werewolves eat Playground.png
Loading
Loading