Fixed appearance

Arquisoft · Apr 27, 2024 · ab4c5a1 · ab4c5a1
1 parent 5f33898
commit ab4c5a1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/questionGenerator/src/main/java/Main.java b/questionGenerator/src/main/java/Main.java
@@ -13,9 +13,9 @@ public class Main {
 
 	private static QuestionGenerator qg = QuestionGenerator.getInstance();
 
-	 private static final long TIME_SKIP = 18000000; //5 hours
+	// private static final long TIME_SKIP = 18000000; //5 hours
 	// private static final long TIME_SKIP = 43200000; //12 hours
-	//private static final long TIME_SKIP = 1000; //1 minute
+	private static final long TIME_SKIP = 10000; //10 minutes
 
 
 	private static String[] languages = {"en", "es", "tr"};
@@ -32,10 +32,12 @@ public class Main {
 	public static void main(String[] args) {
 		List<String> questions = generate().stream().map(q -> q.getJSON().toString()).toList();
 		while(true) {
+			long timeStart = System.currentTimeMillis();
 			QuestionRepository.getInstance().populate(questions);
 			questions = generate().stream().map(q -> q.getJSON().toString()).toList();
+			long timeFinish = System.currentTimeMillis();
 			try {
-				Thread.sleep(TIME_SKIP);
+				Thread.sleep(TIME_SKIP - (timeFinish - timeStart));
 			} catch (InterruptedException e) {
 				e.printStackTrace();
 			}

diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -32,7 +32,8 @@ function App() {
     <Router>
         <div style={{ position: 'relative', minHeight: '100vh' }}>
           <Navbar style={{ width: '100%' }} /> 
-        <Container component="main" className="main" maxWidth="lg" style={{ paddingTop: '64px' }}>
+
+          <Container component="main" className="main" maxWidth="lg" style={{ paddingTop: '64px', paddingBottom : '64px' }}>
 
             <Routes>
               <Route path="/" element={<Navigate to="/home" />} /> 
@@ -49,7 +50,9 @@ function App() {
               <Route path="/restorePassword" element={<ForgetPassword />} />
               <Route path="*" element={<ErrorPage />} />
             </Routes>
+
           </Container>
+
           <Footer style={{ width: '100%' }} /> 
 
         </div>

diff --git a/webapp/src/custom.css b/webapp/src/custom.css
@@ -115,6 +115,15 @@
     margin: 0.5em;
   }
 
+  .user-button{
+    margin-right: 10px;
+    box-shadow: 0 0 10px black;
+    cursor:pointer;
+    font-size: 20px;
+    font-weight: 700;
+    margin: 0.5em;
+  }
+
   .right-nav{
     display: flex;
   }