-
Notifications
You must be signed in to change notification settings - Fork 482
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
Move Instructed PL Sections to My PL page #57947
Merged
Merged
Changes from 30 commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
4d89283
set up framework
TurnerRiley d0a2172
attempt to pull in section data
TurnerRiley 233e5cb
add skip link to self-paced section on LandingPage.jsx
kelbyhawn 4139dfc
add updated PL section to TeacherHomepage.jsx
kelbyhawn e9b1319
update comment
kelbyhawn c51e2a6
update icon
kelbyhawn f7265a8
add unit test to TeacherHomepageTest.js
kelbyhawn e34e4f7
Merge branch 'staging' into remove-recent-courses-component-from-teac…
kelbyhawn e2370c0
replace div tag with section tag to fix spacing on online pl courses
kelbyhawn b018d2f
fix redux to get sections
TurnerRiley fe40bf5
update strings to reflect kelbys skip link style on my pl page
TurnerRiley f1ea23e
Merge branch 'staging' into remove-recent-courses-component-from-teac…
kelbyhawn 3218519
merge in kelbys strings
TurnerRiley 7b5f8c5
remove unnecessary changes
TurnerRiley 1ba0841
setup strings on teacher dashboard
TurnerRiley e65709f
increase permission access
TurnerRiley 4b53719
redux get coteacherInvite
TurnerRiley aa48e09
add Create Section component
TurnerRiley c77c227
merge in staging
TurnerRiley d8d8ef0
set up new component and fix styles for pl sections table
TurnerRiley 4a67a02
add instructors tab
TurnerRiley 44f58ff
update storybook and participant type column formatter
TurnerRiley e64f892
fix weird spacing for sections
TurnerRiley 284048d
remove blank lines
TurnerRiley dbb985e
remove banner margin bottom inline style
TurnerRiley 4c90cc0
update strings to match Figma
TurnerRiley dd279b0
add unit tests for showing right tabs
TurnerRiley eeb0ad8
remove pl specific tests on TeacherSections since we no longer render…
TurnerRiley 2ef1f39
Merge branch 'staging' into setup-pl-sections-on-my-pl
TurnerRiley fc02ae4
update ui test behaviors
TurnerRiley e24fcb1
remove unused parameter
TurnerRiley 1ee8e3b
merge in staging
TurnerRiley File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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
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
27 changes: 19 additions & 8 deletions
27
apps/src/sites/studio/pages/pd/professional_learning_landing/index.js
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 |
---|---|---|
@@ -1,25 +1,36 @@ | ||
import LandingPage from '@cdo/apps/code-studio/pd/professional_learning_landing/LandingPage'; | ||
import React from 'react'; | ||
import ReactDOM from 'react-dom'; | ||
import {Provider} from 'react-redux'; | ||
import {getStore} from '@cdo/apps/redux'; | ||
import analyticsReporter from '@cdo/apps/lib/util/AnalyticsReporter'; | ||
import getScriptData from '@cdo/apps/util/getScriptData'; | ||
import {EVENTS} from '@cdo/apps/lib/util/AnalyticsConstants'; | ||
|
||
// Execute after page has fully loaded so the Amplitude event only fires on full page load | ||
$(() => { | ||
const store = getStore(); | ||
|
||
analyticsReporter.sendEvent(EVENTS.MY_PL_PAGE_VISITED); | ||
|
||
const landingPageData = getScriptData('landingPageData'); | ||
|
||
ReactDOM.render( | ||
<LandingPage | ||
lastWorkshopSurveyUrl={landingPageData['last_workshop_survey_url']} | ||
lastWorkshopSurveyCourse={landingPageData['last_workshop_survey_course']} | ||
deeperLearningCourseData={landingPageData['summarized_plc_enrollments']} | ||
currentYearApplicationId={landingPageData['current_year_application_id']} | ||
workshopsAsParticipant={landingPageData['workshops_as_participant']} | ||
plCoursesStarted={landingPageData['pl_courses_started']} | ||
/>, | ||
<Provider store={store}> | ||
<LandingPage | ||
lastWorkshopSurveyUrl={landingPageData['last_workshop_survey_url']} | ||
lastWorkshopSurveyCourse={ | ||
landingPageData['last_workshop_survey_course'] | ||
} | ||
deeperLearningCourseData={landingPageData['summarized_plc_enrollments']} | ||
currentYearApplicationId={ | ||
landingPageData['current_year_application_id'] | ||
} | ||
workshopsAsParticipant={landingPageData['workshops_as_participant']} | ||
plCoursesStarted={landingPageData['pl_courses_started']} | ||
userPermissions={landingPageData['user_permissions']} | ||
/> | ||
</Provider>, | ||
document.getElementById('pl-landing-page-container') | ||
); | ||
}); |
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.
The facilitator tab should have more components at some point. While adding those components is outside the scope of this PR, it might be worth separating out this logic
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.
Yes for sure, my plan once we started implementing more components was to simplify the logic to a series of
{shouldRenderXComponent && (<XComponent/>)}
where shouldRenderXComponent would contain the logic of checking if the user has the right permissions and any other qualifications