resolved merge conflicts

Author: anjali24671

.github/pull_request_template.md

@@ -2,9 +2,9 @@
 
 ## Issue number 
 <!-- Please make sure issue number is mention in Pull Request else PR will not be merged. 
-eg : Issue No. : #4 -->
+eg : Fixes #4 -->
 
-Issue No. : 
+Fixes #
 
 
 ## Video/Screenshots (mandatory)
@@ -18,4 +18,4 @@ Issue No. :
 - [ ] I have gone through the  `contributing.md` file before contributing
 <!-- [X] - put a cross/X inside [] to check the box -->
 
-## Additional context:
+## Additional context:

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+PranavBarthwal.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

assets/favicon.png

@@ -21,6 +21,29 @@
   </head>
 
   <body>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" integrity="sha512-DTOQO9RWCH3ppGqcWaEA1BIZOC6xxalwEsw9c2QQeAIftl+Vegovlnee1c9QX4TctnWMn13TZye+giMm8e2LwA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+   <link rel="stylesheet" href="./style.css">
+   <link rel="icon" type="image/png" href="./assets/favicon.png"> 
+
+  <style>
+    @keyframes float {
+      0% {
+        transform: translateY(0);
+      }
+  
+      50% {
+        transform: translateY(-10px);
+      }
+  
+      100% {
+        transform: translateY(0);
+      }
+    }
+  </style>
+</head>
+<body>
+    
     <div id="bg"></div>
 
     <!-- NAVBAR -->
@@ -64,6 +87,34 @@
       </div>
     </nav>
 
+<nav class="navbar navbar-expand-lg fixed-top navbar_background">
+  <div class="container-fluid">
+    <a class="navbar-brand" href="#">
+      <img src="./assets/logo_white.png" alt="Bootstrap" width="370">
+    </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 pe-5" id="navbarSupportedContent">
+      <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
+        <li class="nav-item">
+          <a class="nav-link text-light decorate-text" href="#">Home</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link text-light decorate-text" href="#apod">APoD</a>
+        </li>
+        <li class="nav-item ">
+          <a class="nav-link text-light decorate-text" href="#mars">MartianImagery</a>
+        </li>
+        <li class="nav-item">
+         <a href="#contact"> <button class="btn btn-outline-light rounded-pill decorate-text" type="submit">Contact Us</button></a>
+        </li>
+    </div>
+  </div>
+</nav>
+
+
+
     <!-- HERO SECTION -->
     <div class="container col-xxl-8 px-4 py-5">
       <div class="row flex-lg-row-reverse align-items-center g-5 py-5">
@@ -102,6 +153,23 @@ <h1 class="display-2 fw-bold text-light">
         </div>
       </div>
     </div>
+<!-- HERO SECTION -->
+<div class="container col-xxl-9 px-3 py-5">
+  <div class="row flex-lg-row-reverse align-items-center g-5 py-5">
+    <div class="col-10 col-sm-8 col-lg-6">
+    <img src="./assets/A letter tech logo.png" class="d-block mx-lg-auto img-fluid hero_img" alt="Bootstrap Themes"
+      width="700" height="500" loading="lazy" style="animation: float 3s ease-in-out infinite;">
+    </div>
+    <div class="col-lg-6 ">
+      <h1 class="display-2 fw-bold text-light">Let's embark on a Cosmic <span class="highlight">X</span><span class="auto-typed"></span></h1>
+      <p class="lead text-light">Welcome to CosmoXplore, where the celestial canvas unfolds its mysteries before your eyes. Immerse yourself in a cosmic odyssey, as we harness the power of NASA's API to bring you a symphony of space resources. From breathtaking images to cutting-edge astronomical data, embark on a journey that transcends the limits of earthly imagination.</p>
+      <div class="d-grid gap-5 d-md-flex justify-content-md-start pt-2">
+        <a href="#apod"><button type="button" class="btn btn-primary btn-lg px-4 me-md-2">Explore</button></a>
+        
+      </div>
+    </div>
+  </div>
+</div>
 
     <br />
     <br />
@@ -145,6 +213,20 @@ <h5 id="copyright" align="center"></h5>
             <h6 id="date" align="center"></h6>
           </div>
         </div>
+      <p id="apod_info" class="lead">NASA's Astronomy Picture of the Day (APoD) showcases captivating celestial images accompanied by brief explanations. Each day, NASA features astronomical wonders, ranging from stunning nebulae and galaxies to snapshots of our solar system, providing a daily dose of cosmic beauty and scientific insight. APoD serves as a valuable resource for both astronomy enthusiasts and those seeking to explore the wonders of the universe.</p>
+     
+    </div>
+  
+    <div class="apod_img_container">
+      <div class="img">
+           <img src="./assets/64e4e4aabd98a600197c0ca3.webp" id="apod_img" width="100%" height="100%">
+      </div>
+      <div class="video" id="apod_video">
+   </div>
+      <div class="info">
+        <h5 id="copyright" align="center" > </h5>
+        <h6 id="date" align="center"> </h6>
+
       </div>
     </div>
 
