Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix v0.1.2 #78

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Hotfix v0.1.2 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e51a45
Warning removal and correct extensions
andrrsin Mar 15, 2024
2d1f308
fix #68 and #69
andrrsin Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion users/authservice/auth-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const port = 8002;
app.use(express.json());

// Connect to MongoDB
const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/wiq-en1a-users';
mongoose.connect(mongoUri);

// Function to validate required fields in the request body
Expand Down
2 changes: 1 addition & 1 deletion users/userservice/user-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const port = 8001;
app.use(bodyParser.json());

// Connect to MongoDB
const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/wiq-en1a-users';
mongoose.connect(mongoUri);


Expand Down
47 changes: 26 additions & 21 deletions webapp/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site of WIQ by HappySw"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site of WIQ by HappySw" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link
href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap"
rel="stylesheet">
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -24,12 +27,13 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>WIQ</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<title>WIQ</title>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All @@ -39,5 +43,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>

</html>
4 changes: 2 additions & 2 deletions webapp/public/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "WIQ",
"name": "WIQ by HappySW",
"icons": [
{
"src": "favicon.ico",
Expand Down
39 changes: 4 additions & 35 deletions webapp/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
import React, { useState } from 'react';
import React from 'react';
import {BrowserRouter, Routes, Route} from 'react-router-dom'
import AddUser from './components/AddUser';
import Navbar from './components/Navbar';
import Login from './components/Login';
import Rankings from './components/Rankings';
import CssBaseline from '@mui/material/CssBaseline';
import Container from '@mui/material/Container';
import Typography from '@mui/material/Typography';
import Link from '@mui/material/Link';
import { useEffect } from 'react';
import axios from 'axios';
import Game from './components/Game';
import useAuthUser from 'react-auth-kit/hooks/useAuthUser';
import useIsAuthenticated from 'react-auth-kit/hooks/useIsAuthenticated'
import MainPage from './components/MainPage';

function App() {
const [showLogin, setShowLogin] = useState(true);
const [user, setUser] = useState({});
const isAuthenticated = useIsAuthenticated()
const auth = useAuthUser();
// const isAuthenticated = useIsAuthenticated() // True if user has logged in
// const auth = useAuthUser(); // User data: {username,emial,createdAt} To add fields go to Login
// IDK how it works



Expand All @@ -34,28 +25,6 @@ function App() {
<Route path='/play' element={<Game />} />
</Routes>
</BrowserRouter>




/* <Container component="main" maxWidth="xs">
<CssBaseline />
<Typography component="h1" variant="h5" align="center" sx={{ marginTop: 2 }}>
Welcome to the 2024 edition of the Software Architecture course hola
</Typography>
{showLogin ? <Login /> : <AddUser />}
<Typography component="div" align="center" sx={{ marginTop: 2 }}>
{showLogin ? (
<Link name="gotoregister" component="button" variant="body2" onClick={handleToggleView}>
Don't have an account? Register here.
</Link>
) : (
<Link component="button" variant="body2" onClick={handleToggleView}>
Already have an account? Login here.
</Link>
)}
</Typography>
</Container> */
)
}

Expand Down
0 webapp/src/components/AddUser.js → webapp/src/components/AddUser.jsx
View file
Open in desktop
File renamed without changes.
12 changes: 5 additions & 7 deletions webapp/src/components/Game.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@ const Game = () => {
const startGame = () => {
setGameStarted(!gameStarted);
};

useEffect(() => {
if(isAuthenticated()===false) {
navigate('/login');
if (!isAuthenticated()) {
navigate("/login");
}
}
, [isAuthenticated]);
}, [isAuthenticated, navigate]);

return (
<div>
{gameStarted ? (
{isAuthenticated()?gameStarted ? (
<Question />
) : (
<div className="flex flex-col items-center justify-center mt-16">
Expand All @@ -32,7 +30,7 @@ const Game = () => {
Play
</button>
</div>
)}
):""}
</div>
)
};
Expand Down
0 webapp/src/components/Login.js → webapp/src/components/Login.jsx
View file
Open in desktop
File renamed without changes.
Loading