feat: increased Course home font size #1600
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .course-start-info-alert.alert-content { | ||
| font-size: $font-size-base; | ||
| } |
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,77 @@ | ||
| import React from 'react'; | ||
| import { render } from '@testing-library/react'; | ||
| import { useSelector } from 'react-redux'; | ||
| import LiveTab from './LiveTab'; | ||
|
|
||
| jest.mock('react-redux', () => ({ | ||
| useSelector: jest.fn(), | ||
| })); | ||
|
|
||
| describe('LiveTab', () => { | ||
| afterEach(() => { | ||
| jest.clearAllMocks(); | ||
| document.body.innerHTML = ''; | ||
| }); | ||
|
|
||
| it('renders iframe from liveModel using dangerouslySetInnerHTML', () => { | ||
| useSelector.mockImplementation((selector) => selector({ | ||
| courseHome: { courseId: 'course-v1:test+id+2024' }, | ||
| models: { | ||
| live: { | ||
| 'course-v1:test+id+2024': { | ||
| iframe: '<iframe id="lti-tab-embed" src="about:blank"></iframe>', | ||
| }, | ||
| }, | ||
| }, | ||
| })); | ||
|
|
||
| render(<LiveTab />); | ||
|
|
||
| const iframe = document.getElementById('lti-tab-embed'); | ||
| expect(iframe).toBeInTheDocument(); | ||
| expect(iframe.src).toBe('about:blank'); | ||
| }); | ||
|
|
||
| it('adds classes to iframe after mount', () => { | ||
| document.body.innerHTML = ` | ||
| <div id="live_tab"> | ||
| <iframe id="lti-tab-embed" class=""></iframe> | ||
| </div> | ||
| `; | ||
|
|
||
| useSelector.mockImplementation((selector) => selector({ | ||
| courseHome: { courseId: 'course-v1:test+id+2024' }, | ||
| models: { | ||
| live: { | ||
| 'course-v1:test+id+2024': { | ||
| iframe: '<iframe id="lti-tab-embed"></iframe>', | ||
| }, | ||
| }, | ||
| }, | ||
| })); | ||
|
|
||
| render(<LiveTab />); | ||
|
|
||
| const iframe = document.getElementById('lti-tab-embed'); | ||
| expect(iframe.className).toContain('vh-100'); | ||
| expect(iframe.className).toContain('w-100'); | ||
| expect(iframe.className).toContain('border-0'); | ||
| }); | ||
|
|
||
| it('does not throw if iframe is not found in DOM', () => { | ||
| useSelector.mockImplementation((selector) => selector({ | ||
| courseHome: { courseId: 'course-v1:test+id+2024' }, | ||
| models: { | ||
| live: { | ||
| 'course-v1:test+id+2024': { | ||
| iframe: '<div>No iframe here</div>', | ||
| }, | ||
| }, | ||
| }, | ||
| })); | ||
|
|
||
| expect(() => render(<LiveTab />)).not.toThrow(); | ||
| const iframe = document.getElementById('lti-tab-embed'); | ||
| expect(iframe).toBeNull(); | ||
| }); | ||
| }); |
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
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
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 |
|---|---|---|
| @@ -1,36 +1,51 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import classnames from 'classnames'; | ||
| import { useWindowSize, breakpoints } from '@openedx/paragon'; | ||
|
|
||
| const FlagButton = ({ | ||
| buttonIcon, | ||
| title, | ||
| text, | ||
| handleSelect, | ||
| isSelected, | ||
| }) => { | ||
| const wideScreen = useWindowSize().width >= breakpoints.medium.minWidth; | ||
|
|
||
| return ( | ||
| <button | ||
|
There was a problem hiding this comment. [open question]: should there be a component provided by Paragon? For example Paragon FormControl with type="radio" |
||
| type="button" | ||
| className={classnames( | ||
| 'flag-button row w-100 align-content-between m-1.5 py-3.5', | ||
| isSelected ? 'flag-button-selected' : '', | ||
| )} | ||
| aria-checked={isSelected} | ||
| role="radio" | ||
| onClick={() => handleSelect()} | ||
| data-testid={`weekly-learning-goal-input-${title}`} | ||
| > | ||
| <div className="row w-100 m-0 justify-content-center pb-1"> | ||
| {buttonIcon} | ||
| </div> | ||
| <div className={classnames( | ||
| 'row w-100 m-0 justify-content-center text-gray-700 pb-1', | ||
| isSelected ? 'font-weight-bold' : '', | ||
| { small: !wideScreen }, | ||
| )} | ||
| > | ||
| {title} | ||
| </div> | ||
| <div className={classnames( | ||
| 'row w-100 m-0 justify-content-center small text-gray-500', | ||
| isSelected ? 'font-weight-bold' : '', | ||
| { small: !wideScreen }, | ||
| )} | ||
| > | ||
| {text} | ||
| </div> | ||
| </button> | ||
| ); | ||
| }; | ||
|
|
||
| FlagButton.propTypes = { | ||
| buttonIcon: PropTypes.element.isRequired, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| import React, { | ||
| useState, useRef, useEffect, useMemo, | ||
| } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
|
|
||
| import { Alert, Button, TransitionReplace } from '@openedx/paragon'; | ||
| import truncate from 'truncate-html'; | ||
|
|
||
| import { useDispatch } from 'react-redux'; | ||
| import { useIntl } from '@edx/frontend-platform/i18n'; | ||
| import LmsHtmlFragment from '../LmsHtmlFragment'; | ||
| import messages from '../messages'; | ||
| import { useModel } from '../../../generic/model-store'; | ||
|
|
@@ -38,16 +40,28 @@ const WelcomeMessage = ({ courseId, nextElementRef }) => { | |
|
|
||
| const [showShortMessage, setShowShortMessage] = useState(messageCanBeShortened); | ||
| const dispatch = useDispatch(); | ||
| const alertRef = useRef(null); | ||
|
|
||
| if (!welcomeMessageHtml) { | ||
| return null; | ||
| } | ||
|
|
||
| useEffect(() => { | ||
|
There was a problem hiding this comment. [nit]: After discussions on the PWG, the answer was that this behavior of the buttons is a design decision. So, it seems to me that we should remove this |
||
| // TODO: Temporary solution due to a bug in the Paragon Alert component | ||
| // that prevents changing the button sizes. Delete after correction. | ||
| // Issue: https://github.com/openedx/paragon/issues/3205 | ||
| if (alertRef.current) { | ||
| const buttons = alertRef.current.querySelectorAll('button.btn-sm'); | ||
| buttons.forEach(btn => btn.classList.remove('btn-sm')); | ||
| } | ||
| }, [showShortMessage]); | ||
|
|
||
| return ( | ||
| <Alert | ||
| data-testid="alert-container-welcome" | ||
| variant="light" | ||
| stacked | ||
| ref={alertRef} | ||
| dismissible | ||
| show={display} | ||
| onClose={() => { | ||
|
|
||
Empty file.
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.
[open question]: should there be a component provided by Paragon? For example Paragon HyperLink