adding listeners for the team members

This commit is contained in:
Arjun Patel
2022-01-14 17:47:57 -08:00
parent ba88e7af27
commit 5dba460acb
4 changed files with 157 additions and 68 deletions
+103 -50
View File
@@ -3,19 +3,115 @@ import { FaPlus } from "react-icons/fa";
import { IoPulseOutline, IoRemoveOutline, IoTimer } from "react-icons/io5"; import { IoPulseOutline, IoRemoveOutline, IoTimer } from "react-icons/io5";
import { BsThreeDots } from "react-icons/bs"; import { BsThreeDots } from "react-icons/bs";
import { useTeamDashboardContext } from "../../contexts/teamDashboardContext"; import { useTeamDashboardContext } from "../../contexts/teamDashboardContext";
import { UserStatus } from "../../models/user"; import { User, UserStatus } from "../../models/user";
import { useState } from "react"; import { useEffect, useState } from "react";
import { toast } from "react-hot-toast"; import { toast } from "react-hot-toast";
import { TeamMemberRole } from "../../models/teamMember"; import { TeamMemberRole } from "../../models/teamMember";
import UserService from "../../services/userService";
import { DocumentSnapshot, Unsubscribe } from "firebase/firestore";
const userService = new UserService();
function statusBubble(status: UserStatus) {
console.log(status);
switch (status) {
case UserStatus.online:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-green-400 rounded-full"></span>
);
case UserStatus.busy:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-orange-400 rounded-full"></span>
);
case UserStatus.offline:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-gray-400 rounded-full"></span>
);
default:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-green-400 rounded-full"></span>
);
}
}
function renderPulse(status: UserStatus) {
switch (status) {
case UserStatus.online:
return (
<IoPulseOutline className="text-green-500 text-2xl animate-pulse mx-2 ml-auto" />
);
case UserStatus.busy:
return (
<IoPulseOutline className="text-orange-400 text-2xl animate-pulse mx-2 ml-auto" />
);
case UserStatus.offline:
return (
<IoRemoveOutline className="text-gray-400 text-2xl mx-2 ml-auto" />
);
default:
return (
<IoPulseOutline className="text-green-400 text-2xl animate-pulse mx-2 ml-auto" />
);
}
}
export default function TeamVoiceLine() { export default function TeamVoiceLine() {
const router = useRouter(); const router = useRouter();
const { teamid } = router.query; const { teamid } = router.query;
const { team, user, userTeamMember } = useTeamDashboardContext(); const { team, user, userTeamMember, teamMembers } = useTeamDashboardContext();
const { teamMembers } = useTeamDashboardContext();
const [loading, setLoading] = useState<Boolean>(true); const [loading, setLoading] = useState<Boolean>(true);
//listeners for all teammates' status const [teamUsers, setTeamUsers] = useState<User[]>([]);
const [count, setCount] = useState<number>(0);
useEffect(() => {
const unsubs: Unsubscribe[] = [];
(async function () {
try {
// listeners for all teammates' status
if (teamMembers) {
teamMembers.forEach(async (tmember) => {
const unsub = await userService.getUserRealtime(
tmember.userId,
(doc: DocumentSnapshot) => {
// setTeamUsers((prevTeamUsers) => ({
// ...prevTeamUsers,
// }));
// updated user
const updatedUser = doc.data() as User;
// update the teamUsers array in state
const newUsers: User[] = teamUsers.map((user, i) => {
if (user.id == updatedUser.id) {
return updatedUser;
}
return user;
});
setTeamUsers(newUsers);
}
);
unsubs.push(unsub);
});
}
} catch (error) {
console.log(error);
toast.error("Something went wrong");
router.push("/teams/login");
}
setLoading(false);
})();
return () => {
unsubs.map((listener) => listener());
};
}, []);
async function handleAdminRoute() { async function handleAdminRoute() {
if (userTeamMember.role == TeamMemberRole.admin) { if (userTeamMember.role == TeamMemberRole.admin) {
@@ -26,50 +122,6 @@ export default function TeamVoiceLine() {
toast.error("You are not a team admin!"); toast.error("You are not a team admin!");
} }
function statusBubble(status: UserStatus) {
console.log(status);
switch (status) {
case UserStatus.online:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-green-400 rounded-full"></span>
);
case UserStatus.busy:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-orange-400 rounded-full"></span>
);
case UserStatus.offline:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-gray-400 rounded-full"></span>
);
default:
return (
<span className="absolute top-0 right-0 w-3 h-3 bg-green-400 rounded-full"></span>
);
}
}
function renderPulse(status: UserStatus) {
switch (status) {
case UserStatus.online:
return (
<IoPulseOutline className="text-green-500 text-2xl animate-pulse mx-2 ml-auto" />
);
case UserStatus.busy:
return (
<IoPulseOutline className="text-orange-400 text-2xl animate-pulse mx-2 ml-auto" />
);
case UserStatus.offline:
return (
<IoRemoveOutline className="text-gray-400 text-2xl mx-2 ml-auto" />
);
default:
return (
<IoPulseOutline className="text-green-400 text-2xl animate-pulse mx-2 ml-auto" />
);
}
}
function renderTeamMemberList() { function renderTeamMemberList() {
// show loading skeleton if not yet got friend info // show loading skeleton if not yet got friend info
if (loading) { if (loading) {
@@ -85,7 +137,8 @@ export default function TeamVoiceLine() {
} }
// if not teammates, stale state message to tell admin to add people // if not teammates, stale state message to tell admin to add people
if (!teamMembers.length) { if (!teamUsers.length) {
return <span className="text-gray-300">Please add team members.</span>;
} }
return teamMembers.map((tmember, i) => { return teamMembers.map((tmember, i) => {
+5 -3
View File
@@ -119,10 +119,12 @@ export function TeamDashboardContextProvider({ children }) {
} }
// SECTION: get all teammembers for team, will have listeners in other subcomponents // SECTION: get all teammembers for team, will have listeners in other subcomponents
const teamMembers = await teamService.getTeamMembersByTeamId( const teamMembers = await teamService.getTeamMembersByTeamIdNotUser(
returnedTeam.id returnedTeam.id,
currUser.uid
); );
setValue((prevValue) => ({ ...prevValue, teamMembers: teamMembers }));
setValue((prevValue) => ({ ...prevValue, teamMembers }));
} catch (error) { } catch (error) {
console.log(error); console.log(error);
router.push("/teams/login"); router.push("/teams/login");
+6 -2
View File
@@ -158,10 +158,14 @@ export default class TeamService implements IService {
return teamMembers; return teamMembers;
} }
async getTeamMembersByTeamId(teamId: string): Promise<TeamMember[]> { async getTeamMembersByTeamIdNotUser(
teamId: string,
userId: string
): Promise<TeamMember[]> {
const q = query( const q = query(
collection(this.db, Collections.teamMembers), collection(this.db, Collections.teamMembers),
where("teamId", "==", teamId) where("teamId", "==", teamId),
where("userId", "!=", userId)
); );
const querySnapshot = await getDocs(q); const querySnapshot = await getDocs(q);
+41 -11
View File
@@ -1,39 +1,69 @@
import { User as FirUser } from "firebase/auth"; import { User as FirUser } from "firebase/auth";
import { Firestore, getFirestore, doc, getDoc, setDoc, Timestamp, serverTimestamp } from "firebase/firestore"; import {
import { User } from '../models/user' Firestore,
getFirestore,
doc,
getDoc,
setDoc,
Timestamp,
serverTimestamp,
onSnapshot,
Unsubscribe,
DocumentSnapshot,
} from "firebase/firestore";
import { User } from "../models/user";
import { Collections } from "./collections"; import { Collections } from "./collections";
export default class UserService { export default class UserService {
private db : Firestore = getFirestore() private db: Firestore = getFirestore();
// give back the avatar based on the person's google account avatar // give back the avatar based on the person's google account avatar
getUserAvatar(displayName: string) { getUserAvatar(displayName: string) {
return `https://ui-avatars.com/api/?name=${displayName}` return `https://ui-avatars.com/api/?name=${displayName}`;
} }
async getUser(userId: string) : Promise<User | null> { async getUser(userId: string): Promise<User | null> {
const docRef = doc(this.db, Collections.users, userId); const docRef = doc(this.db, Collections.users, userId);
const docSnap = await getDoc(docRef); const docSnap = await getDoc(docRef);
if (docSnap.exists()) { if (docSnap.exists()) {
console.log('got user data') console.log("got user data");
let user: User = docSnap.data() as User let user: User = docSnap.data() as User;
return user return user;
} else { } else {
// doc.data() will be undefined in this case // doc.data() will be undefined in this case
console.log("user not found!"); console.log("user not found!");
return null return null;
} }
} }
async getUserRealtime(
userId: string,
handleDataFetch: (doc: DocumentSnapshot) => void
): Promise<Unsubscribe> {
const docRef = doc(this.db, Collections.users, userId);
const unsub = onSnapshot(docRef, handleDataFetch);
return unsub;
}
async createUser(userId: string, emailAddress: string, avatarUrl: string) { async createUser(userId: string, emailAddress: string, avatarUrl: string) {
const docRef = doc(this.db, Collections.users, userId); const docRef = doc(this.db, Collections.users, userId);
await setDoc(docRef, { emailAddress, avatarUrl, createdDate: serverTimestamp() }, { merge: true }) await setDoc(
docRef,
{ emailAddress, avatarUrl, createdDate: serverTimestamp() },
{ merge: true }
);
} }
async updateUser(user: User) { async updateUser(user: User) {
const docRef = doc(this.db, Collections.users, user.id); const docRef = doc(this.db, Collections.users, user.id);
await setDoc(docRef, { ...user, lastUpdatedDate: serverTimestamp() }, { merge: true }) await setDoc(
docRef,
{ ...user, lastUpdatedDate: serverTimestamp() },
{ merge: true }
);
} }
} }