Added types

package-lock.json

@@ -1101,6 +1101,11 @@
       "resolved": "https://registry.npmjs.org/@devexpress/dx-core/-/dx-core-2.6.3.tgz",
       "integrity": "sha512-MMOPm+UQdxliq0IidfsgOryYCJsFVRHtILZeMyHMs9I8IFbV8DuDwkhzNNr2/RjRZ3GVm4ZuxnWjbeOSUdft8A=="
     },
+    "@devexpress/dx-grid-core": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@devexpress/dx-grid-core/-/dx-grid-core-2.6.3.tgz",
+      "integrity": "sha512-hYgBM/vv70gjIpuHzS80CagzDenoT20ddIcFOLJQinsAk3mdFJr/fkJAMB819wop225S0Rtb+Z157EGNgMCAXA=="
+    },
     "@devexpress/dx-react-core": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/@devexpress/dx-react-core/-/dx-react-core-2.6.3.tgz",
@@ -1110,6 +1115,23 @@
         "prop-types": "^15.7.2"
       }
     },
+    "@devexpress/dx-react-grid": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@devexpress/dx-react-grid/-/dx-react-grid-2.6.3.tgz",
+      "integrity": "sha512-s2RMhn6Ctbe/Tp066sWgscC2eZVTTQfKs2VOR/p9gD1vMIQFPGUkSS/XyDwMPb5MD7DRvFYJ2U8oQryobB2yoQ==",
+      "requires": {
+        "@devexpress/dx-grid-core": "2.6.3"
+      }
+    },
+    "@devexpress/dx-react-grid-material-ui": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/@devexpress/dx-react-grid-material-ui/-/dx-react-grid-material-ui-2.6.3.tgz",
+      "integrity": "sha512-7tVQVrbGQNrkbOOF/xd8mTk7vAsDwQ8URRvRJGILthcnewPCJZqzmjsMV4GRQ1bEAQKAiCnRDbPunvR4vW0GEw==",
+      "requires": {
+        "clsx": "^1.0.4",
+        "prop-types": "^15.7.2"
+      }
+    },
     "@devexpress/dx-react-scheduler": {
       "version": "2.6.3",
       "resolved": "https://registry.npmjs.org/@devexpress/dx-react-scheduler/-/dx-react-scheduler-2.6.3.tgz",

package.json

@@ -4,7 +4,10 @@
   "private": true,
   "dependencies": {
     "-": "0.0.1",
+    "@devexpress/dx-grid-core": "^2.6.3",
     "@devexpress/dx-react-core": "^2.6.3",
+    "@devexpress/dx-react-grid": "^2.6.3",
+    "@devexpress/dx-react-grid-material-ui": "^2.6.3",
     "@devexpress/dx-react-scheduler": "^2.6.3",
     "@devexpress/dx-react-scheduler-material-ui": "^2.6.3",
     "@material-ui/core": "^4.10.0",

src/App.tsx

@@ -2,10 +2,9 @@ import React, { useState } from "react";
 import TopBar from "./components/TopBar/";
 import Transfer from "./components/Transfer/";
 import "./App.scss";
-import Schedule from "./components/Calendar/";
+import Calendar from "./components/Calendar";
 import { appointments } from "./components/Calendar/appointments";
 import RightBar from "./components/RightBar";
-
 function App() {
 	const [isOpenTransfer, setOpenTransfer] = useState(false);
 	const [text, setText] = useState("");
@@ -16,29 +15,27 @@ function App() {
 				textChangeHandler={(e) => {
 					setText(e.target.value);
 				}}
-        handleTransfer={(e) => {
+				handleTransfer={() => {
 					setOpenTransfer(!isOpenTransfer);
 				}}
-        onLangChange={(e) => {
+				onLangChange={() => {
-          console.log(e);
+					console.log("Language has been changed");
 				}}
 			/>
 			<Transfer
 				isOpen={isOpenTransfer}
-        handleClose={(e) => {
+				handleClose={() => {
 					setOpenTransfer(!isOpenTransfer);
 				}}
 			/>
 			<div className="wraper">
 				<div className="wraper__calendar">
-          <Schedule data={appointments} />
+					<Calendar data={appointments} />
 				</div>
 				<div className="wraper__rightbar">
 					<RightBar />
 				</div>
 			</div>
-
-      <h1>{text}</h1>
 		</div>
 	);
 }

src/components/Calendar/index.tsx

@@ -1,16 +1,11 @@
 import * as React from "react";
 import { ViewState } from "@devexpress/dx-react-scheduler";
 import { AppointmentModel } from "@devexpress/dx-react-scheduler";
-import {
+import { Scheduler, WeekView, Appointments, AppointmentTooltip } from "@devexpress/dx-react-scheduler-material-ui";
-  Scheduler,
-  WeekView,
-  Appointments,
-  AppointmentTooltip,
-} from "@devexpress/dx-react-scheduler-material-ui";
 import moment from "moment";
 import "moment/locale/pl";
 import "./index.scss";
-import { makeStyles, Theme, createStyles } from "@material-ui/core/styles";
+import { makeStyles, createStyles } from "@material-ui/core/styles";
 
 interface CalendarProps {
 	data: Array<AppointmentModel>;
@@ -20,16 +15,12 @@ interface CalendarState {
 	currentDate: Date;
 }
 
-const formatDayScaleDate = (
+const formatDayScaleDate = (date: moment.MomentInput, nextOptions: Intl.DateTimeFormatOptions): string => {
-  date: moment.MomentInput,
-  options: { weekday: any }
-) => {
 	const momentDate = moment(date).locale("pl");
-  const { weekday } = options;
+	return momentDate.format(nextOptions.weekday ? "dddd" : " ").toUpperCase();
-  return momentDate.format(weekday ? "dddd" : " ").toUpperCase();
 };
 
-const useStyles = makeStyles((theme: Theme) =>
+const useStyles = makeStyles(() =>
 	createStyles({
 		dayScaleCell: {
 			paddingTop: 10,
@@ -39,9 +30,6 @@ const useStyles = makeStyles((theme: Theme) =>
 			border: "1px solid rgba(224, 224, 224, 1);",
 			borderCollapse: "separate",
 		},
-    timeTableCell: {
-      //borderRadius: 15,
-    },
 		appointmentLayer: {
 			borderRadius: 15,
 			marginLeft: 5,
@@ -50,51 +38,24 @@ const useStyles = makeStyles((theme: Theme) =>
 	})
 );
 
-//don't know how to set proper type of function arguments
+const DayScaleCell = ({ formatDate, ...restProps }: WeekView.DayScaleCellProps) => {
-const DayScaleCell = ({ formatDate, ...restProps }: any) => {
 	const classes = useStyles();
 	return (
-    <WeekView.DayScaleCell
+		<WeekView.DayScaleCell {...restProps} formatDate={formatDayScaleDate} today={false} className={classes.dayScaleCell} />
-      {...restProps}
-      formatDate={formatDayScaleDate}
-      today={false}
-      className={classes.dayScaleCell}
-    />
 	);
 };
 
-const TimeTableCell = ({ ...restProps }: any) => {
+const TimeTableLayout = ({ ...restProps }: WeekView.TimeTableLayoutProps) => {
 	const classes = useStyles();
-  return (
+	return <WeekView.TimeTableLayout {...restProps} className={classes.timeTableLayout} />;
-    <WeekView.TimeTableCell {...restProps} className={classes.timeTableCell} />
-  );
 };
 
-const TimeTableLayout = ({ ...restProps }: any) => {
+const Appointment = ({ ...restProps }: Appointments.AppointmentProps) => {
 	const classes = useStyles();
-  return (
+	return <Appointments.Appointment {...restProps} className={classes.appointmentLayer} />;
-    <WeekView.TimeTableLayout
-      {...restProps}
-      className={classes.timeTableLayout}
-    />
-  );
 };
 
-const Appointment = ({ ...restProps }: any) => {
+export default class Calendar extends React.PureComponent<CalendarProps, CalendarState> {
-  const classes = useStyles();
-  return (
-    <Appointments.Appointment
-      {...restProps}
-      className={classes.appointmentLayer}
-    />
-  );
-};
-
-export default class Calendar extends React.PureComponent<
-  CalendarProps,
-  CalendarState
-> {
-
 	constructor(props: CalendarProps) {
 		super(props);
 
@@ -117,7 +78,6 @@ export default class Calendar extends React.PureComponent<
 					cellDuration={60}
 					dayScaleCellComponent={DayScaleCell}
 					timeTableLayoutComponent={TimeTableLayout}
-          timeTableCellComponent={TimeTableCell}
 				/>
 				<Appointments appointmentComponent={Appointment} />
 				<AppointmentTooltip />

src/components/RightBar/index.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import "./index.scss";
 import Paper from "@material-ui/core/Paper";
+
 interface RightBarProps {}
 
 interface RightBarState {}

src/components/TopBar/index.tsx

@@ -18,7 +18,7 @@ interface TopBarProps {
 
 interface TopBarState {
   isOpenProfile: boolean;
-  anchorEl: null | HTMLElement;
+  anchorEl: HTMLElement | null;
   isPolish: boolean;
 }