diff --git a/README.md b/README.md index f571830f..c0c581fe 100644 --- a/README.md +++ b/README.md @@ -52,11 +52,11 @@ Volg deze stappen om de backend van het project op te zetten: ``` 6. Voer het `fill_database_mock.py` script uit als een module om de database te vullen met mock data: ```bash - python -m db.fill_database_mock + python fill_database_mock.py ``` Je kan ook een lege databank initialiseren met het `create_database_tables.py` script als volgt: ```bash - python -m db.create_database_tables + python create_database_tables.py ``` *Opgelet: beide scripts zullen de huidige databankinhoud verwijderen indien die bestaat en daarna de tabellen opnieuw aanmaken.* 7. Start de API door het `app.py` script uit te voeren: diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 52417613..dcd57d9b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -3014,20 +3014,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", diff --git a/frontend/src/components/ProjectStudentComponent.tsx b/frontend/src/components/ProjectStudentComponent.tsx index b0d78283..b18aa098 100644 --- a/frontend/src/components/ProjectStudentComponent.tsx +++ b/frontend/src/components/ProjectStudentComponent.tsx @@ -10,10 +10,10 @@ import {useTranslation} from 'react-i18next'; export default function ProjectStudentComponent(props: { project: ProjectStudent }): JSX.Element { + // true als er een groep is, anders false. const is_in_group = props.project.groupMembers && props.project.groupMembers.length > 0; - const { t } = useTranslation(); return ( diff --git a/frontend/src/components/ProjectTeacherComponent.tsx b/frontend/src/components/ProjectTeacherComponent.tsx index 2a658f81..de64029b 100644 --- a/frontend/src/components/ProjectTeacherComponent.tsx +++ b/frontend/src/components/ProjectTeacherComponent.tsx @@ -10,6 +10,7 @@ import SimpleTests from "./SimpleTests/SimpleTests.tsx"; import {TeacherOrStudent} from "./SimpleTests/TeacherOrStudentEnum.tsx"; import Calendar from "react-calendar"; import {useTranslation} from 'react-i18next'; +import {RegularButton} from "./RegularButton.tsx"; // SimpleTests const CHECK_SIMPLE_TESTS = false @@ -54,6 +55,10 @@ export function ProjectTeacherComponent(props: { project: ProjectTeacher }): JSX const [data, setData] = useState(calledData); const [hasChanged, setHasChanged] = useState(false); + const save = () => { + // TODO save button + } + return (
{/* PROJECT NAME FIELD */} @@ -181,7 +186,8 @@ export function ProjectTeacherComponent(props: { project: ProjectTeacher }): JSX
- +

@@ -215,8 +221,11 @@ export function ProjectTeacherComponent(props: { project: ProjectTeacher }): JSX } +
+ +
) ; -} \ No newline at end of file +} diff --git a/frontend/src/components/Settings.tsx b/frontend/src/components/Settings.tsx index 313dc0b5..d55e7c2e 100644 --- a/frontend/src/components/Settings.tsx +++ b/frontend/src/components/Settings.tsx @@ -7,7 +7,7 @@ import {MdLanguage, MdOutlineKeyboardArrowDown} from "react-icons/md"; import useAuth from "../hooks/useAuth.ts"; import {User} from "../utils/ApiInterfaces.ts"; import {useTranslation} from "react-i18next"; -import i18n from "../i18n.tsx"; +import {modify_language} from "../utils/api/User.ts"; function DropdownLanguage(): JSX.Element { const [isOpen, setIsOpen] = useState(false); @@ -35,7 +35,7 @@ function DropdownLanguage(): JSX.Element { { - void i18n.changeLanguage("en"); + modify_language("en") toggle() }} > @@ -44,7 +44,7 @@ function DropdownLanguage(): JSX.Element { { - void i18n.changeLanguage("nl"); + modify_language("nl") toggle() }} > diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx index fb1f269e..300dcf93 100644 --- a/frontend/src/components/Sidebar.tsx +++ b/frontend/src/components/Sidebar.tsx @@ -16,7 +16,7 @@ export function Sidebar(props: {home: string, buttons?: SidebarButton[]}): JSX.E if (buttons == undefined) { buttons = [SidebarButton.COURSES, SidebarButton.PROJECTS]; } - + return ( <>