From a1baf2d9c007b1b04f6f04357d2a3e8ae0744a79 Mon Sep 17 00:00:00 2001 From: Stefan Kairinos Date: Tue, 13 Aug 2024 12:10:04 +0300 Subject: [PATCH] Portal frontend 25 (#30) * export results and args * new js package * add icon * table components * quick save * extract id from body * school name field * ready for review * only teachers * fix rendering issue and create placeholder tabs * merge from dev * working order * create sub view for leaving school * merge from dev * student dashboard * Merge branch 'development' into portal-frontend-25 * new js package * addressed feedback * Merge branch 'development' into portal-frontend-25 --- package.json | 2 +- src/components/Card.tsx | 55 +++ src/components/index.tsx | 8 +- src/images/RR_logo.svg | 336 ++++++++++++++++++ src/images/RR_logo_green.svg | 1 + src/pages/studentDashboard/Games.tsx | 36 ++ .../studentDashboard/RapidRouterProgress.tsx | 56 +++ .../studentDashboard/StudentDashboard.tsx | 56 +++ src/router/routes/student.tsx | 18 +- yarn.lock | 6 +- 10 files changed, 562 insertions(+), 12 deletions(-) create mode 100644 src/components/Card.tsx create mode 100644 src/images/RR_logo.svg create mode 100644 src/images/RR_logo_green.svg create mode 100644 src/pages/studentDashboard/Games.tsx create mode 100644 src/pages/studentDashboard/RapidRouterProgress.tsx create mode 100644 src/pages/studentDashboard/StudentDashboard.tsx diff --git a/package.json b/package.json index 6f8a77f..111a4c2 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "✅ Do add `devDependencies` below that are `peerDependencies` in the CFL package." ], "dependencies": { - "codeforlife": "github:ocadotechnology/codeforlife-package-javascript#v2.2.0", + "codeforlife": "github:ocadotechnology/codeforlife-package-javascript#v2.2.1", "crypto-js": "^4.2.0" }, "devDependencies": { diff --git a/src/components/Card.tsx b/src/components/Card.tsx new file mode 100644 index 0000000..25d7821 --- /dev/null +++ b/src/components/Card.tsx @@ -0,0 +1,55 @@ +import { type AnchorHTMLAttributes, type FC } from "react" +import { + Button, + type ButtonProps, + CardActions, + CardContent, + CardMedia, + type CardMediaProps, + Card as MuiCard, + type CardProps as MuiCardProps, + Typography, +} from "@mui/material" + +export interface CardProps extends MuiCardProps { + title: string + description: string + mediaProps: { + image: NonNullable + title: NonNullable + } + buttonProps: ButtonProps & AnchorHTMLAttributes +} + +const Card: FC = ({ + title, + description, + mediaProps, + buttonProps, + style, + ...otherCardProps +}) => { + return ( + + + + {title} + {description} + + +