route

hendrik-boerma · Nov 10, 2023 · 7bd5763 · 7bd5763
1 parent 2884522
commit 7bd5763
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,19 +1,19 @@
 {
   "files": {
     "main.css": "/capstone-course-coursera/static/css/main.205e5408.css",
-    "main.js": "/capstone-course-coursera/static/js/main.717a87b1.js",
+    "main.js": "/capstone-course-coursera/static/js/main.754ea36f.js",
     "static/js/787.505cc4c5.chunk.js": "/capstone-course-coursera/static/js/787.505cc4c5.chunk.js",
     "static/media/bruchetta.jpeg": "/capstone-course-coursera/static/media/bruchetta.6f51ed243117bebb2d12.jpeg",
     "static/media/restaurant chef B.jpg": "/capstone-course-coursera/static/media/restaurant chef B.0173ed674438ddb385d4.jpg",
     "static/media/greek salad.jpg": "/capstone-course-coursera/static/media/greek salad.41cb65093dacb7f2600b.jpg",
     "static/media/Logo.svg": "/capstone-course-coursera/static/media/Logo.6c132dfefa69396bba43f72aa595e62f.svg",
     "index.html": "/capstone-course-coursera/index.html",
     "main.205e5408.css.map": "/capstone-course-coursera/static/css/main.205e5408.css.map",
-    "main.717a87b1.js.map": "/capstone-course-coursera/static/js/main.717a87b1.js.map",
+    "main.754ea36f.js.map": "/capstone-course-coursera/static/js/main.754ea36f.js.map",
     "787.505cc4c5.chunk.js.map": "/capstone-course-coursera/static/js/787.505cc4c5.chunk.js.map"
   },
   "entrypoints": [
     "static/css/main.205e5408.css",
-    "static/js/main.717a87b1.js"
+    "static/js/main.754ea36f.js"
   ]
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/capstone-course-coursera/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Enjoy our amazing food!"/><meta name="og:title" content="Little Lemon"/><meta name="og:description" content="Enjoy our amazing food!"/><meta name="og:image" content="../src/images/logo.svg"/><link rel="apple-touch-icon" href="/capstone-course-coursera/logo192.png"/><script src="https://raw.githubusercontent.com/Meta-Front-End-Developer-PC/capstone/master/api.js"></script><link rel="manifest" href="/capstone-course-coursera/manifest.json"/><title>React App</title><script defer="defer" src="/capstone-course-coursera/static/js/main.717a87b1.js"></script><link href="/capstone-course-coursera/static/css/main.205e5408.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/capstone-course-coursera/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Enjoy our amazing food!"/><meta name="og:title" content="Little Lemon"/><meta name="og:description" content="Enjoy our amazing food!"/><meta name="og:image" content="../src/images/logo.svg"/><link rel="apple-touch-icon" href="/capstone-course-coursera/logo192.png"/><script src="https://raw.githubusercontent.com/Meta-Front-End-Developer-PC/capstone/master/api.js"></script><link rel="manifest" href="/capstone-course-coursera/manifest.json"/><title>React App</title><script defer="defer" src="/capstone-course-coursera/static/js/main.754ea36f.js"></script><link href="/capstone-course-coursera/static/css/main.205e5408.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "homepage" : "https://hendrik-boerma.github.io/capstone-course-coursera/#",
+  "homepage" : "https://hendrik-boerma.github.io/capstone-course-coursera/",
   "name": "capstone-course",
   "version": "0.1.0",
   "private": true,

diff --git a/src/components/BookingForm.js b/src/components/BookingForm.js
@@ -53,7 +53,7 @@ function BookingForm (props) {
     const handleSubmit = event => {
         const formData = inputValue;
         submitAPI(formData)
-        window.location.href = "/capstone-course-coursera/confirmation/"
+        window.location.href = "/confirmation"
         event.preventDefault();
       }
 

diff --git a/src/components/Footer.js b/src/components/Footer.js
@@ -7,7 +7,7 @@ function Footer() {
         <>
         <footer>
             <div className='container'>
-            <a href='/capstone-course-coursera/'><img src={logo} alt='little lemon logo' /></a>
+            <a href='/'><img src={logo} alt='little lemon logo' /></a>
             <div>
                 <h4>Contact</h4>
                 <p>331 North Street <br></br> London E24 8QB</p>

diff --git a/src/components/Navbar.js b/src/components/Navbar.js
@@ -11,13 +11,13 @@ function Navbar () {
         <nav>
       <div className='navheader'>
             <button  aria-label={toggleMenu ? "close menu" : "open menu"} id='hamburger' onClick={() => setToggleMenu(!toggleMenu)} >{toggleMenu ? "Close" : "Menu"}</button>
-            <a href="/capstone-course-coursera/"><img src={logo} id='navlogo' alt="little lemon logo" /></a>
+            <a href="/"><img src={logo} id='navlogo' alt="little lemon logo" /></a>
         </div>
       <ul id='openmenu' className={toggleMenu ? "navlist-mobile" : "navlist"} onClick={() => setToggleMenu(false)}>
-        <Link href="/capstone-course-coursera/" to="/capstone-course-coursera/capstone-course-coursera/" className="nav-item">Home</Link>
-        <Link href="/capstone-course-coursera/about" to="/capstone-course-coursera/about" className="nav-item">About</Link>
-        <Link href="/capstone-course-coursera/menu" to="/capstone-course-coursera/menu" className="nav-item">Menu</Link>
-        <Link href="/capstone-course-coursera/booking" to="/capstone-course-coursera/booking" className="nav-item">Reserve</Link>
+        <Link href="/" to="/" className="nav-item">Home</Link>
+        <Link href="/about" to="/about" className="nav-item">About</Link>
+        <Link href="/menu" to="/menu" className="nav-item">Menu</Link>
+        <Link href="/booking" to="/booking" className="nav-item">Reserve</Link>
       </ul>
     </nav>
     );

diff --git a/src/components/Routing.js b/src/components/Routing.js
@@ -1,23 +1,21 @@
-import React from "react";
-import { HashRouter as Router, Route, Routes } from "react-router-dom";
+import { Routes, Route  } from "react-router-dom";
 import Home from '../pages/Home';
 import About from '../pages/About';
 import Menu from '../pages/Menu';
 import BookingPage from '../pages/BookingPage';
 import BookingConfirmation from "../pages/BookingConfirmation";
 
-function Routing() {
-  return (
-    <Router basename="/capstone-course-coursera">
+function Routing () {
+
+    return (
       <Routes>
-        <Route path="/" element={<Home />} />
-        <Route path="/about" element={<About />} />
-        <Route path="/menu" element={<Menu />} />
-        <Route path="/booking" element={<BookingPage />} />
-        <Route path="/confirmation" element={<BookingConfirmation />} />
+        <Route path="/" element={<Home />}></Route>
+        <Route path="/about" element={<About />}></Route>
+        <Route path="/menu" element={<Menu />}></Route>
+        <Route path="/booking" element={<BookingPage/>}></Route>
+        <Route path="/confirmation" element={<BookingConfirmation />}></Route>
       </Routes>
-    </Router>
-  );
+    );
 }
 
 export default Routing;
diff --git a/src/components/SpecialCards.js b/src/components/SpecialCards.js
@@ -9,7 +9,7 @@ function SpecialCards() {
             <main>
                 <div className="title">
                     <h2>Specials</h2>
-                    <a href='/capstone-course-coursera/menu' className='button'>Online Menu</a>
+                    <a href='/menu' className='button'>Online Menu</a>
                 </div>
                 <div className="cardcontainer">
                     {dishes.map( dish => (
@@ -19,7 +19,7 @@ function SpecialCards() {
                             <h4 className='cardtitle' >{dish.name}</h4>
                             <p className="cardprice">$ {dish.price}</p>
                             <p className="cardtext">{dish.description}</p>
-                            <a href='/capstone-course-coursera/menu' className="cardlink">Watch menu &gt;</a>
+                            <a href='/menu' className="cardlink">Watch menu &gt;</a>
                         </div>
                     </div>
                     ))