cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-15 20:33:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Feat/table (#105)

Browse Source 
* feat/table add react-table
* feat/table add protected table route
* feat/table upgrade dependencies
* feat/table support parsing of new properties

Co-authored-by: DeepSource Bot <bot@deepsource.io>
This commit is contained in:
Carlos Valente
2022-04-09 22:05:56 +02:00
committed by GitHub
parent 8841a02754
commit 67ddcd8c68
146 changed files with 7423 additions and 5780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/features/menu/EventListMenu.jsx
+1 -1
View File
@@ -1,4 +1,4 @@
import { memo, useContext } from 'react';
import React, { memo, useContext } from 'react';
import { Divider } from '@chakra-ui/react';
import { CursorContext } from '../../app/context/CursorContext';
import MenuActionButtons from './MenuActionButtons';
client/src/features/menu/MenuActionButtons.jsx
+5 -4
View File
@@ -1,3 +1,4 @@
import React from 'react';
import { Menu, MenuButton, MenuItem, MenuList } from '@chakra-ui/menu';
import { IconButton } from '@chakra-ui/button';
import { FiClock } from '@react-icons/all-files/fi/FiClock';
@@ -8,7 +9,7 @@ import { Divider } from '@chakra-ui/layout';
import { Tooltip } from '@chakra-ui/tooltip';
export default function MenuActionButtons(props) {
const { actionHandler } = props;
const { actionHandler, size } = props;
const menuStyle = {
color: '#000000',
backgroundColor: 'rgba(255,255,255,1)',
@@ -20,12 +21,12 @@ export default function MenuActionButtons(props) {
<MenuButton
as={IconButton}
aria-label='Create Menu'
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiPlus />}
_expanded={{ bg: 'orange.300', color: 'white' }}
_focus={{ boxShadow: 'none' }}
backgroundColor={'orange.200'}
color={'orange.500'}
backgroundColor='orange.200'
color='orange.500'
/>
</Tooltip>
<MenuList style={menuStyle}>
client/src/features/menu/MenuBar.jsx
+2 -6
View File
@@ -1,3 +1,4 @@
import React, { useContext, useRef } from 'react';
import { useMutation, useQueryClient } from 'react-query';
import { downloadEvents, uploadEvents } from 'app/api/ontimeApi';
import { EVENTS_TABLE } from 'app/api/apiConstants';
@@ -9,7 +10,6 @@ import QuitIconBtn from './buttons/QuitIconBtn';
import style from './MenuBar.module.scss';
import HelpIconBtn from './buttons/HelpIconBtn';
import UploadIconBtn from './buttons/UploadIconBtn';
import { useContext, useRef } from 'react';
import { LoggingContext } from '../../app/context/LoggingContext';
import PropTypes from 'prop-types';
@@ -40,7 +40,6 @@ export default function MenuBar(props) {
const handleUpload = (event) => {
const fileUploaded = event.target.files[0];
console.log('1', fileUploaded)
if (fileUploaded == null) return;
// Limit file size to 1MB
@@ -49,9 +48,6 @@ export default function MenuBar(props) {
return;
}
console.log('2', ! fileUploaded.name.endsWith('.xlsx')
|| !fileUploaded.name.endsWith('.json'))
// Check file extension
if (fileUploaded.name.endsWith('.xlsx') || fileUploaded.name.endsWith('.json')) {
try {
@@ -145,7 +141,7 @@ export default function MenuBar(props) {
}
MenuBar.propTypes = {
isOpen: PropTypes.bool.isRequired,
isOpen: PropTypes.bool,
onOpen: PropTypes.func.isRequired,
};
client/src/features/menu/buttons/DownloadIconBtn.jsx
+3 -2
View File
@@ -1,13 +1,14 @@
import React from 'react';
import { IconButton } from '@chakra-ui/button';
import { Tooltip } from '@chakra-ui/tooltip';
import { FiDownload } from '@react-icons/all-files/fi/FiDownload';
export default function DownloadIconBtn(props) {
const { clickhandler, ...rest } = props;
const { clickhandler, size, ...rest } = props;
return (
<Tooltip label='Export event list'>
<IconButton
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiDownload />}
colorScheme='white'
onClick={clickhandler}
client/src/features/menu/buttons/HelpIconBtn.jsx
+3 -2
View File
@@ -1,13 +1,14 @@
import React from 'react';
import { IconButton } from '@chakra-ui/button';
import { Tooltip } from '@chakra-ui/tooltip';
import { FiHelpCircle } from '@react-icons/all-files/fi/FiHelpCircle';
export default function HelpIconBtn(props) {
const { clickhandler, ...rest } = props;
const { clickhandler, size, ...rest } = props;
return (
<Tooltip label='Help'>
<IconButton
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiHelpCircle />}
colorScheme='white'
onClick={clickhandler}
client/src/features/menu/buttons/MaxIconBtn.jsx
+3 -2
View File
@@ -1,13 +1,14 @@
import React from 'react';
import { IconButton } from '@chakra-ui/button';
import { Tooltip } from '@chakra-ui/tooltip';
import { FiMaximize } from '@react-icons/all-files/fi/FiMaximize';
export default function MaxIconBtn(props) {
const { clickhandler, ...rest } = props;
const { clickhandler, size, ...rest } = props;
return (
<Tooltip label='Show full window'>
<IconButton
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiMaximize />}
colorScheme='white'
onClick={clickhandler}
client/src/features/menu/buttons/MinIconBtn.jsx
+3 -2
View File
@@ -1,13 +1,14 @@
import React from 'react';
import { IconButton } from '@chakra-ui/button';
import { Tooltip } from '@chakra-ui/tooltip';
import { FiMinimize } from '@react-icons/all-files/fi/FiMinimize';
export default function MinIconBtn(props) {
const { clickhandler, ...rest } = props;
const { clickhandler, size, ...rest } = props;
return (
<Tooltip label='Close to tray'>
<IconButton
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiMinimize />}
colorScheme='white'
onClick={clickhandler}
client/src/features/menu/buttons/QuitIconBtn.jsx
+3 -3
View File
@@ -1,3 +1,4 @@
import React, { useRef, useState } from 'react';
import { Button, IconButton } from '@chakra-ui/button';
import {
AlertDialog,
@@ -8,11 +9,10 @@ import {
AlertDialogOverlay,
} from '@chakra-ui/modal';
import { Tooltip } from '@chakra-ui/tooltip';
import { useRef, useState } from 'react';
import { FiPower } from '@react-icons/all-files/fi/FiPower';
export default function QuitIconBtn(props) {
const { clickhandler, ...rest } = props;
const { clickhandler, size, ...rest } = props;
const [isOpen, setIsOpen] = useState(false);
const onClose = () => setIsOpen(false);
const cancelRef = useRef();
@@ -26,7 +26,7 @@ export default function QuitIconBtn(props) {
<>
<Tooltip label='Quit Application'>
<IconButton
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiPower />}
colorScheme='red'
variant='outline'
client/src/features/menu/buttons/SettingsIconBtn.jsx
+3 -2
View File
@@ -1,13 +1,14 @@
import React from 'react';
import { IconButton } from '@chakra-ui/button';
import { Tooltip } from '@chakra-ui/tooltip';
import { FiSettings } from '@react-icons/all-files/fi/FiSettings';
export default function SettingsIconBtn(props) {
const { clickhandler, ...rest } = props;
const { clickhandler, size, ...rest } = props;
return (
<Tooltip label='Settings'>
<IconButton
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiSettings />}
colorScheme='white'
onClick={clickhandler}
client/src/features/menu/buttons/UploadIconBtn.jsx
+3 -2
View File
@@ -1,13 +1,14 @@
import React from 'react';
import { IconButton } from '@chakra-ui/button';
import { Tooltip } from '@chakra-ui/tooltip';
import { FiUpload } from '@react-icons/all-files/fi/FiUpload';
export default function UploadIconBtn(props) {
const { clickhandler, ...rest } = props;
const { clickhandler, size, ...rest } = props;
return (
<Tooltip label='Import event list'>
<IconButton
size={props.size || 'xs'}
size={size || 'xs'}
icon={<FiUpload />}
colorScheme='white'
onClick={clickhandler}