Commit Graph

29 Commits

Author SHA1 Message Date
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
Jordan Yamada
501f5cbf61 polished readme 2024-05-19 18:13:21 +00:00
Dan
6115c3673a Update README.md 2024-05-19 13:40:15 -04: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
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
520a923b2b (WIP)made env to frontend for live deployment... working on making a quiz on frontend. 2024-05-19 15:32:09 +00:00
Dan
d513c363e6 Merge branch 'dev' into simulation 2024-05-19 03:48:54 -04:00
Dan
1711936609 added ignore for pycache 2024-05-19 03:19:04 -04: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
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
Jordan Yamada
94e3f37f70 add the NASA Sentry api call to the backend 2024-05-19 05:05:55 +00: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
Dan
c2a49f4f00 working on rocket interception 2024-05-18 21:04:49 -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
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
Michelle Shoenberger
ad2461a589 update to home page 2024-05-18 09:23:32 -04: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