merge to master

2020-06-14 18:06:08 +02:00 · 2020-06-14 18:06:08 +02:00 · fd33a2687d
commit fd33a2687d
parent 013b0d63f7 52b6953f64
6 changed files with 183 additions and 202 deletions
--- a/package-lock.json
+++ b/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",
--- a/package.json
+++ b/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",
--- a/src/components/Calendar/index.tsx
+++ b/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 {
-  Scheduler,
-  WeekView,
-  Appointments,
-  AppointmentTooltip,
-} from "@devexpress/dx-react-scheduler-material-ui";
+import { 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 = (
-  date: moment.MomentInput,
-  options: { weekday: any }
-) => {
+const formatDayScaleDate = (date: moment.MomentInput, nextOptions: Intl.DateTimeFormatOptions): string => {
 	const momentDate = moment(date).locale("pl");
-  const { weekday } = options;
-  return momentDate.format(weekday ? "dddd" : " ").toUpperCase();
+	return momentDate.format(nextOptions.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 }: any) => {
+const DayScaleCell = ({ formatDate, ...restProps }: WeekView.DayScaleCellProps) => {
 	const classes = useStyles();
 	return (
-    <WeekView.DayScaleCell
-      {...restProps}
-      formatDate={formatDayScaleDate}
-      today={false}
-      className={classes.dayScaleCell}
-    />
+		<WeekView.DayScaleCell {...restProps} formatDate={formatDayScaleDate} today={false} className={classes.dayScaleCell} />
 	);
 };

-const TimeTableCell = ({ ...restProps }: any) => {
+const TimeTableLayout = ({ ...restProps }: WeekView.TimeTableLayoutProps) => {
 	const classes = useStyles();
-  return (
-    <WeekView.TimeTableCell {...restProps} className={classes.timeTableCell} />
-  );
+	return <WeekView.TimeTableLayout {...restProps} className={classes.timeTableLayout} />;
 };

-const TimeTableLayout = ({ ...restProps }: any) => {
+const Appointment = ({ ...restProps }: Appointments.AppointmentProps) => {
 	const classes = useStyles();
-  return (
-    <WeekView.TimeTableLayout
-      {...restProps}
-      className={classes.timeTableLayout}
-    />
-  );
+	return <Appointments.Appointment {...restProps} className={classes.appointmentLayer} />;
 };

-const Appointment = ({ ...restProps }: any) => {
-  const classes = useStyles();
-  return (
-    <Appointments.Appointment
-      {...restProps}
-      className={classes.appointmentLayer}
-    />
-  );
-};
-
-export default class Calendar extends React.PureComponent<
-  CalendarProps,
-  CalendarState
-> {
-
+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 />
--- a/src/components/TopBar/Profile.tsx
+++ b/src/components/TopBar/Profile.tsx
@ -0,0 +1,27 @@
+import { Menu, MenuItem } from "@material-ui/core";
+import React, { FC } from "react";
+
+
+interface ProfileProps {
+    anchorEl: HTMLElement | null;
+    handleClose: () => void
+
+}
+
+export const Profile : FC<ProfileProps> = ({anchorEl, handleClose, ...restProps}) => {
+
+	return (
+		<Menu
+			className="top-bar__menu"
+			id="simple-menu"
+			anchorEl={anchorEl}
+			keepMounted
+			open={Boolean(anchorEl)}
+			onClose={handleClose}
+		>
+			<MenuItem>Profile</MenuItem>
+			<MenuItem>My account</MenuItem>
+			<MenuItem>Logout</MenuItem>
+		</Menu>
+	);
+};
--- a/src/components/TopBar/index.tsx
+++ b/src/components/TopBar/index.tsx
@ -7,19 +7,17 @@ import UK from "./UK.png";
 import PL from "./PL.png";
 import User from "./user.png";
 import CloseIcon from "./close.svg";
-import Menu from "@material-ui/core/Menu";
-import MenuItem from "@material-ui/core/MenuItem";
+import { Profile } from "./Profile";

 interface TopBarProps {
 	handleTransfer: (e: React.MouseEvent) => void;
-  onLangChange: (lang:boolean) => void;
-  textChangeHandler: (e: React.ChangeEvent<HTMLInputElement>) => void;
+	onLangChange: (lang: boolean) => void;
+	textChangeHandler: (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
 }

 interface TopBarState {
-  isOpenProfile: boolean;
-  anchorEl: null | HTMLElement;
 	isPolish: boolean;
+	anchorEl: HTMLElement | null;
 }

 export default class TopBar extends React.Component<TopBarProps, TopBarState> {
@ -30,13 +28,12 @@ export default class TopBar extends React.Component<TopBarProps, TopBarState> {
 		this.onLangChange = this.onLangChange.bind(this);
 		this.handleTransfer = this.handleTransfer.bind(this);
 		this.state = {
-      isOpenProfile: false,
-      anchorEl:null,
-      isPolish:true,
+			isPolish: true,
+			anchorEl: null,
 		};
 	}

-  handleChange(e: React.ChangeEvent<HTMLInputElement>) {
+	handleChange(e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) {
 		this.props.textChangeHandler(e);
 	}

@ -46,21 +43,20 @@ export default class TopBar extends React.Component<TopBarProps, TopBarState> {

 	onLangChange(e: React.MouseEvent) {
 		this.setState({
-      isPolish:!this.state.isPolish,
-    })
+			isPolish: !this.state.isPolish,
+		});
 		this.props.onLangChange(this.state.isPolish);
 	}

-  handleProfile(e: React.MouseEvent) {
+	handleProfile(event: React.MouseEvent<HTMLImageElement>) {
 		this.setState({
-      isOpenProfile: !this.state.isOpenProfile,
-      anchorEl:e.currentTarget as HTMLElement,
+			anchorEl: event.currentTarget,
 		});
 	}

-  handleClose(e: React.MouseEvent) {
+	handleClose() {
 		this.setState({
-      isOpenProfile: !this.state.isOpenProfile,
+			anchorEl: null,
 		});
 	}

@ -68,11 +64,7 @@ export default class TopBar extends React.Component<TopBarProps, TopBarState> {
 		return (
 			<div className="top-bar">
 				<div className="top-bar__logo">
-          <img
-            className="top-bar__logo-image"
-            alt="logo"
-            src="https://plannaplan.pl/img/logo.svg"
-          />
+					<img className="top-bar__logo-image" alt="logo" src="https://plannaplan.pl/img/logo.svg" />
 					<div className="top-bar__tekst"> plan na plan </div>
 				</div>
 				<div className="top-bar__input-div">
@ -81,43 +73,20 @@ export default class TopBar extends React.Component<TopBarProps, TopBarState> {
 						placeholder="Wyszukaj..."
 						inputProps={{ "aria-label": "description" }}
 						className="top-bar__input-field"
-            onChange={(e) =>
-              this.handleChange(e as ChangeEvent<HTMLInputElement>)
-            }
+						onChange={(e) => this.handleChange(e)}
 					/>
 					<img className="top-bar__input-icon" alt="close" src={CloseIcon} />
 				</div>
 				<div className="top-bar__icon-box">
-          <img
-            className="top-bar__icon"
-            alt="transfer"
-            src={Transfer}
-            onClick={this.handleTransfer}
-          />
+					<img className="top-bar__icon" alt="transfer" src={Transfer} onClick={this.handleTransfer} />
 					<img
 						className="top-bar__icon"
 						alt="change_language"
 						src={this.state.isPolish ? UK : PL}
 						onClick={this.onLangChange}
 					/>
-          <img
-            className="top-bar__icon"
-            alt="profile"
-            src={User}
-            onClick={this.handleProfile}
-          />
-          <Menu
-            className="top-bar__menu"
-            id="simple-menu"
-            anchorEl={this.state.anchorEl}
-            keepMounted
-            open={this.state.isOpenProfile}
-            onClose={this.handleClose}
-          >
-            <MenuItem>Profile</MenuItem>
-            <MenuItem>My account</MenuItem>
-            <MenuItem>Logout</MenuItem>
-          </Menu>
+					<img className="top-bar__icon" alt="profile" src={User} onClick={this.handleProfile} />
+					<Profile anchorEl={this.state.anchorEl} handleClose={this.handleClose} />
 				</div>
 			</div>
 		);