Release 2024-10-08

CCrady · Oct 8, 2024 · 8526513 · 8526513
1 parent a626c06
commit 8526513
Show file tree

Hide file tree

Showing 10 changed files with 248 additions and 190 deletions.
diff --git a/docs/app.html b/docs/app.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Orrery Web App</title>
     <style> body { margin: 0; } </style>
-  <script type="module" crossorigin src="/orrery/assets/app-C6gSEJ4D.js"></script>
+  <script type="module" crossorigin src="/orrery/assets/app-BtHqZ0wk.js"></script>
   <link rel="stylesheet" crossorigin href="/orrery/assets/stylesheet-BtUTkMkN.css">
 </head>
 <body>

diff --git a/docs/assets/app-C6gSEJ4D.js → docs/assets/app-BtHqZ0wk.js b/docs/assets/app-C6gSEJ4D.js → docs/assets/app-BtHqZ0wk.js
diff --git a/docs/credits.html b/docs/credits.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <!--add descriptive attributes to improve SEO-->
+  <meta charset="UTF-8">
+  <meta name="author" content="Newt Powers, Calvin Crady">
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+  <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+  <!--responsive web design-->
+  <title>Orrery Education</title>
+  <link rel="stylesheet" crossorigin href="/orrery/assets/stylesheet-BtUTkMkN.css">
+</head>
+<body>
+  <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
+    <div class="container-fluid">
+      <a class="navbar-brand" href="#">Orrery Model</a>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <div class="collapse navbar-collapse" id="navbarSupportedContent">
+        <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+          <li class="nav-item">
+            <a class="nav-link" href="index.html">Home</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="app.html">Play</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="learn.html">Learn</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link active" aria-current="page" href="credits.html">Credits</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </nav>
+  <h2>About This Project</h2>
+  <p>This project was originally created in 48 hours for the 2024 <a href="https://www.spaceappschallenge.org/">NASA Space Apps Challenge</a> hackathon by <a href="https://github.com/CCrady">Calvin Crady</a> and <a href="https://github.com/newt-powers">Newt Powers</a>. It has since been expanded upon by Calvin. <a href="https://github.com/CCrady/orrery/">The source is available on Github.</a></p>
+  <h2>Sources</h2>
+  <p>We took information from the following sources:</p>
+  <ul>
+    <li><a href="https://ssd.jpl.nasa.gov/planets/approx_pos.html">Approximate Positions of the Planets</a> (NASA)</li>
+    <li><a href="https://ssd.jpl.nasa.gov/sb/elem_tables.html">Small-Body Element Tables</a> (NASA)</li>
+    <li><a href="https://ssd.jpl.nasa.gov/tools/sbdb_query.html">Small-Body Database Query</a> (NASA)</li>
+    <li><a href="https://www.britannica.com/science/orrery-astronomical-model">Orrery</a> (Encyclopedia Britannica</li>
+    <li><a href="https://en.wikipedia.org/wiki/Semi-major_and_semi-minor_axes">Semi-major and semi-minor axes</a> (Wikipedia)</li>
+    <li><a href="https://en.wikipedia.org/wiki/Longitude_of_periapsis">Longitude of periapsis</a> (Wikipedia)</li>
+    <li><a href="https://waelyasmina.net/articles/how-to-make-an-object-rotate-around-another-object-in-three-js/">How to Make an Object Rotate Around Another Object in Three.js</a> (Wael Yasmina)</li>
+    <li><a href="https://nasa.github.io/mission-viz/X3Dom/20150611_WebBasedMissionVisualizationSystem.pdf">Web Based Space Mission Visualization System</a> (Daniel O’Neil)</li>
+    <li><a href="https://w3schools.com/">W3Schools</a></li>
+    <li><a href="https://threejs.org/docs/">three.js documentation</a></li>
+    <li><a href="https://vite.dev/config/">Vite config documentation</a></li>
+  </ul>
+  <p>The images on the website were taken from the following sources:</p>
+  <ul>
+    <li><a href="Orbit1.svg.png">Orbit1.svg.png</a> from <a href="https://commons.wikimedia.org/wiki/File:Orbit1.svg">File:Orbit1.svg</a> (Wikimedia Commons), licenced under the <a href="https://creativecommons.org/licenses/by-sa/3.0/deed.en">Creative Commons Attribution-Share Alike 3.0 Unported</a> license and used as-is.</li>
+    <li><a href="space.jpg">space.jpg</a> from <a href="https://blenderartists.org/t/space-background/660743">"Space Background"</a> (blenderartists.org). It has no formal license, but the author allows its use in non-commercial projects.</li>
+    <li><a href="Keplerian-formula.png">Keplerian-formula.png</a> is a screenshot of the web page <a href="https://ssd.jpl.nasa.gov/planets/approx_pos.html">"Approximate Positions of the Planets"</a> (NASA).</li>
+  </ul>
+  <p>The textures of the planets and skymap were taken from the following sources:</p>
+  <ul>
+    <li>Skymap downloaded from <a href="https://commons.wikimedia.org/wiki/File:ESO_-_Milky_Way.jpg">Wikimedia Commons</a>, ultimately from <a href="https://www.eso.org/public/images/eso0932a/">The European Southern Observatory</a>. Created by Serge Brunier and licensed under the <a href="https://creativecommons.org/licenses/by/4.0/deed.en">Creative Commons Attribution 4.0 International</a> license. The version hosted here is downscaled from the original.</li>
+    <!-- TODO: credit the planet texture sources -->
+  </u>
+</body>
diff --git a/docs/index.html b/docs/index.html
@@ -35,9 +35,15 @@
                 <a class="nav-link active" aria-current="page" href="index.html">Home</a>
               </li>
               <li class="nav-item">
-                <a class="nav-link" href="learn.html">Learn</a>
                 <a class="nav-link" href="app.html">Play</a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link" href="learn.html">Learn</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="credits.html">Credits</a>
+              </li>
+            </ul>
           </div>
         </div>
       </nav>

diff --git a/docs/learn.html b/docs/learn.html
@@ -20,17 +20,22 @@
           <div class="collapse navbar-collapse" id="navbarSupportedContent">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
               <li class="nav-item">
-                <a class="nav-link active" aria-current="page" href="index.html">Home</a>
+                <a class="nav-link" href="index.html">Home</a>
               </li>
               <li class="nav-item">
-                <a class="nav-link" href="learn.html">Learn</a>
                 <a class="nav-link" href="app.html">Play</a>
               </li>
+              <li class="nav-item">
+                <a class="nav-link active" aria-current="page" href="learn.html">Learn</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" href="credits.html">Credits</a>
+              </li>
+            </ul>
           </div>
         </div>
       </nav>
       <h2>What is an orrery?</h2>
-      <img src="mechanical-orrery.png" width="600px">
       <p>An orrery is a mechanical model of the solar system that demonstrates how the planets move in orbit around the Sun. The orrery was likely invented by George Graham in 1713 who presented it to Charles Boyle, 4th Earl of Orrery.</p>
       <h2>How Do You Calculate the Planet’s Orbits?</h2>
       <img src="Orbit1.svg.png" width="600px">
@@ -43,24 +48,5 @@ <h2>How To Use the 3D Model</h2>
       <p>First, click the Play button to view the model. Use your mouse’s scroll wheel to zoom in and out (or two finger commands on Mac) and click and drag to change the viewing angle.
         To use the controls, click the down arrow. You will find a slider that controls the speed of the simulation and how fast the bodies are orbiting the Sun.</p>
       <h2>How Was the Model Developed</h2>
-      <p>The model was developed using HTML, CSS, and Javascript, languages that make up the basis of the internet! The threejs library was used to create the graphics and control the camera. It also incorporates bootstrap components to make the navigation bar.
-        You can find the code linked here: https://github.com/CCrady/orrery</p>
-      <h2>Sources: </h2>
-      <p>https://ssd.jpl.nasa.gov/planets/approx_pos.html
-https://www.britannica.com/science/orrery-astronomical-model
-https://laughingsquid.com/a-beautiful-handcrafted-orrery-a-mechanical-model-of-the-solar-system/
-https://ssd.jpl.nasa.gov/sb/elem_tables.html
-https://blenderartists.org/t/space-background/660743
-https://www.spaceappschallenge.org/nasa-space-apps-2024/challenges/create-an-orrery-web-app-that-displays-near-earth-objects/
-https://en.wikipedia.org/wiki/Semi-major_and_semi-minor_axes
-https://en.wikipedia.org/wiki/Longitude_of_periapsis
-https://waelyasmina.net/articles/how-to-make-an-object-rotate-around-another-object-in-three-js/
-https://commons.wikimedia.org/wiki/File:Orbit1.svg#/media/File:Orbit1.svg
-https://ssd.jpl.nasa.gov/tools/sbdb_query.html
-https://nasa.github.io/mission-viz/X3Dom/20150611_WebBasedMissionVisualizationSystem.pdf
-https://data.nasa.gov/Space-Science/Near-Earth-Comets-Orbital-Elements-API/ysqn-vd8v/about_data
-https://ssd.jpl.nasa.gov/tools/sbdb_lookup.html#/
-https://github.com/CCrady/orrery
-https://w3schools.com/
-</p>
+      <p>The model was developed using HTML, CSS, and Javascript, languages that make up the basis of the internet! The threejs library was used to create the graphics and control the camera. It also incorporates bootstrap components to make the navigation bar.</p>
 </body>
diff --git a/docs/mechanical-orrery.png b/docs/mechanical-orrery.png
diff --git a/docs/milky_way.jpg b/docs/milky_way.jpg
diff --git a/docs/space.jpeg b/docs/space.jpeg
diff --git a/docs/temp b/docs/temp
diff --git a/vite.config.js b/vite.config.js
@@ -12,7 +12,7 @@ export default defineConfig({
                 main: resolve(__dirname, 'index.html'),
                 app: resolve(__dirname, 'app.html'),
                 learn: resolve(__dirname, 'learn.html'),
-                credits: resolve(__dirname, 'credits.hrml'),
+                credits: resolve(__dirname, 'credits.html'),
             },
         },
     },