initial redux set up

This commit is contained in:
Taehee Choi 2022-03-13 18:16:19 -07:00
parent 52f76f8209
commit 20a4d5dabf
20 changed files with 384 additions and 67 deletions

View File

@ -0,0 +1,86 @@
const people = [
{
uuid: "0",
emailAddress: "cth0604@gmail.com",
name: "Taehee Choi",
role: "Front-end Dev",
},
{
uuid: "1",
emailAddress: "cth0604@gmail.com",
name: "Arthur Marques",
role: "Team Lead",
},
{
uuid: "2",
emailAddress: "cth0604@gmail.com",
name: "Mathew Balsdon",
role: "Front-end Dev",
},
{
uuid: "3",
emailAddress: "cth0604@gmail.com",
name: "Benson Lin",
role: "Back-end Dev",
},
{
uuid: "4",
emailAddress: "cth0604@gmail.com",
name: "Jincheng Lu",
role: "Front-end Dev",
},
{
uuid: "5",
emailAddress: "cth0604@gmail.com",
name: "Esteban Margaron",
role: "Back-end Dev",
},
{
uuid: "6",
emailAddress: "cth0604@gmail.com",
name: "Leanna Resurreccion",
role: "Back-end Dev",
},
];
const meetings = [
{
meetingId: "0",
liveParticipantIds: [],
registrantIds: ["0", "1", "2", "3", "4", "5", "6"],
start: "2022-03-13T17:00:00",
duration: 15,
timezone: "",
joinUrl: "",
topic: "Daily Scrum Meeting",
},
{
meetingId: "1",
liveParticipantIds: [],
registrantIds: ["0", "2", "4"],
start: "2022-03-13T17:30:00",
duration: 30,
timezone: "",
joinUrl: "",
topic: "Front-end Meeting",
},
{
meetingId: "2",
liveParticipantIds: [],
registrantIds: ["3", "5", "6"],
start: "2022-03-13T17:30:00",
duration: 30,
timezone: "",
joinUrl: "",
topic: "Back-end Meeting",
},
];
const team = {
user: "0",
manager: "1",
sameManager: ["2", "3", "4", "5", "6"],
directReports: [],
};
export { people, meetings, team };

View File

@ -1,8 +0,0 @@
import Status from "./Status";
interface ContactInfo {
name: string;
status: Status;
}
export default ContactInfo;

View File

