Skip to content

Mastery bar v1 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
divyakatyal wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Mastery bar v1 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9125861
Mastery bar v1
divyakatyal Jun 30, 2025
feb3331
UI1
divyakatyal Aug 15, 2025
fb00530
UI1
divyakatyal Aug 15, 2025
d4cb501
Updated UI for mastery bar
divyakatyal Aug 15, 2025
b8653fb
UI update pt 2
divyakatyal Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/static/images/icons/information-icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/static/images/icons/mastery-bolt.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions src/components/Tooltips.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import Tooltip from "@material-ui/core/Tooltip";
import { withStyles } from "@material-ui/core/styles";

export const ProgressTooltip = withStyles((theme) => ({
tooltip: {
backgroundColor: "rgba(97,97,97,0.9)",
color: "#fff",
padding: 16,
borderRadius: 6,
width: 280,
maxWidth: 280,
boxSizing: "border-box",
fontFamily: theme.typography.fontFamily,
boxShadow: "none",
},
arrow: { color: "rgba(97,97,97,0.9)" },
}))(Tooltip);

export const InfoTooltip = withStyles(() => ({
tooltip: { backgroundColor: "rgba(97,97,97,0.9)", color:"#fff", padding:12, borderRadius:6, maxWidth:240, fontFamily:"Inter, sans-serif", boxShadow:"none" },
arrow: { color: "rgba(97,97,97,0.9)" },
}))(Tooltip);
209 changes: 191 additions & 18 deletions src/platform-logic/Platform.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Grid from "@material-ui/core/Grid";
import ProblemWrapper from "@components/problem-layout/ProblemWrapper.js";
import LessonSelectionWrapper from "@components/problem-layout/LessonSelectionWrapper.js";
import { withRouter } from "react-router-dom";
import { ProgressTooltip, InfoTooltip } from "@components/Tooltips";

