+
+
+
+
+
+ 
+
+
+
+ 
+
+
+
+ );
+};
+
+export default BoardCard;
diff --git a/src/components/BoardCard/BoardCard.jsx b/src/components/BoardCard/index.jsx
similarity index 94%
rename from src/components/BoardCard/BoardCard.jsx
rename to src/components/BoardCard/index.jsx
index 4a45967..4d03942 100644
--- a/src/components/BoardCard/BoardCard.jsx
+++ b/src/components/BoardCard/index.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import cardBack from '../../assets/images/cardback.png';
import { ReactComponent as BracketIcon } from '../../assets/images/bracket.svg';
-import FrontCard from '../FrontCard/FrontCard';
+import FrontCard from '../FrontCard';
import styles from './BoardCard.module.css';
const BoardCard = ({ username, vote, isRevealed, isDimmed, isHighlighted }) => {
diff --git a/src/components/FrontCard/FrontCard.jsx b/src/components/FrontCard/index.jsx
similarity index 90%
rename from src/components/FrontCard/FrontCard.jsx
rename to src/components/FrontCard/index.jsx
index c5faa48..187d190 100644
--- a/src/components/FrontCard/FrontCard.jsx
+++ b/src/components/FrontCard/index.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import card from '../../assets/images/card.png';
-import VoteValue from '../VoteValue/VoteValue';
+import VoteValue from '../VoteValue';
import styles from './FrontCard.module.css';
const FrontCard = ({ value, className }) => {
diff --git a/src/components/LoadingRoute/index.jsx b/src/components/LoadingRoute/index.jsx
new file mode 100644
index 0000000..9b713f2
--- /dev/null
+++ b/src/components/LoadingRoute/index.jsx
@@ -0,0 +1,14 @@
+import React, { Fragment } from 'react';
+import { Route } from 'react-router-dom';
+
+const LoadingRoute = ({ loading = false, element, ...rest }) => {
+ debugger;
+ console.log('this.type', this.type);
+ return
+ 
+ 
+
+ Current Users In Session
+
+ );
+};
+
+export default ProfileMenuButton;
diff --git a/src/components/Results/Results.jsx b/src/components/Results/index.jsx
similarity index 94%
rename from src/components/Results/Results.jsx
rename to src/components/Results/index.jsx
index 7da4b8b..b76b9f2 100644
--- a/src/components/Results/Results.jsx
+++ b/src/components/Results/index.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import styles from './Results.module.css';
-import VoteValue from '../VoteValue/VoteValue';
+import VoteValue from '../VoteValue';
const Results = ({ votes }) => {
const voteCounts = Object.values(votes).reduce((acc, vote) => {
diff --git a/src/components/UserSessionListener/UserSessionListener.jsx b/src/components/UserSessionListener/UserSessionListener.jsx
deleted file mode 100644
index fcc13b0..0000000
--- a/src/components/UserSessionListener/UserSessionListener.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { useEffect, useState } from 'react';
-import { ref, onValue, remove } from 'firebase/database';
-import { realtimeDb } from '../../services/firebase';
-import { useNavigate } from 'react-router-dom';
-import { generateUniqueId } from '../../utils/crypto';
-import { auth } from '../../services/firebase';
-
-const UserSessionListener = () => {
- const navigate = useNavigate();
- const user = auth.currentUser;
- const userId = user ? user.uid : generateUniqueId();
- const [isRedirecting, setIsRedirecting] = useState(false);
-
- useEffect(() => {
- const userRef = ref(realtimeDb, `users/${userId}/currentSessionId`);
-
- const unsubscribe = onValue(userRef, async (snapshot) => {
- const currentSessionId = snapshot.val() || generateUniqueId();
-
- // Only redirect if the user is not already being redirected
- if (
- !isRedirecting &&
- currentSessionId &&
- currentSessionId.startsWith('lobby')
- ) {
- setIsRedirecting(true);
-
- console.log(`Removing user from: users/${userId}`);
-
- // Remove the entire user entry from the database
- const fullUserRef = ref(realtimeDb, `users/${userId}`);
- await remove(fullUserRef);
-
- navigate(`/${currentSessionId}`);
-
- setIsRedirecting(false);
- }
- });
-
- return () => unsubscribe();
- }, [userId, navigate, isRedirecting]);
-
- return null;
-};
-
-export default UserSessionListener;
diff --git a/src/components/UserSessionListener/index.jsx b/src/components/UserSessionListener/index.jsx
new file mode 100644
index 0000000..dc6a514
--- /dev/null
+++ b/src/components/UserSessionListener/index.jsx
@@ -0,0 +1,48 @@
+import { useEffect, useState } from 'react';
+import api from '../../services/api'; // Import the Axios instance with the interceptor
+import { useNavigate } from 'react-router-dom';
+import { generateUniqueId } from '../../shared/utils/crypto';
+
+const UserSessionListener = () => {
+ const navigate = useNavigate();
+ const [isRedirecting, setIsRedirecting] = useState(false);
+
+ const userId = generateUniqueId(); // Use the unique ID generator for anonymous users
+
+ useEffect(() => {
+ const fetchUserSession = async () => {
+ try {
+ // Get the user's current session ID from the API
+ const response = await api.get(`/users/${userId}/session`);
+
+ const currentSessionId =
+ response.data.currentSessionId || generateUniqueId();
+
+ // Only redirect if the user is not already being redirected
+ if (
+ !isRedirecting &&
+ currentSessionId &&
+ currentSessionId.startsWith('lobby')
+ ) {
+ setIsRedirecting(true);
+
+ // Delete the user from the session via API
+ await api.delete(`/users/${userId}`);
+
+ // Redirect to the session
+ navigate(`/${currentSessionId}`);
+
+ setIsRedirecting(false);
+ }
+ } catch (error) {
+ console.error('Error fetching user session:', error);
+ }
+ };
+
+ fetchUserSession();
+ }, [userId, navigate, isRedirecting]);
+
+ return null;
+};
+
+export default UserSessionListener;
diff --git a/src/components/VoteCard/VoteCard.module.css b/src/components/VoteCard/VoteCard.module.css
index 93088a1..9de0707 100644
--- a/src/components/VoteCard/VoteCard.module.css
+++ b/src/components/VoteCard/VoteCard.module.css
@@ -1,3 +1,9 @@
+button.voteCard {
+ font-family: 'Cardo', serif;
+ font-weight: 400;
+ font-style: normal;
+}
+
.voteCard {
width: 50px;
height: 75px;
@@ -31,12 +37,6 @@
z-index: 1;
}
-.cardo-regular {
- font-family: 'Cardo', serif;
- font-weight: 400;
- font-style: normal;
-}
-
.shadow {
position: absolute;
width: 50px;
diff --git a/src/components/VoteCard/VoteCard.jsx b/src/components/VoteCard/index.jsx
similarity index 83%
rename from src/components/VoteCard/VoteCard.jsx
rename to src/components/VoteCard/index.jsx
index dfc69cd..b21e700 100644
--- a/src/components/VoteCard/VoteCard.jsx
+++ b/src/components/VoteCard/index.jsx
@@ -1,12 +1,12 @@
import React from 'react';
import styles from './VoteCard.module.css';
-import FrontCard from '../FrontCard/FrontCard';
+import FrontCard from '../FrontCard';
const VoteCard = ({ number, isSelected, onClick, className }) => {
return (
+
+ {acronym}
+
+
+
+
+