@ -2,12 +2,13 @@ import { Box } from "@mui/material";
import React from "react";
import Body from "./contacts-components/Body";
import ContactInfo from "./ContactInfo";
import Sidebar from "./contacts-components/Sidebar";
import UserLite from "../../api-bodies/UserLite";
const Contacts: React.FC = () => {
const [contactSelected, setContactSelected] =
React.useState<ContactInfo | null>(null);
const [contactSelected, setContactSelected] = React.useState<UserLite | null>(
null
);
return (
<Box sx={{ display: "flex", height: "100%" }}>

View File

@ -1,3 +1,4 @@
import DetailedMeeting from "../../api-bodies/DetailedMeeting";
import Status from "./Status";
const returnStatusColor = (
@ -15,4 +16,10 @@ const returnStatusColor = (
}
};
export { returnStatusColor };
const getMeetingDuration = (meeting: DetailedMeeting) => {
const startDate = new Date(meeting.start);
const endDate = new Date(startDate.getTime() + meeting.duration * 60000);
return `${startDate.toTimeString()} - ${endDate.toTimeString()}`;
};
export { returnStatusColor, getMeetingDuration };

View File

@ -2,10 +2,10 @@ import { Box, Toolbar } from "@mui/material";
import React from "react";
import UpperBody from "./body-components/UpperBody";
import LowerBody from "./body-components/LowerBody";
import ContactInfo from "../ContactInfo";
import UserLite from "../../../api-bodies/UserLite";
interface Props {
contactSelected: ContactInfo;
contactSelected: UserLite;
}
const Body: React.FC<Props> = (props) => {
@ -20,7 +20,7 @@ const Body: React.FC<Props> = (props) => {
>
<Toolbar />
<UpperBody contactInfo={props.contactSelected} />
<LowerBody />
<LowerBody contactInfo={props.contactSelected} />
</Box>
);
};

View File

@ -9,19 +9,17 @@ import {
} from "@mui/material";
import React from "react";
import { ExpandLess, ExpandMore } from "@mui/icons-material";
import ContactInfo from "../ContactInfo";
import Status from "../Status";
import ContactItem from "./sidebar-components/ContactItem";
const contacts: ContactInfo[] = [
{ name: "Taehee ...", status: Status.Online },
{ name: "Jincheng ...", status: Status.Offline },
{ name: "Mathew ...", status: Status.InMeeting },
{ name: "Esteban ...", status: Status.Away },
];
import { useAppSelector } from "../../../redux/hooks";
import {
selectFavoritesJSON,
selectTeamJSON,
} from "../../../redux/slices/peopleSlice";
import { selectFavorites } from "../../../redux/slices/favoritesSlice";
import UserLite from "../../../api-bodies/UserLite";
interface Props {
setContactSelected: (contactInfo: ContactInfo) => void;
setContactSelected: (contactInfo: UserLite) => void;
}
const sidebarWidth = 240;
@ -30,6 +28,12 @@ const Sidebar: React.FC<Props> = (props) => {
const [favoritesOpen, setFavoritesOpen] = React.useState<boolean>(true);
const [teamOpen, setTeamOpen] = React.useState<boolean>(false);
const favorites = useAppSelector(selectFavorites);
const favoritesJSON = useAppSelector((state) =>
selectFavoritesJSON(state, favorites)
);
const teamJSON = useAppSelector(selectTeamJSON);
return (
<Drawer
variant="permanent"
@ -49,13 +53,16 @@ const Sidebar: React.FC<Props> = (props) => {
<ListItemButton onClick={() => setFavoritesOpen(!favoritesOpen)}>
{favoritesOpen ? <ExpandLess /> : <ExpandMore />}
<ListItemText primary="Favorites" sx={{ textAlign: "center" }} />
<ListItemText primary="10" sx={{ textAlign: "right" }} />
<ListItemText
primary={favoritesJSON.length}
sx={{ textAlign: "right" }}
/>
</ListItemButton>
<Collapse in={favoritesOpen} timeout="auto" unmountOnExit>
<List disablePadding>
{contacts.map((contact, i) => (
{favoritesJSON.map((favorite, i) => (
<ContactItem
contactInfo={contact}
contactInfo={favorite}
key={i}
setContactSelected={props.setContactSelected}
/>
@ -65,13 +72,13 @@ const Sidebar: React.FC<Props> = (props) => {
<ListItemButton onClick={() => setTeamOpen(!teamOpen)}>
{teamOpen ? <ExpandLess /> : <ExpandMore />}
<ListItemText primary="Team" sx={{ textAlign: "center" }} />
<ListItemText primary="10" sx={{ textAlign: "right" }} />
<ListItemText primary={teamJSON.length} sx={{ textAlign: "right" }} />
</ListItemButton>
<Collapse in={teamOpen} timeout="auto" unmountOnExit>
<List disablePadding>
{contacts.map((contact, i) => (
{teamJSON.map((member, i) => (
<ContactItem
contactInfo={contact}
contactInfo={member}
key={i}
setContactSelected={props.setContactSelected}
/>

View File

@ -1,18 +1,21 @@
import { Box, Button, List, Typography } from "@mui/material";
import React from "react";
import { useDispatch } from "react-redux";
import UserLite from "../../../../api-bodies/UserLite";
import { useAppSelector, useAppDispatch } from "../../../../redux/hooks";
import { open } from "../../../../redux/slices/meetingDetailsOpenSlice";
import { selectUserUpcomingMeetings } from "../../../../redux/slices/meetingsSlice";
import { getMeetingDuration } from "../../Utils";
const meetings: { name: string; duration: string }[] = [
{ name: "Kanban Meeting", duration: "10:45 am - 11:45 am" },
{ name: "Design Meeting", duration: "10:45 am - 11:45 am" },
{ name: "Customer Meeting", duration: "10:45 am - 11:45 am" },
{ name: "Some kind of Meeting", duration: "10:45 am - 11:45 am" },
{ name: "Some kind of Meeting", duration: "10:45 am - 11:45 am" },
];
interface Props {
contactInfo: UserLite;
}
const LowerBody: React.FC = () => {
const dispatch = useDispatch();
const LowerBody: React.FC<Props> = (props) => {
const dispatch = useAppDispatch();
const meetings = useAppSelector((state) =>
selectUserUpcomingMeetings(state, props.contactInfo.uuid)
);
return (
<Box
@ -45,11 +48,13 @@ const LowerBody: React.FC = () => {
<Button
variant="text"
color="info"
onClick={() => dispatch(open())}
onClick={() => dispatch(open(meeting))}
>
{meeting.name}
{meeting.topic}
</Button>
<Typography sx={{ pt: 1.5 }}>{meeting.duration}</Typography>
<Typography sx={{ pt: 1.5 }}>
{getMeetingDuration(meeting)}
</Typography>
</Box>
))}
</List>

View File

@ -3,11 +3,12 @@ import React from "react";
import PhoneIcon from "@mui/icons-material/Phone";
import VideocamIcon from "@mui/icons-material/Videocam";
import GroupsIcon from "@mui/icons-material/Groups";
import ContactInfo from "../../ContactInfo";
import AddIcon from "@mui/icons-material/Add";
import Status from "../../Status";
import UserLite from "../../../../api-bodies/UserLite";
interface Props {
contactInfo: ContactInfo;
contactInfo: UserLite;
}
const UpperBody: React.FC<Props> = (props) => {
@ -63,9 +64,7 @@ const UpperBody: React.FC<Props> = (props) => {
</IconButton>
</Box>
<Box sx={{ display: "flex", flexDirection: "column" }}>
<Typography sx={{ textAlign: "right" }}>
{props.contactInfo.status}
</Typography>
<Typography sx={{ textAlign: "right" }}>{Status.Online}</Typography>
<Typography>MeetingName-1372</Typography>
</Box>
</Box>

View File

@ -2,12 +2,13 @@ import { ListItemButton, ListItemIcon, ListItemText } from "@mui/material";
import React from "react";
import PersonOutlineIcon from "@mui/icons-material/PersonOutline";
import CircleIcon from "@mui/icons-material/Circle";
import ContactInfo from "../../ContactInfo";
import { returnStatusColor } from "../../Utils";
import UserLite from "../../../../api-bodies/UserLite";
import Status from "../../Status";
interface Props {
contactInfo: ContactInfo;
setContactSelected: (contactInfo: ContactInfo) => void;
contactInfo: UserLite;
setContactSelected: (contactInfo: UserLite) => void;
}
const ContactItem: React.FC<Props> = (props) => {
@ -22,10 +23,10 @@ const ContactItem: React.FC<Props> = (props) => {
</ListItemIcon>
<ListItemText
primary={props.contactInfo.name}
secondary={props.contactInfo.status}
secondary={Status.Online}
sx={{ flexGrow: 1 }}
/>
<CircleIcon color={returnStatusColor(props.contactInfo.status)} />
<CircleIcon color={returnStatusColor(Status.Online)} />
</ListItemButton>
);
};

View File

@ -2,20 +2,24 @@ import { Dialog } from "@mui/material";
import React from "react";
import Body from "./meeting-details-components/Body";
import Header from "./meeting-details-components/Header";
import { useSelector, useDispatch } from "react-redux";
import { useAppSelector, useAppDispatch } from "../../redux/hooks";
import {
close,
selectMeetingDetailsOpen,
} from "../../redux/slices/meetingDetailsOpenSlice";
const MeetingDetails: React.FC = () => {
const open = useSelector(selectMeetingDetailsOpen);
const dispatch = useDispatch();
const meetingDetailsOpen = useAppSelector(selectMeetingDetailsOpen);
const dispatch = useAppDispatch();
return (
<Dialog fullScreen open={open} onClose={() => dispatch(close())}>
<Header />
<Body />
<Dialog
fullScreen
open={meetingDetailsOpen.open}
onClose={() => dispatch(close())}
>
<Header meeting={meetingDetailsOpen.meeting} />
<Body meeting={meetingDetailsOpen.meeting} />
</Dialog>
);
};

View File

@ -8,8 +8,13 @@ import {
} from "@mui/material";
import React from "react";
import PersonOutlineIcon from "@mui/icons-material/PersonOutline";
import DetailedMeeting from "../../../api-bodies/DetailedMeeting";
const Body: React.FC = () => {
interface Props {
meeting: DetailedMeeting | null;
}
const Body: React.FC<Props> = () => {
return (
<Box
sx={{

View File

@ -1,17 +1,22 @@
import { AppBar, Button, IconButton, Toolbar, Typography } from "@mui/material";
import React from "react";
import CloseIcon from "@mui/icons-material/Close";
import { useDispatch } from "react-redux";
import { useAppDispatch } from "../../../redux/hooks";
import { close } from "../../../redux/slices/meetingDetailsOpenSlice";
import DetailedMeeting from "../../../api-bodies/DetailedMeeting";
const Header: React.FC = () => {
const dispatch = useDispatch();
interface Props {
meeting: DetailedMeeting | null;
}
const Header: React.FC<Props> = (props) => {
const dispatch = useAppDispatch();
return (
<AppBar sx={{ position: "relative" }}>
<Toolbar>
<Typography variant="h6" sx={{ flexGrow: 1 }}>
Kanban Meeting
{props.meeting !== null ? props.meeting.topic : null}
</Typography>
<Button variant="contained" color="secondary">
Join

View File

@ -4,6 +4,15 @@ import "./style/App.css";
import { AuthProvider } from "./context/AuthProvider";
import { Provider } from "react-redux";
import { store } from "./redux/store";
import { fetchFavorites } from "./redux/slices/favoritesSlice";
import { fetchTeam } from "./redux/slices/teamSlice";
import { fetchMeetings } from "./redux/slices/meetingsSlice";
import { fetchPeople } from "./redux/slices/peopleSlice";
store.dispatch(fetchPeople(""));
store.dispatch(fetchFavorites(""));
store.dispatch(fetchTeam(""));
store.dispatch(fetchMeetings(""));
const Index: React.FC = () => {
return (

6
src/redux/hooks.tsx Normal file
View File

@ -0,0 +1,6 @@
import { TypedUseSelectorHook, useDispatch, useSelector } from "react-redux";
import type { RootState, AppDispatch } from "./store";
// Use throughout your app instead of plain `useDispatch` and `useSelector`
export const useAppDispatch = () => useDispatch<AppDispatch>();
export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;

View File

@ -0,0 +1,55 @@
import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
import { RootState } from "../store";
interface FavoritesState {
favorites: string[];
}
const initialState: FavoritesState = {
favorites: [],
};
export const favoritesSlice = createSlice({
name: "favorites",
initialState,
reducers: {},
extraReducers(builder) {
builder
.addCase(fetchFavorites.fulfilled, (state, action) => {
state.favorites = action.payload;
})
.addCase(addFavorite.fulfilled, (state, action) => {
state.favorites.push(action.payload);
})
.addCase(removeFavorite.fulfilled, (state, action) => {
const index = state.favorites.indexOf(action.payload);
state.favorites.splice(index, 1);
});
},
});
export const fetchFavorites = createAsyncThunk(
"favorites/fetchFavorites",
async (uuid: string) => {
// const response = await client.post("/fakeApi/posts", initialPost);
// !!!
console.log(uuid);
return ["2", "4"];
}
);
export const addFavorite = createAsyncThunk(
"favorites/addFavorite",
async (uuid: string) => {
// const response = await client.post("/fakeApi/posts", initialPost);
return uuid;
}
);
export const removeFavorite = createAsyncThunk(
"favorites/removeFavorite",
async (uuid: string) => {
// const response = await client.post("/fakeApi/posts", initialPost);
return uuid;
}
);
export const selectFavorites = (state: RootState) => state.favorites.favorites;
export default favoritesSlice.reducer;

View File

@ -1,28 +1,33 @@
import { createSlice } from "@reduxjs/toolkit";
import DetailedMeeting from "../../api-bodies/DetailedMeeting";
import { RootState } from "../store";
interface MeetingDetailsOpenState {
open: boolean;
meeting: DetailedMeeting | null;
}
const initialState: MeetingDetailsOpenState = {
open: false,
meeting: null,
};
export const meetingDetailsOpenSlice = createSlice({
name: "meetingDetailsOpen",
initialState,
reducers: {
open: (state) => {
open: (state, action) => {
state.open = true;
state.meeting = action.payload;
},
close: (state) => {
state.open = false;
state.meeting = null;
},
},
});
export const { open, close } = meetingDetailsOpenSlice.actions;
export const selectMeetingDetailsOpen = (state: RootState) =>
state.meetingDetailsOpen.open;
state.meetingDetailsOpen;
export default meetingDetailsOpenSlice.reducer;

View File

@ -0,0 +1,41 @@
import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
import DetailedMeeting from "../../api-bodies/DetailedMeeting";
import { RootState } from "../store";
import { meetings } from "../../api-bodies/MockData";
interface MeetingsState {
meetings: DetailedMeeting[];
}
const initialState: MeetingsState = {
meetings: [],
};
export const meetingsSlice = createSlice({
name: "meetings",
initialState,
reducers: {},
extraReducers(builder) {
builder.addCase(fetchMeetings.fulfilled, (state, action) => {
return action.payload;
});
},
});
export const fetchMeetings = createAsyncThunk(
"meetings/fetchMeetings",
async (uuid: string) => {
// const response = await client.post("/fakeApi/posts", initialPost);
// !!!
console.log(uuid);
return { meetings: meetings };
}
);
export const selectMeetings = (state: RootState) => state.meetings.meetings;
export const selectUserUpcomingMeetings = (state: RootState, uuid: string) => {
return state.meetings.meetings.filter((meeting) =>
meeting.registrantIds.includes(uuid)
);
};
export default meetingsSlice.reducer;

View File

@ -0,0 +1,40 @@
import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
import UserLite from "../../api-bodies/UserLite";
import { RootState } from "../store";
import { people } from "../../api-bodies/MockData";
interface PeopleState {
people: UserLite[];
}
const initialState: PeopleState = {
people: [],
};
export const peopleSlice = createSlice({
name: "people",
initialState,
reducers: {},
extraReducers(builder) {
builder.addCase(fetchPeople.fulfilled, (state, action) => {
console.log(action.payload);
state.people = action.payload;
});
},
});
export const fetchPeople = createAsyncThunk(
"people/fetchPeople",
async (uuid: string) => {
// const response = await client.post("/fakeApi/posts", initialPost);
// !!!
console.log(uuid);
return people;
}
);
export const selectFavoritesJSON = (state: RootState, favorites: string[]) => {
return state.people.people.filter((p) => favorites.includes(p.uuid));
};
export const selectTeamJSON = (state: RootState) => state.people.people;
export default peopleSlice.reducer;

View File

@ -0,0 +1,41 @@
import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
import { RootState } from "../store";
import { team } from "../../api-bodies/MockData";
interface TeamState {
user: string | null;
manager: string | null;
sameManager: string[];
directReports: string[];
}
const initialState: TeamState = {
user: null,
manager: null,
sameManager: [],
directReports: [],
};
export const teamSlice = createSlice({
name: "team",
initialState,
reducers: {},
extraReducers(builder) {
builder.addCase(fetchTeam.fulfilled, (state, action) => {
return action.payload;
});
},
});
export const fetchTeam = createAsyncThunk(
"team/fetchTeam",
async (uuid: string) => {
// const response = await client.post("/fakeApi/posts", initialPost);
// !!!
console.log(uuid);
return team;
}
);
export const selectTeam = (state: RootState) => state.team;
export default teamSlice.reducer;

View File

@ -1,9 +1,17 @@
import { configureStore } from "@reduxjs/toolkit";
import meetingDetailsOpenReducer from "./slices/meetingDetailsOpenSlice";
import favoritesReducer from "./slices/favoritesSlice";
import teamReducer from "./slices/teamSlice";
import meetingsReducer from "./slices/meetingsSlice";
import peopleReducer from "./slices/peopleSlice";
export const store = configureStore({
reducer: {
meetingDetailsOpen: meetingDetailsOpenReducer,
favorites: favoritesReducer,
team: teamReducer,
meetings: meetingsReducer,
people: peopleReducer,
},
});