️ This Gitlab will be shut down at 2021-12-31 23:59:59.
Students and staff can migrate to gitlab.utwente.nl.
SNT members can migrate to gitlab.snt.utwente.nl.
Contact bestuur@snt.utwente.nl for more information.

Migrate your projects today!
Export your project using the webinterface or use a script.

Commit af672493 authored by TJHeeringa's avatar TJHeeringa

Updated packages, dependencies and imports

parent 57dccaa2
......@@ -10731,11 +10731,6 @@
"json5": "^1.0.1"
}
},
"loaders.css": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/loaders.css/-/loaders.css-0.1.2.tgz",
"integrity": "sha1-Op+0NybHMzSjgUKvnQYpAZtlh0M="
},
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
......@@ -17270,21 +17265,11 @@
"universal-cookie": "^3.1.0"
}
},
"react-country-region-selector": {
"version": "1.4.7",
"resolved": "https://registry.npmjs.org/react-country-region-selector/-/react-country-region-selector-1.4.7.tgz",
"integrity": "sha512-8fWkEqDY8bIzJ2UdqSAF/hH8za/nvGUAY7fINOz1YAKhdLJTyF3Dg2fkhJDEn+3Lm6IY1l4px81KszCNBNO1WQ=="
},
"react-csv": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/react-csv/-/react-csv-2.0.3.tgz",
"integrity": "sha512-exyAdFLAxtuM4wNwLYrlKyPYLiJ7e0mv9tqPAd3kq+k1CiJFtznevR3yP0icv5q/y200w+lzNgi7TQn1Wrhu0w=="
},
"react-data-grid": {
"version": "5.0.5",
"resolved": "https://registry.npmjs.org/react-data-grid/-/react-data-grid-5.0.5.tgz",
"integrity": "sha512-OR4LDoOpN4yj3NexaxYFS2OEIYFUk2V5lascPTHgtTMwwkb163tEPqQSertkv2YAJu+YBzIm8epW8+UMip1LPw=="
},
"react-datepicker": {
"version": "2.16.0",
"resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.16.0.tgz",
......@@ -17652,11 +17637,6 @@
"warning": "^4.0.3"
}
},
"react-numeric-input": {
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/react-numeric-input/-/react-numeric-input-2.2.3.tgz",
"integrity": "sha1-S/WRjD6v7YUagN8euZLZQQArtVI="
},
"react-onclickoutside": {
"version": "6.9.0",
"resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.9.0.tgz",
......@@ -17778,15 +17758,6 @@
"tiny-warning": "^1.0.0"
}
},
"react-router-tabs": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/react-router-tabs/-/react-router-tabs-1.3.2.tgz",
"integrity": "sha512-RZLes3fUTDP4EvDuAOxXt7MRvW2Wpla1ToiNO6E3wEHJs51r4SE7UkVmqou/sBOaUvigweDcaf4f8huNiCGGzA==",
"requires": {
"@babel/runtime": "^7.4.3",
"prop-types": "^15.7.2"
}
},
"react-scripts": {
"version": "3.4.3",
"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-3.4.3.tgz",
......@@ -17981,22 +17952,6 @@
}
}
},
"react-spinkit": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/react-spinkit/-/react-spinkit-3.0.0.tgz",
"integrity": "sha1-Mf2vThgXd2bFfRsfMzApD4SSqFo=",
"requires": {
"classnames": "^2.2.3",
"loaders.css": "^0.1.2",
"object-assign": "^4.1.0",
"prop-types": "^15.5.8"
}
},
"react-strap": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/react-strap/-/react-strap-0.0.1.tgz",
"integrity": "sha1-CPIsXioK5/R1zVgUuJ/AwFpnIV4="
},
"react-table": {
"version": "6.11.5",
"resolved": "https://registry.npmjs.org/react-table/-/react-table-6.11.5.tgz",
......
......@@ -5,7 +5,7 @@ import { makeStyles, useTheme } from "@material-ui/core/styles";
import Typography from "@material-ui/core/Typography";
import { useOverShadowStyles } from "@mui-treasury/styles/shadow/over";
import { useBlogTextInfoContentStyles } from "@mui-treasury/styles/textInfoContent/blog";
import Info from "App/Components/Info/Info";
import Info from "./Components/Info/Info";
import cx from "clsx";
import PropTypes from "prop-types";
import React from "react";
......
import TextField from "App/Components/Fields/TextField";
import React from "react";
import TextField from "./TextField";
const NumberField = (props) => {
return (
<TextField
......
......@@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button";
import Typography from "@material-ui/core/Typography";
import AccountTreeIcon from "@material-ui/icons/AccountTree";
import AssignmentLateIcon from "@material-ui/icons/AssignmentLate";
import CalendarToday from "@material-ui/icons/CalendarToday";
import ContactsIcon from "@material-ui/icons/Contacts";
import Create from "@material-ui/icons/Create";
import DescriptionIcon from "@material-ui/icons/Description";
......@@ -22,19 +21,16 @@ import PhotoIcon from "@material-ui/icons/Photo";
import PhotoSizeSelectLargeIcon from "@material-ui/icons/PhotoSizeSelectLarge";
import RoomServiceIcon from "@material-ui/icons/RoomService";
import WhatsAppIcon from "@material-ui/icons/WhatsApp";
import DateField from "App/Components/Fields/DateField";
import FileField from "App/Components/Fields/FileField";
import IconHolder from "App/Components/Fields/IconHolder";
import TextField from "App/Components/Fields/TextField";
import Wrapper from "App/Components/Fields/Wrapper";
import YearlessDateField from "App/Components/Fields/YearlessDateField";
import { useAlertHandler } from "App/Contexts/AlertHandler";
import { Helper } from "App/Helper";
import PropTypes from "prop-types";
import React, { useState } from "react";
import React from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import DateField from "../Fields/DateField";
import FileField from "../Fields/FileField";
import FontAwesomeIconHolder from "../Fields/FontAwesomeIconHolder";
import IconHolder from "../Fields/IconHolder";
import TextField from "../Fields/TextField";
import Wrapper from "../Fields/Wrapper";
export const AssociationForm = ({ association, handleChange, onSubmit, onCancel }) => {
......
import Button from "@material-ui/core/Button";
import DraftsIcon from "@material-ui/icons/Drafts";
import SubjectIcon from "@material-ui/icons/Subject";
import IconHolder from "App/Components/Fields/IconHolder";
import TextField from "App/Components/Fields/TextField";
import Wrapper from "App/Components/Fields/Wrapper";
import { useAlertHandler } from "App/Contexts/AlertHandler";
import PropTypes from "prop-types";
import React, { useState } from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import { useAlertHandler } from "../../Contexts/AlertHandler";
import {useAPI} from "../../Contexts/API";
import IconHolder from "../Fields/IconHolder";
import TextField from "../Fields/TextField";
import Wrapper from "../Fields/Wrapper";
const EmailTemplateForm = ({ association, emailTemplate, onTemplateChange}) => {
......
import Button from "@material-ui/core/Button";
import FormControlLabel from "@material-ui/core/FormControlLabel";
import MenuItem from "@material-ui/core/MenuItem";
import { makeStyles, useTheme } from "@material-ui/core/styles";
import Switch from "@material-ui/core/Switch";
import Typography from "@material-ui/core/Typography";
import BallotIcon from "@material-ui/icons/Ballot";
import CalendarToday from "@material-ui/icons/CalendarToday";
import Create from "@material-ui/icons/Create";
import LocationOn from "@material-ui/icons/LocationOn";
import Notes from "@material-ui/icons/Notes";
import IconHolder from "App/Components/Fields/IconHolder";
import TextField from "App/Components/Fields/TextField";
import Wrapper from "App/Components/Fields/Wrapper";
import { useAlertHandler } from "App/Contexts/AlertHandler";
import PropTypes from "prop-types";
import React from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import {useHistory} from "react-router-dom";
import {useGet} from "restful-react";
import { useAlertHandler } from "../../Contexts/AlertHandler";
import {useAPI} from "../../Contexts/API";
import DateTimeField from "../Fields/DateTimeField";
import IconHolder from "../Fields/IconHolder";
import NumberField from "../Fields/NumberField";
import SelectField from "../Fields/SelectField";
import {useHistory} from "react-router-dom";
import TextField from "../Fields/TextField";
import Wrapper from "../Fields/Wrapper";
export const EventForm = ({ association, event, handleEventChange, update, onSucces, onCancel}) => {
......
import Button from "@material-ui/core/Button";
import Wrapper from "App/Components/Fields/Wrapper";
import PropTypes from "prop-types";
import React from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import Wrapper from "../Fields/Wrapper";
export const GenericInfoFormForm = ({ Form, formObject, handleFormObjectChange, onSubmit, onCancel, allowDelete, submitButtonText }) => {
return (
......@@ -41,6 +41,6 @@ GenericInfoFormForm.propTypes = {
GenericInfoFormForm.defaultProps = {
submitButtonText: "save"
}
};
export default GenericInfoFormForm;
\ No newline at end of file
......@@ -7,13 +7,13 @@ import EventAvailableIcon from "@material-ui/icons/EventAvailable";
import EventBusyIcon from "@material-ui/icons/EventBusy";
import FormatListNumberedIcon from "@material-ui/icons/FormatListNumbered";
import GradeIcon from "@material-ui/icons/Grade";
import Wrapper from "App/Components/Fields/Wrapper";
import Wrapper from "../Fields/Wrapper";
import PropTypes from "prop-types";
import React, {useEffect, useMemo, useState} from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import IconHolder from "../../Components/Fields/IconHolder";
import TextField from "../../Components/Fields/TextField";
import IconHolder from "../Fields/IconHolder";
import TextField from "../Fields/TextField";
import { useAlertHandler } from "../../Contexts/AlertHandler";
import {useAPI} from "../../Contexts/API";
import BooleanField from "../Fields/BooleanField";
......
......@@ -4,19 +4,19 @@ import AccessTimeIcon from "@material-ui/icons/AccessTime";
import CreateIcon from "@material-ui/icons/Create";
import EuroIcon from "@material-ui/icons/Euro";
import SwapHorizIcon from "@material-ui/icons/SwapHoriz";
import IconHolder from "App/Components/Fields/IconHolder";
import TextField from "App/Components/Fields/TextField";
import Wrapper from "App/Components/Fields/Wrapper";
import { useAlertHandler } from "App/Contexts/AlertHandler";
import PropTypes from "prop-types";
import React, { useState } from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import { useAlertHandler } from "../../Contexts/AlertHandler";
import {useAPI} from "../../Contexts/API";
import FileField from "../Fields/FileField";
import FontAwesomeIconHolder from "../Fields/FontAwesomeIconHolder";
import IconHolder from "../Fields/IconHolder";
import NumberField from "../Fields/NumberField";
import SelectField from "../Fields/SelectField";
import TextField from "../Fields/TextField";
import Wrapper from "../Fields/Wrapper";
const ProductForm = ({ association, product: propProduct, onProductChange, update}) => {
......
......@@ -2,7 +2,6 @@ import Button from "@material-ui/core/Button";
import Container from "@material-ui/core/Container";
import MenuItem from "@material-ui/core/MenuItem";
import Typography from "@material-ui/core/Typography";
import { Osiris } from "App/Components/Forms/Osiris";
import PropTypes from "prop-types";
import React, {useEffect, useMemo} from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
......@@ -12,12 +11,13 @@ import { useAlertHandler} from "../../Contexts/AlertHandler";
import {useAPI} from "../../Contexts/API";
import CountryField, { countries } from "../Fields/CountryField";
import DateField from "../Fields/DateField";
import PhoneNumberField from "../Fields/PhoneNumberField";
import SelectField from "../Fields/SelectField";
import TextField from "../Fields/TextField";
import Wrapper from "../Fields/Wrapper";
import Block from "../PageLayout/Content/Block";
import isIban from "../ValidatorRules/isIban";
import PhoneNumberField from "../Fields/PhoneNumberField";
import { Osiris } from "./Osiris";
const ProfileForm = ({container, ...rest}) => {
......
......@@ -4,18 +4,18 @@ import AccessTimeIcon from "@material-ui/icons/AccessTime";
import EuroIcon from "@material-ui/icons/Euro";
import PersonIcon from "@material-ui/icons/Person";
import TodayIcon from "@material-ui/icons/Today";
import IconHolder from "App/Components/Fields/IconHolder";
import Wrapper from "App/Components/Fields/Wrapper";
import { useAlertHandler } from "App/Contexts/AlertHandler";
import PropTypes from "prop-types";
import React, { useState } from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import { useAlertHandler } from "../../Contexts/AlertHandler";
import {useAPI} from "../../Contexts/API";
import DateField from "../Fields/DateField";
import FontAwesomeIconHolder from "../Fields/FontAwesomeIconHolder";
import IconHolder from "../Fields/IconHolder";
import NumberField from "../Fields/NumberField";
import SelectField from "../Fields/SelectField";
import Wrapper from "../Fields/Wrapper";
const PurchaseForm = ({ association, purchase: propPurchase, onPurchaseChange}) => {
......
......@@ -6,17 +6,17 @@ import Create from "@material-ui/icons/Create";
import GradeIcon from "@material-ui/icons/Grade";
import InputIcon from "@material-ui/icons/Input";
import PriorityHighIcon from "@material-ui/icons/PriorityHigh";
import Wrapper from "App/Components/Fields/Wrapper";
import PropTypes from "prop-types";
import React, { useState } from "react";
import { ValidatorForm } from "react-material-ui-form-validator";
import IconHolder from "../../Components/Fields/IconHolder";
import SelectField from "../../Components/Fields/SelectField";
import TextField from "../../Components/Fields/TextField";
import { useAlertHandler } from "../../Contexts/AlertHandler";
import {useAPI} from "../../Contexts/API";
import IconHolder from "../Fields/IconHolder";
import SelectField from "../Fields/SelectField";
import SpecificDataField from "../Fields/SpecificDataField";
import TextField from "../Fields/TextField";
import Wrapper from "../Fields/Wrapper";
const SpecificDataFieldForm = ({ data_field: propDataField, association, onSuccess, onDelete, update}) => {
......
import Info from "App/Components/Info/Info";
import React from "react";
import AssociationType from "../Types/Association";
import Info from "./Info";
const AssociationInfo = ({ association }) => {
// const data = useMemo(() => {
let data = [];
data["General"] = {
"Name": association.name,
......@@ -40,8 +39,6 @@ const AssociationInfo = ({ association }) => {
"Privacy Statement": <a href={association.privacy_statements}>Privacy Statement</a>,
"Terms of Service": <a href={association.terms_of_service}>Terms of Service</a>
};
// return data;
// },[association]);
return (
<Info
......
import Info from "App/Components/Info/Info";
import moment from "moment/moment";
import PropTypes from "prop-types";
import React, {useMemo} from "react";
import {useMemberTypes} from "../../Contexts/Members";
import Info from "./Info";
const MembershipInfo = ({ membership }) => {
const MembertypesAPI = useMemberTypes();
......
import Info from "App/Components/Info/Info";
import PropTypes from "prop-types";
import React, {useMemo} from "react";
import {useStudies} from "../../Contexts/Studies";
import Info from "./Info";
const ProfileInfo = ({ profile }) => {
const StudiesApi = useStudies();
......
import Info from "App/Components/Info/Info";
import PropTypes from "prop-types";
import React, {useMemo} from "react";
import {useDataFields} from "../../Contexts/Members";
import Info from "./Info";
const SpecificData = ({ specific_data }) => {
const { collection: dataFields } = useDataFields();
......
import {Typography} from "@material-ui/core";
import {grey} from "@material-ui/core/colors";
import {makeStyles, useTheme} from "@material-ui/core/styles";
import Typography from "@material-ui/core/Typography";
import AddIcon from "@material-ui/icons/Add";
import Menu from "App/Components/Menu/Menu";
import PropTypes from "prop-types";
import React from "react";
import logo from "../../../../img/logo oud.png";
import Menu from "../../Menu/Menu";
const useStyles = makeStyles(theme=>({
......
......@@ -10,22 +10,22 @@ import Toolbar from "@material-ui/core/Toolbar";
import useMediaQuery from "@material-ui/core/useMediaQuery";
import ChevronLeftIcon from "@material-ui/icons/ChevronLeft";
import MoreVertIcon from "@material-ui/icons/MoreVert";
import { AlertHandler } from "App/Components/AlertHandler";
import clsx from "clsx";
import PropTypes from "prop-types";
import React, {useEffect, useMemo, useState} from "react";
import {useLocation} from "react-router-dom";
import { SizeMe } from "react-sizeme";
import { useAlertHandler } from "../../Contexts/AlertHandler";
import {useAuth} from "../../Contexts/API";
import { AlertHandler } from "../AlertHandler";
import Burger from "./Burger";
import AvatarMenu from "./Menu/AvatarMenu";
import AssociationHeader from "./Header/Header";
import {useLocation} from "react-router-dom";
import AvatarMenu from "./Menu/AvatarMenu";
import AssociationBoardSideBar from "./SideBar/AssociationBoardSideBar";
import AssociationMemberSideBar from "./SideBar/AssociationMemberSideBar";
import PublicSideBar from "./SideBar/PublicSideBar";
import EmptySideBar from "./SideBar/EmptySideBar";
import PublicSideBar from "./SideBar/PublicSideBar";
const drawerWidth = 240;
......
import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
import AlternateEmailIcon from "@material-ui/icons/AlternateEmail";
import DateRangeIcon from "@material-ui/icons/DateRange";
import EmailIcon from "@material-ui/icons/Email";
import EqualizerIcon from "@material-ui/icons/Equalizer";
import EuroIcon from "@material-ui/icons/Euro";
import EventIcon from "@material-ui/icons/Event";
import ExitToAppIcon from "@material-ui/icons/ExitToApp";
import FeaturedVideoIcon from "@material-ui/icons/FeaturedVideo";
import GradeIcon from "@material-ui/icons/Grade";
import GroupWorkIcon from "@material-ui/icons/GroupWork";
import HomeWorkIcon from "@material-ui/icons/HomeWork";
......@@ -16,7 +13,6 @@ import PeopleRoundedIcon from "@material-ui/icons/PeopleRounded";
import PersonIcon from "@material-ui/icons/Person";
import PersonAddIcon from "@material-ui/icons/PersonAdd";
import PersonAddDisabledIcon from "@material-ui/icons/PersonAddDisabled";
import PieChartIcon from "@material-ui/icons/PieChart";
import ReceiptIcon from "@material-ui/icons/Receipt";
import SettingsIcon from "@material-ui/icons/Settings";
import ShareIcon from "@material-ui/icons/Share";
......@@ -24,10 +20,11 @@ import StorageIcon from "@material-ui/icons/Storage";
import SubjectIcon from "@material-ui/icons/Subject";
import SupervisedUserCircleIcon from "@material-ui/icons/SupervisedUserCircle";
import WcIcon from "@material-ui/icons/Wc";
import Drawer from "App/Components/Lists/Drawer/Drawer";
import React, {useMemo} from "react";
import {useLocation} from "react-router-dom";
import Drawer from "../../Lists/Drawer/Drawer";
const AssociationBoardSideBar = (props) => {
return AssociationBoardDrawer(props);
};
......
......@@ -5,11 +5,11 @@ import HomeIcon from "@material-ui/icons/Home";
import InfoIcon from "@material-ui/icons/Info";
import ShareIcon from "@material-ui/icons/Share";
import SupervisedUserCircleIcon from "@material-ui/icons/SupervisedUserCircle";
import Drawer from "App/Components/Lists/Drawer/Drawer";
import React, {useMemo} from "react";
import {useLocation} from "react-router-dom";
import {useAPI} from "../../../Contexts/API";
import Drawer from "../../Lists/Drawer/Drawer";
const AssociationMemberSideBar = (props) => {
......
import EventIcon from "@material-ui/icons/Event";
import HomeIcon from "@material-ui/icons/Home";
import PaymentIcon from "@material-ui/icons/Payment";
import Drawer from "App/Components/Lists/Drawer/Drawer";
import React from "react";
import Drawer from "../../Lists/Drawer/Drawer";
export default function PublicSideBar(props){
return PublicDrawer(props);
......
import "react-table/react-table.css";
import Button from "@material-ui/core/Button";
import Checkbox from "@material-ui/core/Checkbox";
import IconButton from "@material-ui/core/IconButton";
import Paper from "@material-ui/core/Paper";
......@@ -16,11 +15,11 @@ import MuiToolbar from "@material-ui/core/Toolbar";
import Tooltip from "@material-ui/core/Tooltip";
import Typography from "@material-ui/core/Typography";
import DeleteIcon from "@material-ui/icons/Delete";
import { Helper } from "App/Helper";
import clsx from "clsx";
import PropTypes from "prop-types";
import React, { useState } from "react";
import { Col,Row } from "reactstrap";
import { Helper } from "../../Helper";
const useToolbarStyles = makeStyles((theme) => ({
......
......@@ -47,11 +47,12 @@ import Select from "@material-ui/core/Select";
import { withStyles } from "@material-ui/core/styles";
import { fade } from "@material-ui/core/styles/colorManipulator";
import {DateRange} from "@material-ui/icons";
import { Helper } from "App/Helper";
import saveAs from "file-saver";
import PropTypes from "prop-types";
import React, {useCallback, useEffect, useRef, useState} from "react";
import { Helper } from "../../Helper";
// ****** Styling ******
......
import RefreshIcon from "@material-ui/icons/Refresh";
import ExtremeTable from "App/Components/Tables/ExtremeTable";
import PropTypes from "prop-types";
import React, {useMemo} from "react";
......@@ -10,6 +9,7 @@ import {
deriveMemberTableHeadersFromDataFields,
flattenMembers,
} from "../../Transformers/Members";
import ExtremeTable from "./ExtremeTable";
import {ToolbarButton} from "./Plugins/ToolbarButton";
const getRowId = (row) => row.slug;
......
import Container from "@material-ui/core/Container";
import IconButton from "@material-ui/core/IconButton";
import Tooltip from "@material-ui/core/Tooltip";
import Typography from "@material-ui/core/Typography";
import RefreshIcon from "@material-ui/icons/Refresh";
import CollapsableList from "App/Components/Lists/CollapsableList";
import {orderBy} from "lodash";
import PropTypes from "prop-types";