Skip to content

Commit ca1db3b

Browse files
committed
testing2
1 parent da409bc commit ca1db3b

5 files changed

Lines changed: 97 additions & 70 deletions

File tree

package-lock.json

Lines changed: 85 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<<<<<<< HEAD
2-
<<<<<<< HEAD
31
.GridItems {
42
background-color: var(--primary-99);
53
border-radius: 8px;
@@ -27,53 +25,3 @@
2725
line-height: 150%;
2826
color: var(--primary-20);
2927
}
30-
=======
31-
=======
32-
>>>>>>> parent of 009ee99 (testing)
33-
.GridItems {
34-
background-color: var(--primary-99);
35-
border-radius: 8px;
36-
padding: 16px;
37-
gap: 16px;
38-
text-align: start;
39-
40-
@media (max-width: 600px) {
41-
<<<<<<< HEAD
42-
width:100%;
43-
=======
44-
width: 100%;
45-
>>>>>>> parent of 009ee99 (testing)
46-
}
47-
}
48-
.GridItems > h1 {
49-
color: var(--primary-20);
50-
font-weight: 600;
51-
<<<<<<< HEAD
52-
font-size:20px;
53-
=======
54-
font-size: 20px;
55-
>>>>>>> parent of 009ee99 (testing)
56-
57-
font-family: var(--quicksand);
58-
}
59-
60-
<<<<<<< HEAD
61-
.GridItems>p{
62-
margin-top:5px;
63-
font-family:(--inter);
64-
font-weight:400;
65-
font-size:16px;
66-
line-height: 150%;
67-
color:var(--primary-20);
68-
}
69-
>>>>>>> parent of 7feba60 (fixing breaks)
70-
=======
71-
.GridItems > p {
72-
margin-top: 5px;
73-
font-family: (--inter);
74-
font-weight: 400;
75-
font-size: 16px;
76-
line-height: 150%;
77-
color: var(--primary-20);
78-
}
79-
>>>>>>> parent of 009ee99 (testing)

src/components/data-entry/GoalCard.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ import type { Benchmark } from "@/types/global";
1010

1111
import styles from "./GoalCard.module.css";
1212

13+
import { useRouter } from "next/router";
14+
1315
export default function BenchmarksContainer({
1416
benchmarks,
1517
}: {
1618
benchmarks: Benchmark | undefined;
1719
}) {
20+
const router = useRouter();
1821
return (
1922
<Box
2023
sx={{
@@ -71,7 +74,13 @@ export default function BenchmarksContainer({
7174
<Box
7275
sx={{ display: "flex", justifyContent: "center", marginTop: "20px" }}
7376
>
74-
<Button>Start Trial</Button>
77+
<Button
78+
onClick={() =>
79+
router.push(`/benchmarks/${benchmarks?.benchmark_id}`)
80+
}
81+
>
82+
Start Trial
83+
</Button>
7584
</Box>
7685
</Box>
7786
</Box>

src/pages/students/[student_id]/goals/[goal_id]/benchmarks/[benchmark_id]/dataEntry.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const GoalPage: NextPageWithBreadcrumbs = () => {
3232
);
3333
const benchmarkId = (router.query?.benchmark_id as string) || "";
3434
const filteredBenchmark = benchmarks?.find(
35-
(e) => e.benchmark_id === benchmarkId
35+
(e: Benchmark) => e.benchmark_id === benchmarkId
3636
);
3737
useEffect(() => {
3838
if (student && goal) {

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"next-env.d.ts",
2626
"references.d.ts",
2727
"**/*.ts",
28-
"**/*.tsx",
28+
"**/*.tsx"
2929
],
3030
"exclude": ["node_modules"]
3131
}

0 commit comments

Comments
 (0)