From 2556d1d30c6fc484577f0f7d9dfdb065ba2fe52e Mon Sep 17 00:00:00 2001 From: Daithi Hearn Date: Sun, 26 Feb 2023 22:10:26 +0100 Subject: [PATCH 1/4] v5.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e5a462..5d34781 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "5.2.3", + "version": "5.3.0", "description": "React frontend for the Cards 110", "author": "Daithi Hearn", "license": "MIT", From 361cbf8c8d45697f518935ea024ed4e39e8d48b3 Mon Sep 17 00:00:00 2001 From: Daithi Hearn Date: Sun, 26 Feb 2023 22:48:38 +0100 Subject: [PATCH 2/4] v5.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5d34781..df91173 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "5.3.0", + "version": "5.3.1", "description": "React frontend for the Cards 110", "author": "Daithi Hearn", "license": "MIT", From 93edbca519262b16cf3c60ee0098e10f567c2957 Mon Sep 17 00:00:00 2001 From: Daithi Hearn Date: Sun, 26 Feb 2023 22:49:24 +0100 Subject: [PATCH 3/4] Update latest version (5.3.1) --- public/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/manifest.json b/public/manifest.json index b89281a..d887752 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,7 +1,7 @@ { "short_name": "Cards 110", "name": "Cards 110", - "version": "5.2.3", + "version": "5.3.1", "icons": [ { "src": "./assets/favicon.png", @@ -13,4 +13,4 @@ "display": "standalone", "theme_color": "#000000", "background_color": "#ffffff" -} \ No newline at end of file +} From 1026156da5de42d37835edae309e49e1eccdb9fb Mon Sep 17 00:00:00 2001 From: Daithi Hearn Date: Sun, 26 Feb 2023 22:49:52 +0100 Subject: [PATCH 4/4] Sorting players by last access timestamp --- src/caches/MyProfileSlice.ts | 1 + src/components/GameStats/PlayerSwitcher.tsx | 17 ++++++++++++++--- src/components/StartNewGame/StartNewGame.tsx | 11 +++++++++++ src/model/Player.ts | 1 + src/services/ProfileService.ts | 2 ++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/caches/MyProfileSlice.ts b/src/caches/MyProfileSlice.ts index caf022c..a38e48f 100644 --- a/src/caches/MyProfileSlice.ts +++ b/src/caches/MyProfileSlice.ts @@ -9,6 +9,7 @@ const initialProfileState: MyProfile = { "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAMAAAAPkIrYAAAAV1BMVEVHcEz/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD5S+t0AAAAHHRSTlMAOAPXFwch/O/lLUINUFmymMWlhPbOYY7eebxrUg5LCAAAAu5JREFUWMOtmFeCgjAQQCEBQg+95v7nFGYCgoqkkC9Xl8f0Ese5PfHYCiEmz7E9cU0FnsIO5Hel2A+3IXl1+CbRIrYgFY1gG2iMiTkpfcsU9rGVofJoI7WdD19QykfX1ycFfCNNidQNnRnyTjMyuk29Mtm/KzY6K+dU3VKVfCrKj9FR71oLViWK+rXygf7j9SToqt0fbabgV1e+fnB//UqSPtppd6hMvrm6tklSyahr3f+hgP/GOqV8YMUfL2SICt377Gr+WAJsha+LApUMQ03ZeOHBSB212o1eW9ZvtVBLIGL8lj9g+Euok8d5+BuWo2sSnWQjGI2fMA/tPutWAYBN5yTAysC1Kx7CTq0gQWMZtBoXIu2QUAT9m5uUzQ6kCM5/i8msBhenZ30QixmW9TQ6aplhBBs3B2hVshdAQ2WBKQutjYLFdmJJwVr42AMrMWf5YLG1/pAB9LVppyBNv0YbiDXasAAxLB9qYAU2LAeyeYmp9m054wPp3DkeFNvajlVjhmOgunYsiIoSkcy3Y4HxI1S1tJxqPVAOp6HiGVZjUpsvWLYJ9MWydKMsD8iy3SmgX7BnWDOWh0dYsubTJ2zfYmBNxt3s040d1rH6AXMtNSd7IIcmTEcnXWsOS21QAduaz4S62lYvaGq5rZIpVOhoLVt+aJlFo9jakBTRfAP2mkPbh5mQGQtWndo+CNkSi7R+TyMpNe+2ODEdCnOyBkhjNH/hoBulHwMB9Ux9yI4LIIERbNLubB37caUSwLDDNWEJrmvlx2NxqA+TqO8VCmGTRpLnzdUKRRBGlb05oq2an4t3DDYLO6Wg3a4emosd3sMbKq4w17mDuNmnSQ9yh6N/tyFvF1D/LJJhSgy5r3IvxlOlV0bjRRYE/UYK74uxXMpFw/MvXDBP7zs/lXGZ5Nt1I2uL2fVAkdRL5oIyIZTvYHba4c5x0Xc54nSUSRhs/SAuTlNpjwzErcvmCxRVmWEvTd254BSJjPI+/3uf+QKDNWmJwx+g3AAAAABJRU5ErkJggg==", isPlayer: false, isAdmin: false, + lastAccess: "1970-01-01T00:00:00", } export const myProfileSlice = createSlice({ diff --git a/src/components/GameStats/PlayerSwitcher.tsx b/src/components/GameStats/PlayerSwitcher.tsx index 9e642b3..df34435 100644 --- a/src/components/GameStats/PlayerSwitcher.tsx +++ b/src/components/GameStats/PlayerSwitcher.tsx @@ -1,5 +1,5 @@ import { useSnackbar } from "notistack" -import { useCallback, useEffect, useState } from "react" +import { useCallback, useEffect, useMemo, useState } from "react" import { Dropdown, DropdownItem, @@ -25,10 +25,21 @@ const PlayerSwitcher: React.FC = () => { [showDropdown], ) + const sortedPlayers = useMemo( + () => + [...players].sort((a, b) => { + const aDate = new Date(a.lastAccess) + const bDate = new Date(b.lastAccess) + if (aDate === bDate) return 0 + return aDate > bDate ? -1 : 1 + }), + [players], + ) + useEffect(() => { const me = players.find(p => p.id === myProfile.id) if (me) setCurrentPlayer(me) - }, [players, myProfile]) + }, [sortedPlayers, myProfile]) useEffect(() => { if (currentPlayer) @@ -54,7 +65,7 @@ const PlayerSwitcher: React.FC = () => { - {players.map(p => { + {sortedPlayers.map(p => { return ( { const dispatch = useAppDispatch() @@ -95,6 +96,14 @@ const StartNewGame = () => { selector: row => row.name, sortable: true, }, + { + name: "Last Access", + id: "lastAccess", + selector: row => row.lastAccess, + format: row => moment(row.lastAccess).format("lll"), + sortable: true, + omit: true, + }, ] return ( @@ -140,6 +149,8 @@ const StartNewGame = () => { selectableRows customStyles={customStyles} onSelectedRowsChange={togglePlayer} + defaultSortFieldId="lastAccess" + defaultSortAsc={false} /> diff --git a/src/model/Player.ts b/src/model/Player.ts index 6b58050..19bc629 100644 --- a/src/model/Player.ts +++ b/src/model/Player.ts @@ -16,6 +16,7 @@ export interface PlayerProfile { id: string name: string picture: string + lastAccess: string } export interface Team extends Scorable { diff --git a/src/services/ProfileService.ts b/src/services/ProfileService.ts index a1de929..e8b0210 100644 --- a/src/services/ProfileService.ts +++ b/src/services/ProfileService.ts @@ -25,6 +25,7 @@ interface ProfileResponse { name: string picture: string pictureLocked: boolean + lastAccess: string } interface JWTToken { @@ -56,6 +57,7 @@ const updateProfile = isAdmin: decodedAccessToken.permissions.indexOf("read:admin") !== -1, accessToken: token, + lastAccess: response.data.lastAccess, }), ) }