{(['WAITING_LIST', 'CANCELLED'].includes(booking.bookingStatus as string)) &&
-
+
confirmThen(
"Are you sure you want to convert this to a confirmed booking?",
() => promoteUserBooking({eventId, userId})
@@ -166,7 +167,7 @@ export const ManageExistingBookings = ({user, eventId, eventBookings, userIdToSc
}
{(['WAITING_LIST', 'CONFIRMED'].includes(booking.bookingStatus as string)) &&
-
+
confirmThen(
"Are you sure you want to cancel this booking?",
() => cancelUserBooking({eventId, userId})
@@ -176,7 +177,7 @@ export const ManageExistingBookings = ({user, eventId, eventBookings, userIdToSc
}
{isAdmin(user) &&
-
+
confirmThen(
"Are you sure you want to delete this booking permanently?",
() => deleteUserBooking({eventId, userId})
@@ -185,7 +186,7 @@ export const ManageExistingBookings = ({user, eventId, eventBookings, userIdToSc
Delete
}
-
+
confirmThen(
"Are you sure you want to resend the confirmation email for this booking?",
() => resendUserConfirmationEmail({eventId, userId})
@@ -243,7 +244,7 @@ export const ManageExistingBookings = ({user, eventId, eventBookings, userIdToSc
Export as CSV
diff --git a/src/app/components/elements/panels/UserPassword.tsx b/src/app/components/elements/panels/UserPassword.tsx
index 7e4d17bfa1..006cee2d0c 100644
--- a/src/app/components/elements/panels/UserPassword.tsx
+++ b/src/app/components/elements/panels/UserPassword.tsx
@@ -196,7 +196,7 @@ export const UserPassword = (
"You might want to do this if you forgot to log out on a shared device like a school computer."}
- dispatch(logOutUserEverywhere())}>
+ dispatch(logOutUserEverywhere())}>
Log {above['sm'](deviceSize) ? "me " : ""}out everywhere
diff --git a/src/app/components/elements/quiz/QuizProgressCommon.tsx b/src/app/components/elements/quiz/QuizProgressCommon.tsx
index 58363edfdd..45b76c59fc 100644
--- a/src/app/components/elements/quiz/QuizProgressCommon.tsx
+++ b/src/app/components/elements/quiz/QuizProgressCommon.tsx
@@ -1,7 +1,7 @@
import React, {useContext, useLayoutEffect, useMemo, useRef, useState} from "react";
import {Button} from "reactstrap";
import {AssignmentProgressPageSettingsContext, ProgressSortOrder} from "../../../../IsaacAppTypes";
-import {isAuthorisedFullAccess, siteSpecific, TODAY} from "../../../services";
+import {isAda, isAuthorisedFullAccess, siteSpecific, TODAY} from "../../../services";
import {Link} from "react-router-dom";
import orderBy from "lodash/orderBy";
import { IsaacSpinner } from "../../handlers/IsaacSpinner";
@@ -89,7 +89,7 @@ export function ResultsTable({
title: "Allow another attempt?",
body: "This will allow the student to attempt the test again.",
buttons: [
- dispatch(closeActiveModal())}>
+ dispatch(closeActiveModal())}>
Cancel
,
diff --git a/src/app/components/navigation/DowntimeWarningBanner.tsx b/src/app/components/navigation/DowntimeWarningBanner.tsx
index 6ea2a510ce..e8183f42b4 100644
--- a/src/app/components/navigation/DowntimeWarningBanner.tsx
+++ b/src/app/components/navigation/DowntimeWarningBanner.tsx
@@ -1,7 +1,7 @@
import React, {useState} from 'react';
import {Alert, Button, Col, Container, Row} from 'reactstrap';
import Cookies from 'js-cookie';
-import {SITE_TITLE, siteSpecific} from "../../services";
+import {isAda, SITE_TITLE, siteSpecific} from "../../services";
const DOWNTIME_COOKIE = "downtimeBannerDismissed";
@@ -27,7 +27,7 @@ export const DowntimeWarningBanner = () => {
{SITE_TITLE} will be unavailable on Saturday 10 August from 8pm BST until early Sunday morning for essential server maintenance.
View all of your {siteSpecific("question decks", "quizzes")}
diff --git a/src/app/components/elements/modals/GroupsModalCreators.tsx b/src/app/components/elements/modals/GroupsModalCreators.tsx
index 951479f82c..9e37e11a91 100644
--- a/src/app/components/elements/modals/GroupsModalCreators.tsx
+++ b/src/app/components/elements/modals/GroupsModalCreators.tsx
@@ -37,7 +37,7 @@ export const additionalManagerSelfRemovalModal = (group: AppGroup, user: Registe
buttons: [
- {
+ {
store.dispatch(closeActiveModal());
}}>
Cancel
@@ -251,7 +251,7 @@ Are you sure you want to promote this manager to group owner?\n
{manager.givenName} {manager.familyName} {user.id === manager.id && (you)} ({manager.email})
{userIsOwner &&
- promoteManager(manager)}>
+ promoteManager(manager)}>
Make owner
An Ada account makes it easy to assess your students. Set assignments to reinforce learning from lessons and use our pre-made tests to check student knowledge.
;
diff --git a/src/app/components/elements/quiz/QuizProgressCommon.tsx b/src/app/components/elements/quiz/QuizProgressCommon.tsx
index b2d1de96a3..37edbc3dd9 100644
--- a/src/app/components/elements/quiz/QuizProgressCommon.tsx
+++ b/src/app/components/elements/quiz/QuizProgressCommon.tsx
@@ -92,7 +92,7 @@ export function ResultsTable({
dispatch(closeActiveModal())}>
Cancel
,
-
+
Confirm
,
]
diff --git a/src/app/components/navigation/LLMFreeTextQuestionInfoBanner.tsx b/src/app/components/navigation/LLMFreeTextQuestionInfoBanner.tsx
index af479f70e9..ba108c1d36 100644
--- a/src/app/components/navigation/LLMFreeTextQuestionInfoBanner.tsx
+++ b/src/app/components/navigation/LLMFreeTextQuestionInfoBanner.tsx
@@ -75,10 +75,10 @@ function OpenAIConsentCopy({doc}: InfoBannerProps) {
You can withdraw your consent at any time in your account settings.
-
+
{groupSortOrder}
diff --git a/src/app/components/pages/LogIn.tsx b/src/app/components/pages/LogIn.tsx
index 9de67a71ed..a81f1853a2 100644
--- a/src/app/components/pages/LogIn.tsx
+++ b/src/app/components/pages/LogIn.tsx
@@ -265,7 +265,7 @@ export const LogIn = () => {
{
No, skip this
{" "}
- {store.dispatch(authorisationsApi.endpoints.authenticateWithToken.initiate(authenticationToken)); history.push("/account");}}>
+ {store.dispatch(authorisationsApi.endpoints.authenticateWithToken.initiate(authenticationToken)); history.push("/account");}}>
Yes, join the group
diff --git a/src/app/components/pages/RegistrationSetPreferences.tsx b/src/app/components/pages/RegistrationSetPreferences.tsx
index 17546880ab..beecbc88b4 100644
--- a/src/app/components/pages/RegistrationSetPreferences.tsx
+++ b/src/app/components/pages/RegistrationSetPreferences.tsx
@@ -119,7 +119,7 @@ export const RegistrationSetPreferences = () => {
I'll do this later
- Save preferences
+ Save preferences
}
diff --git a/src/app/components/pages/SetAssignments.tsx b/src/app/components/pages/SetAssignments.tsx
index 32f4aa4d3f..b0c4e85452 100644
--- a/src/app/components/pages/SetAssignments.tsx
+++ b/src/app/components/pages/SetAssignments.tsx
@@ -556,7 +556,7 @@ export const SetAssignments = () => {
You have no {siteSpecific("question decks", "quizzes")} to assign
{siteSpecific(
"; use one of the options above to find one.",
- <> setAssignBoardPath(PATHS.SET_ASSIGNMENTS)} color="secondary">
+ <> setAssignBoardPath(PATHS.SET_ASSIGNMENTS)} color="solid">
Create a quiz
>
)}
diff --git a/src/app/components/pages/TeacherFeatures.tsx b/src/app/components/pages/TeacherFeatures.tsx
index 66e379d3d7..7280ad6055 100644
--- a/src/app/components/pages/TeacherFeatures.tsx
+++ b/src/app/components/pages/TeacherFeatures.tsx
@@ -48,7 +48,7 @@ export const TeacherFeatures = () => {
Isaac provides you with a huge range of resources to support your teaching of Science subjects – all for free.
}
{isDisabled &&