Skip to content

Commit

Permalink
[refactoring] #30
Browse files Browse the repository at this point in the history
  • Loading branch information
yoneyan committed Jul 9, 2021
1 parent c3d9fbc commit 73a675f
Show file tree
Hide file tree
Showing 16 changed files with 14 additions and 59 deletions.
1 change: 0 additions & 1 deletion src/components/Dashboard/Alert/Alert.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {Button, Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle, Slide} from "@material-ui/core";
import React, {Dispatch, SetStateAction} from "react";
import {TransitionProps} from "@material-ui/core/transitions";
import {JPNICData} from "../../../interface";

const Transition = React.forwardRef(function Transition(
props: TransitionProps & { children?: React.ReactElement<any, any> },
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dashboard/Connection/Connection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export function StatusTable(props: {
template: TemplateData
setReload: Dispatch<SetStateAction<boolean>>
}) {
const {connection, template, setReload} = props;
const {template, connection, setReload} = props;
const classes = useStyles2();
const [page, setPage] = React.useState(0);
const [rowsPerPage, setRowsPerPage] = React.useState(5);
Expand Down
6 changes: 3 additions & 3 deletions src/components/Dashboard/Group/Group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export function StatusTable(props: {
group: GroupDetailData[]
setReload: Dispatch<SetStateAction<boolean>>
}) {
const {group, setReload} = props;
const {group} = props;
const classes = useStyles2();
const history = useHistory();
const [page, setPage] = React.useState(0);
Expand Down Expand Up @@ -183,11 +183,11 @@ export function StatusTable(props: {
</TableCell>
<TableCell style={{width: 160}} align="right">
{
(row.member_expired == null || row.member_expired != "") &&
(row.member_expired == null || row.member_expired !== "") &&
<Chip size="small" color="secondary" label="未払い状態"/>
}
{
!(row.member_expired == null || row.member_expired != "") &&
!(row.member_expired == null || row.member_expired !== "") &&
<div>
<Chip size="small" color="secondary" label={"期限切れ: " + row.member_expired}/>
</div>
Expand Down
6 changes: 1 addition & 5 deletions src/components/Dashboard/SideBar/SideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,18 @@ import SettingsIcon from "@material-ui/icons/Settings";
import useStyles from "./styles";
import useStyles2 from "../styles";

export default function SideBar(props: any) {
export default function SideBar() {
const classesDashboard = useStyles2();
const classesMenu = useStyles();


// Menu Bar
const [open, setOpen] = React.useState(false);
const handleDrawerOpen = () => {
setOpen(true);
};
const handleDrawerClose = () => {
setOpenOther(false);
setOpen(false);
};
// Menu Bar (Other Button)
const fixedHeightPaper = clsx(classesDashboard.paper, classesDashboard.fixedHeight);
const [openOther, setOpenOther] = React.useState(false);
const handleClick = () => {
setOpenOther(!openOther);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Group/GroupDetail/Group.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ export function GroupStatus(props: {
color: "primary",
label: ""
});
const nowDate = new Date;
const nowDate = new Date();

useEffect(() => {
setMembershipLabel({color: "primary", label: ""});
Expand Down
3 changes: 1 addition & 2 deletions src/pages/Group/GroupDetail/GroupMenu.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Button, Menu, MenuItem} from "@material-ui/core";
import React, {Dispatch, SetStateAction, useEffect} from "react";
import React, {Dispatch, SetStateAction} from "react";
import {GroupDetailData} from "../../../interface";
import useStyles from "./styles";
import {Put} from "../../../api/Group";
Expand All @@ -8,7 +8,6 @@ import {useSnackbar} from "notistack";
export function GroupStatusButton(props: { data: GroupDetailData, reload: Dispatch<SetStateAction<boolean>> }): any {
const {data, reload} = props;
const classes = useStyles();
const {enqueueSnackbar} = useSnackbar();
const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null);

const handleClose = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Group/GroupDetail/Memo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
DialogTitle, FormControl, FormControlLabel, FormLabel,
Grid, Radio, RadioGroup, TextField
} from "@material-ui/core";
import React, {Dispatch, SetStateAction, useEffect} from "react";
import React, {Dispatch, SetStateAction} from "react";
import {useSnackbar} from "notistack";
import {Delete, Post} from "../../../api/Memo";

Expand Down
3 changes: 1 addition & 2 deletions src/pages/Group/GroupDetail/Service.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {Delete, Put} from "../../../api/Service";
import {useSnackbar} from "notistack";
import {TransitionProps} from "@material-ui/core/transitions";
import {RowConnectionCheck} from "./Connection";
import {Update} from "../../../api/Connection";

const useRowStyles = makeStyles({
root: {
Expand All @@ -45,7 +44,7 @@ export function ChipGet(props: {
pass: boolean,
enable: boolean
}) {
const {open, pass, enable} = props;
const {pass, enable} = props;

if (!enable) {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Group/GroupDetail/ServiceAdd/ServiceAdd.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function ServiceAddDialogs(props: {
const {enqueueSnackbar} = useSnackbar();

useEffect(() => {
const nowDate = new Date;
const nowDate = new Date();
let tmpEndDate = nowDate;
setData({
...data, start_date: nowDate.getFullYear() + '-' + ('00' + (nowDate.getMonth() + 1)).slice(-2) +
Expand Down
2 changes: 0 additions & 2 deletions src/pages/Login/SignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import {
Container,
CssBaseline,
FormControlLabel,
Grid,
Link,
makeStyles,
TextField, ThemeProvider, Typography
} from '@material-ui/core';
Expand Down
1 change: 0 additions & 1 deletion src/pages/Service/Service.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, {useEffect, useState} from 'react';
import Dashboard from "../../components/Dashboard/Dashboard";
import useStyles from "../Dashboard/styles"
import {
Button,
Card,
CardActions,
CardContent,
Expand Down
25 changes: 0 additions & 25 deletions src/pages/Support/SupportDetail/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,31 +119,6 @@ const useStyles = makeStyles((theme: Theme) =>
})
);

const useResize = (myRef: React.RefObject<HTMLDivElement>) => {
const getWidth = useCallback(() => myRef?.current?.offsetWidth, [myRef]);

const [width, setWidth] = useState<number | undefined>(undefined);

useEffect(() => {
const handleResize = () => {
setWidth(getWidth());
};

if (myRef.current) {
setWidth(getWidth());
}

window.addEventListener('resize', handleResize);

return () => {
window.removeEventListener('resize', handleResize);
};
}, [myRef, getWidth]);

return width && width > 25 ? width - 25 : width;
};


export const MessageLeft = (props: { message: string; timestamp: string; displayName?: string; }) => {
const message = props.message ? props.message : 'no message';
const timestamp = props.timestamp ? props.timestamp : '';
Expand Down
13 changes: 2 additions & 11 deletions src/pages/Support/SupportDetail/SupportDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {DefaultChatDataArray} from "../../../interface";
import useStyles from "./styles";
import {Paper} from "@material-ui/core";
import {restfulApiConfig} from "../../../api/Config";
import useWebSocket, {ReadyState} from "react-use-websocket";
import useWebSocket from "react-use-websocket";
import {MessageLeft, MessageRight} from "./Message";
import {TextInput} from "./TextInput";
import {Get} from "../../../api/Support";
Expand All @@ -14,7 +14,7 @@ export default function SupportDetail() {
const classes = useStyles();
let id: string;
({id} = useParams());
const {sendMessage, lastMessage, readyState,} = useWebSocket(restfulApiConfig.wsURL + "/support" +
const {sendMessage, lastMessage} = useWebSocket(restfulApiConfig.wsURL + "/support" +
'?id=' + id + '&user_token=' + sessionStorage.getItem('ClientID') + '&access_token=' +
sessionStorage.getItem('AccessToken'), {
onOpen: () => enqueueSnackbar("WebSocket接続確立", {variant: "success"}),
Expand Down Expand Up @@ -83,15 +83,6 @@ export default function SupportDetail() {
}
}, [sendPush]);


const connectionStatus = {
[ReadyState.CONNECTING]: 'Connecting',
[ReadyState.OPEN]: 'Open',
[ReadyState.CLOSING]: 'Closing',
[ReadyState.CLOSED]: 'Closed',
[ReadyState.UNINSTANTIATED]: 'Uninstantiated',
}[readyState];

return (
<div>
<div className={classes.container}>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Support/SupportDetail/TextInput.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {Dispatch, SetStateAction, useState} from 'react'
import React, {Dispatch, SetStateAction} from 'react'
import TextField from '@material-ui/core/TextField';
import {createStyles, makeStyles, Theme} from "@material-ui/core/styles";
import SendIcon from '@material-ui/icons/Send';
Expand Down
1 change: 0 additions & 1 deletion src/pages/Token/Token.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import {GetAll} from "../../api/Token";
import {
DefaultTokenDetailDataArray,
TokenDetailData,
UserDetailData
} from "../../interface";
import {useSnackbar} from "notistack";

Expand Down
2 changes: 1 addition & 1 deletion src/pages/User/User.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
Typography
} from "@material-ui/core";
import {GetAll} from "../../api/User";
import {DefaultUserDetailDataArray, NoticeData, UserDetailData} from "../../interface";
import {DefaultUserDetailDataArray, UserDetailData} from "../../interface";
import {useSnackbar} from "notistack";


Expand Down

0 comments on commit 73a675f

Please sign in to comment.