cptluke76/Deep-Impact
1
0
Fork 0
mirror of https://github.com/its-michaelroy/Deep-Impact.git synced 2026-06-04 02:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 9a1f5152d9 Merge pull request #19 from Team-Deep-Impact/dependabot/pip/django-cors-headers-4.4.0 Michael Roy 2024-09-25 19:51:18 -03:00
  • cd67f96611 Merge pull request #20 from Team-Deep-Impact/dependabot/pip/gunicorn-23.0.0 Michael Roy 2024-09-25 19:51:04 -03:00
  • 744e441871 Merge pull request #21 from Team-Deep-Impact/dependabot/pip/httpcore-1.0.5 Michael Roy 2024-09-25 19:50:48 -03:00
  • 431c842afb Bump django-cors-headers from 4.2.0 to 4.4.0 dependabot[bot] 2024-09-25 22:50:45 +00:00
  • 95a537e3c0 Merge pull request #23 from Team-Deep-Impact/dependabot/pip/pydantic-2.9.2 Michael Roy 2024-09-25 19:50:34 -03:00
  • 32958afb1f Bump gunicorn from 22.0.0 to 23.0.0 dependabot[bot] 2024-09-25 22:50:05 +00:00
  • b0808537be Bump pydantic from 2.6.1 to 2.9.2 dependabot[bot] 2024-09-25 22:50:02 +00:00
  • ad2b1169d0 Bump httpcore from 1.0.2 to 1.0.5 dependabot[bot] 2024-09-25 22:50:01 +00:00
  • 02e0cf709c Merge pull request #24 from Team-Deep-Impact/dependabot/pip/typing-extensions-4.12.2 Michael Roy 2024-09-25 19:49:53 -03:00
  • 5af2ed406a Merge branch 'dev' into dependabot/pip/backend/pip-7ea75cc8df Michael Roy 2024-09-25 19:49:26 -03:00
  • 7506f38683 Bump typing-extensions from 4.9.0 to 4.12.2 dependabot[bot] 2024-09-25 22:48:42 +00:00
  • f1831601a5 Merge pull request #30 from Team-Deep-Impact/dependabot/npm_and_yarn/frontend/npm_and_yarn-cc856c89ab Michael Roy 2024-09-25 19:48:22 -03:00
  • 6119a81cba Bump the npm_and_yarn group across 1 directory with 4 updates dependabot[bot] 2024-09-25 22:47:56 +00:00
  • 30236a3b35 Bump the pip group across 1 directory with 4 updates dependabot[bot] 2024-09-25 22:47:35 +00:00
  • b5b292f572 Merge pull request #25 from Team-Deep-Impact/dependabot/pip/djangorestframework-3.15.2 Michael Roy 2024-09-25 19:47:28 -03:00
  • db8c95a27e Merge pull request #26 from Team-Deep-Impact/dependabot/pip/urllib3-2.2.3 Michael Roy 2024-09-25 19:47:16 -03:00
  • 081fb58367 Merge pull request #27 from Team-Deep-Impact/dependabot/pip/tqdm-4.66.5 Michael Roy 2024-09-25 19:47:03 -03:00
  • 2ca9bafde4 Merge pull request #28 from Team-Deep-Impact/dependabot/pip/sniffio-1.3.1 Michael Roy 2024-09-25 19:46:37 -03:00
  • 4a95badad2 Bump sniffio from 1.3.0 to 1.3.1 dependabot[bot] 2024-09-25 22:45:42 +00:00
  • 590321c70d Bump tqdm from 4.66.2 to 4.66.5 dependabot[bot] 2024-09-25 22:45:39 +00:00
  • 36a60b7273 Bump urllib3 from 2.2.1 to 2.2.3 dependabot[bot] 2024-09-25 22:45:36 +00:00
  • c60b580316 Bump djangorestframework from 3.15.1 to 3.15.2 dependabot[bot] 2024-09-25 22:45:33 +00:00
  • cafe369d06 Bump httpx from 0.26.0 to 0.27.2 dependabot[bot] 2024-09-25 22:45:23 +00:00
  • 6716892b93 Create dependabot.yml Michael Roy 2024-09-25 19:44:25 -03:00
  • 501f5cbf61 polished readme Jordan Yamada 2024-05-19 18:13:21 +00:00
  • 89bd33afc6 pycache ignored Dan 2024-05-19 13:48:47 -04:00
  • 6115c3673a Update README.md Dan 2024-05-19 13:40:15 -04:00
  • fda11b04be Merge pull request #17 from Team-Deep-Impact/question Jordan Yamada 2024-05-19 11:08:15 -05:00
  • a560dd186e (WIP) working on quiz Jordan Yamada 2024-05-19 16:01:20 +00:00
  • 1619661b89 Merge branch 'dev' into question Jordan Yamada 2024-05-19 15:59:45 +00:00
  • f89c6ca0f7 Merge branch 'dev' of https://github.com/Team-Deep-Impact/Deep-Impact into dev Jordan Yamada 2024-05-19 15:57:22 +00:00
  • 3452dbb26d added live deploy in readme Jordan Yamada 2024-05-19 15:56:52 +00:00
  • 3d81002ef2 Merge pull request #16 from Team-Deep-Impact/simulation Dan 2024-05-19 11:54:24 -04:00
  • 4294173680 Merge branch 'dev' into question Jordan Yamada 2024-05-19 15:52:21 +00:00
  • 75ea879b87 updated simulation ui Dan 2024-05-19 11:50:56 -04:00
  • 78a875d5b2 (WIP) resolving merge conflict Jordan Yamada 2024-05-19 15:49:13 +00:00
  • 1902c2e687 (WIP) resolving merge conflict Jordan Yamada 2024-05-19 15:40:04 +00:00
  • 520a923b2b (WIP)made env to frontend for live deployment... working on making a quiz on frontend. Jordan Yamada 2024-05-19 15:32:09 +00:00
  • 3c35f78d8f Merge pull request #14 from Team-Deep-Impact/main Jordan Yamada 2024-05-19 04:00:18 -05:00
  • 7001f3ffc7 Merge pull request #13 from Team-Deep-Impact/dev Jordan Yamada 2024-05-19 03:59:50 -05:00
  • e72caab854 working on issue with openai api key(WIP) Jordan Yamada 2024-05-19 08:55:49 +00:00
  • 6c9d8a3a6d Merge pull request #12 from Team-Deep-Impact/simulation Dan 2024-05-19 03:51:32 -04:00
  • d513c363e6 Merge branch 'dev' into simulation Dan 2024-05-19 03:48:54 -04:00
  • ee810c04d1 add ignored pycache Dan 2024-05-19 03:22:30 -04:00
  • 1711936609 added ignore for pycache Dan 2024-05-19 03:19:04 -04:00
  • 2dcd96fc1e Merge pull request #11 from Team-Deep-Impact/page-updates Jordan Yamada 2024-05-19 01:41:05 -05:00
  • 844ed6736c Cleaned up proj directory by removing extra proj dir, updated defenses, effects, and main page with new formatting for better appearance Michael Roy 2024-05-19 02:33:30 -04:00
  • 3a6aeb3866 Update README.md Michael Roy 2024-05-19 02:27:07 -04:00
  • d68dd59149 Merge branch 'dev' into simulation Dan 2024-05-19 01:13:46 -04:00
  • aaa20177c5 ugh Dan 2024-05-19 01:12:29 -04:00
  • b422b98123 Merge pull request #10 from Team-Deep-Impact/sentry-backend Dan 2024-05-19 01:11:46 -04:00
  • 94e3f37f70 add the NASA Sentry api call to the backend Jordan Yamada 2024-05-19 05:05:55 +00:00
  • fc33f5e0f6 Update README.md Michael Roy 2024-05-18 22:48:08 -04:00
  • 0de0b25fab Merge pull request #9 from Team-Deep-Impact/api_app Jordan Yamada 2024-05-18 21:10:51 -05:00
  • 54e0d6a24c Modified Title & Tab, updated url for Github, updated url paths for project and started template for views within api application Michael Roy 2024-05-18 22:04:38 -04:00
  • a333aa8fa4 Merge pull request #8 from Team-Deep-Impact/backend Jordan Yamada 2024-05-18 20:05:29 -05:00
  • c2a49f4f00 working on rocket interception Dan 2024-05-18 21:04:49 -04:00
  • da3d84cf41 Added api_app Michael Roy 2024-05-18 20:57:46 -04:00
  • 895ab74cc8 Merge pull request #7 from Team-Deep-Impact/mitigations-page Michael Roy 2024-05-18 20:50:01 -04:00
  • 81209996d0 Merge pull request #6 from Team-Deep-Impact/simulation Jordan Yamada 2024-05-18 19:12:04 -05:00
  • 327d522c0d Merge pull request #5 from Team-Deep-Impact/about-page Jordan Yamada 2024-05-18 19:09:02 -05:00
  • 7f81537bf8 Created inital template for backend Michael Roy 2024-05-18 18:59:27 -04:00
  • 71d97c8848 added a defenses page that details our defensive options Jordan Yamada 2024-05-18 21:36:08 +00:00
  • c66f53c5ca add: info to about page, width to main page Jordan Edgington 2024-05-18 17:08:15 -04:00
  • c8aa6403a4 added forecast line and an angle slider to control the impact point with earth. Dan 2024-05-18 16:45:52 -04:00
  • 2241d3f65f added a page to decribe effects of an impact on earth Jordan Yamada 2024-05-18 19:58:34 +00:00
  • 5e1062f7e7 initial simulation working. Asteroid data collected from Nasa Sentry data set. Gravity Attraction seems working ok. Simulation ends when asteroid hits earth. Started deflection method implementation. not done at all. Dan 2024-05-18 14:59:28 -04:00
  • 6b4104b9ce Merge branch 'dev' into threats-page Jordan Yamada 2024-05-18 18:23:51 +00:00
  • 7a0396bcfa starting a page for effects Jordan Yamada 2024-05-18 18:13:11 +00:00
  • 7143619fdf Merge pull request #4 from Team-Deep-Impact/mickey Dan 2024-05-18 13:47:09 -04:00
  • ad2461a589 update to home page Michelle Shoenberger 2024-05-18 09:23:32 -04:00
  • 603f1dd143 Merge pull request #2 from Team-Deep-Impact/dev Jordan Yamada 2024-05-17 21:16:04 -05:00
  • 42013431b2 fixing logo in readme Jordan Yamada 2024-05-18 02:14:51 +00:00
  • b1d8fdc4ca Merge pull request #1 from Team-Deep-Impact/dev Jordan Yamada 2024-05-17 21:13:22 -05:00
  • f196c2d11d added a logo to the readme Jordan Yamada 2024-05-18 02:12:37 +00:00
  • efce89bd16 add: boilerplate w/ navbar, tailwindcss Jordan Edgington 2024-05-17 21:58:07 -04:00
  • 2fd5a4583c initial commit Jordan Edgington 2024-05-17 20:57:50 -04:00