-
-
Notifications
You must be signed in to change notification settings - Fork 440
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
[UX] Add messages when there are no games to display in the library #3536
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
src/frontend/screens/Library/components/AddGameButton/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import React, { useContext } from 'react' | ||
import { useTranslation } from 'react-i18next' | ||
import LibraryContext from '../../LibraryContext' | ||
|
||
function AddGameButton() { | ||
const { t } = useTranslation() | ||
const { handleAddGameButtonClick } = useContext(LibraryContext) | ||
|
||
return ( | ||
<button className="sideloadGameButton" onClick={handleAddGameButtonClick}> | ||
{t('add_game', 'Add Game')} | ||
</button> | ||
) | ||
} | ||
|
||
export default AddGameButton |
14 changes: 14 additions & 0 deletions
14
src/frontend/screens/Library/components/EmptyLibrary/index.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
.noResultsMessage { | ||
font-size: 2rem; | ||
max-width: 500px; | ||
margin: auto; | ||
padding-bottom: 20%; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this message looks odd vertically centered, this padding moves it a bit up |
||
.sideloadGameButton { | ||
margin: 0; | ||
display: inline; | ||
vertical-align: text-bottom; | ||
} | ||
& a { | ||
text-decoration: underline; | ||
} | ||
} |
36 changes: 36 additions & 0 deletions
36
src/frontend/screens/Library/components/EmptyLibrary/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import React, { useContext } from 'react' | ||
import ContextProvider from 'frontend/state/ContextProvider' | ||
import { Trans, useTranslation } from 'react-i18next' | ||
import './index.css' | ||
import { NavLink } from 'react-router-dom' | ||
import AddGameButton from '../AddGameButton' | ||
|
||
function EmptyLibraryMessage() { | ||
const { epic, gog, amazon, sideloadedLibrary } = useContext(ContextProvider) | ||
const { i18n } = useTranslation() | ||
|
||
let message = ( | ||
<Trans i18n={i18n} i18nKey="emptyLibrary.noGames"> | ||
Your library is empty. You can <NavLink to="/login">log in</NavLink> using | ||
a store or click <AddGameButton /> to add one manually. | ||
</Trans> | ||
) | ||
|
||
if ( | ||
epic.library.length + | ||
gog.library.length + | ||
amazon.library.length + | ||
sideloadedLibrary.length > | ||
0 | ||
) { | ||
message = ( | ||
<Trans i18n={i18n} i18nKey="emptyLibrary.noResults"> | ||
The current filters produced no results. | ||
</Trans> | ||
) | ||
} | ||
|
||
return <p className="noResultsMessage">{message}</p> | ||
} | ||
|
||
export default EmptyLibraryMessage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,16 +4,13 @@ import ActionIcons from 'frontend/components/UI/ActionIcons' | |
import { GameInfo } from 'common/types' | ||
import LibraryContext from '../../LibraryContext' | ||
import './index.css' | ||
import AddGameButton from '../AddGameButton' | ||
|
||
type Props = { | ||
list: GameInfo[] | ||
handleAddGameButtonClick: () => void | ||
} | ||
|
||
export default React.memo(function LibraryHeader({ | ||
list, | ||
handleAddGameButtonClick | ||
}: Props) { | ||
export default React.memo(function LibraryHeader({ list }: Props) { | ||
const { t } = useTranslation() | ||
const { showFavourites } = useContext(LibraryContext) | ||
|
||
|
@@ -38,12 +35,7 @@ export default React.memo(function LibraryHeader({ | |
? t('favourites', 'Favourites') | ||
: t('title.allGames', 'All Games')} | ||
<span className="numberOfgames">{numberOfGames}</span> | ||
<button | ||
className="sideloadGameButton" | ||
onClick={handleAddGameButtonClick} | ||
> | ||
{t('add_game', 'Add Game')} | ||
</button> | ||
<AddGameButton /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. extracted this into a component to use it in the empty library message |
||
</span> | ||
<ActionIcons /> | ||
</div> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these
<1>
and<3>
are intentional, theTrans
component replaces them with the tags from the children