Merge branch 'master' into Color-Pallete-Generator

Author: ashishgit10

05-Weather-App/img/Screenshot.png

@@ -16,8 +16,7 @@ btn.onclick = () => {
   // Consider fetching the key from a secure backend or prompting the user.
   var key = "YOUR_API_KEY";
   fetch(
-    `https://api.openweathermap.org/data/2.5/weather?q=${val}
-      &appid=${key}`
+    `https://api.openweathermap.org/data/2.5/weather?q=${val}&appid=${key}`
   )
     .then((res) => res.json())
     .then((data) => {
@@ -79,12 +78,11 @@ setInterval(() => {
   const date = newdt.getDate();
   /*     console.log(dy[day]); */
   /* console.log(hours); */
-  const hrin12format = hours >= 13 ? hours % 12 : hours;
-  const apmp = hours >= 12 ? "PM " : "AM";
+  const hrin12format = hours === 0 ? 12 : (hours > 12 ? hours - 12 : hours);
+  const apmp = hours >= 12 ? "PM" : "AM";
   const min = minutes < 10 ? "0" + minutes : minutes;
   const hrs = hrin12format < 10 ? "0" + hrin12format : hrin12format;
-  const nhr = hrin12format == "00" ? "12" : hrin12format;
-  time.innerHTML = ` <span class="tm">${nhr}:${min} ${apmp}</span>`;
+  time.innerHTML = ` <span class="tm">${hrs}:${min} ${apmp}</span>`;
   dt.innerHTML = `<span class="dt1"> ${dy[day]}, ${date} ${mth[month]}</span>`;
 }, 1000);
 
@@ -112,7 +110,7 @@ locatebtn.onclick = () => {
             1
           )} &#176;C</h5>`;
         country.innerHTML = `<span id="country">${data.sys.country}</span>`;
-        city.innerHTML = `<span id="city">${data.name}/</span>`;
+        city.innerHTML = `<span id="city">${data.name}</span>`;
       })
       .catch((err) => {
         console.log(err);

05-Weather-App/img/bg.jpg

@@ -159,7 +159,7 @@ footer {
     display: flex !important;
     align-items: center !important;
     color: white !important;
-    cursor:pointer;
+    cursor: pointer;
     font-size: 20px;
 }
 @media (max-width: 768px) {
@@ -173,10 +173,10 @@ footer {
     min-width: 170px;
   }
   .upbox{
-    gap:10px;
+    gap: 10px;
   }
 }
-@media(max-width:305px){
+@media (max-width: 305px) {
   .time,.centerbox{
     min-width:262px;
   }
@@ -206,7 +206,7 @@ footer {
   font-size: 18px;
 }
 }
-@media(min-width:768px){
+@media (min-width: 768px) {
   .input{
     min-width:175px;
   }

05-Weather-App/img/favicon/android-chrome-192x192.png

@@ -137,7 +137,7 @@ <h3>
       </h3>
     </div>
     <div class="email">
-      <input type="mail" placeholder="Your email address" />
+      <input type="email" placeholder="Your email address" />
       <button>Sign Up</button>
     </div>
   </section>

05-Weather-App/img/favicon/android-chrome-512x512.png

@@ -38,7 +38,7 @@
     <ul class="ul-list">
       <i class="fa-solid x-mark fa-xmark"></i>
       <li>
-        <a href="Ecommerce.html'" onclick="window.location.href='Ecommerce.html';">Home</a>
+        <a href="Ecommerce.html" onclick="window.location.href='Ecommerce.html';">Home</a>
       </li>
       <li>
         <a href="shop.html" onclick="window.location.href='shop.html';">Shop</a>
@@ -506,7 +506,7 @@ <h3>
     </h3>
   </div>
   <div class="email">
-    <input type="mail" placeholder="Your email address" />
+    <input type="email" placeholder="Your email address" />
     <button>Sign Up</button>
   </div>
 </section>