@@ -197,6 +279,26 @@ <h1 align="center" class="section_title" id="mars">Mars Rover Imagery</h1>
         </p>
       </div>
     </div>
+<!-- Default display -->
+<div class="rover_container">
+  <div class="rover_section_img">
+    <img src="./assets/mars.png" class="mars_illus" style="animation: float 3s ease-in-out infinite;"> 
+  </div>
+<div class="rover_section_text">
+<p class="">Welcome to an extraordinary adventure into the Martian landscape, where we invite you to explore the wonders of the Red Planet through the lens of various rovers that have traversed its surface. Our journey takes us deep into the photographic archives, a treasure trove of captivating images captured by these robotic explorers. Each rover, armed with sophisticated cameras, has documented the Martian terrain, unveiling its mysteries one snapshot at a time.
+
+  The heart of this exploration lies in a comprehensive database meticulously organized to offer you an unparalleled visual chronicle of Mars' exploration. This repository is a testament to the marvels of technology and the spirit of scientific curiosity that drives humanity to push the boundaries of exploration.
+  
+  But how do you, the explorer, access this vast collection? Fear not, for we present a user-friendly approach that allows you to effortlessly navigate through the visual wonders of Mars. By simply entering the Earth date corresponding to a specific photo, you unlock a portal to the Red Planet's past, witnessing moments frozen in time by the lenses of our robotic companions.
+  
+  The convenience of this method provides unparalleled flexibility, enabling you to tailor your exploration based on your interests. Whether you're drawn to the intricate geological formations that dot the Martian surface, mesmerized by the dance of atmospheric phenomena in the thin Martian air, or captivated by the milestones achieved by the rovers themselves, our immersive experience ensures that your curiosity is rewarded.
+  
+  This journey offers a deeper understanding of Mars' unique features and the scientific endeavors that drive these robotic explorers. From the striking landscapes to the subtle details that tell the story of a planet's evolution, each image contributes to our collective knowledge of the Red Planet.
+  
+  Join us in unlocking the mysteries of Mars as we navigate through the cutting-edge technology and unparalleled exploration that has brought us face to face with the enigmatic Red Planet.</p>
+</div>
+</div>
+
 
     <!-- display on enetering a date -->
     <div class="rover_display">
@@ -393,3 +495,4 @@ <h1 align="center" class="section_title" id="contact">Contact Us</h1>
     </script>
   </body>
 </html>
+

index.html

@@ -119,8 +119,7 @@ fetch(
     return response.json()
   })
   .then(data => {
-
-    console.log("fetching")
+    console.log('fetching')
 
     displayData(
       data.url,
@@ -180,6 +179,12 @@ function updateDom (img_src, date, roverName, camera, launch, land, status) {
   document.querySelector('.status').textContent = status
 }
 
+// added closeRover function
+function closeRoverDisplay (e) {
+  document.querySelector('.rover_container').style.display = 'flex'
+  document.querySelector('.rover_display').style.display = 'none'
+}
+
 // API CALL 3 : NASA Photo Video Gallery
 fetch('https://images-api.nasa.gov/search?q=apollo')
   .then(response => {

js/app.js

@@ -76,15 +76,15 @@ function htmlMedia (data, childrenHTML, nasa_id, media_type) {
   elem.id = nasa_id
   elem.type = media_type
 
-
   childrenHTML[0] += elem.outerHTML
 }
 
 // when user clicks on a media, the function redirects them to detail page for that media
-function openDetailPage (id) {
+function openDetailPage (id, mediaURL) {
+  console.log(mediaURL)
   window.location.href = '/mediaDetail.html'
   window.sessionStorage.setItem('nasa_id', id)
-  // window.sessionStorage.setItem('mediaURL', mediaURL)
+  window.sessionStorage.setItem('mediaURL', mediaURL)
 }
 
 // when user search, this function makes API request for that query.

js/gallery.js

@@ -33,6 +33,7 @@ function putDataInHTML (src, data) {
   if (data['AVAIL:MediaType'] === 'image') {
     let img = document.createElement('img')
     img.src = src
+    console.log(src)
     media.appendChild(img)
   } else {
     // search for mp4 url of video
@@ -41,17 +42,16 @@ function putDataInHTML (src, data) {
         return response.json()
       })
       .then(data => {
-        let count=2
+        let count = 2
         for (i = 0; i < data.collection.items.length; i++) {
           console.log('hello')
           let url = String(data.collection.items[i].href)
           if (url.endsWith('mp4')) {
-            if(count!=0)
-        {
-            let video = document.createElement('video')
+            if (count != 0) {
+              let video = document.createElement('video')
               video.src = url
-              video.setAttribute("controls", '')
-              video.style.width = "45vw"
+              video.setAttribute('controls', '')
+              video.style.width = '45vw'
               media.appendChild(video)
             }
             count--