-
-
Notifications
You must be signed in to change notification settings - Fork 196
[Task-979] Remove submission counter and add organization name to header if MMO is enabled #5215
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
c10e160
Remove submission counter
duvld ec34c6a
Missing brance and basic component
duvld d414cb1
Merge branch 'main' into task-979-Add-org-name-badge-to-app-header-nav
duvld c735fb6
Basic CSS
duvld e548597
Hooking up mock backend
duvld d0dfb7f
Cleanup
duvld c77dfb0
Merge branch 'main' into task-979-Add-org-name-badge-to-app-header-nav
duvld dffed1e
Add todo comment
duvld 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 hidden or 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 hidden or 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
17 changes: 17 additions & 0 deletions
17
jsapp/js/components/header/organizationBadge.component.tsx
This file contains hidden or 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,17 @@ | ||
import {useOrganizationQuery} from 'jsapp/js/account/stripe.api'; | ||
import styles from './organizationBadge.module.scss'; | ||
|
||
export default function OrganizationBadge() { | ||
// TODO: move this logic to the parent component when we refactor it | ||
// into a functional component. OrganizationBadge should just be a | ||
// purely presentational component. | ||
const orgQuery = useOrganizationQuery(); | ||
|
||
if (orgQuery.data?.is_mmo) { | ||
return ( | ||
<div className={styles.root}>{orgQuery.data.name.toUpperCase()}</div> | ||
); | ||
} else { | ||
return null; | ||
} | ||
} |
This file contains hidden or 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,12 @@ | ||
@use 'scss/colors'; | ||
|
||
.root { | ||
jamesrkiger marked this conversation as resolved.
Show resolved
Hide resolved
|
||
color: colors.$kobo-white; | ||
background-color: colors.$kobo-gray-700; | ||
padding: 6px 10px; | ||
border-radius: 48px; | ||
font-weight: 600; | ||
font-size: .85em; | ||
line-height: 12px; | ||
margin-right: 20px; | ||
} |
This file contains hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.