+
+
+
+ {controlButton('', IconNames.DUPLICATE, this.selectShareInputText)}
+
+
+
) : (
<>
{!this.props.shortURL || this.props.shortURL === 'ERROR' ? (
@@ -71,7 +81,7 @@ export class ControlBarShareButton extends React.PureComponentGitHub Assessments
+ Classroom
Source Academy Playground
+ Playground
GitHub Assessments
+ Classroom
SICP JS
@@ -152,12 +151,12 @@ const NavigationBar: React.FCSource Academy Playground
+ Playground
SICP JS
@@ -225,17 +224,17 @@ const NavigationBar: React.FCGitHub Assessments
+ Classroom
SICP JS
@@ -302,12 +301,7 @@ const NavigationBar: React.FC
- GitHub Assessments
+ Classroom
SICP JS
@@ -52,10 +52,7 @@ exports[`NavigationBar renders "Not logged in" correctly 1`] = `
-
-
-
+
- GitHub Assessments
+ Classroom
SICP JS
@@ -125,10 +122,7 @@ exports[`NavigationBar renders correctly with student role 1`] = `
-
-
-
+
diff --git a/src/commons/navigationBar/subcomponents/GitHubAssessmentsNavigationBar.tsx b/src/commons/navigationBar/subcomponents/GitHubAssessmentsNavigationBar.tsx
index 2953cf2dda..2017300340 100644
--- a/src/commons/navigationBar/subcomponents/GitHubAssessmentsNavigationBar.tsx
+++ b/src/commons/navigationBar/subcomponents/GitHubAssessmentsNavigationBar.tsx
@@ -1,42 +1,113 @@
-import { Alignment, Classes, Icon, Navbar, NavbarGroup } from '@blueprintjs/core';
-import { IconNames } from '@blueprintjs/icons';
+import {
+ Alignment,
+ Button,
+ Classes,
+ Icon,
+ InputGroup,
+ Menu,
+ MenuItem,
+ Navbar,
+ NavbarGroup
+} from '@blueprintjs/core';
+import { IconName, IconNames } from '@blueprintjs/icons';
+import { Popover2 } from '@blueprintjs/popover2';
+import { Octokit } from '@octokit/rest';
import classNames from 'classnames';
import * as React from 'react';
import { NavLink } from 'react-router-dom';
+import { assessmentTypeLink } from '../../../commons/utils/ParamParseHelper';
+import { GHAssessmentTypeOverview } from '../../../pages/githubAssessments/GitHubClassroom';
import { ControlBarGitHubLoginButton } from '../../controlBar/github/ControlBarGitHubLoginButton';
-type OwnProps = {
- handleGitHubLogIn: any;
- handleGitHubLogOut: any;
+type GitHubAssessmentsNavigationBarProps = DispatchProps & StateProps;
+
+type DispatchProps = {
+ changeCourseHandler: (e: any) => void;
+ handleGitHubLogIn: () => void;
+ handleGitHubLogOut: () => void;
+};
+
+type StateProps = {
+ octokit?: Octokit;
+ courses?: string[];
+ selectedCourse: string;
+ types?: string[];
+ assessmentTypeOverviews?: GHAssessmentTypeOverview[];
};
/**
* The white navbar for the website. Should only be displayed when using GitHub-hosted missions.
- *
- * @param props Component properties
*/
-const GitHubAssessmentsNavigationBar: React.FunctionComponent = props => (
-
-
-
-
-
-
-
-
-
-);
+const GitHubAssessmentsNavigationBar: React.FC = props => {
+ const handleClick = (e: any) => {
+ props.changeCourseHandler(e);
+ };
+
+ return (
+
+
+ {props.types?.map((type, idx) => {
+ return (
+
+
+ );
+ })}
+
+
+ {props.octokit !== undefined && props.types && props.types.length > 0 && (
+
+ {props.courses?.map((course: string) => (
+
+ ))}
+
+ }
+ placement={'bottom-end'}
+ >
+
+
+ }
+ placeholder={'Select Course'}
+ onChange={props.changeCourseHandler}
+ value={props.selectedCourse}
+ />
+ )}
+
+
+ );
+};
+
+const icons: IconName[] = [
+ IconNames.FLAME,
+ IconNames.LIGHTBULB,
+ IconNames.PREDICTIVE_ANALYSIS,
+ IconNames.COMPARISON,
+ IconNames.MANUAL
+];
export default GitHubAssessmentsNavigationBar;
diff --git a/src/commons/navigationBar/subcomponents/NavigationBarMobileSideMenu.tsx b/src/commons/navigationBar/subcomponents/NavigationBarMobileSideMenu.tsx
index ae09d10f9e..bedd1cd180 100644
--- a/src/commons/navigationBar/subcomponents/NavigationBarMobileSideMenu.tsx
+++ b/src/commons/navigationBar/subcomponents/NavigationBarMobileSideMenu.tsx
@@ -165,11 +165,11 @@ const NavigationBarMobileSideMenu: React.FC =
Classes.MINIMAL,
Classes.LARGE
)}
- to="/githubassessments/missions"
+ to="/githubassessments"
onClick={props.onClose}
>
=
Classes.MINIMAL,
Classes.LARGE
)}
- to="/interactive-sicp/index"
+ to="/sicpjs/index"
onClick={props.onClose}
>
-
+
+
+
+
"
diff --git a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/NavigationBarMobileSideMenu.tsx.snap b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/NavigationBarMobileSideMenu.tsx.snap
index b456c1c3eb..3d7291718f 100644
--- a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/NavigationBarMobileSideMenu.tsx.snap
+++ b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/NavigationBarMobileSideMenu.tsx.snap
@@ -14,13 +14,13 @@ exports[`NavigationBarMobileSideMenu renders "Not logged in" correctly 1`] = `
Playground
Missions
- {type}
+ GitHub Assessments
+ Classroom
{controlButton('Previous', IconNames.ARROW_LEFT, handlePrev)}
- );
- }, [history, section]);
+ const prevButton = prev && (
+
+ {controlButton('Previous', IconNames.ARROW_LEFT, () => handleNavigation(prev))}
+
+ );
// Next button only displayed when next page is valid.
- const nextButton = React.useMemo(() => {
- const sect = tocNavigation[section];
- if (!sect) {
- return;
- }
-
- const next = sect['next'];
- if (!next) {
- return;
- }
-
- const handleNext = () => {
- history.push('/interactive-sicp/' + next);
- };
-
- return (
- next && (
-
- {controlButton('Next', IconNames.ARROW_RIGHT, handleNext, { iconOnRight: true })}
-
- )
- );
- }, [history, section]);
+ const nextButton = next && (
+
+ {controlButton('Next', IconNames.ARROW_RIGHT, () => handleNavigation(next), {
+ iconOnRight: true
+ })}
+
+ );
const drawerProps = {
onClose: handleCloseToc,
diff --git a/src/commons/navigationBar/subcomponents/__tests__/GitHubAssessmentsNavigationBar.tsx b/src/commons/navigationBar/subcomponents/__tests__/GitHubAssessmentsNavigationBar.tsx
index f10f83b442..68c8ab7cc8 100644
--- a/src/commons/navigationBar/subcomponents/__tests__/GitHubAssessmentsNavigationBar.tsx
+++ b/src/commons/navigationBar/subcomponents/__tests__/GitHubAssessmentsNavigationBar.tsx
@@ -1,10 +1,17 @@
+import { Octokit } from '@octokit/rest';
import { shallow } from 'enzyme';
import GitHubAssessmentsNavigationBar from '../GitHubAssessmentsNavigationBar';
const props = {
+ changeCourseHandler: () => {},
handleGitHubLogIn: () => {},
- handleGitHubLogOut: () => {}
+ handleGitHubLogOut: () => {},
+ octokit: new Octokit(undefined),
+ courses: [],
+ selectedCourse: '',
+ setSelectedCourse: () => {},
+ types: ['Missions', 'Quests']
};
test('Navbar renders correctly', () => {
diff --git a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/GitHubAssessmentsNavigationBar.tsx.snap b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/GitHubAssessmentsNavigationBar.tsx.snap
index edc85a7a71..7d6584197f 100644
--- a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/GitHubAssessmentsNavigationBar.tsx.snap
+++ b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/GitHubAssessmentsNavigationBar.tsx.snap
@@ -3,14 +3,21 @@
exports[`Navbar renders correctly 1`] = `
"
Missions
+ Quests
+
+
- GitHub Assessments
+ Classroom
SICP JS
@@ -77,13 +77,13 @@ exports[`NavigationBarMobileSideMenu renders correctly with student role 1`] = `
Playground
- GitHub Assessments
+ Classroom
SICP JS
diff --git a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/SicpNavigationBar.tsx.snap b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/SicpNavigationBar.tsx.snap
index 2f460b98d6..4a36f17df5 100644
--- a/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/SicpNavigationBar.tsx.snap
+++ b/src/commons/navigationBar/subcomponents/__tests__/__snapshots__/SicpNavigationBar.tsx.snap
@@ -8,7 +8,7 @@ exports[`Navbar renders correctly 1`] = `
);
};
const substKeyMap = {
- FIRST_STEP: ',',
- LAST_STEP: '.'
+ FIRST_STEP: 'a',
+ NEXT_STEP: 'f',
+ PREVIOUS_STEP: 'b',
+ LAST_STEP: 'e'
};
const SubstCodeDisplay = (props: { content: string }) => {
@@ -89,10 +89,14 @@ class SideContentSubstVisualizer extends React.Component
-
+
Next
diff --git a/src/commons/sagas/GitHubPersistenceSaga.ts b/src/commons/sagas/GitHubPersistenceSaga.ts
index 95100f763e..641e2bbb6e 100644
--- a/src/commons/sagas/GitHubPersistenceSaga.ts
+++ b/src/commons/sagas/GitHubPersistenceSaga.ts
@@ -19,7 +19,6 @@ import RepositoryDialog, { RepositoryDialogProps } from '../gitHubOverlay/Reposi
import { actions } from '../utils/ActionsHelper';
import Constants from '../utils/Constants';
import { promisifyDialog } from '../utils/DialogHelper';
-import { history } from '../utils/HistoryHelper';
import { showSuccessMessage, showWarningMessage } from '../utils/NotificationsHelper';
export function* GitHubPersistenceSaga(): SagaIterator {
@@ -64,7 +63,6 @@ function* githubLogoutSaga() {
yield put(actions.removeGitHubOctokitObjectAndAccessToken());
yield call(showSuccessMessage, `Logged out from GitHub`, 1000);
- yield call(history.push, '/githubassessments/missions');
}
function* githubOpenFile(): any {
diff --git a/src/commons/sagas/WorkspaceSaga.ts b/src/commons/sagas/WorkspaceSaga.ts
index b262959aca..e7372b19cc 100644
--- a/src/commons/sagas/WorkspaceSaga.ts
+++ b/src/commons/sagas/WorkspaceSaga.ts
@@ -48,7 +48,6 @@ import {
getRestoreExtraMethodsString,
getStoreExtraMethodsString,
highlightLine,
- inspectorUpdate,
makeElevatedContext,
visualizeEnv
} from '../utils/JsSlangHelper';
@@ -278,7 +277,6 @@ export default function* WorkspaceSaga(): SagaIterator {
const workspaceLocation = action.payload.workspaceLocation;
context = yield select((state: OverallState) => state.workspaces[workspaceLocation].context);
yield put(actions.clearReplOutput(workspaceLocation));
- inspectorUpdate(undefined);
highlightLine(undefined);
yield put(actions.clearReplOutput(workspaceLocation));
context.runtime.break = false;
@@ -564,7 +562,6 @@ function* updateInspector(workspaceLocation: WorkspaceLocation): SagaIterator {
const start = lastDebuggerResult.context.runtime.nodes[0].loc.start.line - 1;
const end = lastDebuggerResult.context.runtime.nodes[0].loc.end.line - 1;
yield put(actions.highlightEditorLine([start, end], workspaceLocation));
- inspectorUpdate(lastDebuggerResult);
visualizeEnv(lastDebuggerResult);
} catch (e) {
yield put(actions.highlightEditorLine([], workspaceLocation));
@@ -613,10 +610,6 @@ export function* evalCode(
): SagaIterator {
context.runtime.debuggerOn =
(actionType === EVAL_EDITOR || actionType === DEBUG_RESUME) && context.chapter > 2;
- if (!context.runtime.debuggerOn && context.chapter > 2 && actionType !== EVAL_SILENT) {
- // Interface not guaranteed to exist, e.g. mission editor.
- inspectorUpdate(undefined); // effectively resets the interface
- }
// Logic for execution of substitution model visualizer
const correctWorkspace = workspaceLocation === 'playground' || workspaceLocation === 'sicp';
diff --git a/src/commons/sagas/__tests__/WorkspaceSaga.ts b/src/commons/sagas/__tests__/WorkspaceSaga.ts
index 1760331b2b..878fffc0d2 100644
--- a/src/commons/sagas/__tests__/WorkspaceSaga.ts
+++ b/src/commons/sagas/__tests__/WorkspaceSaga.ts
@@ -77,7 +77,6 @@ function generateDefaultState(
beforeEach(() => {
// Mock the inspector
(window as any).Inspector = jest.fn();
- (window as any).Inspector.updateContext = jest.fn();
(window as any).Inspector.highlightClean = jest.fn();
(window as any).Inspector.highlightLine = jest.fn();
});
diff --git a/src/commons/sideContent/SideContent.tsx b/src/commons/sideContent/SideContent.tsx
index 54945c0eac..c289ae98e2 100644
--- a/src/commons/sideContent/SideContent.tsx
+++ b/src/commons/sideContent/SideContent.tsx
@@ -134,7 +134,7 @@ const SideContent = (props: SideContentProps) => {
/**
* Remove the 'side-content-tab-alert' class that causes tabs flash.
* To be run when tabs are changed.
- * Currently this style is only used for the "Inspector" and "Env Visualizer" tabs.
+ * Currently this style is only used for the "Env Visualizer" tab.
*/
const resetAlert = (prevTabId: TabId) => {
const iconId = generateIconId(prevTabId);
diff --git a/src/commons/sideContent/SideContentInspector.tsx b/src/commons/sideContent/SideContentInspector.tsx
deleted file mode 100644
index 0099fbc583..0000000000
--- a/src/commons/sideContent/SideContentInspector.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Classes, NonIdealState, Spinner } from '@blueprintjs/core';
-import * as React from 'react';
-
-type State = {
- loading: boolean;
-};
-
-class SideContentInspector extends React.Component<{}, State> {
- private $parent: HTMLElement | null = null;
-
- constructor(props: any) {
- super(props);
- this.state = { loading: true };
- }
-
- public componentDidMount() {
- this.tryToLoad();
- }
-
- public render() {
- return (
- (this.$parent = r)} className="sa-inspector bp3-dark">
-
- );
- }
-
- private tryToLoad = () => {
- const element = (window as any).Inspector;
- if (this.$parent && element) {
- // Inspector has been loaded into the DOM
- element.init(this.$parent);
- this.setState((state, props) => {
- return { loading: false };
- });
- } else {
- // Try again in 1 second
- window.setTimeout(this.tryToLoad, 1000);
- }
- };
-}
-
-export default SideContentInspector;
diff --git a/src/commons/sideContent/SideContentSubstVisualizer.tsx b/src/commons/sideContent/SideContentSubstVisualizer.tsx
index 96db593227..acdfb2f487 100644
--- a/src/commons/sideContent/SideContentSubstVisualizer.tsx
+++ b/src/commons/sideContent/SideContentSubstVisualizer.tsx
@@ -1,6 +1,5 @@
/* eslint-disable simple-import-sort/imports */
import { Card, Classes, Divider, Pre, Slider, Button, ButtonGroup } from '@blueprintjs/core';
-import { IconNames } from '@blueprintjs/icons';
import * as React from 'react';
import AceEditor from 'react-ace';
import { HotKeys } from 'react-hotkeys';
@@ -9,8 +8,6 @@ import { HighlightRulesSelector, ModeSelector } from 'js-slang/dist/editors/ace/
import 'js-slang/dist/editors/ace/theme/source';
import { IStepperPropContents } from 'js-slang/dist/stepper/stepper';
-import controlButton from '../ControlButton';
-
const SubstDefaultText = () => {
return (
- The inspector generates a list of variable bindings based on breakpoints set in the
- editor.
-
-
- It is activated by clicking on the gutter of the editor (where all the line numbers are,
- on the left) to set a breakpoint, and then running the program. Only the first line of a
- statement can have a breakpoint. The program halts just before the statement is evaluated.
-
@@ -32,24 +29,27 @@ const SubstDefaultText = () => {
Some useful keyboard shortcuts:
- {controlButton('(Comma)', IconNames.LESS_THAN)}: Move to the first step + a: Move to the first step
- {controlButton('(Period)', IconNames.GREATER_THAN)}: Move to the last step + e: Move to the last step
+ f: Move to the next step
- Note that the first and last step shortcuts are only active when the browser focus is on - this panel (click on the slider or the text!). + b: Move to the previous step
- When the focus is on the slider, the arrow keys may also be used to move a single step. + Note that these shortcuts are only active when the browser focus is on this tab (click on or + above the explanation text).
- {controlButton('(Comma)', IconNames.LESS_THAN)}: Move to the first step + a: Move to the first step
- {controlButton('(Period)', IconNames.GREATER_THAN)}: Move to the last step + e: Move to the last step
+ f: Move to the next step
- Note that the first and last step shortcuts are only active when the browser focus is on - this panel (click on the slider or the text!). + b: Move to the previous step
- When the focus is on the slider, the arrow keys may also be used to move a single step. + Note that these shortcuts are only active when the browser focus is on this tab (click on or + above the explanation text).
The environment model diagram follows a notation introduced in - + Structure and Interpretation of Computer Programs, JavaScript Adaptation, Chapter 3, Section 2 diff --git a/src/commons/sideContent/githubAssessments/SideContentMissionEditor.tsx b/src/commons/sideContent/githubAssessments/SideContentMissionEditor.tsx index a04578f4a0..25aa14b7a7 100644 --- a/src/commons/sideContent/githubAssessments/SideContentMissionEditor.tsx +++ b/src/commons/sideContent/githubAssessments/SideContentMissionEditor.tsx @@ -1,5 +1,4 @@ -import { InputGroup, Label } from '@blueprintjs/core'; -import { DatePicker } from '@blueprintjs/datetime'; +import { Label } from '@blueprintjs/core'; import { Variant } from 'js-slang/dist/types'; import React from 'react'; @@ -14,41 +13,13 @@ export type SideContentMissionEditorProps = { }; const SideContentMissionEditor: React.FC
-
-
-
-
-
-
-
- = props
disabled={false}
handleChapterSelect={handleChapterSelect}
/>
-
+ Something unexpected went wrong trying to load this page. Please try refreshing the page. If the
+ issue persists, kindly let us know by filing an issue at{' '}
+
+ https://github.com/source-academy/cadet-frontend
+
+ .
+
+);
+
+const pageNotFoundError = (
+
+ We could not find the page you were looking for. Please check the URL again. If you believe the
+ URL is correct, kindly let us know by filing an issue at{' '}
+
+ https://github.com/source-academy/cadet-frontend
+
+ .
+
+);
+
+const parsingError = (
+
+ An error occured while loading the page. Kindly let us know by filing an issue at{' '}
+
+ https://github.com/source-academy/cadet-frontend
+ {' '}
+ and we will get it fixed as soon as possible.
+
+);
+
+const errorComponent = (description: JSX.Element) => (
+
+
+
+
+
+
+
+
+
+
+
+ + Something went wrong :( +
+
+ We could not find the page you were looking for. Please check the URL again. If you believe the URL is correct, kindly let us know by filing an issue at
+
+
+ https://github.com/source-academy/cadet-frontend
+
+ .
+
+
+
+
+
+
+
+
+
+
+
+
+ + Something went wrong :( +
+
+ Something unexpected went wrong trying to load this page. Please try refreshing the page. If the issue persists, kindly let us know by filing an issue at
+
+
+ https://github.com/source-academy/cadet-frontend
+
+ .
+
+
+
+
+
+
+
+
+
+
+
+
+ + Something went wrong :( +
+
+ An error occured while loading the page. Kindly let us know by filing an issue at
+
+
+ https://github.com/source-academy/cadet-frontend
+
+
+ and we will get it fixed as soon as possible.
+
+
{obj['count'] === 1 &&
} -
} -
(refs.current[obj['id']!] = ref)} className="sicp-footnote">
+
+
(refs.current[obj['id']!] = ref)} />
{'[' + obj['count'] + '] '}
{parseArr(obj['child']!, refs)}
@@ -104,7 +105,7 @@ const handleSnippet = (obj: JsonType) => {
body: obj['body']!,
id: obj['id']!,
initialEditorValueHash: obj['withoutPrepend']!,
- initialFullProgramHash: obj['program']!,
+ initialFullProgramHash: obj['program']! || obj['withoutPrepend']!,
initialPrependHash: obj['prepend']!,
output: obj['output']!
};
@@ -113,7 +114,8 @@ const handleSnippet = (obj: JsonType) => {
};
const handleFigure = (obj: JsonType, refs: React.MutableRefObject<{}>) => (
- (refs.current[obj['id']!] = ref)} className="sicp-figure">
+
+
(refs.current[obj['id']!] = ref)} />
{handleImage(obj, refs)}
{obj['captionName'] && (
@@ -130,7 +132,7 @@ const handleImage = (obj: JsonType, refs: React.MutableRefObject<{}>) => {
@@ -130,7 +132,7 @@ const handleImage = (obj: JsonType, refs: React.MutableRefObject<{}>) => {
![{obj['id']}]({Constants.interactiveSicpDataUrl)
);
} else if (obj['snippet']) {
@@ -152,7 +154,8 @@ const handleTD = (obj: JsonType, refs: React.MutableRefObject<{}>, index: intege
const handleExercise = (obj: JsonType, refs: React.MutableRefObject<{}>) => {
return (
- (refs.current[obj['id']!] = ref)}>
+
+ (refs.current[obj['id']!] = ref)} />
) => (
<>
- (refs.current[obj['id']!] = ref)} className="sicp-text">
+
+ (refs.current[obj['id']!] = ref)} />
{parseArr(obj['child']!, refs)}
diff --git a/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap b/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap
index d4e6b50d93..ad006b0bca 100644
--- a/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap
+++ b/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap
@@ -115,18 +115,21 @@ exports[`Parse epigraph EPIGRAPH with title successful 1`] = `
exports[`Parse exercise EXERCISE with solution successful 1`] = `
"
+
![\\"id\\"](\\"https://source-academy.github.io/sicp/sicp.png\\")
name
@@ -141,7 +144,8 @@ exports[`Parse figures FIGURE with image and scale successful 1`] = `
exports[`Parse figures FIGURE with image successful 1`] = `
"
-
+
+
name
@@ -155,7 +159,8 @@ exports[`Parse figures FIGURE with image successful 1`] = `
exports[`Parse figures FIGURE with snippet successful 1`] = `
"
-
name
@@ -169,6 +174,7 @@ exports[`Parse figures FIGURE with snippet successful 1`] = `
exports[`Parse figures FIGURE with table successful 1`] = `
"
+
@@ -220,6 +226,7 @@ exports[`Parse footnote DISPLAYFOOTNOTE count is 1 successful 1`] = `
"
+
[1]
@@ -235,6 +242,7 @@ exports[`Parse footnote DISPLAYFOOTNOTE count is 1 successful 1`] = `
exports[`Parse footnote DISPLAYFOOTNOTE count is 2 successful 1`] = `
"
+
[2]
@@ -364,6 +372,7 @@ exports[`Parse section SECTION successful 1`] = `
+
Mock Text
@@ -379,6 +388,7 @@ exports[`Parse section SECTION successful 1`] = `
+
Mock Text
@@ -415,13 +425,13 @@ exports[`Parse snippet SNIPPET with prepend successful 1`] = `
`;
exports[`Parse snippet SNIPPET without prepend successful 1`] = `
-"
+"
Code Snippet
"
`;
exports[`Parse snippet SNIPPET without prepend with output successful 1`] = `
-"
+"
Code Snippet
"
`;
diff --git a/src/pages/academy/sourcereel/Sourcereel.tsx b/src/pages/academy/sourcereel/Sourcereel.tsx
index eb766766dd..b3f3c7eabe 100644
--- a/src/pages/academy/sourcereel/Sourcereel.tsx
+++ b/src/pages/academy/sourcereel/Sourcereel.tsx
@@ -14,7 +14,6 @@ import { ControlBarExternalLibrarySelect } from '../../../commons/controlBar/Con
import { HighlightedLines, Position } from '../../../commons/editor/EditorTypes';
import SideContentDataVisualizer from '../../../commons/sideContent/SideContentDataVisualizer';
import SideContentEnvVisualizer from '../../../commons/sideContent/SideContentEnvVisualizer';
-import SideContentInspector from '../../../commons/sideContent/SideContentInspector';
import { SideContentTab, SideContentType } from '../../../commons/sideContent/SideContentTypes';
import SourceRecorderControlBar, {
SourceRecorderControlBarProps
@@ -345,7 +344,6 @@ class Sourcereel extends React.Component {
toSpawn: () => true
},
dataVisualizerTab,
- inspectorTab,
envVisualizerTab
],
workspaceLocation: 'sourcereel'
@@ -406,14 +404,6 @@ const dataVisualizerTab: SideContentTab = {
toSpawn: () => true
};
-const inspectorTab: SideContentTab = {
- label: 'Inspector',
- iconName: IconNames.SEARCH,
- body:
- The People behind Source Academy
+ The Team behind the Source Academy
- The Source Academy is designed by and for students of the National University of
- Singapore. Students who completed the CS1101S module come back to coach their juniors as
- "Avengers" or to further develop and improve the Academy. This page includes all
- developers who contributed to the Source Academy Knight (2020) and its its
- precursor, Cadet (2018). Both of these succeeded Source Academy 2 (2017) and
- ultimately the original Source Academy (2016).
+ The Source Academy is designed and developed by a team of students, most of who
+ have used the system to learn the fundamentals of computing and enjoyed it. This page
+ includes all developers who contributed to the Source Academy Rook (2022) and its
+ precursors Knight (2020) and Cadet (2018). These versions succeeded Source
+ Academy 2 (2017) and ultimately the original Source Academy (2016).
- 2021 Leadership
+ 2022 Leadership
- Tiffany Chong
+ Tee Hao Wei
+
+ (CTO)
+
+ {dot}
+
+ Gokul Rajiv
(Game)
{dot}
- Anthony Halim
+ Chow En Rong
(Frontend)
{dot}
-
- Daryl Tan,
-
+
Thomas Tan
(Source)
{dot}
-
- Tee Hao Wei
+
+ Chen Yanyu
- (Backend & DevOps)
+ (Backend)
{dot}
@@ -124,8 +127,8 @@ class ContributorsDetails extends React.Component {
-
- 2020 Leadership
+
+ 2020 Leadership (Knight)
@@ -164,6 +167,35 @@ class ContributorsDetails extends React.Component {
(Backend & DevOps)
+
+
+ 2021 Leadership
+
+
+
+ Tiffany Chong
+
+ (Game)
+
+ {dot}
+
+ Anthony Halim
+
+ (Frontend)
+
+ {dot}
+
+ Daryl Tan, Thomas Tan
+
+ (Source)
+
+ {dot}
+
+ Tee Hao Wei
+
+ (Backend & DevOps)
+
+
diff --git a/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts b/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts
index ec1468b695..b7e4cd2b72 100644
--- a/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts
+++ b/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts
@@ -70,14 +70,7 @@ If you need a more detailed cheatsheet, please click [here](https://www.markdown
export const defaultStarterCode = '// Your program here!\n';
export const defaultMissionMetadata = {
- coverImage: '',
- type: '',
- id: '',
- title: '',
- sourceVersion: 1,
- dueDate: new Date(8640000000000000),
- reading: '',
- webSummary: ''
+ sourceVersion: 1
} as MissionMetadata;
export const defaultTask = {
diff --git a/src/pages/githubAssessments/GitHubAssessmentListing.tsx b/src/pages/githubAssessments/GitHubAssessmentListing.tsx
new file mode 100644
index 0000000000..8c65a0737b
--- /dev/null
+++ b/src/pages/githubAssessments/GitHubAssessmentListing.tsx
@@ -0,0 +1,162 @@
+import {
+ Button,
+ Card,
+ Elevation,
+ H4,
+ H6,
+ Icon,
+ NonIdealState,
+ Spinner,
+ Text
+} from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { useMemo } from 'react';
+import { useMediaQuery } from 'react-responsive';
+
+import defaultCoverImage from '../../assets/default_cover_image.jpg';
+import ContentDisplay from '../../commons/ContentDisplay';
+import Markdown from '../../commons/Markdown';
+import Constants from '../../commons/utils/Constants';
+import { history } from '../../commons/utils/HistoryHelper';
+import { GHAssessmentOverview } from './GitHubClassroom';
+
+type GitHubAssessmentListingProps = {
+ assessmentOverviews?: GHAssessmentOverview[];
+ refreshAssessmentOverviews: () => void;
+};
+
+/**
+ * A page that lists the missions available to the authenticated user.
+ * This page should only be reachable if using a GitHub-hosted deployment.
+ */
+const GitHubAssessmentListing: React.FC = props => {
+ const isMobileBreakpoint = useMediaQuery({ maxWidth: Constants.mobileBreakpoint });
+
+ let display: JSX.Element;
+
+ const createAssessmentButton = useMemo(
+ () => (
+
+ ),
+ []
+ );
+
+ const refreshButton = useMemo(
+ () => (
+
+ ),
+ [props.refreshAssessmentOverviews]
+ );
+
+ if (!props.assessmentOverviews) {
+ display = (
+ <>
+ {createAssessmentButton}
+ {}} />
+
+ );
+};
+
+/**
+ * Maps from a BrowsableMission object to a JSX card that can be displayed on the Mission Listing.
+ *
+ * @param missionRepo The BrowsableMission representation of a single mission repository
+ * @param isMobileBreakpoint Whether we are using mobile breakpoint
+ */
+function convertAssessmentOverviewToCard(
+ assessmentOverview: GHAssessmentOverview,
+ isMobileBreakpoint: boolean
+) {
+ const ratio = isMobileBreakpoint ? 5 : 3;
+ const ownerSlashName =
+ assessmentOverview.missionRepoData.repoOwner +
+ '/' +
+ assessmentOverview.missionRepoData.repoName;
+ const dueDate = assessmentOverview.dueDate.toDateString();
+
+ const hasDueDate = new Date(8640000000000000) > assessmentOverview.dueDate;
+ const isOverdue = new Date() > assessmentOverview.dueDate;
+
+ const assessmentNotAccepted = assessmentOverview.link !== undefined;
+ let buttonText = 'Open';
+ let handleClick = () => history.push(`/githubassessments/editor`, assessmentOverview);
+
+ if (assessmentNotAccepted) {
+ buttonText = 'Accept';
+ handleClick = () => window.open(assessmentOverview.link);
+ } else if (isOverdue) {
+ buttonText = 'Review Answers';
+ }
+
+ return (
+
+
+
+ 
+
+
+
+
+
+ {assessmentOverview.title}
+ {ownerSlashName}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default GitHubAssessmentListing;
diff --git a/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx b/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx
index f7b3baa7e5..8398810262 100644
--- a/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx
+++ b/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx
@@ -45,11 +45,6 @@ import {
discoverFilesToBeCreatedWithoutMissionRepoData,
getMissionData
} from '../../commons/githubAssessments/GitHubMissionDataUtils';
-import {
- GitHubMissionSaveDialog,
- GitHubMissionSaveDialogProps,
- GitHubMissionSaveDialogResolution
-} from '../../commons/githubAssessments/GitHubMissionSaveDialog';
import {
MissionData,
MissionMetadata,
@@ -86,6 +81,7 @@ import {
defaultMissionMetadata,
defaultTask
} from './GitHubAssessmentDefaultValues';
+import { GHAssessmentOverview } from './GitHubClassroom';
export type GitHubAssessmentWorkspaceProps = DispatchProps & StateProps & RouteComponentProps;
@@ -136,7 +132,7 @@ const GitHubAssessmentWorkspace: React.FC = prop
const octokit = getGitHubOctokitInstance();
if (octokit === undefined) {
- history.push('/githubassessments/missions');
+ history.push('/githubassessments/login');
}
/**
@@ -164,9 +160,10 @@ const GitHubAssessmentWorkspace: React.FC = prop
const [currentTaskIsMCQ, setCurrentTaskIsMCQ] = React.useState(false);
const [displayMCQInEditor, setDisplayMCQInEditor] = React.useState(true);
const [mcqQuestion, setMCQQuestion] = React.useState(defaultMCQQuestion);
- const [missionRepoData, setMissionRepoData] = React.useState(
- props.location.state as MissionRepoData
+ const [missionRepoData, setMissionRepoData] = React.useState(
+ undefined
);
+ const assessmentOverview = props.location.state as GHAssessmentOverview;
const [showBriefingOverlay, setShowBriefingOverlay] = React.useState(false);
const [selectedTab, setSelectedTab] = React.useState(SideContentType.questionOverview);
@@ -261,35 +258,22 @@ const GitHubAssessmentWorkspace: React.FC = prop
/**
* Sets up the workspace for when the user is retrieving Mission information from a GitHub repository
*/
- const setUpWithMissionRepoData = useCallback(async () => {
+ const setUpWithAssessmentOverview = useCallback(async () => {
if (octokit === undefined) return;
+ const missionRepoData = assessmentOverview.missionRepoData;
+
const missionDataPromise = getMissionData(missionRepoData, octokit);
- const isTeacherModePromise = octokit.users
- .getAuthenticated()
- .then((authenticatedUser: any) => {
- const userLogin = authenticatedUser.data.login;
- return userLogin === missionRepoData.repoOwner;
- })
- .then(async (userOwnsRepo: boolean) => {
- if (userOwnsRepo) return true;
-
- const userOrganisations = (await octokit.orgs.listForAuthenticatedUser()).data;
- let userOrganisationOwnsRepo = false;
- for (let i = 0; i < userOrganisations.length; i++) {
- const org = userOrganisations[i];
- // User has admin access to an organization owning the repo
- userOrganisationOwnsRepo = org.login === missionRepoData.repoOwner;
- if (userOrganisationOwnsRepo) {
- break;
- }
- }
- return userOrganisationOwnsRepo;
- });
+ const isTeacherModePromise = octokit.users.getAuthenticated().then((authenticatedUser: any) => {
+ const userLogin = authenticatedUser.data.login;
+ return userLogin === missionRepoData.repoOwner;
+ });
const promises = [missionDataPromise, isTeacherModePromise];
Promise.all(promises).then((promises: any[]) => {
+ setMissionRepoData(missionRepoData);
+
setHasUnsavedChangesToTasks(false);
setHasUnsavedChangesToBriefing(false);
setHasUnsavedChangesToMetadata(false);
@@ -316,12 +300,17 @@ const GitHubAssessmentWorkspace: React.FC = prop
setIsLoading(false);
});
- }, [changeStateDueToChangedTaskNumber, missionRepoData, octokit, handleUpdateHasUnsavedChanges]);
+ }, [
+ assessmentOverview,
+ octokit,
+ changeStateDueToChangedTaskNumber,
+ handleUpdateHasUnsavedChanges
+ ]);
/**
* Sets up the workspace for when the user is creating a new Mission
*/
- const setUpWithoutMissionRepoData = useCallback(() => {
+ const setUpWithoutAssessmentOverview = useCallback(() => {
setSummary(defaultMissionBriefing);
setMissionMetadata(defaultMissionMetadata);
@@ -346,12 +335,12 @@ const GitHubAssessmentWorkspace: React.FC = prop
}, [changeStateDueToChangedTaskNumber, handleUpdateHasUnsavedChanges]);
useEffect(() => {
- if (missionRepoData === undefined) {
- setUpWithoutMissionRepoData();
+ if (assessmentOverview === undefined) {
+ setUpWithoutAssessmentOverview();
} else {
- setUpWithMissionRepoData();
+ setUpWithAssessmentOverview();
}
- }, [missionRepoData, setUpWithMissionRepoData, setUpWithoutMissionRepoData]);
+ }, [assessmentOverview, setUpWithAssessmentOverview, setUpWithoutAssessmentOverview]);
const briefingOverlay = (
) : (
-
-
-
+
+
+
+
+
)}
) : (
diff --git a/src/pages/sicp/subcomponents/SicpToc.tsx b/src/pages/sicp/subcomponents/SicpToc.tsx
index 7664b25da7..ac1b8c9025 100644
--- a/src/pages/sicp/subcomponents/SicpToc.tsx
+++ b/src/pages/sicp/subcomponents/SicpToc.tsx
@@ -2,7 +2,7 @@ import { Tree, TreeNodeInfo } from '@blueprintjs/core';
import { cloneDeep } from 'lodash';
import * as React from 'react';
import { useState } from 'react';
-import { Redirect } from 'react-router';
+import { useHistory } from 'react-router';
import toc from '../../../features/sicp/data/toc.json';
@@ -17,7 +17,7 @@ type OwnProps = {
*/
const SicpToc: React.FC = props => {
const [sidebarContent, setSidebarContent] = useState(toc as TreeNodeInfo[]);
- const [slug, setSlug] = useState('');
+ const history = useHistory();
const handleNodeExpand = (_node: TreeNodeInfo, path: integer[]) => {
const newState = cloneDeep(sidebarContent);
@@ -36,14 +36,13 @@ const SicpToc: React.FC = props => {
if (props.handleCloseToc) {
props.handleCloseToc();
}
- setSlug(String(node.nodeData));
+ history.push('/sicpjs/' + String(node.nodeData));
},
- [props]
+ [history, props]
);
return (
- {slug !== '' && = props => {
toSpawn: () => true
},
dataVisualizerTab,
- inspectorTab,
envVisualizerTab
];
@@ -389,14 +387,6 @@ const dataVisualizerTab: SideContentTab = {
toSpawn: () => true
};
-const inspectorTab: SideContentTab = {
- label: 'Inspector',
- iconName: IconNames.SEARCH,
- body:
+
(refs.current[obj['id']!] = ref)} />
) => (
<>
-
(refs.current[obj['id']!] = ref)} className="sicp-text">
+
+
diff --git a/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap b/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap index d4e6b50d93..ad006b0bca 100644 --- a/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap +++ b/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap @@ -115,18 +115,21 @@ exports[`Parse epigraph EPIGRAPH with title successful 1`] = ` exports[`Parse exercise EXERCISE with solution successful 1`] = ` "
(refs.current[obj['id']!] = ref)} />
{parseArr(obj['child']!, refs)}
diff --git a/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap b/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap index d4e6b50d93..ad006b0bca 100644 --- a/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap +++ b/src/features/sicp/parser/__tests__/__snapshots__/ParseJson.tsx.snap @@ -115,18 +115,21 @@ exports[`Parse epigraph EPIGRAPH with title successful 1`] = ` exports[`Parse exercise EXERCISE with solution successful 1`] = ` "
+
"
`;
exports[`Parse exercise EXERCISE without solution successful 1`] = `
"
+
"
`;
exports[`Parse figures FIGURE with image and scale successful 1`] = `
"
+
name
@@ -141,7 +144,8 @@ exports[`Parse figures FIGURE with image and scale successful 1`] = `
exports[`Parse figures FIGURE with image successful 1`] = `
"
name
@@ -141,7 +144,8 @@ exports[`Parse figures FIGURE with image and scale successful 1`] = `
exports[`Parse figures FIGURE with image successful 1`] = `
"
-
+
+
name
@@ -155,7 +159,8 @@ exports[`Parse figures FIGURE with image successful 1`] = `
exports[`Parse figures FIGURE with snippet successful 1`] = `
"
-
name
@@ -169,6 +174,7 @@ exports[`Parse figures FIGURE with snippet successful 1`] = `
exports[`Parse figures FIGURE with table successful 1`] = `
"
+
@@ -220,6 +226,7 @@ exports[`Parse footnote DISPLAYFOOTNOTE count is 1 successful 1`] = `
"
+
[1]
@@ -235,6 +242,7 @@ exports[`Parse footnote DISPLAYFOOTNOTE count is 1 successful 1`] = `
exports[`Parse footnote DISPLAYFOOTNOTE count is 2 successful 1`] = `
"
+
[2]
@@ -364,6 +372,7 @@ exports[`Parse section SECTION successful 1`] = `
+
Mock Text
@@ -379,6 +388,7 @@ exports[`Parse section SECTION successful 1`] = `
+
Mock Text
@@ -415,13 +425,13 @@ exports[`Parse snippet SNIPPET with prepend successful 1`] = `
`;
exports[`Parse snippet SNIPPET without prepend successful 1`] = `
-"
+"
Code Snippet
"
`;
exports[`Parse snippet SNIPPET without prepend with output successful 1`] = `
-"
+"
Code Snippet
"
`;
diff --git a/src/pages/academy/sourcereel/Sourcereel.tsx b/src/pages/academy/sourcereel/Sourcereel.tsx
index eb766766dd..b3f3c7eabe 100644
--- a/src/pages/academy/sourcereel/Sourcereel.tsx
+++ b/src/pages/academy/sourcereel/Sourcereel.tsx
@@ -14,7 +14,6 @@ import { ControlBarExternalLibrarySelect } from '../../../commons/controlBar/Con
import { HighlightedLines, Position } from '../../../commons/editor/EditorTypes';
import SideContentDataVisualizer from '../../../commons/sideContent/SideContentDataVisualizer';
import SideContentEnvVisualizer from '../../../commons/sideContent/SideContentEnvVisualizer';
-import SideContentInspector from '../../../commons/sideContent/SideContentInspector';
import { SideContentTab, SideContentType } from '../../../commons/sideContent/SideContentTypes';
import SourceRecorderControlBar, {
SourceRecorderControlBarProps
@@ -345,7 +344,6 @@ class Sourcereel extends React.Component {
toSpawn: () => true
},
dataVisualizerTab,
- inspectorTab,
envVisualizerTab
],
workspaceLocation: 'sourcereel'
@@ -406,14 +404,6 @@ const dataVisualizerTab: SideContentTab = {
toSpawn: () => true
};
-const inspectorTab: SideContentTab = {
- label: 'Inspector',
- iconName: IconNames.SEARCH,
- body:
- The People behind Source Academy
+ The Team behind the Source Academy
- The Source Academy is designed by and for students of the National University of
- Singapore. Students who completed the CS1101S module come back to coach their juniors as
- "Avengers" or to further develop and improve the Academy. This page includes all
- developers who contributed to the Source Academy Knight (2020) and its its
- precursor, Cadet (2018). Both of these succeeded Source Academy 2 (2017) and
- ultimately the original Source Academy (2016).
+ The Source Academy is designed and developed by a team of students, most of who
+ have used the system to learn the fundamentals of computing and enjoyed it. This page
+ includes all developers who contributed to the Source Academy Rook (2022) and its
+ precursors Knight (2020) and Cadet (2018). These versions succeeded Source
+ Academy 2 (2017) and ultimately the original Source Academy (2016).
- 2021 Leadership
+ 2022 Leadership
- Tiffany Chong
+ Tee Hao Wei
+
+ (CTO)
+
+ {dot}
+
+ Gokul Rajiv
(Game)
{dot}
- Anthony Halim
+ Chow En Rong
(Frontend)
{dot}
-
- Daryl Tan,
-
+
Thomas Tan
(Source)
{dot}
-
- Tee Hao Wei
+
+ Chen Yanyu
- (Backend & DevOps)
+ (Backend)
{dot}
@@ -124,8 +127,8 @@ class ContributorsDetails extends React.Component {
-
- 2020 Leadership
+
+ 2020 Leadership (Knight)
@@ -164,6 +167,35 @@ class ContributorsDetails extends React.Component {
(Backend & DevOps)
+
+
+ 2021 Leadership
+
+
+
+ Tiffany Chong
+
+ (Game)
+
+ {dot}
+
+ Anthony Halim
+
+ (Frontend)
+
+ {dot}
+
+ Daryl Tan, Thomas Tan
+
+ (Source)
+
+ {dot}
+
+ Tee Hao Wei
+
+ (Backend & DevOps)
+
+
diff --git a/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts b/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts
index ec1468b695..b7e4cd2b72 100644
--- a/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts
+++ b/src/pages/githubAssessments/GitHubAssessmentDefaultValues.ts
@@ -70,14 +70,7 @@ If you need a more detailed cheatsheet, please click [here](https://www.markdown
export const defaultStarterCode = '// Your program here!\n';
export const defaultMissionMetadata = {
- coverImage: '',
- type: '',
- id: '',
- title: '',
- sourceVersion: 1,
- dueDate: new Date(8640000000000000),
- reading: '',
- webSummary: ''
+ sourceVersion: 1
} as MissionMetadata;
export const defaultTask = {
diff --git a/src/pages/githubAssessments/GitHubAssessmentListing.tsx b/src/pages/githubAssessments/GitHubAssessmentListing.tsx
new file mode 100644
index 0000000000..8c65a0737b
--- /dev/null
+++ b/src/pages/githubAssessments/GitHubAssessmentListing.tsx
@@ -0,0 +1,162 @@
+import {
+ Button,
+ Card,
+ Elevation,
+ H4,
+ H6,
+ Icon,
+ NonIdealState,
+ Spinner,
+ Text
+} from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { useMemo } from 'react';
+import { useMediaQuery } from 'react-responsive';
+
+import defaultCoverImage from '../../assets/default_cover_image.jpg';
+import ContentDisplay from '../../commons/ContentDisplay';
+import Markdown from '../../commons/Markdown';
+import Constants from '../../commons/utils/Constants';
+import { history } from '../../commons/utils/HistoryHelper';
+import { GHAssessmentOverview } from './GitHubClassroom';
+
+type GitHubAssessmentListingProps = {
+ assessmentOverviews?: GHAssessmentOverview[];
+ refreshAssessmentOverviews: () => void;
+};
+
+/**
+ * A page that lists the missions available to the authenticated user.
+ * This page should only be reachable if using a GitHub-hosted deployment.
+ */
+const GitHubAssessmentListing: React.FC = props => {
+ const isMobileBreakpoint = useMediaQuery({ maxWidth: Constants.mobileBreakpoint });
+
+ let display: JSX.Element;
+
+ const createAssessmentButton = useMemo(
+ () => (
+
+ ),
+ []
+ );
+
+ const refreshButton = useMemo(
+ () => (
+
+ ),
+ [props.refreshAssessmentOverviews]
+ );
+
+ if (!props.assessmentOverviews) {
+ display = (
+ <>
+ {createAssessmentButton}
+ {}} />
+
+ );
+};
+
+/**
+ * Maps from a BrowsableMission object to a JSX card that can be displayed on the Mission Listing.
+ *
+ * @param missionRepo The BrowsableMission representation of a single mission repository
+ * @param isMobileBreakpoint Whether we are using mobile breakpoint
+ */
+function convertAssessmentOverviewToCard(
+ assessmentOverview: GHAssessmentOverview,
+ isMobileBreakpoint: boolean
+) {
+ const ratio = isMobileBreakpoint ? 5 : 3;
+ const ownerSlashName =
+ assessmentOverview.missionRepoData.repoOwner +
+ '/' +
+ assessmentOverview.missionRepoData.repoName;
+ const dueDate = assessmentOverview.dueDate.toDateString();
+
+ const hasDueDate = new Date(8640000000000000) > assessmentOverview.dueDate;
+ const isOverdue = new Date() > assessmentOverview.dueDate;
+
+ const assessmentNotAccepted = assessmentOverview.link !== undefined;
+ let buttonText = 'Open';
+ let handleClick = () => history.push(`/githubassessments/editor`, assessmentOverview);
+
+ if (assessmentNotAccepted) {
+ buttonText = 'Accept';
+ handleClick = () => window.open(assessmentOverview.link);
+ } else if (isOverdue) {
+ buttonText = 'Review Answers';
+ }
+
+ return (
+
+
+
+
+
+
+
+
+
+ {assessmentOverview.title}
+ {ownerSlashName}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default GitHubAssessmentListing;
diff --git a/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx b/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx
index f7b3baa7e5..8398810262 100644
--- a/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx
+++ b/src/pages/githubAssessments/GitHubAssessmentWorkspace.tsx
@@ -45,11 +45,6 @@ import {
discoverFilesToBeCreatedWithoutMissionRepoData,
getMissionData
} from '../../commons/githubAssessments/GitHubMissionDataUtils';
-import {
- GitHubMissionSaveDialog,
- GitHubMissionSaveDialogProps,
- GitHubMissionSaveDialogResolution
-} from '../../commons/githubAssessments/GitHubMissionSaveDialog';
import {
MissionData,
MissionMetadata,
@@ -86,6 +81,7 @@ import {
defaultMissionMetadata,
defaultTask
} from './GitHubAssessmentDefaultValues';
+import { GHAssessmentOverview } from './GitHubClassroom';
export type GitHubAssessmentWorkspaceProps = DispatchProps & StateProps & RouteComponentProps;
@@ -136,7 +132,7 @@ const GitHubAssessmentWorkspace: React.FC = prop
const octokit = getGitHubOctokitInstance();
if (octokit === undefined) {
- history.push('/githubassessments/missions');
+ history.push('/githubassessments/login');
}
/**
@@ -164,9 +160,10 @@ const GitHubAssessmentWorkspace: React.FC = prop
const [currentTaskIsMCQ, setCurrentTaskIsMCQ] = React.useState(false);
const [displayMCQInEditor, setDisplayMCQInEditor] = React.useState(true);
const [mcqQuestion, setMCQQuestion] = React.useState(defaultMCQQuestion);
- const [missionRepoData, setMissionRepoData] = React.useState(
- props.location.state as MissionRepoData
+ const [missionRepoData, setMissionRepoData] = React.useState(
+ undefined
);
+ const assessmentOverview = props.location.state as GHAssessmentOverview;
const [showBriefingOverlay, setShowBriefingOverlay] = React.useState(false);
const [selectedTab, setSelectedTab] = React.useState(SideContentType.questionOverview);
@@ -261,35 +258,22 @@ const GitHubAssessmentWorkspace: React.FC = prop
/**
* Sets up the workspace for when the user is retrieving Mission information from a GitHub repository
*/
- const setUpWithMissionRepoData = useCallback(async () => {
+ const setUpWithAssessmentOverview = useCallback(async () => {
if (octokit === undefined) return;
+ const missionRepoData = assessmentOverview.missionRepoData;
+
const missionDataPromise = getMissionData(missionRepoData, octokit);
- const isTeacherModePromise = octokit.users
- .getAuthenticated()
- .then((authenticatedUser: any) => {
- const userLogin = authenticatedUser.data.login;
- return userLogin === missionRepoData.repoOwner;
- })
- .then(async (userOwnsRepo: boolean) => {
- if (userOwnsRepo) return true;
-
- const userOrganisations = (await octokit.orgs.listForAuthenticatedUser()).data;
- let userOrganisationOwnsRepo = false;
- for (let i = 0; i < userOrganisations.length; i++) {
- const org = userOrganisations[i];
- // User has admin access to an organization owning the repo
- userOrganisationOwnsRepo = org.login === missionRepoData.repoOwner;
- if (userOrganisationOwnsRepo) {
- break;
- }
- }
- return userOrganisationOwnsRepo;
- });
+ const isTeacherModePromise = octokit.users.getAuthenticated().then((authenticatedUser: any) => {
+ const userLogin = authenticatedUser.data.login;
+ return userLogin === missionRepoData.repoOwner;
+ });
const promises = [missionDataPromise, isTeacherModePromise];
Promise.all(promises).then((promises: any[]) => {
+ setMissionRepoData(missionRepoData);
+
setHasUnsavedChangesToTasks(false);
setHasUnsavedChangesToBriefing(false);
setHasUnsavedChangesToMetadata(false);
@@ -316,12 +300,17 @@ const GitHubAssessmentWorkspace: React.FC = prop
setIsLoading(false);
});
- }, [changeStateDueToChangedTaskNumber, missionRepoData, octokit, handleUpdateHasUnsavedChanges]);
+ }, [
+ assessmentOverview,
+ octokit,
+ changeStateDueToChangedTaskNumber,
+ handleUpdateHasUnsavedChanges
+ ]);
/**
* Sets up the workspace for when the user is creating a new Mission
*/
- const setUpWithoutMissionRepoData = useCallback(() => {
+ const setUpWithoutAssessmentOverview = useCallback(() => {
setSummary(defaultMissionBriefing);
setMissionMetadata(defaultMissionMetadata);
@@ -346,12 +335,12 @@ const GitHubAssessmentWorkspace: React.FC = prop
}, [changeStateDueToChangedTaskNumber, handleUpdateHasUnsavedChanges]);
useEffect(() => {
- if (missionRepoData === undefined) {
- setUpWithoutMissionRepoData();
+ if (assessmentOverview === undefined) {
+ setUpWithoutAssessmentOverview();
} else {
- setUpWithMissionRepoData();
+ setUpWithAssessmentOverview();
}
- }, [missionRepoData, setUpWithMissionRepoData, setUpWithoutMissionRepoData]);
+ }, [assessmentOverview, setUpWithAssessmentOverview, setUpWithoutAssessmentOverview]);
const briefingOverlay = (
) : (
-
-
-
+
+
+
+
+
)}
) : (
diff --git a/src/pages/sicp/subcomponents/SicpToc.tsx b/src/pages/sicp/subcomponents/SicpToc.tsx
index 7664b25da7..ac1b8c9025 100644
--- a/src/pages/sicp/subcomponents/SicpToc.tsx
+++ b/src/pages/sicp/subcomponents/SicpToc.tsx
@@ -2,7 +2,7 @@ import { Tree, TreeNodeInfo } from '@blueprintjs/core';
import { cloneDeep } from 'lodash';
import * as React from 'react';
import { useState } from 'react';
-import { Redirect } from 'react-router';
+import { useHistory } from 'react-router';
import toc from '../../../features/sicp/data/toc.json';
@@ -17,7 +17,7 @@ type OwnProps = {
*/
const SicpToc: React.FC = props => {
const [sidebarContent, setSidebarContent] = useState(toc as TreeNodeInfo[]);
- const [slug, setSlug] = useState('');
+ const history = useHistory();
const handleNodeExpand = (_node: TreeNodeInfo, path: integer[]) => {
const newState = cloneDeep(sidebarContent);
@@ -36,14 +36,13 @@ const SicpToc: React.FC = props => {
if (props.handleCloseToc) {
props.handleCloseToc();
}
- setSlug(String(node.nodeData));
+ history.push('/sicpjs/' + String(node.nodeData));
},
- [props]
+ [history, props]
);
return (
- {slug !== '' && = props => {
toSpawn: () => true
},
dataVisualizerTab,
- inspectorTab,
envVisualizerTab
];
@@ -389,14 +387,6 @@ const dataVisualizerTab: SideContentTab = {
toSpawn: () => true
};
-const inspectorTab: SideContentTab = {
- label: 'Inspector',
- iconName: IconNames.SEARCH,
- body:
+
+