cptluke76/Deep-Impact
1
0
Fork 0
mirror of https://github.com/its-michaelroy/Deep-Impact.git synced 2026-06-04 10:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
110 Commits 1 Branch 0 Tags
f5860b5e9fa38e4009c2f20225c100e5a25322ca
Commit Graph

110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Roy
2ca9bafde4 Merge pull request #28 from Team-Deep-Impact/dependabot/pip/sniffio-1.3.1 
Bump sniffio from 1.3.0 to 1.3.1
 2024-09-25 19:46:37 -03:00
dependabot[bot]
4a95badad2 Bump sniffio from 1.3.0 to 1.3.1 
Bumps [sniffio](https://github.com/python-trio/sniffio) from 1.3.0 to 1.3.1.
- [Commits](https://github.com/python-trio/sniffio/compare/v1.3.0...v1.3.1)

---
updated-dependencies:
- dependency-name: sniffio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:45:42 +00:00
dependabot[bot]
590321c70d Bump tqdm from 4.66.2 to 4.66.5 
Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.66.2 to 4.66.5.
- [Release notes](https://github.com/tqdm/tqdm/releases)
- [Commits](https://github.com/tqdm/tqdm/compare/v4.66.2...v4.66.5)

---
updated-dependencies:
- dependency-name: tqdm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:45:39 +00:00
dependabot[bot]
36a60b7273 Bump urllib3 from 2.2.1 to 2.2.3 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.2.1 to 2.2.3.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/2.2.1...2.2.3)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:45:36 +00:00
dependabot[bot]
c60b580316 Bump djangorestframework from 3.15.1 to 3.15.2 
Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.15.1 to 3.15.2.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.15.1...3.15.2)

---
updated-dependencies:
- dependency-name: djangorestframework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:45:33 +00:00
dependabot[bot]
cafe369d06 Bump httpx from 0.26.0 to 0.27.2 
Bumps [httpx](https://github.com/encode/httpx) from 0.26.0 to 0.27.2.
- [Release notes](https://github.com/encode/httpx/releases)
- [Changelog](https://github.com/encode/httpx/blob/master/CHANGELOG.md)
- [Commits](https://github.com/encode/httpx/compare/0.26.0...0.27.2)

---
updated-dependencies:
- dependency-name: httpx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:45:23 +00:00
Michael Roy
6716892b93 Create dependabot.yml 
Added to maintain security and dep updates yml
 2024-09-25 19:44:25 -03:00
Jordan Yamada
501f5cbf61 polished readme 2024-05-19 18:13:21 +00:00
Dan
89bd33afc6 pycache ignored 2024-05-19 13:48:47 -04:00
Dan
6115c3673a Update README.md 2024-05-19 13:40:15 -04:00
Jordan Yamada
fda11b04be Merge pull request #17 from Team-Deep-Impact/question 
Question
 2024-05-19 11:08:15 -05:00
Jordan Yamada
a560dd186e (WIP) working on quiz 2024-05-19 16:01:20 +00:00
Jordan Yamada
1619661b89 Merge branch 'dev' into question 2024-05-19 15:59:45 +00:00
Jordan Yamada
f89c6ca0f7 Merge branch 'dev' of https://github.com/Team-Deep-Impact/Deep-Impact into dev 2024-05-19 15:57:22 +00:00
Jordan Yamada
3452dbb26d added live deploy in readme 2024-05-19 15:56:52 +00:00
Dan
3d81002ef2 Merge pull request #16 from Team-Deep-Impact/simulation 
updated simulation ui
 2024-05-19 11:54:24 -04:00
Jordan Yamada
4294173680 Merge branch 'dev' into question 2024-05-19 15:52:21 +00:00
Dan
75ea879b87 updated simulation ui 2024-05-19 11:50:56 -04:00
Jordan Yamada
78a875d5b2 (WIP) resolving merge conflict 2024-05-19 15:49:13 +00:00
Jordan Yamada
1902c2e687 (WIP) resolving merge conflict 2024-05-19 15:40:04 +00:00
Jordan Yamada
520a923b2b (WIP)made env to frontend for live deployment... working on making a quiz on frontend. 2024-05-19 15:32:09 +00:00
Jordan Yamada
3c35f78d8f Merge pull request #14 from Team-Deep-Impact/main 
Main
 2024-05-19 04:00:18 -05:00
Jordan Yamada
7001f3ffc7 Merge pull request #13 from Team-Deep-Impact/dev 
Day 2 latest complete work
 2024-05-19 03:59:50 -05:00
Jordan Yamada
e72caab854 working on issue with openai api key(WIP) 2024-05-19 08:55:49 +00:00
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