y0rune/frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dej te endpointy

Browse Source
This commit is contained in:
unknown
2020-07-24 18:59:45 +02:00
parent 34d7f9a14e
commit bef314120a
5 changed files with 97 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/RightBar/LectureCard/index.tsx
View File

@@ -2,7 +2,7 @@ import React from "react";
import "./index.scss";
import Collapse from "@material-ui/core/Collapse";
import ExpandIcon from "./expand.png";
import { Lecture } from "../../../businesslogic/mockData/lectures";
import { Lecture } from "../../../businesslogic/types/lecture";
interface LectureCardProps {
onGroupMouseOver: (id: string, name: string) => void;

69
src/components/RightBar/index.tsx
View File

@@ -1,46 +1,51 @@
import React, { useState, useContext } from "react";
import "./index.scss";
import { Lecture } from "../../businesslogic/mockData/lectures";
import { Lecture } from "../../businesslogic/types/lecture";
import LectureCard from "./LectureCard";
import { LecturesContext } from "../../businesslogic/LecturesProvider";
interface RightBarProps {
onGroupMouseOver: (id: string, name: string) => void;
onGroupClick: (id: string, name: string) => void;
lectures: Array<Lecture>;
onGroupMouseOver: (id: string, name: string) => void;
onGroupClick: (id: string, name: string) => void;
lectures: Array<Lecture>;
}
export default function RightBar({ lectures, onGroupMouseOver, onGroupClick }: RightBarProps) {
const [selectedCardId, setSelectedCardId] = useState<string | null>(null);
export default function RightBar({
lectures,
onGroupMouseOver,
onGroupClick,
}: RightBarProps) {
const [selectedCardId, setSelectedCardId] = useState<string | null>(null);
const lecturesContext = useContext(LecturesContext);
const lecturesContext = useContext(LecturesContext);
const onCardClick = (e: React.MouseEvent) => {
const target = e.currentTarget as HTMLElement;
selectedCardId === target.id
? setSelectedCardId(null)
: setSelectedCardId(target.id);
};
const onCardClick = (e: React.MouseEvent) => {
const target = e.currentTarget as HTMLElement;
selectedCardId === target.id ? setSelectedCardId(null) : setSelectedCardId(target.id);
};
return (
<div className="right-bar">
{/* <BusinessLogicContext.Consumer>
return (
<div className="right-bar">
{/* <BusinessLogicContext.Consumer>
{(context) => <p>{JSON.stringify((context as BuisnessProvided).states.user?.ticket)}</p>}
</BusinessLogicContext.Consumer> */}
<div className="right-bar__text">
Hubert Wrzesiński<br></br>
Semestr zimowy 2020/2021
</div>
{lecturesContext.lectures.map((lecture, index) => (
<LectureCard
lecture={lecture}
key={index}
id={index.toString()}
onGroupMouseOver={onGroupMouseOver}
onGroupClick={onGroupClick}
onCardClick={onCardClick}
isSelected={selectedCardId === index.toString()}
/>
))}
</div>
);
<div className="right-bar__text">
Hubert Wrzesiński<br></br>
Semestr zimowy 2020/2021
</div>
{lecturesContext.lectures.map((lecture, index) => (
<LectureCard
lecture={lecture}
key={index}
id={index.toString()}
onGroupMouseOver={onGroupMouseOver}
onGroupClick={onGroupClick}
onCardClick={onCardClick}
isSelected={selectedCardId === index.toString()}
/>
))}
</div>
);
}

46
src/components/TopBar/Results/index.tsx
View File

@@ -1,15 +1,23 @@
import React, { useState, useContext, useEffect } from "react";
import axios from "axios";
import { Input } from "@material-ui/core";
import { Input, Grow } from "@material-ui/core";
import "./index.scss";
import ClickAwayListener from "@material-ui/core/ClickAwayListener";
import { LecturesContext } from "../../../businesslogic/LecturesProvider";
import { Lecture } from "../../../businesslogic/types/lecture";
import { LectureInit } from "../../../businesslogic/types/lectureInit";
import { Group } from "../../../businesslogic/types/group";
interface LectureData {
name: string;
id: number;
}
export const Results: React.FC = () => {
const [input, setInput] = useState<string>("");
const [lecturesData, setLecturesData] = useState<Array<LectureInit>>([]);
const [lecturesData, setLecturesData] = useState<Array<LectureData>>([]);
const [filteredLecturesData, setFilteredLecturesData] = useState<
Array<LectureData>
>([]);
const [open, setOpen] = React.useState(false);
const lecturesContext = useContext(LecturesContext);
@@ -42,16 +50,15 @@ export const Results: React.FC = () => {
useEffect(() => {
const filterLectures = (value: string) => {
const zmienna = lecturesData.filter((lecture) =>
const filteredLectures = lecturesData.filter((lecture) =>
lecture.name.toLowerCase().includes(value.toLowerCase())
);
console.log(zmienna);
return zmienna;
setFilteredLecturesData(filteredLectures);
};
filterLectures(input);
}, [input]);
const getLecturesById = async (id: string): Promise<Lecture> => {
const getLecturesById = async (id: string) => {
const { data } = await axios.get(
`http://localhost:1287/getClassesByCourseId?id=${id}`
);
@@ -74,7 +81,28 @@ export const Results: React.FC = () => {
const target = e.currentTarget as HTMLElement;
const id = target.id;
const result = await getLecturesById(id);
lecturesContext.updateLectures(result);
let groups: Array<Group> = [];
let lecture = { groups: groups } as Lecture;
lecture.id = result[0].course.id;
lecture.name = result[0].course.name;
for (let i = 0; i < result.length; i++) {
let group = {} as Group;
group.id = result[i].id;
group.day = result[i].day;
group.time = result[i].time;
group.lecturer =
result[i].lecturer.title +
" " +
result[i].lecturer.name +
" " +
result[i].lecturer.surname;
group.room = result[i].room;
lecture.groups.push(group);
}
console.log(result);
console.log(result[0].course.name);
lecturesContext.updateLectures(lecture);
setOpen(false);
};
@@ -91,7 +119,7 @@ export const Results: React.FC = () => {
/>
{open ? (
<div className="dropdown">
{lecturesData.map((lecture, index) => (
{filteredLecturesData.map((lecture, index) => (
<div
className="lecture"
key={index}