From 148156fdca0ecc3b2a60d3d200c93ef40d116ac3 Mon Sep 17 00:00:00 2001 From: maciekglowacki Date: Wed, 21 Oct 2020 20:42:18 +0200 Subject: [PATCH] Auth done --- src/components/CourseCard.tsx | 6 ++---- src/components/Dropdown.tsx | 21 ++++++++++----------- src/contexts/CoursesProvider.tsx | 6 ++++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/components/CourseCard.tsx b/src/components/CourseCard.tsx index ad7d482..46ce574 100644 --- a/src/components/CourseCard.tsx +++ b/src/components/CourseCard.tsx @@ -1,7 +1,7 @@ import React, { useState, useContext, MouseEvent } from 'react'; import Collapse from '@material-ui/core/Collapse'; import ExpandIcon from '../assets/expand.png'; -import { Course, Group, GroupType } from '../types/index'; +import { Course, Group } from '../types/index'; import { coursesContext } from '../contexts/CoursesProvider'; import styled from 'styled-components'; import { makeStyles } from '@material-ui/core/styles'; @@ -35,9 +35,7 @@ padding-left:35px; padding-right:35px; `; -interface ClassGroupProps { - groupType: GroupType; -} + const ClassGroupStyled = styled.div` position:relative; diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx index b270f2d..0160e2b 100644 --- a/src/components/Dropdown.tsx +++ b/src/components/Dropdown.tsx @@ -1,20 +1,19 @@ import React, { useState, useContext, useEffect, MouseEvent, ChangeEvent } from 'react'; -import axios from 'axios'; import { Input } from '@material-ui/core'; import ClickAwayListener from '@material-ui/core/ClickAwayListener'; import { coursesContext } from '../contexts/CoursesProvider'; -import { Course, Basket } from '../types'; +import { Course } from '../types'; import styled from 'styled-components'; import { makeStyles } from '@material-ui/core/styles'; -const DropdownStyled = styled.div` +const DropdownContainer = styled.div` max-height: 420px; overflow-y: auto; scroll-snap-type: y mandatory; scroll-behavior: smooth; z-index: 100; - position: relative; - border-radius:0px 0px 0px 15px; + position: relative; + border-radius: 0px 0px 0px 15px; ::-webkit-scrollbar-track { border-radius: 10px; background-color: #f5f5f5; @@ -30,7 +29,7 @@ const DropdownStyled = styled.div` } `; -const CourseStyled = styled.div` +const CourseContainer = styled.div` position: relative; z-index: 10; padding: 5px; @@ -39,7 +38,7 @@ const CourseStyled = styled.div` font-size: 18px; font-family: Lato; scroll-snap-align: end; - border-bottom:1px solid; + border-bottom: 1px solid; :hover { background-color: #d4b851; cursor: pointer; @@ -113,13 +112,13 @@ export const Dropdown = ({ clearInput, handleClearInput }: DropdownProps) => { value={input} /> {open && ( - + {filteredCourses.map(({ name, id }, index) => ( - +

{name}

-
+ ))} -
+ )} diff --git a/src/contexts/CoursesProvider.tsx b/src/contexts/CoursesProvider.tsx index 56d7de7..bfcecb2 100644 --- a/src/contexts/CoursesProvider.tsx +++ b/src/contexts/CoursesProvider.tsx @@ -26,18 +26,20 @@ export const CoursesProvider = ({ children }: CoursesProviderProps) => { const token = CAS?.user?.token; const addToBasket = (course: Course) => { - const courseToBasket = { + const courseToBasket: Basket = { name: course.name, id: course.id, classes: course.classes[0], lecture: course.lectures !== undefined ? course.lectures[0] : undefined, - } as Basket; + }; setBasket([...basket, courseToBasket]); }; + const deleteFromBasket = (id: number) => setBasket(basket.filter((course) => course.id !== id)); const saveBasket = async () => { try { + //to be deleted let data = [7, 43, 54]; let json = JSON.stringify(data); let post_data = { json_data: json };