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
34 Commits 1 Branch 0 Tags
6c9d8a3a6d6eb21cce1053c63c6006f21d1c25dc
Commit Graph

34 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan
6c9d8a3a6d Merge pull request #12 from Team-Deep-Impact/simulation 
Simulation
 2024-05-19 03:51:32 -04:00
Dan
d513c363e6 Merge branch 'dev' into simulation 2024-05-19 03:48:54 -04:00
Dan
ee810c04d1 add ignored pycache 2024-05-19 03:22:30 -04:00
Dan
1711936609 added ignore for pycache 2024-05-19 03:19:04 -04:00
Jordan Yamada
2dcd96fc1e Merge pull request #11 from Team-Deep-Impact/page-updates 
Cleaned up proj directory by removing extra proj dir, updated defense…
 2024-05-19 01:41:05 -05:00
Michael Roy
844ed6736c Cleaned up proj directory by removing extra proj dir, updated defenses, effects, and main page with new formatting for better appearance 2024-05-19 02:33:30 -04:00
Michael Roy
3a6aeb3866 Update README.md 2024-05-19 02:27:07 -04:00
Dan
d68dd59149 Merge branch 'dev' into simulation 2024-05-19 01:13:46 -04:00
Dan
aaa20177c5 ugh 2024-05-19 01:12:29 -04:00
Dan
b422b98123 Merge pull request #10 from Team-Deep-Impact/sentry-backend 
add the NASA Sentry api call to the backend
 2024-05-19 01:11:46 -04:00
Jordan Yamada
94e3f37f70 add the NASA Sentry api call to the backend 2024-05-19 05:05:55 +00:00
Michael Roy
fc33f5e0f6 Update README.md 
Updated Readme
 2024-05-18 22:48:08 -04:00
Jordan Yamada
0de0b25fab Merge pull request #9 from Team-Deep-Impact/api_app 
Modified Title & Tab, updated url for Github, updated url paths for p…
 2024-05-18 21:10:51 -05:00
Michael Roy
54e0d6a24c Modified Title & Tab, updated url for Github, updated url paths for project and started template for views within api application 2024-05-18 22:04:38 -04:00
Jordan Yamada
a333aa8fa4 Merge pull request #8 from Team-Deep-Impact/backend 
Backend
 2024-05-18 20:05:29 -05:00
Dan
c2a49f4f00 working on rocket interception 2024-05-18 21:04:49 -04:00
Michael Roy
da3d84cf41 Added api_app 2024-05-18 20:57:46 -04:00
Michael Roy
895ab74cc8 Merge pull request #7 from Team-Deep-Impact/mitigations-page 
Mitigations page
 2024-05-18 20:50:01 -04:00
Jordan Yamada
81209996d0 Merge pull request #6 from Team-Deep-Impact/simulation 
Simulation
 2024-05-18 19:12:04 -05:00
Jordan Yamada
327d522c0d Merge pull request #5 from Team-Deep-Impact/about-page 
add: info to about page, width to main page
 2024-05-18 19:09:02 -05:00
Michael Roy
7f81537bf8 Created inital template for backend 2024-05-18 18:59:27 -04:00
Jordan Yamada
71d97c8848 added a defenses page that details our defensive options 2024-05-18 21:36:08 +00:00
Jordan Edgington
c66f53c5ca add: info to about page, width to main page 2024-05-18 17:08:15 -04:00
Dan
c8aa6403a4 added forecast line and an angle slider to control the impact point with earth. 2024-05-18 16:45:52 -04:00
Jordan Yamada
2241d3f65f added a page to decribe effects of an impact on earth 2024-05-18 19:58:34 +00:00
Dan
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.
 2024-05-18 14:59:28 -04:00
Jordan Yamada
6b4104b9ce Merge branch 'dev' into threats-page 2024-05-18 18:23:51 +00:00
Jordan Yamada
7a0396bcfa starting a page for effects 2024-05-18 18:13:11 +00:00
Dan
7143619fdf Merge pull request #4 from Team-Deep-Impact/mickey 
update to home page
 2024-05-18 13:47:09 -04:00
Michelle Shoenberger
ad2461a589 update to home page 2024-05-18 09:23:32 -04:00
Jordan Yamada
42013431b2 fixing logo in readme 2024-05-18 02:14:51 +00:00
Jordan Yamada
f196c2d11d added a logo to the readme 2024-05-18 02:12:37 +00:00
Jordan Edgington
efce89bd16 add: boilerplate w/ navbar, tailwindcss 2024-05-17 21:58:07 -04:00
Jordan Edgington
2fd5a4583c initial commit 2024-05-17 20:57:50 -04:00