Merged all the css into one "custom.css"

Arquisoft · Mar 7, 2024 · a243b80 · a243b80
1 parent 5e26b9c
commit a243b80
Show file tree

Hide file tree

Showing 23 changed files with 361 additions and 365 deletions.
diff --git a/webapp/src/App.css b/webapp/src/App.css
diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -4,11 +4,11 @@ import Container from '@mui/material/Container';
 import QuestionView from './components/questionView/QuestionView';
 import GameMenu from './components/GameMenu/GameMenu';
 import Navbar from './components/fragments/NavBar';
-import Home from './components/Home/Home';
+import Home from './components/home/Home';
 import Login from './components/loginAndRegistration/Login';
 import AddUser from './components/loginAndRegistration/AddUser';
 import Instructions from './components/Instructions'; 
-
+import './custom.css';
 
 function App() {
   return (

diff --git a/webapp/src/components/GameMenu.js b/webapp/src/components/GameMenu.js
diff --git a/webapp/src/components/GameMenu/GameMenu.css b/webapp/src/components/GameMenu/GameMenu.css
diff --git a/webapp/src/components/GameMenu/GameMenu.js b/webapp/src/components/GameMenu/GameMenu.js
@@ -1,6 +1,5 @@
-import './GameMenu.css';
+import "../../custom.css";
 import { Link } from "react-router-dom";
-import QuestionView from '../questionView/QuestionView';
 export default function GameMenu() {
   return (
     <div className="divMenu">
@@ -22,8 +21,8 @@ export default function GameMenu() {
   function ButtonNewGame() {
     return (
       <>
-        <Link className="menuButton" to="/questions">
-        <button >Create New Game</button>
+        <Link  to="/questions">
+          <button className='create-game'>Create New Game</button>
         </Link>
       </>
       );

diff --git a/webapp/src/components/Home/Home.css b/webapp/src/components/Home/Home.css
diff --git a/webapp/src/components/Home/Home.js b/webapp/src/components/Home/Home.js
@@ -1,12 +1,9 @@
 import React from "react";
-import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
 import { Link } from 'react-router-dom';
-import "./Home.css";
+import "../../custom.css";
 import {useTranslation} from "react-i18next";
 
-import "./Home.css";
-
 
 function Home() {
 

diff --git a/webapp/src/components/Instructions.css b/webapp/src/components/Instructions.css
diff --git a/webapp/src/components/Instructions.js b/webapp/src/components/Instructions.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import '../components/Instructions.css';
+import '../custom.css';
 import {useTranslation} from "react-i18next";
 
 

diff --git a/webapp/src/components/fragments/NavBar.css b/webapp/src/components/fragments/NavBar.css
diff --git a/webapp/src/components/fragments/NavBar.js b/webapp/src/components/fragments/NavBar.js
@@ -2,7 +2,7 @@
 import React from 'react';
 import Typography from "@mui/material/Typography";
 import { Link } from 'react-router-dom';
-import "./NavBar.css";
+import "../../custom.css";
 import {useTranslation} from "react-i18next";
 
 function Navbar() {
@@ -15,9 +15,12 @@ function Navbar() {
       <Typography variant="h6" gutterBottom className="navbar-text">
       {t("navBar.title")}
       </Typography>
-      <button onClick={()=> i18n.changeLanguage("en")}>EN</button>
-      <button onClick={()=> i18n.changeLanguage("es")}>ES</button>
-      <Help />
+      <div className='right-nav'>
+        <button className="en-button" onClick={()=> i18n.changeLanguage("en")}>EN</button>
+        <button className="es-button" onClick={()=> i18n.changeLanguage("es")}>ES</button>
+        <Help />
+      </div>
+
     </div>
   );
 }

diff --git a/webapp/src/components/loginAndRegistration/AddUser.js b/webapp/src/components/loginAndRegistration/AddUser.js
@@ -1,6 +1,6 @@
 import React from "react";
 import { FaUser, FaLock } from "react-icons/fa";
-import "./Login.css";
+import "../../custom.css";
 import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 

diff --git a/webapp/src/components/loginAndRegistration/Login.css b/webapp/src/components/loginAndRegistration/Login.css
diff --git a/webapp/src/components/loginAndRegistration/Login.js b/webapp/src/components/loginAndRegistration/Login.js
@@ -3,6 +3,7 @@ import { FaUser, FaLock } from "react-icons/fa";
 import { Link } from "react-router-dom";
 import Button from "@mui/material/Button";
 import { useTranslation } from "react-i18next";
+import "../../custom.css";
 
 const Login = () => {
   const { t } = useTranslation("global");

diff --git a/webapp/src/components/questionView/Question.js b/webapp/src/components/questionView/Question.js
@@ -1,3 +1,5 @@
+import "../../custom.css";
+
 class Question{
     constructor(json){
         this.question = "";

diff --git a/webapp/src/components/questionView/QuestionGenerator.js b/webapp/src/components/questionView/QuestionGenerator.js
@@ -1,4 +1,5 @@
 import Question from './Question';
+import "../../custom.css";
 class QuestionGenerator{
 
     constructor(){