From bc7ba30fa10764988fec52c92c20f331a6778b2f Mon Sep 17 00:00:00 2001 From: uo287841 Date: Tue, 16 Apr 2024 16:23:23 +0200 Subject: [PATCH 1/7] created user_profile --- webapp/src/components/UserProfile.jsx | 75 +++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 webapp/src/components/UserProfile.jsx diff --git a/webapp/src/components/UserProfile.jsx b/webapp/src/components/UserProfile.jsx new file mode 100644 index 0000000..97776cb --- /dev/null +++ b/webapp/src/components/UserProfile.jsx @@ -0,0 +1,75 @@ +import React, { useEffect, useState, useCallback } from "react"; +import axios from "axios"; +import useAuthUser from "react-auth-kit/hooks/useAuthUser"; +import userAvatar from "./ranking/profile_img.webp"; + +const UserProfile = () => { + const auth = useAuthUser(); + const [category, setCategory] = useState('global'); + const [questions, setQuestions] = useState(0); + const [right, setRight] = useState(0); + const [wrong, setWrong] = useState(0); + + const apiEndpoint = process.env.REACT_APP_API_ENDPOINT ||'http://localhost:8000'; + + + const handleCategoryChange = useCallback(async (newCategory) => { + try { + const result = await axios.get(`${apiEndpoint}/ranking/user`, { + params: { + username: auth.username, + category: newCategory + } + }); + + setQuestions(result.data.questions); + setRight(result.data.correct); + setWrong(result.data.wrong); + setCategory(newCategory); + } catch (error) { + console.error('Error fetching question:', error); + } + }, [apiEndpoint, auth.username]); + + useEffect(() => { + handleCategoryChange(category); + }, [handleCategoryChange, category]); + + + return ( +
+
+
+ User Avatar +

Username: {auth.username}

+ +

Email: {auth.email}

+

Joined: {new Date(auth.createdAt).toLocaleDateString()}

+ + + {/* Buttons to change category */} +
+ + + + + + +
+ +
+

{category} Ranking

+
+

Total Answered Questions: {questions}

+

Right Answers: {right}

+

Wrong Answers: {wrong}

+
+
+ +
+
+
+ ); +}; + +export default UserProfile; From c1f98ab948cf67288195b052e3c3742c6c7a875b Mon Sep 17 00:00:00 2001 From: uo287841 Date: Tue, 16 Apr 2024 16:23:58 +0200 Subject: [PATCH 2/7] user profile services --- gatewayservice/gateway-service.js | 21 ++++++++++++++++ users/userservice/user-service.js | 32 +++++++++++++++++++++++++ webapp/e2e/steps/register-form.steps.js | 2 +- 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js index 7b96b97..229cd8b 100644 --- a/gatewayservice/gateway-service.js +++ b/gatewayservice/gateway-service.js @@ -127,6 +127,27 @@ app.get('/rankings/:filter', async (req, res) => { } }); + +app.get('/ranking/user', async (req, res) => { + const username = req.query.username; + const category = req.query.category; + + try { + // Forward the request to the user service + const result = await axios.get(`${userServiceUrl}/ranking/user`, { + params: { + username: username, + category: category + } + }); + + res.json(result.data); + + } catch (error) { + res.status(error.response.status).json({ error: error.response.data.error }); + } +}); + // Read the OpenAPI YAML file synchronously openapiPath='./openapi.yaml' if (fs.existsSync(openapiPath)) { diff --git a/users/userservice/user-service.js b/users/userservice/user-service.js index 521ab55..a8989c6 100644 --- a/users/userservice/user-service.js +++ b/users/userservice/user-service.js @@ -54,6 +54,38 @@ app.get('/rankings/:filter', async (req, res) => { }) +// Get the ranking info for a specified category and user +app.get('/ranking/user', async (req, res) => { + const username = req.query.username; + const category = req.query.category; + + try { + // Fetch the user with the specified username + const user = await User.findOne({ username }); + + // If user not found, return error + if (!user) { + return res.status(400).json("Error: User not found"); + } + + // Extract ranking info for the specified category + const rankingInfo = { + username: user.username, + category, + points: user.ranking[category].points, + questions: user.ranking[category].questions, + correct: user.ranking[category].correct, + wrong: user.ranking[category].wrong + }; + + res.status(200).json(rankingInfo); + } catch (error) { + res.status(400).json({ error: error.message }); + } +}); + + + app.post("/addpoints", async (req, res) => { const username = req.body.username; const category = req.body.category; diff --git a/webapp/e2e/steps/register-form.steps.js b/webapp/e2e/steps/register-form.steps.js index d00172c..ad9e64f 100644 --- a/webapp/e2e/steps/register-form.steps.js +++ b/webapp/e2e/steps/register-form.steps.js @@ -15,7 +15,7 @@ defineFeature(feature, test => { beforeAll(async () => { browser = process.env.GITHUB_ACTIONS ? await puppeteer.launch() - : await puppeteer.launch({ headless: false, slowMo:5 }); + : await puppeteer.launch({ headless: false, slowMo:60 }); page = await browser.newPage(); //Way of setting up the timeout setDefaultOptions({ timeout: 10000 }) From 5ac7fea83b26f3f8e198d7d4bbbc5a44ceb8db3e Mon Sep 17 00:00:00 2001 From: uo287841 Date: Tue, 16 Apr 2024 16:24:21 +0200 Subject: [PATCH 3/7] user image and modification of navbar and app --- webapp/src/App.jsx | 2 ++ webapp/src/components/Navbar.jsx | 7 ++++++- webapp/src/components/ranking/profile_img.webp | Bin 0 -> 7626 bytes 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 webapp/src/components/ranking/profile_img.webp diff --git a/webapp/src/App.jsx b/webapp/src/App.jsx index 80e81ba..bd0c101 100644 --- a/webapp/src/App.jsx +++ b/webapp/src/App.jsx @@ -6,6 +6,7 @@ import Login from './components/Login'; import RankingsLayout from './components/ranking/RankingLayout'; import Game from './components/Game'; import MainPage from './components/MainPage'; +import UserProfile from './components/UserProfile'; function App() { // const isAuthenticated = useIsAuthenticated() // True if user has logged in @@ -23,6 +24,7 @@ function App() { } /> } /> } /> + } /> ) diff --git a/webapp/src/components/Navbar.jsx b/webapp/src/components/Navbar.jsx index 9726c12..809073d 100644 --- a/webapp/src/components/Navbar.jsx +++ b/webapp/src/components/Navbar.jsx @@ -21,9 +21,14 @@ function Navbar() {
  • Play
  • Rankings
    • + + {isAuthenticated() && ( +
  • UserProfile
    • + )} {isAuthenticated() ? :
  • Sign in
    • } + + :
  • Sign in
    • }
diff --git a/webapp/src/components/ranking/profile_img.webp b/webapp/src/components/ranking/profile_img.webp new file mode 100644 index 0000000000000000000000000000000000000000..4a19dcd59b033f46050561ed5a1f37d94d14d3db GIT binary patch literal 7626 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 Date: Sun, 21 Apr 2024 12:14:44 +0200 Subject: [PATCH 4/7] Line 28: changed {isAuthenticated() ? :
  • Sign in
    • } diff --git a/webapp/src/components/Navbar.test.js b/webapp/src/components/Navbar.test.js new file mode 100644 index 0000000..0c00b9b --- /dev/null +++ b/webapp/src/components/Navbar.test.js @@ -0,0 +1,46 @@ +import React from 'react'; +import { render, fireEvent } from '@testing-library/react'; +import { MemoryRouter } from 'react-router-dom'; +import Navbar from './Navbar'; +import useIsAuthenticated from 'react-auth-kit/hooks/useIsAuthenticated'; +import useSignOut from 'react-auth-kit/hooks/useSignOut'; + +jest.mock('react-auth-kit/hooks/useIsAuthenticated'); +jest.mock('react-auth-kit/hooks/useSignOut'); + +describe('Navbar', () => { + + beforeEach(() => { + // Reset mock function calls before each test + jest.clearAllMocks(); + }); + + it('renders authenticated user links and logout button', () => { + useIsAuthenticated.mockReturnValue(() => true); + const { getByText } = render( + + + + ); + + expect(getByText('WIQ')).toBeInTheDocument(); + expect(getByText('Play')).toBeInTheDocument(); + expect(getByText('Rankings')).toBeInTheDocument(); + expect(getByText('UserProfile')).toBeInTheDocument(); + expect(getByText('Logout')).toBeInTheDocument(); + }); + + it('renders unauthenticated user links and sign-in link', () => { + useIsAuthenticated.mockReturnValue(() => false); + const { getByText } = render( + + + + ); + + expect(getByText('WIQ')).toBeInTheDocument(); + expect(getByText('Play')).toBeInTheDocument(); + expect(getByText('Rankings')).toBeInTheDocument(); + expect(getByText('Sign in')).toBeInTheDocument(); + }); +}); diff --git a/webapp/src/components/UserProfile.test.js b/webapp/src/components/UserProfile.test.js new file mode 100644 index 0000000..4215e00 --- /dev/null +++ b/webapp/src/components/UserProfile.test.js @@ -0,0 +1,59 @@ +import React from 'react'; +import { render, waitFor, fireEvent } from '@testing-library/react'; +import UserProfile from './UserProfile'; +import axios from 'axios'; +import useAuthUser from 'react-auth-kit/hooks/useAuthUser'; + +jest.mock('axios'); +jest.mock('react-auth-kit/hooks/useAuthUser', () => jest.fn()); + +describe('UserProfile', () => { + beforeEach(() => { + useAuthUser.mockReturnValue({ + username: 'testUser', + email: 'test@example.com', + createdAt: '2024-01-01T00:00:00Z', + }); + }); + + it('renders user details', async () => { + axios.get.mockResolvedValueOnce({ + data: { + questions: 10, + correct: 7, + wrong: 3, + }, + }); + + const { getByText } = render(); + + await waitFor(() => { + expect(getByText('Username: testUser')).toBeInTheDocument(); + expect(getByText('Email: test@example.com')).toBeInTheDocument(); + expect(getByText('Joined: 1/1/2024')).toBeInTheDocument(); + expect(getByText('Total Answered Questions: 10')).toBeInTheDocument(); + expect(getByText('Right Answers: 7')).toBeInTheDocument(); + expect(getByText('Wrong Answers: 3')).toBeInTheDocument(); + }); + }); + + it('changes category when category button is clicked', async () => { + axios.get.mockResolvedValueOnce({ + data: { + questions: 5, + correct: 3, + wrong: 2, + }, + }); + + const { getByText } = render(); + + fireEvent.click(getByText('Flags')); + + await waitFor(() => { + expect(getByText('Total Answered Questions: 5')).toBeInTheDocument(); + expect(getByText('Right Answers: 3')).toBeInTheDocument(); + expect(getByText('Wrong Answers: 2')).toBeInTheDocument(); + }); + }); + }); \ No newline at end of file From 3093b898ffe85da055b6172384f1b8bd601121bb Mon Sep 17 00:00:00 2001 From: uo287841 Date: Sun, 21 Apr 2024 12:27:09 +0200 Subject: [PATCH 5/7] Navbar Test and UserProfile test --- webapp/src/components/Navbar.test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/src/components/Navbar.test.js b/webapp/src/components/Navbar.test.js index 0c00b9b..f0d5e2c 100644 --- a/webapp/src/components/Navbar.test.js +++ b/webapp/src/components/Navbar.test.js @@ -14,7 +14,7 @@ describe('Navbar', () => { // Reset mock function calls before each test jest.clearAllMocks(); }); - + it('renders authenticated user links and logout button', () => { useIsAuthenticated.mockReturnValue(() => true); const { getByText } = render( @@ -43,4 +43,5 @@ describe('Navbar', () => { expect(getByText('Rankings')).toBeInTheDocument(); expect(getByText('Sign in')).toBeInTheDocument(); }); + }); From f36aae0fc6b9168cfb4b48acf1673f0253186091 Mon Sep 17 00:00:00 2001 From: uo287841 Date: Thu, 25 Apr 2024 00:27:03 +0200 Subject: [PATCH 6/7] Modifies NavBarTest --- webapp/src/components/Navbar.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/components/Navbar.test.js b/webapp/src/components/Navbar.test.js index f0d5e2c..0e80380 100644 --- a/webapp/src/components/Navbar.test.js +++ b/webapp/src/components/Navbar.test.js @@ -27,7 +27,7 @@ describe('Navbar', () => { expect(getByText('Play')).toBeInTheDocument(); expect(getByText('Rankings')).toBeInTheDocument(); expect(getByText('UserProfile')).toBeInTheDocument(); - expect(getByText('Logout')).toBeInTheDocument(); + expect(getByText('Log out')).toBeInTheDocument(); }); it('renders unauthenticated user links and sign-in link', () => { @@ -41,7 +41,7 @@ describe('Navbar', () => { expect(getByText('WIQ')).toBeInTheDocument(); expect(getByText('Play')).toBeInTheDocument(); expect(getByText('Rankings')).toBeInTheDocument(); - expect(getByText('Sign in')).toBeInTheDocument(); + expect(getByText('Log In')).toBeInTheDocument(); }); }); From 2eacb7e81db7db17a6b2f440418f2995e5a08d11 Mon Sep 17 00:00:00 2001 From: uo287841 Date: Thu, 25 Apr 2024 00:34:59 +0200 Subject: [PATCH 7/7] changed && by ? --- webapp/src/components/Navbar.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/components/Navbar.jsx b/webapp/src/components/Navbar.jsx index 8adba39..f6b49fa 100644 --- a/webapp/src/components/Navbar.jsx +++ b/webapp/src/components/Navbar.jsx @@ -39,9 +39,9 @@ function Navbar() {
  • Rankings
    • - {isAuthenticated() && ( + {isAuthenticated() ? (
  • UserProfile
    • - )} + ):"" }