diff --git a/src/commons/dialogs/ConfirmDialog.tsx b/src/commons/dialogs/ConfirmDialog.tsx index c6854b4055..81f2dfbad9 100644 --- a/src/commons/dialogs/ConfirmDialog.tsx +++ b/src/commons/dialogs/ConfirmDialog.tsx @@ -3,6 +3,8 @@ import { ButtonProps, Classes, Dialog, + DialogBody, + DialogFooter, DialogProps, IconName, Intent @@ -54,11 +56,10 @@ export function ConfirmDialog( icon={props.icon} {...props.props} > -
{props.contents}
-
+ {props.contents} + {buttons}}> {props.largeButtons && buttons} - {!props.largeButtons &&
{buttons}
} -
+ ); } diff --git a/src/commons/editingOverviewCard/EditingOverviewCard.tsx b/src/commons/editingOverviewCard/EditingOverviewCard.tsx index 289a4521e5..868c8973c3 100644 --- a/src/commons/editingOverviewCard/EditingOverviewCard.tsx +++ b/src/commons/editingOverviewCard/EditingOverviewCard.tsx @@ -3,6 +3,7 @@ import { Card, Classes, Dialog, + DialogBody, Elevation, H3, H4, @@ -179,7 +180,7 @@ export const EditingOverviewCard: React.FC = props => onClose={toggleOptionsOverlay} title="Other options" > -
+

Assessment Type

{assessmentTypeSelect(props.overview.type, saveCategory)}

Number

@@ -201,7 +202,7 @@ export const EditingOverviewCard: React.FC = props => ? makeEditingOverviewTextarea('fileName') : createPlaceholder(props.overview.fileName || '')}
- + ); diff --git a/src/commons/editingWorkspace/EditingWorkspace.tsx b/src/commons/editingWorkspace/EditingWorkspace.tsx index e92fb1bb68..83a6ac1e31 100644 --- a/src/commons/editingWorkspace/EditingWorkspace.tsx +++ b/src/commons/editingWorkspace/EditingWorkspace.tsx @@ -1,7 +1,8 @@ import { - ButtonGroup, Classes, Dialog, + DialogBody, + DialogFooter, Intent, NonIdealState, Spinner, @@ -214,31 +215,33 @@ const EditingWorkspace: React.FC = props => { isOpen={showResetTemplateOverlay} title="Confirmation: Reset editor?" > -
+ -
-
- - setShowResetTemplateOverlay(false)} - options={{ minimal: false }} - /> - { - const assessment = retrieveLocalAssessment()!; - setAssessment(assessment); - setHasUnsavedChanges(false); - setShowResetTemplateOverlay(false); - setOriginalMaxXp(getMaxXp()); - handleRefreshLibrary(); - resetWorkspaceValues(); - }} - options={{ minimal: false, intent: Intent.DANGER }} - /> - -
+ + + setShowResetTemplateOverlay(false)} + options={{ minimal: false }} + /> + { + const assessment = retrieveLocalAssessment()!; + setAssessment(assessment); + setHasUnsavedChanges(false); + setShowResetTemplateOverlay(false); + setOriginalMaxXp(getMaxXp()); + handleRefreshLibrary(); + resetWorkspaceValues(); + }} + options={{ minimal: false, intent: Intent.DANGER }} + /> + + } + /> ); diff --git a/src/commons/editingWorkspaceSideContent/EditingWorkspaceSideContentManageQuestionTab.tsx b/src/commons/editingWorkspaceSideContent/EditingWorkspaceSideContentManageQuestionTab.tsx index 1c3db43464..31bca99493 100644 --- a/src/commons/editingWorkspaceSideContent/EditingWorkspaceSideContentManageQuestionTab.tsx +++ b/src/commons/editingWorkspaceSideContent/EditingWorkspaceSideContentManageQuestionTab.tsx @@ -1,4 +1,4 @@ -import { Button, ButtonGroup, Classes, Dialog, Intent } from '@blueprintjs/core'; +import { Button, Dialog, DialogBody, DialogFooter, Intent } from '@blueprintjs/core'; import { IconNames } from '@blueprintjs/icons'; import React, { useState } from 'react'; import { useNavigate } from 'react-router'; @@ -120,26 +120,28 @@ const ManageQuestionTab: React.FC = props => { isOpen={showSaveOverlay} title="Confirmation: Save unsaved changes?" > -
+ -
-
- - setShowSaveOverlay(false)} - options={{ minimal: false }} - /> - { - modifyAssessment(); - setShowSaveOverlay(false); - }} - options={{ minimal: false, intent: Intent.DANGER }} - /> - -
+ + + setShowSaveOverlay(false)} + options={{ minimal: false }} + /> + { + modifyAssessment(); + setShowSaveOverlay(false); + }} + options={{ minimal: false, intent: Intent.DANGER }} + /> + + } + /> ); diff --git a/src/commons/gitHubOverlay/FileExplorerDialog.tsx b/src/commons/gitHubOverlay/FileExplorerDialog.tsx index 4bbbbd1fa9..6afffd2236 100644 --- a/src/commons/gitHubOverlay/FileExplorerDialog.tsx +++ b/src/commons/gitHubOverlay/FileExplorerDialog.tsx @@ -3,6 +3,8 @@ import { Button, Classes, Dialog, + DialogBody, + DialogFooter, InputGroup, Intent, Tree, @@ -47,7 +49,7 @@ const FileExplorerDialog: React.FC = props => {

Select a File

-
+ = props => { />
)} - -
-
- - -
-
+ + + + + + } + /> ); diff --git a/src/commons/gitHubOverlay/RepositoryDialog.tsx b/src/commons/gitHubOverlay/RepositoryDialog.tsx index 6139059d8a..97e539c753 100644 --- a/src/commons/gitHubOverlay/RepositoryDialog.tsx +++ b/src/commons/gitHubOverlay/RepositoryDialog.tsx @@ -3,6 +3,8 @@ import { Button, Classes, Dialog, + DialogBody, + DialogFooter, Intent, Radio, RadioGroup @@ -25,7 +27,7 @@ const RepositoryDialog: React.FC = props => {

Select a Repository

-
+ = props => { ))} -
-
-
- - - Select - -
-
+ + + + + Select + + + } + /> ); diff --git a/src/commons/researchAgreementPrompt/ResearchAgreementPrompt.tsx b/src/commons/researchAgreementPrompt/ResearchAgreementPrompt.tsx index 7621b12a40..9b05ad9a57 100644 --- a/src/commons/researchAgreementPrompt/ResearchAgreementPrompt.tsx +++ b/src/commons/researchAgreementPrompt/ResearchAgreementPrompt.tsx @@ -1,4 +1,4 @@ -import { Button, Classes, Dialog, H4, Intent } from '@blueprintjs/core'; +import { Button, Classes, Dialog, DialogBody, DialogFooter, H4, Intent } from '@blueprintjs/core'; import { useDispatch } from 'react-redux'; import SessionActions from '../application/actions/SessionActions'; @@ -17,7 +17,7 @@ const ResearchAgreementPrompt: React.FC = () => { isCloseButtonShown={false} isOpen > -
+

Welcome to your new {Constants.sourceAcademyDeploymentName} course!

Here at {Constants.sourceAcademyDeploymentName}, our mission is to bring out the beauty @@ -31,20 +31,22 @@ const ResearchAgreementPrompt: React.FC = () => { with no penalty for you whatsoever. Contact your course instructor if you have questions or concerns about this research.
-
-
-
-
-
+ + +