resolved conflict and addressing issue no. #27

Vin205 · Oct 4, 2024 · f7eef4b · f7eef4b
1 parent 2bddc28
commit f7eef4b
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 43 deletions.
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon/android-chrome-192x192.png b/public/favicon/android-chrome-192x192.png
diff --git a/public/favicon/android-chrome-512x512.png b/public/favicon/android-chrome-512x512.png
diff --git a/public/favicon/apple-touch-icon.png b/public/favicon/apple-touch-icon.png
diff --git a/public/favicon/favicon-16x16.png b/public/favicon/favicon-16x16.png
diff --git a/public/favicon/favicon-32x32.png b/public/favicon/favicon-32x32.png
diff --git a/public/favicon/favicon.ico b/public/favicon/favicon.ico
diff --git a/public/favicon/site.webmanifest b/public/favicon/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
diff --git a/public/index.html b/public/index.html
@@ -1,20 +1,24 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet">
-
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!-- Apple Touch Icon -->
+    <link rel="apple-touch-icon" sizes="180x180" href="./favicon/apple-touch-icon.png">
+
+    <!-- Standard Favicon Sizes -->
+    <link rel="icon" type="image/png" sizes="32x32" href="./favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="./favicon/favicon-16x16.png">
+
+    <!-- Android Chrome Icons -->
+    <link rel="icon" type="image/png" sizes="192x192" href="./favicon/android-chrome-192x192.png">
+    <link rel="icon" type="image/png" sizes="512x512" href="./favicon/android-chrome-512x512.png">
+
+    <!-- Web App Manifest -->
+    <link rel="manifest" href="./favicon/site.webmanifest">
 
-    <title>React App</title>
+    <title>e-nyanjyoti</title>
   </head>
   <body>
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>

diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/manifest.json b/public/manifest.json
diff --git a/src/App.js b/src/App.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import {Routes, Route} from 'react-router-dom';
-import Nabar from './Nabar.js'
+import Navbar from './Navbar.js'
 import Hom from './Hom.js'
 import Educ from './Educ.js';
 import Quiz from './Quiz.js';
@@ -22,7 +22,7 @@ function App  () {
     <>
     <div>
 
-         <Nabar/>
+         <Navbar/>
     <Routes>
 
     <Route path ='/' element={<Hom/>}/>
@@ -37,7 +37,7 @@ function App  () {
 
 
 
-      <Nabar />
+      <Navbar />
       <main>
         <Routes>
           <Route path='/' element={<Hom />} />

diff --git a/src/Nabar.css → src/Navbar.css b/src/Nabar.css → src/Navbar.css
diff --git a/src/Nabar.js → src/Navbar.js b/src/Nabar.js → src/Navbar.js
@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import './Nabar.css';
+import './Navbar.css';
 
-function Nabar() {
+function Navbar() {
   const [isMobileMenuOpen, setMobileMenuOpen] = useState(false);
   const navigate = useNavigate();
 
@@ -44,4 +44,4 @@ function Nabar() {
   );
 }
 
-export default Nabar;
+export default Navbar;