Merge branch 'dev' of https://github.com/CPP-BitByBit/BitMatch into dev

Author: larrylaa

backend/.dockerignore

@@ -0,0 +1,6 @@
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+.env
+/static

backend/.gitignore

@@ -38,27 +38,6 @@ static/
 .DS_Store
 Thumbs.db
 
-# Local .terraform directories
-.terraform/
-
-# Terraform state files
-*.tfstate
-*.tfstate.*
-
-# Crash log files
-crash.log
-
-# Terraform variable files (containing sensitive data)
-*.tfvars
-*.tfvars.json
-
-# Override files, which may contain sensitive data
-override.tf
-override.tf.json
-
-# .terraform.lock.hcl files (optional to include, especially in team environments)
-.terraform.lock.hcl
-
 # IDE and editor folders
 .vscode/
 .idea/

backend/Dockerfile

@@ -0,0 +1,21 @@
+# Use an official Python runtime as a parent image
+FROM python:3.11
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy the requirements file and install dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the application
+COPY . .
+
+# Set environment variables
+ENV PYTHONUNBUFFERED=1
+
+# Expose the port for Gunicorn
+EXPOSE 8000
+
+# Run migrations and start Django server
+CMD ["sh", "-c", "python manage.py migrate && python manage.py collectstatic --noinput && gunicorn bitmatch.wsgi:application --bind 0.0.0.0:8000"]

backend/bitmatch/bitmatch/__init__.py renamed to backend/bitmatch/__init__.py

@@ -175,10 +175,10 @@
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 CORS_ALLOWED_ORIGINS = [
-    "http://localhost:5173",  # Vite development server URL
-    "http://localhost:5174",
-    "http://localhost:5175",
-    "http://localhost:5176",
+    "http://localhost:5173", 
+    "http://localhost:5174", 
+    "https://bitmatchapp.com",
+    "https://api.bitmatchapp.com",
 ]
 
 CORS_ALLOW_CREDENTIALS = True

backend/bitmatch/bitmatch/asgi.py renamed to backend/bitmatch/asgi.py

@@ -1,9 +1,11 @@
+import { useEffect, useState } from "react";
 import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 import {
   SignedIn,
   SignedOut,
   SignInButton,
   UserButton,
+  useUser,
 } from "@clerk/clerk-react";
 import { Button } from "./components/ui/button";
 import HomePage from "./views/HomePage";
@@ -12,6 +14,18 @@ import ProjectDetailPage from "./views/IndividualProjectPage";
 import "./styles/global.css";
 
 export default function App() {
+  const { user } = useUser();
+  const [showModal, setShowModal] = useState(false);
+  // eslint-disable-next-line no-unused-vars
+  const [showMaintenanceNote, setShowMaintenanceNote] = useState(true); // Toggle for maintenance note
+
+  useEffect(() => {
+    if (user && !sessionStorage.getItem("seenDevelopmentModal")) {
+      setShowModal(true);
+      sessionStorage.setItem("seenDevelopmentModal", "true"); // Store it for the session
+    }
+  }, [user]);
+
   return (
     <Router>
       <div className="container mx-auto px-4 py-16 flex pb-6 flex-col items-center justify-center min-h-screen">
@@ -20,6 +34,18 @@ export default function App() {
             <h1 className="text-3xl font-semibold text-gray-800 mb-4">
               Sign in to continue
             </h1>
+            {/* Maintenance Note */}
+            {showMaintenanceNote && (
+              <div className="bg-yellow-100 text-yellow-800 p-4 mb-4 rounded max-w-xs mx-auto">
+                <strong>
+                  Maintenance Notice: We are currently performing maintenance to
+                  improve the performance and reliability of our service. Some
+                  features may be temporarily unavailable. We appreciate your
+                  patience and understanding as we work to enhance your
+                  experience.
+                </strong>
+              </div>
+            )}
             <SignInButton mode="modal">
               <Button className="px-6 py-3 bg-blue-600 text-white rounded-lg shadow-md hover:bg-blue-700">
                 Sign In
@@ -29,6 +55,35 @@ export default function App() {
         </SignedOut>
 
         <SignedIn>
+          {/* First Login Modal (Per Session) */}
+          {showModal && (
+            <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-[1000]">
+              <div className="bg-white p-6 rounded-lg shadow-lg max-w-md text-center z-[1001]">
+                <h2 className="text-xl font-bold text-gray-800 mb-4">
+                  Disclaimer
+                </h2>
+                <p className="text-gray-600 mb-4">
+                  Bitmatch is in early development, so some features may not
+                  work as expected. Thanks for your patience and support as we
+                  continue to improve!
+                </p>
+                <p className="text-gray-600 mb-4">
+                  If you experience any issues, please email us at{" "}
+                  <a href="mailto:[email protected]" className="text-blue-600">
+                    [email protected]
+                  </a>
+                  .
+                </p>
+                <Button
+                  onClick={() => setShowModal(false)}
+                  className="bg-blue-600 text-white px-4 py-2 rounded"
+                >
+                  Got it!
+                </Button>
+              </div>
+            </div>
+          )}
+
           <header className="w-full bg-white shadow-md p-4 fixed top-0 left-0 z-50">
             <div className="max-w-[1485px] mx-auto flex justify-between items-center">
               <a href="/">
@@ -41,13 +96,8 @@ export default function App() {
           </header>
 
           <Routes>
-            {/* Home Page */}
             <Route path="/" element={<HomePage />} />
-
-            {/* Project List Page */}
             <Route path="/project-list" element={<ProjectListPage />} />
-
-            {/* Individual List Page */}
             <Route path="/projects/:id" element={<ProjectDetailPage />} />
           </Routes>
         </SignedIn>

backend/bitmatch/bitmatch/settings.py renamed to backend/bitmatch/settings.py

@@ -0,0 +1,20 @@
+# Local .terraform directories
+.terraform/
+
+# Terraform state files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+
+# Terraform variable files (containing sensitive data)
+*.tfvars
+*.tfvars.json
+
+# Override files, which may contain sensitive data
+override.tf
+override.tf.json
+
+# .terraform.lock.hcl files (optional to include, especially in team environments)
+.terraform.lock.hcl