Merge branch 'master' into SKIL-group

Lunatic-Labs · Dec 6, 2024 · 06261ba · 06261ba
2 parents 0655b1e + 3c6f4cd
commit 06261ba
Show file tree

Hide file tree

Showing 84 changed files with 2,577 additions and 1,052 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,7 @@ package-lock.json
 BackEndFlask/logs/all.log
 BackEndFlask/models/hidden.py
 BackEndFlask/logs/all.log
+BackEndFlask/.env
 .vscode
 
 # Nginx configuration files

diff --git a/AWS/maintenance.html b/AWS/maintenance.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>SkillBuilder - System Maintenance</title>
+    <!-- Favicon for various platforms -->
+    <link rel="icon" type="image/svg+xml" href="/FrontEndReact/public/sbLogo.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/FrontEndReact/public/sbLogo.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/FrontEndReact/public/sbLogo.png">
+    <style>
+        body {
+            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
+            margin: 0;
+            padding: 0;
+            min-height: 100vh;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            background-color: #f5f5f5;
+        }
+        .container {
+            text-align: center;
+            padding: 2rem;
+            max-width: 600px;
+            background-color: white;
+            border-radius: 8px;
+            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+        }
+        .logo {
+            width: 120px;
+            height: auto;
+            margin-bottom: 2rem;
+        }
+        h1 {
+            color: #2c5282;
+            margin-bottom: 1rem;
+        }
+        p {
+            color: #4a5568;
+            line-height: 1.6;
+            margin-bottom: 1.5rem;
+        }
+        .status-badge {
+            background-color: #2c5282;
+            color: white;
+            padding: 0.5rem 1rem;
+            border-radius: 9999px;
+            display: inline-block;
+            font-size: 0.875rem;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <img src="/FrontEndReact/public/sbLogo.png" alt="SkillBuilder Logo" class="logo">
+        <h1>System Maintenance</h1>
+        <p>We're currently performing scheduled maintenance to improve your SkillBuilder experience. Our team is working to bring the system back online as quickly as possible.</p>
+        <p>Thank you for your patience.</p>
+        <div class="status-badge">System Status: Maintenance in Progress</div>
+    </div>
+</body>
+</html>
diff --git a/BackEndFlask/.env b/BackEndFlask/.env
@@ -4,3 +4,7 @@ DEMO_ADMIN_PASSWORD=demo_admin
 DEMO_TA_INSTRUCTOR_PASSWORD=demo_ta
 DEMO_STUDENT_PASSWORD=demo_student
 SECRET_KEY=Thisissupposedtobesecret!
+MYSQL_HOST=localhost:3306
+MYSQL_USER=rubricapp_admin
+MYSQL_PASSWORD=ThisReallyNeedsToBeASecret1!
+MYSQL_DATABASE=rubricapp
diff --git a/BackEndFlask/.gitignore b/BackEndFlask/.gitignore
@@ -17,4 +17,5 @@ Functions/test.py
 Models/hidden.py
 dump.rdb
 BackEndFlaskVenv
-Test
+Test
+.env