Merge, do not push to develop yet, Listening.tsx is not updated
This commit is contained in:
@@ -77,7 +77,6 @@ interface StatsGridItemProps {
|
||||
assignments: Assignment[];
|
||||
users: User[];
|
||||
training?: boolean;
|
||||
gradingSystem?: Step[];
|
||||
selectedTrainingExams?: string[];
|
||||
maxTrainingExams?: number;
|
||||
setSelectedTrainingExams?: React.Dispatch<React.SetStateAction<string[]>>;
|
||||
@@ -92,7 +91,6 @@ const StatsGridItem: React.FC<StatsGridItemProps> = ({
|
||||
users,
|
||||
training,
|
||||
selectedTrainingExams,
|
||||
gradingSystem,
|
||||
setSelectedTrainingExams,
|
||||
renderPdfIcon,
|
||||
width = undefined,
|
||||
|
||||
@@ -3,7 +3,7 @@ import {useEffect, useState} from "react";
|
||||
import {motion} from "framer-motion";
|
||||
import TimerEndedModal from "../TimerEndedModal";
|
||||
import clsx from "clsx";
|
||||
import {BsStopwatch} from "react-icons/bs";
|
||||
import { BsStopwatch } from "react-icons/bs";
|
||||
|
||||
interface Props {
|
||||
minTimer: number;
|
||||
@@ -11,7 +11,7 @@ interface Props {
|
||||
standalone?: boolean;
|
||||
}
|
||||
|
||||
const Timer: React.FC<Props> = ({minTimer, disableTimer, standalone = false}) => {
|
||||
const Timer: React.FC<Props> = ({ minTimer, disableTimer, standalone = false }) => {
|
||||
const [timer, setTimer] = useState(minTimer * 60);
|
||||
const [showModal, setShowModal] = useState(false);
|
||||
const [warningMode, setWarningMode] = useState(false);
|
||||
@@ -51,9 +51,9 @@ const Timer: React.FC<Props> = ({minTimer, disableTimer, standalone = false}) =>
|
||||
standalone ? "top-10" : "top-4",
|
||||
warningMode && !disableTimer && "bg-mti-red-light text-mti-gray-seasalt",
|
||||
)}
|
||||
initial={{scale: warningMode && !disableTimer ? 0.8 : 1}}
|
||||
animate={{scale: warningMode && !disableTimer ? 1.1 : 1}}
|
||||
transition={{repeat: Infinity, repeatType: "reverse", duration: 0.5, ease: "easeInOut"}}>
|
||||
initial={{ scale: warningMode && !disableTimer ? 0.8 : 1 }}
|
||||
animate={{ scale: warningMode && !disableTimer ? 1.1 : 1 }}
|
||||
transition={{ repeat: Infinity, repeatType: "reverse", duration: 0.5, ease: "easeInOut" }}>
|
||||
<BsStopwatch className="w-6 h-6" />
|
||||
<span className="text-lg font-bold w-12">
|
||||
{timer > 0 && (
|
||||
|
||||
Reference in New Issue
Block a user