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 ( - <> -
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:
-+ 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: +
+ +By combining these strategies, the global community aims to protect Earth from the potentially devastating effects of asteroid impacts.
-+ By combining these strategies, the global community aims to protect Earth from the potentially devastating effects of asteroid impacts. +
+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:
-+ 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: +
+ +In summary, while the impact of small meteors is relatively minor and localized, large meteors can have devastating global consequences. Preparedness and mitigation strategies are essential for minimizing the potential impacts of such events.
-+ In summary, while the impact of small meteors is relatively minor and localized, large meteors can have devastating global consequences. Preparedness and mitigation strategies are essential for minimizing the potential impacts of such events. +
A body in space is considered a near-earth object if passing within 1.3 times the distance from the Earth to the Sun (defined as 1 astronomical unit, AU). For reference, the Earth is 93 million miles from the Sun (150 million km), and the moon is 238,900 miles (384,000 km) from Earth.
-Collision with the earth can have significant effects on the environment, ranging from local effects to global impact.
-A potential hazardous asteroid (PHA) would approach closer than 0.05 AU and a diameter of greater than 500 ft (140m).
-Since 1900, NASA has logged 2,586 PHAs and anticipate 3,317 more out to 2200 AD.
-Comparison of the distances of satellite range and the closest approaches to the Earth
-In 1957, 2019 CD2 asteroid passed 46,349 mi from Earth, with a diameter of 850-1940 ft. This is relatively large, and with this asteroid's orbit around the sun it will have at least 5 more close approaches in the future (although not as close).
-In 2029, 99942 Apophis, an asteroid of around 1,115 ft in diameter, will pass 23,619 mi from the Earth.
-The near-earth object everyone recognizes is Halley's Comet. With observations going back 2,000 years, the comet approaches the earth every 76 years. The comet is large, being about 48,000 ft by 26,000 ft. Thankfully the closest approach has been 0.033 AU (3 million miles), in 837 AD.
+A body in space is considered a near-earth object if passing within 1.3 times the distance from the Earth to the Sun (defined as 1 astronomical unit, AU). For reference, the Earth is 93 million miles from the Sun (150 million km), and the moon is 238,900 miles (384,000 km) from Earth.
+ +Collision with the earth can have significant effects on the environment, ranging from local effects to global impact.
+A potential hazardous asteroid (PHA) would approach closer than 0.05 AU and a diameter of greater than 500 ft (140m).
+ +Since 1900, NASA has logged 2,586 PHAs and anticipate 3,317 more out to 2200 AD.
+Comparison of the distances of satellite range and the closest approaches to the Earth
+ +In 1957, 2019 CD2 asteroid passed 46,349 mi from Earth, with a diameter of 850-1940 ft. This is relatively large, and with this asteroid's orbit around the sun it will have at least 5 more close approaches in the future (although not as close).
+In 2029, 99942 Apophis, an asteroid of around 1,115 ft in diameter, will pass 23,619 mi from the Earth.
+The near-earth object everyone recognizes is Halley's Comet. With observations going back 2,000 years, the comet approaches the earth every 76 years. The comet is large, being about 48,000 ft by 26,000 ft. Thankfully the closest approach has been 0.033 AU (3 million miles), in 837 AD.