- Meetings in Progress
+
+ Meetings in Progress
+
@@ -42,10 +56,6 @@ const MeetingsPanel: React.FC = () => {
const startDatemil = startDate.getTime();
const endDatemil = startDatemil + meeting.duration*60000;
const endDate = new Date(endDatemil);
- const [currentDate, setCurrentDate] = useState(new Date());
- useEffect(() => {
- setInterval(() => setCurrentDate(new Date()), 1000);
- }, []);
const currentDatemil = currentDate.getTime();
@@ -63,5 +73,5 @@ const MeetingsPanel: React.FC = () => {
);
};
-
-export default MeetingsPanel;
\ No newline at end of file
+
+export default MeetingsPanel;
diff --git a/src/components/login/Login.tsx b/src/components/login/Login.tsx
index 493ab33..36bfd79 100644
--- a/src/components/login/Login.tsx
+++ b/src/components/login/Login.tsx
@@ -8,11 +8,7 @@ import hsbcLogo from "../../assets/logo-png.png";
import zoomLogo from "../../assets/zoom.png";
import LoginIcon from "@mui/icons-material/Login";
import useAuth from "../../hooks/useAuth";
-import { store } from "../../redux/store";
-import { fetchFavorites } from "../../redux/slices/favoritesSlice";
-import { fetchMeetings } from "../../redux/slices/meetingsAndUserStatusSlice";
-import { fetchUsers } from "../../redux/slices/usersSlice";
-import axios from "../../api/axios"
+import axios from "../../api/axios";
interface LocationState {
from: { pathname: string };
@@ -27,7 +23,6 @@ const Login: React.FC = () => {
const [email, setEmail] = useState("");
const [password, setPassword] = useState("");
- const [logedInUser, setLogedInUser] = useState("");
// const [errMsg, setErrMsg] = useState('');
// const userRef = useRef();
@@ -41,28 +36,23 @@ const Login: React.FC = () => {
// setErrMsg('');
// }, [user, pwd])
- store.dispatch(fetchMeetings(logedInUser));
- store.dispatch(fetchUsers(logedInUser));
- store.dispatch(fetchFavorites(logedInUser));
-
const handleLogin = async(e: React.SyntheticEvent) => {
e.preventDefault();
try {
if (email === "" && password === "") {
- setAuth["email"] = email;
+ setAuth["uuid"] = "";
setAuth["isLoggedIn"] = true;
-
navigate(from, { replace: true });
}
const response = await axios.post(
- '/login',
+ "/login",
JSON.stringify({ email: email, password: password })
// { headers: { 'Content-Type': 'application/json' } }
- )
+ );
// const response = { data: { userid: "123456" }}; // delete later
-
+
const logedInUserId = response?.data?.userId;
console.log(email);
@@ -70,15 +60,12 @@ const Login: React.FC = () => {
console.log(response?.data);
if (logedInUserId != undefined) {
- setAuth["email"] = email;
+ setAuth["uuid"] = logedInUserId;
setAuth["isLoggedIn"] = true;
-
- setLogedInUser(logedInUserId);
navigate(from, { replace: true });
}
-
} catch (error) {
-
+ console.log(error);
}
setEmail(email);
setPassword("");
diff --git a/src/components/sidebar/SettingsButton.tsx b/src/components/sidebar/SettingsButton.tsx
index 8d970ac..2621a30 100644
--- a/src/components/sidebar/SettingsButton.tsx
+++ b/src/components/sidebar/SettingsButton.tsx
@@ -12,6 +12,7 @@ import {
import { open as openMeetingDetails } from "../../redux/slices/meetingDetailsOpenSlice";
import { selectMeeting } from "../../redux/slices/meetingsAndUserStatusSlice";
import { useNavigate } from "react-router-dom";
+import { selectMe } from "../../redux/slices/usersSlice";
interface Props {
user: UserLite;
@@ -21,9 +22,10 @@ interface Props {
const SettingsButton: React.FC