{lecture.name}
-
{group.time} {group.room}
{group.lecturer}
-
- 
+
Semestr zimowy 2020/2021 - {lecturesContext.lectures.map((lecture, index) => ( + {lecturesContext?.lectures.map((lecture, index) => (
- {isEventable || term}
-
- );
-};
diff --git a/src/components/Scheduler/Column/index.scss b/src/components/Scheduler/Column/index.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/components/Scheduler/Column/index.tsx b/src/components/Scheduler/Column/index.tsx
deleted file mode 100644
index e200b65..0000000
--- a/src/components/Scheduler/Column/index.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from "react";
-import { Cell } from "../Cell";
-
-interface ColumnProps {
- hours: Array
- {hours.map((hour, index) => (
- |
- ))}
- {children}
-
- );
-};
diff --git a/src/components/Scheduler/SchedulerEvents/index.tsx b/src/components/Scheduler/SchedulerEvents/index.tsx
index d02c2fa..999dd0a 100644
--- a/src/components/Scheduler/SchedulerEvents/index.tsx
+++ b/src/components/Scheduler/SchedulerEvents/index.tsx
@@ -1,86 +1,81 @@
-import React, { useContext, useEffect, useState } from "react";
-import { SchedulerRow } from "../SchedulerRow";
-import { LecturesContext } from "../../../businesslogic/LecturesProvider";
-import { Group } from "../../../businesslogic/types/group";
+import React, { useContext, useEffect, useState } from 'react';
+import { SchedulerRow } from '../SchedulerRow';
+import { LecturesContext } from '../../../contexts/LecturesProvider';
+import { Group } from '../../../types';
interface SchedulerEventsProps {
cellTop: number;
cellWidth: number;
}
-export const SchedulerEvents = ({
- cellTop,
- cellWidth,
-}: SchedulerEventsProps) => {
- // const handleEventClick = (e: React.MouseEvent) => {
- // const eventDiv = e.target as HTMLDivElement;
- // eventDiv.style.backgroundColor = "#1547C5";
- // };
-
- const { choosenGroups } = useContext(LecturesContext);
+export const SchedulerEvents = ({ cellTop, cellWidth }: SchedulerEventsProps) => {
+ const { choosenGroups } = useContext(LecturesContext)!;
const [groupsMappedToEvents, setGroupsMappedToEvents] = useState
- {
- [...Array(6)].map((_, index) => (
- { return group.eventRow === index })}
- indexRow={index}
- cellTop={cellTop + (10 + 70 * index)}
- cellWidth={cellWidth}
- />
- ))
- }
-
-
+ {[...Array(6)].map((_, index) => (
+ {
+ return group.eventRow === index;
+ })}
+ indexRow={index}
+ cellTop={cellTop + (10 + 70 * index)}
+ cellWidth={cellWidth}
+ />
+ ))}
);
};
diff --git a/src/components/Scheduler/SchedulerRow/index.tsx b/src/components/Scheduler/SchedulerRow/index.tsx
index dd1f693..79cd7e8 100644
--- a/src/components/Scheduler/SchedulerRow/index.tsx
+++ b/src/components/Scheduler/SchedulerRow/index.tsx
@@ -1,5 +1,22 @@
-import React from "react";
-import { Group } from "../../../businesslogic/types/group";
+import React from 'react';
+import { Group } from '../../../types';
+import styled from 'styled-components';
+
+interface SchedulerEventProps {
+ eventIndex: number;
+ cellTop: number;
+ cellWidth: number;
+}
+
+const SchedulerEvent = styled.div
+ <>
{[...Array(5)].map((value, eventIndex) => (
-
+
);
};
diff --git a/src/components/Scheduler/index.scss b/src/components/Scheduler/index.scss
deleted file mode 100644
index 8a0764f..0000000
--- a/src/components/Scheduler/index.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.scheduler {
- margin-top: 20px;
- border-collapse: collapse;
-
-
- .tbody {
- display: flex;
- &__column {
- display: flex;
- flex-direction: column;
- position: relative;
- flex: 1;
- }
- }
-
- .td,
- .th {
- border: 1px solid #ddd;
- padding: 10px;
- text-align: center;
- flex: 1;
- }
- .td:hover {
- background-color: #ddd;
- }
-}
diff --git a/src/components/Scheduler/index.tsx b/src/components/Scheduler/index.tsx
index dcf8a5f..40522c9 100644
--- a/src/components/Scheduler/index.tsx
+++ b/src/components/Scheduler/index.tsx
@@ -1,61 +1,45 @@
import React, { useEffect, useRef } from "react";
import { useState } from "react";
-import "./index.scss";
import { SchedulerEvents } from "./SchedulerEvents";
-const days = ["", "poniedziałek", "wtorek", "środa", "czwartek", "piątek"];
+import { days, hours } from "../../constants/index";
+import styled from "styled-components";
-const hours = [
- "8:00",
- "9:00",
- "10:00",
- "11:00",
- "12:00",
- "13:00",
- "14:00",
- "15:00",
- "16:00",
- "17:00",
- "18:00",
- "19:00",
-];
+const SchedulerWrapper = styled.div`
+ flex-grow: 3;
+ margin-top: 20px;
+ border-collapse: collapse;
+`;
-let events: Array
-
{groups.map((group, index) =>
- (
- parseInt(group.day) === eventIndex ?
+ parseInt(group.day) === eventIndex ? {groups[index]?.lecturer}
- : null
- ))}
- {groups[index]?.lecturer}
: null,
+ )}
+
))}
-
-
+
);
};
diff --git a/src/components/TopBar/Results/index.tsx b/src/components/TopBar/Results/index.tsx
index 7068d1c..e365673 100644
--- a/src/components/TopBar/Results/index.tsx
+++ b/src/components/TopBar/Results/index.tsx
@@ -1,11 +1,10 @@
-import React, { useState, useContext, useEffect } from "react";
-import axios from "axios";
-import { Input } 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 { Group } from "../../../businesslogic/types/group";
+import React, { useState, useContext, useEffect } from 'react';
+import axios from 'axios';
+import { Input } from '@material-ui/core';
+import './index.scss';
+import ClickAwayListener from '@material-ui/core/ClickAwayListener';
+import { LecturesContext } from '../../../contexts/LecturesProvider';
+import { Lecture, Group } from '../../../types';
interface LectureData {
name: string;
@@ -13,14 +12,12 @@ interface LectureData {
}
export const Results: React.FC = () => {
- const [input, setInput] = useState
+
+
{days.map((day, index) => (
- {day}
))}
-
-
- {day}
-
+
+
+
{hours.map((hour, indexRow) => (
-
+
+
{[hour, "", "", "", "", ""].map((value, indexCell) =>
indexRow === 0 && indexCell === 1 ? (
-
+ {value}
)
)}
-
+
))}
- {value}
+
{
{open ? (
{filteredLecturesData.map((lecture, index) => (
-
+
))}
diff --git a/src/constants/index.ts b/src/constants/index.ts
new file mode 100644
index 0000000..ad14654
--- /dev/null
+++ b/src/constants/index.ts
@@ -0,0 +1,22 @@
+export const days = [
+ "",
+ "poniedziałek",
+ "wtorek",
+ "środa",
+ "czwartek",
+ "piątek",
+];
+export const hours = [
+ "8:00",
+ "9:00",
+ "10:00",
+ "11:00",
+ "12:00",
+ "13:00",
+ "14:00",
+ "15:00",
+ "16:00",
+ "17:00",
+ "18:00",
+ "19:00",
+];
diff --git a/src/contexts/CASProvider.tsx b/src/contexts/CASProvider.tsx
new file mode 100644
index 0000000..a46f549
--- /dev/null
+++ b/src/contexts/CASProvider.tsx
@@ -0,0 +1,48 @@
+import React, { useState, useEffect } from 'react';
+import { User } from '../types';
+
+export interface CASContext {
+ user: User | null;
+ logout: () => void;
+}
+
+export const CASContext = React.createContext(null);
+
+export interface CASProviderProps {
+ children: React.ReactNode;
+}
+
+export const CASProvider = ({ children }: CASProviderProps) => {
+ const [user, setUser] = useState(null);
+
+ useEffect(() => {
+ login();
+ }, []);
+
+ function login() {
+ const urlParams = new URLSearchParams(window.location.search);
+ const ticket = urlParams.get('ticket');
+
+ if (!ticket) {
+ redirectToCASLoginService();
+ }
+ if (ticket) {
+ console.log(`Ticket is: ${ticket}`);
+ setUser({ ...user, ticket: ticket });
+ }
+ }
+
+ function logout() {
+ redirectToCASLogoutService();
+ }
+
+ function redirectToCASLogoutService() {
+ window.location.replace(`https://cas.amu.edu.pl/cas/logout?service=${window.origin}`);
+ }
+
+ function redirectToCASLoginService() {
+ window.location.replace(`https://cas.amu.edu.pl/cas/login?service=${window.origin}&locale=pl`);
+ }
+
+ return {children} ;
+};
diff --git a/src/contexts/LecturesProvider.tsx b/src/contexts/LecturesProvider.tsx
new file mode 100644
index 0000000..be7f04a
--- /dev/null
+++ b/src/contexts/LecturesProvider.tsx
@@ -0,0 +1,32 @@
+import React, { useState, createContext } from 'react';
+import { Lecture, Group } from '../types';
+
+interface LectureContext {
+ lectures: Array;
+ choosenGroups: Array;
+ addLecture: (lectures: Lecture) => void;
+ addGroup: (group: Group) => void;
+}
+export const LecturesContext = createContext(null);
+
+interface LecturesProviderProps {
+ children: React.ReactNode;
+}
+
+export const LecturesProvider = ({ children }: LecturesProviderProps) => {
+ const [lectures, setLectures] = useState>([]);
+ const [choosenGroups, setChoosenGroups] = useState>([]);
+
+ const addLecture = (lecture: Lecture) => {
+ setLectures([...lectures, lecture]);
+ };
+ const addGroup = (group: Group) => {
+ setChoosenGroups([...choosenGroups, group]);
+ };
+
+ return (
+
+ {children}
+
+ );
+};
diff --git a/src/contexts/reducers.ts b/src/contexts/reducers.ts
new file mode 100644
index 0000000..bb8b250
--- /dev/null
+++ b/src/contexts/reducers.ts
@@ -0,0 +1,8 @@
+export enum Types {
+ addLecture = 'ADD_LECTURE',
+ removeLecture = 'REMOVE_LECTURE',
+ addGroup = 'ADD_GROUP',
+ removeGroup = 'ADD_GROUP',
+ addCourse = 'ADD_COURSE',
+ removeCourse = 'REMOVE_COURSE',
+}
diff --git a/src/index.tsx b/src/index.tsx
index 315593c..57d769e 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,16 +1,18 @@
-import React from "react";
-import ReactDOM from "react-dom";
-import App from "./App";
-import BuisnessLogicProvider from "./businesslogic/BusinessLogicProvider";
-import { LecturesProvider } from "./businesslogic/LecturesProvider";
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { App } from './App';
+import { CASProvider } from './contexts/CASProvider';
+import { LecturesProvider } from './contexts/LecturesProvider';
+import { GlobalStyles } from './styles/GlobalStyles';
ReactDOM.render(
- <>
-
-
-
-
- ,
- document.getElementById("root")
+ <>
+
+
+
+
+ ,
+ document.getElementById('root'),
);
diff --git a/src/styles/GlobalStyles.ts b/src/styles/GlobalStyles.ts
new file mode 100644
index 0000000..4f68eaa
--- /dev/null
+++ b/src/styles/GlobalStyles.ts
@@ -0,0 +1,20 @@
+import { createGlobalStyle } from 'styled-components';
+
+export const GlobalStyles = createGlobalStyle`
+ *, *::before, *::after {
+ box-sizing: border-box;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ }
+
+ body {
+ margin: 0;
+ padding: 0;
+ line-height: 24px;
+
+ }
+
+ body::-webkit-scrollbar {
+ display: none;
+ }
+`;
diff --git a/src/teest.tsx b/src/teest.tsx
deleted file mode 100644
index 639a670..0000000
--- a/src/teest.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { withStyles } from '@material-ui/core/styles';
-import Button from '@material-ui/core/Button';
-
-const styles = {
- root: {
- background: 'linear-gradient(45deg, #FE6B8B 30%, #FF8E53 90%)',
- border: 0,
- borderRadius: 3,
- boxShadow: '0 3px 5px 2px rgba(255, 105, 135, .3)',
- color: 'white',
- height: 48,
- padding: '0 30px',
- },
-};
-
-function HigherOrderComponent(props: { classes: any; }) {
- const { classes } = props;
- return ;
-}
-
-HigherOrderComponent.propTypes = {
- classes: PropTypes.object.isRequired,
-};
-
-export default withStyles(styles)(HigherOrderComponent);
\ No newline at end of file
diff --git a/src/types/index.ts b/src/types/index.ts
new file mode 100644
index 0000000..d4aa768
--- /dev/null
+++ b/src/types/index.ts
@@ -0,0 +1,21 @@
+export interface Group {
+ id: string;
+ day: string;
+ time: string;
+ lecturer: string;
+ room: string;
+}
+export interface Lecture {
+ id?: number;
+ name: string;
+ groups: Array;
+}
+export interface LectureInit {
+ name: string;
+ id: number;
+}
+export interface User {
+ name?: string;
+ surname?: string;
+ ticket: string | null;
+}
{lecture.name}