linter fixes

This commit is contained in:
Taehee Choi 2022-03-25 11:08:49 -07:00
parent 8dc4fef0c4
commit 04320c0ee5
8 changed files with 17 additions and 10 deletions

View File

@ -1,5 +1,5 @@
import axios from "axios"; import axios from "axios";
export default axios.create({ export default axios.create({
baseURL: "https://g17vmhsvwi.execute-api.us-west-2.amazonaws.com/Prod" baseURL: "https://g17vmhsvwi.execute-api.us-west-2.amazonaws.com/Prod"
}); });

View File

@ -27,13 +27,13 @@ const Sidebar: React.FC = () => {
const favorites = useAppSelector((state) => const favorites = useAppSelector((state) =>
selectUsers(state, favoritesUuids) selectUsers(state, favoritesUuids)
); );
let filteredFavorites = favorites.filter((favorite) => const filteredFavorites = favorites.filter((favorite) =>
favorite.name.toLowerCase().includes(inputText.toLowerCase()) favorite.name.toLowerCase().includes(inputText.toLowerCase())
); );
const teamUuids = useAppSelector(selectTeam); const teamUuids = useAppSelector(selectTeam);
const team = useAppSelector((state) => selectUsers(state, teamUuids)); const team = useAppSelector((state) => selectUsers(state, teamUuids));
let filteredTeam = team.filter((member) => const filteredTeam = team.filter((member) =>
member.name.toLowerCase().includes(inputText.toLowerCase()) member.name.toLowerCase().includes(inputText.toLowerCase())
); );

View File

@ -33,6 +33,7 @@ const CallFavouritesDialog: React.FC<Props> = ({
const handleClose = () => { const handleClose = () => {
onClose(selectedValue); onClose(selectedValue);
}; };
console.log(users);
const [group, setGroup] = useState<string>("Favorites"); const [group, setGroup] = useState<string>("Favorites");
const [inputText, setInputText] = useState<string>(""); const [inputText, setInputText] = useState<string>("");

View File

@ -25,9 +25,9 @@ const Home: React.FC = () => {
return ( return (
<Container className="main-home"> <Container className="main-home">
<Grid container> <Grid container>
{/* <Grid item sm={8}> <Grid item sm={8}>
<MeetingsPanel /> <MeetingsPanel />
</Grid> */} </Grid>
<Grid item sm={4}> <Grid item sm={4}>
<ShortCuts users={mockUsers} /> <ShortCuts users={mockUsers} />
</Grid> </Grid>

View File

@ -78,7 +78,9 @@ const Login: React.FC = () => {
store.dispatch(fetchFavorites(logedInUserId)); store.dispatch(fetchFavorites(logedInUserId));
navigate(from, { replace: true }); navigate(from, { replace: true });
} }
} catch (error) {} } catch (error) {
console.log(error);
}
setEmail(email); setEmail(email);
setPassword(""); setPassword("");
}; };

View File

@ -10,7 +10,10 @@ const socketMiddleware: Middleware = (store) => {
const isConnectionEstablished = const isConnectionEstablished =
socket && store.getState().meetingsAndUserStatuses.isConnected; socket && store.getState().meetingsAndUserStatuses.isConnected;
if (socketActions.startConnecting.match(action)) { if (
socketActions.startConnecting.match(action) &&
!isConnectionEstablished
) {
console.log("startConnecting called"); console.log("startConnecting called");
socket = io("wss://uo5wdcbn6l.execute-api.us-west-2.amazonaws.com/Prod/"); socket = io("wss://uo5wdcbn6l.execute-api.us-west-2.amazonaws.com/Prod/");

View File

@ -70,8 +70,8 @@ export const selectMeetings = (state: RootState) =>
export const selectMeeting = (state: RootState, meetingID: string | null) => { export const selectMeeting = (state: RootState, meetingID: string | null) => {
return meetingID !== null return meetingID !== null
? state.meetingsAndUserStatuses.meetings.find( ? state.meetingsAndUserStatuses.meetings.find(
(meeting) => meeting.meetingId === meetingID (meeting) => meeting.meetingId === meetingID
) )
: null; : null;
}; };
export const selectUserUpcomingMeetings = (state: RootState, uuid: string) => { export const selectUserUpcomingMeetings = (state: RootState, uuid: string) => {

View File

@ -17,7 +17,8 @@ const getStatusColor = (ms: MeetingStatus): string => {
const formatTimeFromDate = (date: Date): string => { const formatTimeFromDate = (date: Date): string => {
let hour = date.getHours(); let hour = date.getHours();
let ampm = ""; let ampm = "";
let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes(); const minutes =
date.getMinutes() < 10 ? "0" + date.getMinutes() : "" + date.getMinutes();
if (hour < 12) { if (hour < 12) {
ampm = "am"; ampm = "am";
} else { } else {