File tree Expand file tree Collapse file tree 5 files changed +18
-14
lines changed
assessment/__tests__/__snapshots__ Expand file tree Collapse file tree 5 files changed +18
-14
lines changed Original file line number Diff line number Diff line change 11{
22 "private" : true ,
33 "name" : " cadet-frontend" ,
4- "version" : " 1.0.0 " ,
4+ "version" : " 1.0.1 " ,
55 "scripts-info" : {
66 "format" : " Format source code" ,
77 "start" : " Start the Webpack development server" ,
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ const NavigationBar: React.SFC<NavigationBarProps> = props => (
3131 className = "NavigationBar__link pt-button pt-minimal"
3232 >
3333 < Icon icon = { IconNames . LIGHTBULB } />
34- < div className = "navbar-button-text hidden-xs" > Sidequests </ div >
34+ < div className = "navbar-button-text hidden-xs" > Quests </ div >
3535 </ NavLink >
3636
3737 < NavLink
Original file line number Diff line number Diff line change @@ -9,10 +9,10 @@ exports[`Grading NavLink does NOT renders for Role.Student 1`] = `
99 Missions
1010 </div>
1111 </NavLink>
12- <NavLink to =\\"/academy/sidequests \\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
12+ <NavLink to =\\"/academy/quests \\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
1313 <Blueprint2.Icon icon =\\"lightbulb\\" />
1414 <div className =\\"navbar-button-text hidden-xs\\">
15- Sidequests
15+ Quests
1616 </div>
1717 </NavLink>
1818 <NavLink to =\\"/academy/paths\\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
@@ -40,10 +40,10 @@ exports[`Grading NavLink renders for Role.Admin 1`] = `
4040 Missions
4141 </div>
4242 </NavLink>
43- <NavLink to =\\"/academy/sidequests \\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
43+ <NavLink to =\\"/academy/quests \\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
4444 <Blueprint2.Icon icon =\\"lightbulb\\" />
4545 <div className =\\"navbar-button-text hidden-xs\\">
46- Sidequests
46+ Quests
4747 </div>
4848 </NavLink>
4949 <NavLink to =\\"/academy/paths\\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
@@ -79,10 +79,10 @@ exports[`Grading NavLink renders for Role.Staff 1`] = `
7979 Missions
8080 </div>
8181 </NavLink>
82- <NavLink to =\\"/academy/sidequests \\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
82+ <NavLink to =\\"/academy/quests \\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
8383 <Blueprint2.Icon icon =\\"lightbulb\\" />
8484 <div className =\\"navbar-button-text hidden-xs\\">
85- Sidequests
85+ Quests
8686 </div>
8787 </NavLink>
8888 <NavLink to =\\"/academy/paths\\" activeClassName =\\"pt-active\\" className =\\"NavigationBar__link pt-button pt-minimal\\" ariaCurrent =\\"true\\">
Original file line number Diff line number Diff line change @@ -651,10 +651,10 @@ exports[`Assessment page with multiple loaded missions renders correctly 1`] = `
651651 Due: 18th June, 13:24
652652 </div>
653653 </Text>
654- <NavLink to =\\"/academy/sidequests /2/0\\" activeClassName =\\"active\\" ariaCurrent =\\"true\\">
655- <Route path =\\"/academy/sidequests /2/0\\" exact = { [undefined ]} strict = { [undefined ]} location = { [undefined ]} >
656- <Link to =\\"/academy/sidequests /2/0\\" className = { [undefined ]} style = { [undefined ]} aria-current = { false } replace = { false } >
657- <a className = { [undefined ]} style = { [undefined ]} aria-current = { false } onClick = { [Function ]} href =\\"/academy/sidequests /2/0\\">
654+ <NavLink to =\\"/academy/quests /2/0\\" activeClassName =\\"active\\" ariaCurrent =\\"true\\">
655+ <Route path =\\"/academy/quests /2/0\\" exact = { [undefined ]} strict = { [undefined ]} location = { [undefined ]} >
656+ <Link to =\\"/academy/quests /2/0\\" className = { [undefined ]} style = { [undefined ]} aria-current = { false } replace = { false } >
657+ <a className = { [undefined ]} style = { [undefined ]} aria-current = { false } onClick = { [Function ]} href =\\"/academy/quests /2/0\\">
658658 <Blueprint2.Button fill = { false } intent =\\"none\\" minimal = { true } className =\\"\\" icon =\\"step-forward\\">
659659 <button type =\\"button\\" className =\\"pt-button pt-minimal\\" disabled = { [undefined ]} onClick = { [undefined ]} onKeyDown = { [Function ]} onKeyUp = { [Function ]} >
660660 <Blueprint2.Icon icon =\\"step-forward\\">
Original file line number Diff line number Diff line change 1- import { AssessmentCategory } from '../components/assessment/assessmentShape'
1+ import { AssessmentCategories , AssessmentCategory } from '../components/assessment/assessmentShape'
22
33/**
44 * Converts an AssessmentCategory into a string for use in URLs.
55 *
6+ * Note that there is an exception to the usual logic, for sidequests.
7+ * Sidequests show up on the frontend as 'Quests' (#295) and the URLs
8+ * must be represented as such.
9+ *
610 * @param {AssessmentCategory } cat - Any AssessmentCategory, usually
711 * retrieved from the AssessmentCategories enum
812 */
913export const assessmentCategoryLink = ( cat : AssessmentCategory ) : string =>
10- cat . toLowerCase ( ) . concat ( 's' )
14+ cat === AssessmentCategories . Sidequest ? 'quests' : cat . toLowerCase ( ) . concat ( 's' )
1115
1216/** Converts an optinal string
1317 * parameter into an integer or null value.
You can’t perform that action at this time.
0 commit comments