Skip to content

Commit

Permalink
Merge pull request #44 from deanblackborough/v1.07.1
Browse files Browse the repository at this point in the history
v1.07.1
  • Loading branch information
deanblackborough authored Aug 29, 2022
2 parents cf90a38 + 9e1fdb0 commit ee233e3
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

The complete changelog for the Costs to Expect REST API, our changelog follows the format defined at https://keepachangelog.com/en/1.0.0/

## [1.07.1] - [2022-08-30]
### Fixed
- Corrected a type.
- Corrected combination outputs in log, missing space.
- When a player has finished their row should change in the player scores table.

## [1.07.0] - [2022-08-29]
### Changed
- Added a "How to score" section to the top of each score sheet.
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Game.php
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ public function scoreLower(Request $request)

$message = match ($combo) {
'three_of_a_kind', 'four_of_a_kind', 'chance' => 'Scored ' . $score . ' in ' . ucfirst(
str_replace('_', '', $combo)
str_replace('_', ' ', $combo)
),
default => 'Scored their ' . ucfirst(str_replace('_', ' ', $combo)) . ', scoring ' . $score,
};
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Share.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ public function scoreLower(Request $request, $token)

$message = match ($combo) {
'three_of_a_kind', 'four_of_a_kind', 'chance' => 'Scored ' . $score . ' in ' . ucfirst(
str_replace('_', '', $combo)
str_replace('_', ' ', $combo)
),
default => 'Scored their ' . ucfirst(str_replace('_', ' ', $combo)) . ', scoring ' . $score,
};
Expand Down
4 changes: 2 additions & 2 deletions config/app/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
'error_email' => env('ERROR_EMAIL'),
'cookie_user' => env('SESSION_NAME_USER'),
'cookie_bearer' => env('SESSION_NAME_BEARER'),
'version' => '1.07.0',
'release_date' => '29th August 2022'
'version' => '1.07.1',
'release_date' => '30th August 2022'
];
100 changes: 100 additions & 0 deletions public/css/theme.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/theme.css.map

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions resources/scss/theme.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
$theme-colors: (
"primary": rgba(137, 43, 124, 1),
"danger": rgb(182, 36, 36),
"success": rgb(7, 138, 64),

"light": rgba(239, 242, 245, 1),
"dark": rgb(15, 27, 47),
);

$table-variants: (
"light": rgba(239, 242, 245, 1),
"dark": rgb(15, 27, 47),
"light":rgba(239, 242, 245, 1),
"dark": rgb(15, 27, 47),
"success": rgb(7, 138, 64),
);

$link-color: rgba(137, 43, 124, 1);
Expand Down
2 changes: 1 addition & 1 deletion resources/views/game.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
a signed-in user, <mark>[Public Score Sheet]</mark> is for non-registered users, copy the URL and send it to each user,
if you are on a phone, long press the link and Share.</p>

<p>If you need to remove a player from the game, click the <mark>[Remove Player]</mark> button next to the player's name, there
<p>If you need to remove a player from the game, click the <mark>[Remove Player]</mark> button next to the player's name, their
score sheet and access token will be removed immediately.</p>
@else
<p>We are working on a game player log and game statistics, as soon as we add them, they will
Expand Down
2 changes: 1 addition & 1 deletion resources/views/home.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
a signed-in user, <mark>[Public Score Sheet]</mark> is for non-registered users, copy the URL and send it to each user,
if you are on a phone, long press the link and Share.</p>

<p>If you need to remove a player from the game, click the <mark>[Remove Player]</mark> button next to the player's name, there
<p>If you need to remove a player from the game, click the <mark>[Remove Player]</mark> button next to the player's name, thier
score sheet and access token will be removed immediately.</p>

<ul class="list-unstyled">
Expand Down

0 comments on commit ee233e3

Please sign in to comment.