import {
coursePlans,
Expand All @@ -28,12 +29,13 @@ let problemPool = require(`@generated/processed-content-pool/${CONTENT_SOURCE}.j
let seed = Date.now().toString();
console.log("Generated seed");


class Platform extends React.Component {
static contextType = ThemeContext;

constructor(props, context) {
super(props);

this.problemIndex = {
problems: problemPool,
};
Expand Down Expand Up @@ -78,7 +80,7 @@ class Platform extends React.Component {
componentDidMount() {
this._isMounted = true;
if (this.props.lessonID != null) {
console.log("calling selectLesson from componentDidMount...")
console.log("calling selectLesson from componentDidMount...")
const lesson = findLessonById(this.props.lessonID)
console.debug("lesson: ", lesson)
this.selectLesson(lesson).then(
Expand Down Expand Up @@ -112,7 +114,7 @@ class Platform extends React.Component {
this.onComponentUpdate(prevProps, prevState, snapshot);
}


onComponentUpdate(prevProps, prevState, snapshot) {
if (
Boolean(this.state.currProblem?.id) &&
Expand All @@ -124,7 +126,7 @@ class Platform extends React.Component {
this.context.problemID = "n/a";
}
}

async selectLesson(lesson, updateServer=true) {
const context = this.context;
console.debug("lesson: ", context)
Expand Down Expand Up @@ -494,21 +496,192 @@ class Platform extends React.Component {
""
)}
{this.state.status === "learning" ? (
<ErrorBoundary
componentName={"Problem"}
descriptor={"problem"}
>
<ProblemWrapper
problem={this.state.currProblem}
problemComplete={this.problemComplete}
lesson={this.lesson}
seed={this.state.seed}
lessonID={this.props.lessonID}
displayMastery={this.displayMastery}
/>
</ErrorBoundary>
<ErrorBoundary componentName={"Problem"} descriptor={"problem"}>
<div style={{ display: "flex", justifyContent: "center", padding: "24px 0" }}>
<div style={{ display: "flex", alignItems: "center", width: 880, gap: 20 }}>
<div style={{ display: "flex", alignItems: "center", gap: 4 }}>
<img
src="/place-holder/static/images/icons/mastery-bolt.png"
alt="Mastery Icon"
width={20}
height={20}
style={{ display: "block" }}
/>
<span style={{ fontFamily: "Inter, sans-serif", fontSize: 16, fontWeight: 500 }}>
Lesson Mastery: {Math.round((this.state.mastery || 0) * 100)}%
</span>
</div>

<ProgressTooltip
arrow
placement="bottom"
interactive
title={
<div style={{ width: "100%", boxSizing: "border-box" }}>
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "space-between",
marginBottom: 8,
lineHeight: "28px",
}}
>
<div style={{ fontFamily: "Inter, sans-serif", fontSize: 14, fontWeight: 600 }}>
Learning Objectives:
</div>
{(() => {
const keys = Object.keys(this.lesson.learningObjectives || {});
const mastered = keys.filter(
(k) => (this.context.bktParams[k]?.probMastery ?? 0) >= MASTERY_THRESHOLD
).length;
return (
<div style={{ display: "flex", alignItems: "center", gap: 4, whiteSpace: "nowrap" }}>
<img
src="/place-holder/static/images/icons/mastery-bolt.png"
alt=""
width={20}
height={20}
/>
<div style={{ fontFamily: "Inter, sans-serif", fontSize: 14, fontWeight: 500 }}>
{mastered}/{keys.length}
</div>
</div>
);
})()}
</div>

{Object.entries(this.lesson.learningObjectives).map(([kc]) => {
const mastery = this.context.bktParams[kc]?.probMastery ?? 0;
const pct = Math.round(mastery * 100);
const label = kc.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());

return (
<div key={kc} style={{ marginBottom: 12 }}>
<div
style={{
display: "flex",
alignItems: "center",
justifyContent: "space-between",
marginBottom: 4,
}}
>
<div
title={label}
style={{
fontFamily: "Inter, sans-serif",
fontSize: 12,
fontWeight: 500,
overflow: "hidden",
textOverflow: "ellipsis",
whiteSpace: "nowrap",
marginRight: 8,
}}
>
{label}
</div>
<div
style={{
fontFamily: "Inter, sans-serif",
fontSize: 12,
fontWeight: 500,
whiteSpace: "nowrap",
}}
>
{pct}%
</div>
</div>

<div
style={{
width: "100%",
height: 8,
backgroundColor: "#E8EDEC",
borderRadius: 4,
overflow: "hidden",
}}
>
<div
style={{
width: `${pct}%`,
height: "100%",
backgroundColor: "#83CDC1",
transition: "width 0.3s ease-in-out",
}}
/>
</div>
</div>
);
})}
</div>
}
>

<div
role="progressbar"
aria-valuenow={Math.round((this.state.mastery || 0) * 100)}
aria-valuemin={0}
aria-valuemax={100}
style={{
width: 631,
height: 16,
backgroundColor: "#E8EDEC",
borderRadius: 18,
overflow: "hidden",
cursor: "pointer",
}}
>
<div
style={{
width: `${Math.round((this.state.mastery || 0) * 100)}%`,
height: "100%",
backgroundColor: "#67CDBC",
borderRadius: 18,
transition: "width 0.3s ease",
}}
/>
</div>
</ProgressTooltip>


<InfoTooltip
arrow
placement="bottom"
enterTouchDelay={0}
leaveTouchDelay={3000}
title={
<div style={{ width: "100%", boxSizing: "border-box" }}>
<div style={{ fontFamily: "Inter, sans-serif", fontSize: 12, fontWeight: 600, marginBottom: 4 }}>
What is Mastery?
</div>
<div style={{ fontFamily: "Inter, sans-serif", fontSize: 12, fontWeight: 400, lineHeight: "16px" }}>
Mastery estimates your understanding based on lesson objectives completed.
</div>
</div>
}
>
<img
src="/place-holder/static/images/icons/information-icon.png"
alt="Info"
width={20}
height={20}
style={{ display: "block", cursor: "pointer" }}
/>
</InfoTooltip>
</div>
</div>

<ProblemWrapper
problem={this.state.currProblem}
problemComplete={this.problemComplete}
lesson={this.lesson}
seed={this.state.seed}
lessonID={this.props.lessonID}
displayMastery={this.displayMastery}
/>
</ErrorBoundary>
) : (
""
""
)}
{this.state.status === "exhausted" ? (
<center>
Expand Down