Merge pull request #56 from Arquisoft/UserDataBase

Functioning user system + created schema for game database.

game/game-model.js

@@ -0,0 +1,46 @@
+const mongoose = require('mongoose');
+//const { Match, Answer, User } = require('./game-model'); para usarlo luego en otras partes se añade así el esquema
+const answerSchema = new mongoose.Schema({
+    isCorrect: Boolean,
+    text: String,
+});
+
+const matchSchema = new mongoose.Schema({
+    date: { type: Date, default: Date.now },
+    question: { type: String, required: true },
+    answers: { type: [answerSchema], required: true},
+    dni: { type: String, required: true },
+});
+
+const userSchema = new mongoose.Schema({
+    username: {
+        type: String,
+    },
+   matches: [matchSchema],
+});
+
+const User = mongoose.model('User', userSchema);
+const Answer = mongoose.model('Answer', answerSchema);
+const Match = mongoose.model('Match', matchSchema);
+
+
+module.exports = { Match, Answer, User };
+
+// async function createMatchForUser(dni) {
+//     const user = await User.findOne({ dni });
+//     if (!user) {
+//         console.log('User not found');
+//         return;
+//     }
+//
+//     const match = new Match({
+//         question: 'What is 2+2?',
+//         answers: [
+//             { text: '4', isCorrect: true },
+//             { text: '5', isCorrect: false },
+//         ],
+//         dni: user.dni,
+//     });
+//
+//     await match.save();
+// }

users/userservice/user-model.js

@@ -2,12 +2,13 @@ const mongoose = require('mongoose');
 
 const userSchema = new mongoose.Schema({
     username: {
-      type: String,
-      required: true,
+        type: String,
+        required: true,
+        unique: true
     },
     password: {
-      type: String,
-      required: true,
+        type: String,
+        required: true,
     },
     createdAt: {
       type: Date,

users/userservice/user-service.js

@@ -22,22 +22,30 @@ function validateRequiredFields(req, requiredFields) {
       if (!(field in req.body)) {
         throw new Error(`Missing required field: ${field}`);
       }
+
+    }
+
+    if (req.body.username.length < 3||
+        req.body.password.length < 3 ) {
+        throw new Error(`Username and password length must be at least 3`);
     }
 }
 
 app.post('/adduser', async (req, res) => {
     try {
         // Check if required fields are present in the request body
         validateRequiredFields(req, ['username', 'password']);
-
+        const existingUser = await User.findOne({ username: req.body.username });
+        if (existingUser) {
+            return res.status(400).json({ error: 'Username already exists' });
+        }
         // Encrypt the password before saving it
         const hashedPassword = await bcrypt.hash(req.body.password, 10);
 
         const newUser = new User({
             username: req.body.username,
             password: hashedPassword,
         });
-
         await newUser.save();
         res.json(newUser);
     } catch (error) {

webapp/src/App.js

@@ -3,7 +3,8 @@ import React from "react";
 import { Routes, Route } from "react-router-dom";
 import CssBaseline from "@mui/material/CssBaseline";
 import Home from "./Home";
-import LoginSignup from "./LoginSignup";
+import Login from "./components/Login";
+import AddUser from "./components/AddUser";
 
 
 function App() {
@@ -13,8 +14,9 @@ function App() {
             <Routes>
                 <Route path="/" element={<Home />} />
                 <Route path="/home" element={<Home />} />
-                <Route path="/login" element={<LoginSignup />} />
-                <Route path="/signup" element={<LoginSignup />} />
+                <Route path="/login" element={<Login />} />
+                <Route path="/signup" element={<AddUser />} />
+                <Route path="/register" element={<AddUser />} />
             </Routes>
         </>
     );

webapp/src/Home.css

@@ -17,6 +17,12 @@ body, html {
   align-items: center;
   padding: 0;
   margin: 0;
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  image-rendering: crisp-edges;
+  backface-visibility: hidden;
+  transform: translateZ(0);
 }
 
 .play-button {

webapp/src/Home.js

@@ -1,10 +1,10 @@
-import React, { useState } from "react";
+import React, {useEffect, useState} from "react";
 import { Link } from "react-router-dom";
 import Nav from "./components/Nav";
 import "./Home.css";
 
 function Home() {
-    const [user, setUser] = useState(null);
+    const [isLoggedIn, setIsLoggedIn] = useState(!!localStorage.getItem('token'));
 
     return (
         <div style={{ height: "100vh", display: "flex", flexDirection: "column" }}>
@@ -13,23 +13,26 @@ function Home() {
                 className="container"
                 style={{
                     flex: 1,
-                    backgroundImage: "url('/logo.jpg')",
+                    backgroundImage: "url('/bg.jpg')",
                     backgroundSize: "cover",
                     backgroundPosition: "center",
                     backgroundRepeat: "no-repeat",
                     position: "relative"
                 }}
             >
-                <button className="play-button">
+                {!isLoggedIn?( <button className="play-button">
                     <Link to="/login" style={{color: "white"}}>
                         Log in to play
                     </Link>
+                </button> )
+             : (
+                <button className="play-button">
+                    <Link to="/game" style={{color: "white"}}>
+                        Play the game
+                    </Link>
                 </button>
-                {/*<button className="play-button">*/}
-                {/*    <Link to="/game" style={{color: "white"}}>*/}
-                {/*        Play the game*/}
-                {/*    </Link>*/}
-                {/*</button>*/}
+                    )
+            }
             </div>
         </div>
     );