diff --git a/src/components/shared/ExerciseSide.tsx b/src/components/shared/ExerciseSide.tsx
index b28f618..dea5fd5 100644
--- a/src/components/shared/ExerciseSide.tsx
+++ b/src/components/shared/ExerciseSide.tsx
@@ -25,12 +25,17 @@ function ExerciseSide({
ExerciseSideProps): JSX.Element {
const [displayExercise, setDisplayExercise] = useState(0);
- type availableExercises = 'axis' | 'congrats' | 'graph' | 'unitcircle';
+ type availableExercises =
+ | 'axis'
+ | 'congrats'
+ | 'graph0'
+ | 'unitcircle'
+ | 'graph1';
const exercises: availableExercises[] = [
'unitcircle',
'axis',
- 'graph',
+ 'graph0',
'congrats',
];
let curExercise;
@@ -39,7 +44,89 @@ ExerciseSideProps): JSX.Element {
setDisplayExercise(ExercisesNum);
}
- if (exercises[displayExercise] == 'graph') {
+ if (exercises[displayExercise] == 'graph0') {
+ curExercise = (
+
+
+
+
+
+ incrementExercise()}
+ />
+
+
+ );
+
+ /*
+
{
+ setCompleteExercises(completeExercises + 1);
+ incrementExercise();
+ return;
+ }}
+ />
+
+ );*/
+ } else if (exercises[displayExercise] == 'graph1') {
curExercise = (
diff --git a/src/components/shared/Exercises/GraphExercise.tsx b/src/components/shared/Exercises/GraphExercise.tsx
index ca3be1f..cefab0b 100644
--- a/src/components/shared/Exercises/GraphExercise.tsx
+++ b/src/components/shared/Exercises/GraphExercise.tsx
@@ -128,7 +128,7 @@ GraphProps): JSX.Element {
const dyPercent = yPos(endY) - yPos(startY);
// use this factor because dyPercent is relative to height,
// but we express a line's length as a percentage of width.
- const yxRatio = 22.5 / 40;
+ const yxRatio = 22.5 / 50;
const lineLengthPercent =
Math.sqrt(
(dxPercent / 100) ** 2 + ((dyPercent * yxRatio) / 100) ** 2
diff --git a/src/styles/Exercises/GraphInput.scss b/src/styles/Exercises/GraphInput.scss
index 3f6b1a2..a561dd7 100644
--- a/src/styles/Exercises/GraphInput.scss
+++ b/src/styles/Exercises/GraphInput.scss
@@ -22,8 +22,9 @@
font-style: normal;
font-weight: bold;
margin-bottom: 2vh;
- margin-left: -20px;
+ margin-left: 0;
margin-right: auto;
+ margin-top: 100px;
padding-left: 8%;
}
diff --git a/src/styles/Graph.scss b/src/styles/Graph.scss
index 6a182fc..6df3344 100644
--- a/src/styles/Graph.scss
+++ b/src/styles/Graph.scss
@@ -1,14 +1,15 @@
.graph-container {
align-items: center;
- border: solid 2px #000;
+ border: solid 1px rgb(209, 209, 209);
border-radius: 12px;
height: 0;
+ margin-left: 5%;
// If editing the sizing of graph-container (padding-bottom or width),
// modify the value of `yxRatio` in Graph.tsx
padding-bottom: 22.5%;
position: absolute;
top: 5%;
- width: 40%; // see above warning
+ width: 50%; // see above warning
}
.grid-line {