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
168 Commits 1 Branch 0 Tags
4295e00ecfd8afd982040c39abb0455ce032142c
Commit Graph

168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Roy
5af2ed406a Merge branch 'dev' into dependabot/pip/backend/pip-7ea75cc8df 2024-09-25 19:49:26 -03:00
dependabot[bot]
7506f38683 Bump typing-extensions from 4.9.0 to 4.12.2 
Bumps [typing-extensions](https://github.com/python/typing_extensions) from 4.9.0 to 4.12.2.
- [Release notes](https://github.com/python/typing_extensions/releases)
- [Changelog](https://github.com/python/typing_extensions/blob/main/CHANGELOG.md)
- [Commits](https://github.com/python/typing_extensions/compare/4.9.0...4.12.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:48:42 +00:00
Michael Roy
f1831601a5 Merge pull request #30 from Team-Deep-Impact/dependabot/npm_and_yarn/frontend/npm_and_yarn-cc856c89ab 
Bump the npm_and_yarn group across 1 directory with 4 updates
 2024-09-25 19:48:22 -03:00
dependabot[bot]
6119a81cba Bump the npm_and_yarn group across 1 directory with 4 updates 
Bumps the npm_and_yarn group with 3 updates in the /frontend directory: [axios](https://github.com/axios/axios), [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) and [braces](https://github.com/micromatch/braces).


Updates `axios` from 1.6.8 to 1.7.4
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.6.8...v1.7.4)

Updates `vite` from 5.2.11 to 5.4.8
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.8/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.8/packages/vite)

Updates `braces` from 3.0.2 to 3.0.3
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

Updates `rollup` from 4.17.2 to 4.22.4
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.17.2...v4.22.4)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  dependency-group: npm_and_yarn
- dependency-name: vite
  dependency-type: direct:development
  dependency-group: npm_and_yarn
- dependency-name: braces
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: rollup
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:47:56 +00:00
dependabot[bot]
30236a3b35 Bump the pip group across 1 directory with 4 updates 
Bumps the pip group with 4 updates in the /backend directory: [certifi](https://github.com/certifi/python-certifi), [djangorestframework](https://github.com/encode/django-rest-framework), [requests](https://github.com/psf/requests) and [urllib3](https://github.com/urllib3/urllib3).


Updates `certifi` from 2024.2.2 to 2024.7.4
- [Commits](https://github.com/certifi/python-certifi/compare/2024.02.02...2024.07.04)

Updates `djangorestframework` 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)

Updates `requests` from 2.31.0 to 2.32.2
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.31.0...v2.32.2)

Updates `urllib3` from 2.2.1 to 2.2.2
- [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.2)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: djangorestframework
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: requests
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: urllib3
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-09-25 22:47:35 +00:00
Michael Roy
b5b292f572 Merge pull request #25 from Team-Deep-Impact/dependabot/pip/djangorestframework-3.15.2 
Bump djangorestframework from 3.15.1 to 3.15.2
 2024-09-25 19:47:28 -03:00
Michael Roy
db8c95a27e Merge pull request #26 from Team-Deep-Impact/dependabot/pip/urllib3-2.2.3 
Bump urllib3 from 2.2.1 to 2.2.3
 2024-09-25 19:47:16 -03:00
Michael Roy
081fb58367 Merge pull request #27 from Team-Deep-Impact/dependabot/pip/tqdm-4.66.5 
Bump tqdm from 4.66.2 to 4.66.5
 2024-09-25 19:47:03 -03:00
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