diff --git a/FU.SPA/src/components/pages/SignUp.jsx b/FU.SPA/src/components/pages/SignUp.jsx
index f3b2b134..7af35edf 100644
--- a/FU.SPA/src/components/pages/SignUp.jsx
+++ b/FU.SPA/src/components/pages/SignUp.jsx
@@ -31,7 +31,7 @@ export default function SignUp() {
};
if (creds.password !== data.get('confirmPassword')) {
- alert('Passwords do not match');
+ alert("Passwords do not match");
return;
}
diff --git a/FU.SPA/src/components/pages/Social.jsx b/FU.SPA/src/components/pages/Social.jsx
index a2022dcd..b4d1bde4 100644
--- a/FU.SPA/src/components/pages/Social.jsx
+++ b/FU.SPA/src/components/pages/Social.jsx
@@ -3,31 +3,29 @@ import UserService from '../../services/userService';
import Posts from '../Posts';
export default function Social() {
- // const [currentTab, setCurrentTab] = useState('posts'); // ['posts', 'players', 'groups']
+ const [currentTab, setCurrentTab] = useState('posts'); // ['posts', 'players', 'groups']
const [posts, setPosts] = useState([]);
- // const [groups, setGroups] = useState([]);
- // const [players, setPlayers] = useState([]);
+ const [groups, setGroups] = useState([]);
+ const [players, setPlayers] = useState([]);
useEffect(() => {
- // if (currentTab === 'posts') {
- // UserService.getConnectedPosts().then(setPosts);
- // } else if (currentTab === 'groups') {
- // UserService.getConnectedGroups().then(setGroups);
- // } else if (currentTab === 'players') {
- // UserService.getConnectedPlayers().then(setPlayers);
- // }
- UserService.getConnectedPosts().then(setPosts);
- }, []);
+ if (currentTab === 'posts') {
+ UserService.getConnectedPosts().then(setPosts);
+ } else if (currentTab === 'groups') {
+ UserService.getConnectedGroups().then(setGroups);
+ } else if (currentTab === 'players') {
+ UserService.getConnectedPlayers().then(setPlayers);
+ }
+ }, [currentTab]);
const renderTabContent = () => {
- // if (currentTab === 'posts') {
- // return
;
- // } else if (currentTab === 'groups') {
- // return
Groups
;
- // } else if (currentTab === 'players') {
- // return
Players
;
- // }
- return
;
+ if (currentTab === 'posts') {
+ return
;
+ } else if (currentTab === 'groups') {
+ return
Groups
;
+ } else if (currentTab === 'players') {
+ return
Players
;
+ }
};
return (
diff --git a/FU.SPA/src/context/userProvider.jsx b/FU.SPA/src/context/userProvider.jsx
index 369017a5..d8ea9e7e 100644
--- a/FU.SPA/src/context/userProvider.jsx
+++ b/FU.SPA/src/context/userProvider.jsx
@@ -1,4 +1,5 @@
-import { useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
+import { useNavigate } from 'react-router-dom';
import UserContext from './userContext';
import UserService from '../services/userService';
import { startConnection, stopConnection } from '../services/signalrService';
@@ -6,6 +7,7 @@ import { startConnection, stopConnection } from '../services/signalrService';
const UserProvider = ({ children }) => {
const [user, setUser] = useState(null);
const [token, setToken] = useState(localStorage.getItem('token') || null);
+ const navigate = useNavigate();
useEffect(() => {
const fetchCurrentUser = async () => {
@@ -14,7 +16,6 @@ const UserProvider = ({ children }) => {
const currentUser = await UserService.getUserprofile('current');
console.log(currentUser);
setUser(currentUser);
- startConnection();
} else {
setUser(null);
}
@@ -25,6 +26,9 @@ const UserProvider = ({ children }) => {
};
fetchCurrentUser();
+ if (user) {
+ startConnection();
+ }
}, [token]);
const login = (newToken) => {
@@ -41,6 +45,13 @@ const UserProvider = ({ children }) => {
stopConnection();
};
+ // useEffect(() => {
+ // // Redirect to home page if the user is not null
+ // if (user) {
+ // navigate('/home');
+ // }
+ // }, [user, navigate]);
+
return (
{children}
diff --git a/FU.SPA/src/main.jsx b/FU.SPA/src/main.jsx
index 5574a6d7..be74370c 100644
--- a/FU.SPA/src/main.jsx
+++ b/FU.SPA/src/main.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './App.jsx';
-import './index.css';
+import './index.css'
// add comment
import './components/Navbar.css';
import { BrowserRouter } from 'react-router-dom';
diff --git a/FU.SPA/src/services/gameService.js b/FU.SPA/src/services/gameService.js
index 6e123a20..a2b10cfe 100644
--- a/FU.SPA/src/services/gameService.js
+++ b/FU.SPA/src/services/gameService.js
@@ -8,7 +8,7 @@ import AuthService from './authService';
}
*/
const searchGames = async (keyword) => {
- keyword = encodeURIComponent(keyword);
+ keyword = encodeURIComponent(keyword)
const response = await fetch(`${API_BASE_URL}/games?keyword=${keyword}`);
return await response.json();
@@ -20,21 +20,21 @@ const findGameByTitle = async (title) => {
let game = null;
for (const g of games) {
- if (g.name == title) game = g;
+ if (g.name == title) game = g
}
return game;
-};
+}
const findOrCreateGameByTitle = async (title) => {
- let game = await findGameByTitle(title);
+ let game = await findGameByTitle(title)
if (!game) {
- game = await createGame({ Name: title });
+ game = await createGame({ Name: title })
}
- return game;
-};
+ return game
+}
// Create game request
const createGame = async (params) => {
@@ -53,10 +53,5 @@ const createGame = async (params) => {
return await response.json();
};
-const GameService = {
- searchGames,
- createGame,
- findOrCreateGameByTitle,
- findGameByTitle,
-};
+const GameService = { searchGames, createGame, findOrCreateGameByTitle, findGameByTitle };
export default GameService;
diff --git a/FU.SPA/src/services/postService.js b/FU.SPA/src/services/postService.js
index c98bbfd6..64b3b730 100644
--- a/FU.SPA/src/services/postService.js
+++ b/FU.SPA/src/services/postService.js
@@ -27,8 +27,8 @@ const getPostDetails = async (postId) => {
const response = await fetch(`${API_BASE_URL}/posts/${postId}`, {
method: 'GET',
headers: {
- ...(AuthService.getAuthHeader() ?? {}),
- },
+ ...AuthService.getAuthHeader() ?? {}
+ }
});
const jsonResponse = await response.json();
@@ -59,6 +59,6 @@ const PostService = {
createPost,
getPostDetails,
joinPost,
- leavePost,
+ leavePost
};
export default PostService;
diff --git a/FU.SPA/src/services/searchService.js b/FU.SPA/src/services/searchService.js
index 98f393ec..f3140a9e 100644
--- a/FU.SPA/src/services/searchService.js
+++ b/FU.SPA/src/services/searchService.js
@@ -17,7 +17,7 @@ const searchPosts = async (query) => {
queryString += '&tags=' + query.tags.map((g) => String(g.id)).join(',');
}
- let authHeader = null;
+ let authHeader = null
try {
authHeader = AuthService.getAuthHeader();
} catch {
diff --git a/FU.SPA/src/services/tagService.js b/FU.SPA/src/services/tagService.js
index cf3cbfcd..f6c8b709 100644
--- a/FU.SPA/src/services/tagService.js
+++ b/FU.SPA/src/services/tagService.js
@@ -8,7 +8,7 @@ import AuthService from './authService';
}
*/
const searchTags = async (keyword) => {
- keyword = encodeURIComponent(keyword);
+ keyword = encodeURIComponent(keyword)
const response = await fetch(`${API_BASE_URL}/tags?$keyword=${keyword}`);
return await response.json();
@@ -21,21 +21,21 @@ const findTagByName = async (name) => {
let tag = null;
for (const t of tags) {
- if (t.name == name) tag = t;
+ if (t.name == name) tag = t
}
return tag;
-};
+}
const findOrCreateTagByName = async (name) => {
- let tag = await findTagByName(name);
+ let tag = await findTagByName(name)
if (!tag) {
- tag = await createTag({ Name: name });
+ tag = await createTag({ Name: name })
}
- return tag;
-};
+ return tag
+}
// Create tag request
const createTag = async (params) => {
@@ -58,10 +58,5 @@ const createTag = async (params) => {
return jsonResponse;
};
-const TagService = {
- searchTags,
- createTag,
- findTagByName,
- findOrCreateTagByName,
-};
+const TagService = { searchTags, createTag, findTagByName, findOrCreateTagByName };
export default TagService;