diff --git a/README.md b/README.md index daadc03..95263b2 100644 --- a/README.md +++ b/README.md @@ -31,24 +31,37 @@ To learn more about Deep Impact, check out our [Deep Impact GitHub](https://gith 1. **Set Up Python Environment**: - Vanilla Python: ```sh - python -m venv deep-impact-env + python -m venv .venv ``` - Virtual Environment Wrapper: ```sh - mkvirtualenv deep-impact-env + mkvirtualenv .venv ``` - Activate the environment: ```sh - source deep-impact-env/bin/activate + source .venv/bin/activate ``` 2. **Install Required Packages**: - Navigate to the backend directory and install dependencies: ```sh - cd Deep-Impact/backend/deep_impact_proj + cd Deep-Impact/backend pip install -r requirements.txt ``` +3. **Initial Migration(s)**: + - Ensure you're located in the path: Deep-Impact/backend + ```sh + python manage.py makemigrations + python manage.py migrate + ``` + +4. **Start Django Server**: + - Ensure you're located in the path: Deep-Impact/backend + ```sh + python manage.py runserver + ``` + ### Vite Frontend Setup 1. **Install Node Modules**: diff --git a/backend/deep_impact_proj/.env.sample b/backend/.env.sample similarity index 100% rename from backend/deep_impact_proj/.env.sample rename to backend/.env.sample diff --git a/backend/deep_impact_proj/.gitignore b/backend/.gitignore similarity index 100% rename from backend/deep_impact_proj/.gitignore rename to backend/.gitignore diff --git a/backend/deep_impact_proj/api_app/__init__.py b/backend/api_app/__init__.py similarity index 100% rename from backend/deep_impact_proj/api_app/__init__.py rename to backend/api_app/__init__.py diff --git a/backend/deep_impact_proj/api_app/admin.py b/backend/api_app/admin.py similarity index 100% rename from backend/deep_impact_proj/api_app/admin.py rename to backend/api_app/admin.py diff --git a/backend/deep_impact_proj/api_app/apps.py b/backend/api_app/apps.py similarity index 100% rename from backend/deep_impact_proj/api_app/apps.py rename to backend/api_app/apps.py diff --git a/backend/deep_impact_proj/api_app/migrations/__init__.py b/backend/api_app/migrations/__init__.py similarity index 100% rename from backend/deep_impact_proj/api_app/migrations/__init__.py rename to backend/api_app/migrations/__init__.py diff --git a/backend/deep_impact_proj/api_app/models.py b/backend/api_app/models.py similarity index 100% rename from backend/deep_impact_proj/api_app/models.py rename to backend/api_app/models.py diff --git a/backend/deep_impact_proj/api_app/tests.py b/backend/api_app/tests.py similarity index 100% rename from backend/deep_impact_proj/api_app/tests.py rename to backend/api_app/tests.py diff --git a/backend/deep_impact_proj/api_app/urls.py b/backend/api_app/urls.py similarity index 100% rename from backend/deep_impact_proj/api_app/urls.py rename to backend/api_app/urls.py diff --git a/backend/deep_impact_proj/api_app/utils.py b/backend/api_app/utils.py similarity index 100% rename from backend/deep_impact_proj/api_app/utils.py rename to backend/api_app/utils.py diff --git a/backend/deep_impact_proj/api_app/views.py b/backend/api_app/views.py similarity index 100% rename from backend/deep_impact_proj/api_app/views.py rename to backend/api_app/views.py diff --git a/backend/deep_impact_proj/db.sqlite3 b/backend/db.sqlite3 similarity index 100% rename from backend/deep_impact_proj/db.sqlite3 rename to backend/db.sqlite3 diff --git a/backend/deep_impact_proj/deep_impact_proj/__init__.py b/backend/deep_impact_proj/__init__.py similarity index 100% rename from backend/deep_impact_proj/deep_impact_proj/__init__.py rename to backend/deep_impact_proj/__init__.py diff --git a/backend/deep_impact_proj/api_app/__pycache__/__init__.cpython-311.pyc b/backend/deep_impact_proj/api_app/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index a4b76cd..0000000 Binary files a/backend/deep_impact_proj/api_app/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/api_app/__pycache__/admin.cpython-311.pyc b/backend/deep_impact_proj/api_app/__pycache__/admin.cpython-311.pyc deleted file mode 100644 index c8277e4..0000000 Binary files a/backend/deep_impact_proj/api_app/__pycache__/admin.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/api_app/__pycache__/apps.cpython-311.pyc b/backend/deep_impact_proj/api_app/__pycache__/apps.cpython-311.pyc deleted file mode 100644 index 4f32680..0000000 Binary files a/backend/deep_impact_proj/api_app/__pycache__/apps.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/api_app/__pycache__/models.cpython-311.pyc b/backend/deep_impact_proj/api_app/__pycache__/models.cpython-311.pyc deleted file mode 100644 index 60807df..0000000 Binary files a/backend/deep_impact_proj/api_app/__pycache__/models.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/api_app/__pycache__/urls.cpython-311.pyc b/backend/deep_impact_proj/api_app/__pycache__/urls.cpython-311.pyc deleted file mode 100644 index 152c84f..0000000 Binary files a/backend/deep_impact_proj/api_app/__pycache__/urls.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/api_app/__pycache__/utils.cpython-311.pyc b/backend/deep_impact_proj/api_app/__pycache__/utils.cpython-311.pyc deleted file mode 100644 index bce4ab9..0000000 Binary files a/backend/deep_impact_proj/api_app/__pycache__/utils.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/api_app/__pycache__/views.cpython-311.pyc b/backend/deep_impact_proj/api_app/__pycache__/views.cpython-311.pyc deleted file mode 100644 index 44d1d2d..0000000 Binary files a/backend/deep_impact_proj/api_app/__pycache__/views.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/api_app/migrations/__pycache__/__init__.cpython-311.pyc b/backend/deep_impact_proj/api_app/migrations/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 56c39e0..0000000 Binary files a/backend/deep_impact_proj/api_app/migrations/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/deep_impact_proj/asgi.py b/backend/deep_impact_proj/asgi.py similarity index 100% rename from backend/deep_impact_proj/deep_impact_proj/asgi.py rename to backend/deep_impact_proj/asgi.py diff --git a/backend/deep_impact_proj/deep_impact_proj/__pycache__/__init__.cpython-311.pyc b/backend/deep_impact_proj/deep_impact_proj/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 7b76c90..0000000 Binary files a/backend/deep_impact_proj/deep_impact_proj/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/deep_impact_proj/__pycache__/settings.cpython-311.pyc b/backend/deep_impact_proj/deep_impact_proj/__pycache__/settings.cpython-311.pyc deleted file mode 100644 index 8be5445..0000000 Binary files a/backend/deep_impact_proj/deep_impact_proj/__pycache__/settings.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/deep_impact_proj/__pycache__/urls.cpython-311.pyc b/backend/deep_impact_proj/deep_impact_proj/__pycache__/urls.cpython-311.pyc deleted file mode 100644 index 3b34415..0000000 Binary files a/backend/deep_impact_proj/deep_impact_proj/__pycache__/urls.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/deep_impact_proj/__pycache__/wsgi.cpython-311.pyc b/backend/deep_impact_proj/deep_impact_proj/__pycache__/wsgi.cpython-311.pyc deleted file mode 100644 index 39afbf7..0000000 Binary files a/backend/deep_impact_proj/deep_impact_proj/__pycache__/wsgi.cpython-311.pyc and /dev/null differ diff --git a/backend/deep_impact_proj/deep_impact_proj/settings.py b/backend/deep_impact_proj/settings.py similarity index 100% rename from backend/deep_impact_proj/deep_impact_proj/settings.py rename to backend/deep_impact_proj/settings.py diff --git a/backend/deep_impact_proj/deep_impact_proj/urls.py b/backend/deep_impact_proj/urls.py similarity index 100% rename from backend/deep_impact_proj/deep_impact_proj/urls.py rename to backend/deep_impact_proj/urls.py diff --git a/backend/deep_impact_proj/deep_impact_proj/wsgi.py b/backend/deep_impact_proj/wsgi.py similarity index 100% rename from backend/deep_impact_proj/deep_impact_proj/wsgi.py rename to backend/deep_impact_proj/wsgi.py diff --git a/backend/deep_impact_proj/manage.py b/backend/manage.py similarity index 100% rename from backend/deep_impact_proj/manage.py rename to backend/manage.py diff --git a/backend/deep_impact_proj/requirements.txt b/backend/requirements.txt similarity index 100% rename from backend/deep_impact_proj/requirements.txt rename to backend/requirements.txt diff --git a/frontend/src/pages/defenses.jsx b/frontend/src/pages/defenses.jsx index 20f6edc..74e684b 100644 --- a/frontend/src/pages/defenses.jsx +++ b/frontend/src/pages/defenses.jsx @@ -1,107 +1,117 @@ - const Defenses = () => { return ( - <> -
-

Defensive Options

-

What Can We Do?

-

Defending Earth against potentially hazardous meteors or asteroids involves several strategies and technologies, primarily focused on detection, deflection, and disruption. Here are the primary defense options:

-

Early Detection and Monitoring

-
+ ); +}; + +export default Defenses; diff --git a/frontend/src/pages/effects.jsx b/frontend/src/pages/effects.jsx index 21ee8b5..ee6d4e1 100644 --- a/frontend/src/pages/effects.jsx +++ b/frontend/src/pages/effects.jsx @@ -1,86 +1,94 @@ - const Effects = () => { return ( - <> -
-

Effects of an Impact

-

The Impact of a Meteor Hitting Earth

-

The impact of a meteor hitting Earth can vary widely depending on the size, composition, speed, and location of the impact. Here are the key impacts based on the size of the meteor:

-

Small Meteors (up to 25 meters in diameter)

-