diff --git a/client/component.test.js b/client/component.test.js
new file mode 100644
index 0000000..d1b79fd
--- /dev/null
+++ b/client/component.test.js
@@ -0,0 +1,34 @@
+import { render, screen, describe, test, expect } from '@testing-library/react';
+import Navbar from './Navbar'; 
+import Footer from './Footer'; 
+import Admin from './Admin'; 
+import Register from './Register'; 
+import Login from './Login'; 
+
+describe('Component Tests', () => {
+  test('renders Navbar component', () => {
+    render(<Navbar />);
+    expect(screen.getByText('Navbar Text')).toBeInTheDocument();
+  });
+
+  test('renders Footer component', () => {
+    render(<Footer />);
+    expect(screen.getByText('Footer Text')).toBeInTheDocument();
+  });
+
+  test('renders Admin component', () => {
+    render(<Admin />);
+    expect(screen.getByText('Admin Text')).toBeInTheDocument();
+  });
+
+  test('renders Register component', () => {
+    render(<Register />);
+    expect(screen.getByText('Register Text')).toBeInTheDocument();
+  });
+
+  test('renders Login component', () => {
+    render(<Login />);
+    expect(screen.getByText('Login Text')).toBeInTheDocument();
+  });
+
+});
\ No newline at end of file
diff --git a/client/form.test.js b/client/form.test.js
new file mode 100644
index 0000000..043f4fd
--- /dev/null
+++ b/client/form.test.js
@@ -0,0 +1,32 @@
+import { render, fireEvent, waitFor, describe, test, expect } from '@testing-library/react';
+import LoginForm from '../LoginForm';
+import RegistrationForm from '../RegistrationForm'; 
+
+describe('Form Tests', () => {
+  test('Login form can be filled out', async () => {
+    const { getByLabelText, getByRole } = render(<LoginForm />);
+
+    fireEvent.change(getByLabelText(/username/i), { target: { value: 'testuser' } });
+    fireEvent.change(getByLabelText(/password/i), { target: { value: 'testpass' } });
+
+    fireEvent.click(getByRole('button'));
+
+    await waitFor(() => expect(getByLabelText(/username/i).value).toBe('testuser'));
+    await waitFor(() => expect(getByLabelText(/password/i).value).toBe('testpass'));
+  });
+
+  test('Registration form can be filled out', async () => {
+    const { getByLabelText, getByRole } = render(<RegistrationForm />);
+
+    fireEvent.change(getByLabelText(/username/i), { target: { value: 'testuser' } });
+    fireEvent.change(getByLabelText(/password/i), { target: { value: 'testpass' } });
+    fireEvent.change(getByLabelText(/confirm password/i), { target: { value: 'testpass' } });
+
+    fireEvent.click(getByRole('button'));
+
+    await waitFor(() => expect(getByLabelText(/username/i).value).toBe('testuser'));
+    await waitFor(() => expect(getByLabelText(/password/i).value).toBe('testpass'));
+    await waitFor(() => expect(getByLabelText(/confirm password/i).value).toBe('testpass'));
+  });
+
+});
\ No newline at end of file
diff --git a/client/pages.test.js b/client/pages.test.js
new file mode 100644
index 0000000..b303c5b
--- /dev/null
+++ b/client/pages.test.js
@@ -0,0 +1,33 @@
+import { render, screen, describe, test, expect } from '@testing-library/react';
+import Admin from './Admin'; 
+import SeatBooking from './SeatBooking'; 
+import Profile from './Profile'; 
+import About from './About'; 
+import Contact from './Contact'; 
+
+describe('Page Tests', () => {
+  test('renders Admin page', () => {
+    render(<Admin />);
+    expect(screen.getByText('Admin Text')).toBeInTheDocument();
+  });
+
+  test('renders SeatBooking page', () => {
+    render(<SeatBooking />);
+    expect(screen.getByText('SeatBooking Text')).toBeInTheDocument();
+  });
+
+  test('renders Profile page', () => {
+    render(<Profile />);
+    expect(screen.getByText('Profile Text')).toBeInTheDocument();
+  });
+
+  test('renders About page', () => {
+    render(<About />);
+    expect(screen.getByText('About Text')).toBeInTheDocument();
+  });
+
+  test('renders Contact page', () => {
+    render(<Contact />);
+    expect(screen.getByText('Contact Text')).toBeInTheDocument();
+  });
+});
\ No newline at end of file
diff --git a/client/route.test.js b/client/route.test.js
new file mode 100644
index 0000000..ae8ea5e
--- /dev/null
+++ b/client/route.test.js
@@ -0,0 +1,25 @@
+import { render, screen, describe, expect, test } from '@testing-library/react';
+import { MemoryRouter } from 'react-router-dom';
+import App from '../App'; 
+
+describe('Route Tests', () => {
+  test('renders Home component when / route is visited', () => {
+    render(<MemoryRouter initialEntries={['/']}><App /></MemoryRouter>);
+    expect(screen.getByText('Home Text')).toBeInTheDocument();
+  });
+
+  test('renders About component when /about route is visited', () => {
+    render(<MemoryRouter initialEntries={['/about']}><App /></MemoryRouter>);
+    expect(screen.getByText('About Text')).toBeInTheDocument();
+  });
+
+  test('renders Admin_Dashboard component when / route is visited', () => {
+    render(<MemoryRouter initialEntries={['/']}><App /></MemoryRouter>);
+    expect(screen.getByText('Admin Dashboard Text')).toBeInTheDocument();
+  });
+
+  test('renders Admin_Premiere component when /premiere route is visited', () => {
+    render(<MemoryRouter initialEntries={['/premiere']}><App /></MemoryRouter>);
+    expect(screen.getByText('Admin Premiere Text')).toBeInTheDocument();
+  });
+});
\ No newline at end of file
diff --git a/client/src/App.jsx b/client/src/App.jsx
index e47d6bb..63acd8d 100644
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -5,7 +5,7 @@ import Admin from "./Routes/Admin";
 
 function App() {
   const shouldHideNavAndFooter = () => {
-    const hiddenRoutes = ['/admin', '/premiere', '/upcoming', 'logout', '/adminlogin', '/add_premiere_movie', '/add_upcoming_movie', '/edit_premiere']; // Add more routes if needed
+    const hiddenRoutes = ['/admin', '/premiere', '/upcoming', 'logout', '/adminlogin', '/add_premiere_movie', '/add_upcoming_movie', '/edit_premiere', '/edit_upcoming']; // Add more routes if needed
     return hiddenRoutes.includes(window.location.pathname);
   };
 
diff --git a/client/src/Routes/Admin.jsx b/client/src/Routes/Admin.jsx
index 4abd294..4759594 100644
--- a/client/src/Routes/Admin.jsx
+++ b/client/src/Routes/Admin.jsx
@@ -8,6 +8,7 @@ import Admin_Logout from "../pages/Admin/Admin_Logout";
 import Premiere_Movie_Add from "/src/components/Admin-Premiere-Movie-Add/Premiere_Movie_Add";
 import Upcoming_Movie_Add from "/src/components/Admin-Upcoming-Movie-Add/Upcoming_Movie_Add";
 import Admin_Edit_Premiere from "/src/pages/Admin/Admin_Edit_PremiereMovies";
+import Admin_Edit_Upcoming from "/src/pages/Admin/Admin_Edit_UpcomingMovies";
 
 function Admin() {
   return (
@@ -22,6 +23,7 @@ function Admin() {
               <Route path="/add_premiere_movie" element={<Premiere_Movie_Add/>} />
               <Route path="/add_upcoming_movie" element={<Upcoming_Movie_Add/>} />
               <Route path="/edit_premiere" element={<Admin_Edit_Premiere/>} />
+              <Route path="/edit_upcoming" element={<Admin_Edit_Upcoming/>} />
               
           
 
diff --git a/client/src/components/Admin-Movie-Items/Admin-Upcoming-Item.jsx b/client/src/components/Admin-Movie-Items/Admin-Upcoming-Item.jsx
index 078ab5a..d998045 100644
--- a/client/src/components/Admin-Movie-Items/Admin-Upcoming-Item.jsx
+++ b/client/src/components/Admin-Movie-Items/Admin-Upcoming-Item.jsx
@@ -20,7 +20,7 @@ function MenuItem({ title, image }) {
             <p>Yesterday</p>
           </div>
           <div className="Edit-Delete-Right">
-            <Link>
+            <Link to = "/edit_upcoming">
               <FaEdit />
             </Link>
             <Link>
diff --git a/client/src/helpers/Admin_Booking_Data.jsx b/client/src/helpers/Admin_Booking_Data.jsx
index 933b7e6..1cec7fb 100644
--- a/client/src/helpers/Admin_Booking_Data.jsx
+++ b/client/src/helpers/Admin_Booking_Data.jsx
@@ -1,74 +1,32 @@
 const Admin_Booking_Data = [
   {
-    user: "u_name01",
-    movie: "Avatar",
+    user: "Amith",
+    movie: "Wonka",
     date: "2024-01-01",
     time: "08.00pm",
     seats: "12,13,14",
   },
   {
-    user: "u_name02",
-    movie: "Batman",
-    date: "2024-02-01",
-    time: "05.00pm",
-    seats: "1,2",
-  },
-  {
-    user: "u_name03",
-    movie: "Avatar",
-    date: "2024-01-01",
-    time: "08.00pm",
-    seats: "18,19",
-  },
-  {
-    user: "u_name04",
-    movie: "Avatar",
+    user: "Dushan",
+    movie: "Leo",
     date: "2024-01-01",
     time: "08.00pm",
     seats: "30,31",
   },
   {
-    user: "u_name05",
-    movie: "Avatar",
-    date: "2024-01-01",
-    time: "08.00pm",
-    seats: "24,25",
-  },
-  {
-    user: "u_name06",
-    movie: "Avatar",
-    date: "2024-01-01",
-    time: "08.00pm",
-    seats: "7,8",
-  },
-  {
-    user: "u_name07",
-    movie: "Avatar",
-    date: "2024-01-01",
-    time: "08.00pm",
-    seats: "5",
-  },
-  {
-    user: "u_name08",
-    movie: "Avatar",
-    date: "2024-01-01",
-    time: "08.00pm",
-    seats: "13",
-  },
-  {
-    user: "u_name09",
-    movie: "Avatar",
-    date: "2024-01-01",
-    time: "08.00pm",
-    seats: "9,10,11,12,15",
+    user: "Ashan",
+    movie: "Kathuru Mithuru",
+    date: "2024-02-01",
+    time: "05.00pm",
+    seats: "1,2",
   },
   {
-    user: "u_name10",
-    movie: "Avatar",
-    date: "2024-01-01",
-    time: "08.00pm",
-    seats: "20,21",
-  },
+    user: "Dushan",
+    movie: "Pathaan",
+    date: "2024-07-01",
+    time: "05.00pm",
+    seats: "18,19",
+  }
 ];
 
-export default Admin_Booking_Data;
+export default Admin_Booking_Data;
\ No newline at end of file
diff --git a/client/src/pages/Admin/Admin_Edit_UpcomingMovies.jsx b/client/src/pages/Admin/Admin_Edit_UpcomingMovies.jsx
index b118b56..07ca9dd 100644
--- a/client/src/pages/Admin/Admin_Edit_UpcomingMovies.jsx
+++ b/client/src/pages/Admin/Admin_Edit_UpcomingMovies.jsx
@@ -1,9 +1,195 @@
-function Admin_Edit_Upcoming() {
+import Data from "./Movie_Data_Upcoming.json";
+import React, { useState } from "react";
+import { useNavigate } from "react-router-dom";
+
+const Admin_Edit_Upcoming = () => {
+  const navigate = useNavigate();
+
+  const [movieName, setMovieName] = useState("");
+  const [movieCategory, setMovieCategory] = useState("");
+  const [cast, setCast] = useState("");
+  const [movieDetails, setMovieDetails] = useState("");
+  const [bannerImage, setBannerImage] = useState(null);
+  const [videoLink, setVideoLink] = useState("");
+  const [odcPrice, setODCPrice] = useState("");
+  const [boxPrice, setBoxPrice] = useState("");
+
+  const handleInputChange = (e) => {
+    setMovieName(e.target.value);
+  };
+
+  const handleCategoryChange = (e) => {
+    setMovieCategory(e.target.value);
+  };
+
+  const handleCastChange = (e) => {
+    setCast(e.target.value);
+  };
+
+  const handleMovieDetailsChange = (e) => {
+    setMovieDetails(e.target.value);
+  };
+
+  const handleBannerImageChange = (e) => {
+    const file = e.target.files[0];
+    setBannerImage(file);
+  };
+
+  const handleVideoLinkChange = (e) => {
+    setVideoLink(e.target.value);
+  };
+
+  const handleODCPriceChange = (e) => {
+    setODCPrice(e.target.value);
+  };
+
+  const handleBoxPriceChange = (e) => {
+    setBoxPrice(e.target.value);
+  };
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    // after submission
+    console.log("Submitted data:", {
+      movieName,
+      movieCategory,
+      cast,
+      movieDetails,
+      bannerImage,
+      videoLink,
+      odcPrice,
+      boxPrice,
+    });
+  };
+
+  const handleCancel = () => {
+    // After Cancel
+
+    console.log("Form Cancelled");
+  };
+
   return (
-    <div>
-      <h1>Upcoming Edit</h1>
+    <div className="Edit_Movie_Form">
+      <h3>Add Upcoming Movie</h3>
+      {Data.map((items) => (
+        <form key={items.key} onSubmit={handleSubmit}>
+          <div className="Form_lables_n_inputs_style">
+            <label htmlFor="movieName">Movie Name:</label>
+            <input
+              type="text"
+              id="movieName"
+              name="movieName"
+              value={items.title}
+              placeholder="Movie Name"
+              onChange={handleInputChange}
+            />
+          </div>
+
+          <div className="Form_lables_n_inputs_style">
+            <label htmlFor="movieCategory">Movie Category: </label>
+            <select
+              id="movieCategory"
+              name="movieCategory"
+              value={items.category}
+              onChange={handleCategoryChange}
+            >
+              <option value="">Select a Category</option>
+              <option value="ActionAdventure">Action & Adventure</option>
+              <option value="Comedy">Comedy</option>
+              <option value="Horror">Horror</option>
+              <option value="Thriller">Thriller</option>
+              <option value="Fantasy">Fantasy</option>
+            </select>
+          </div>
+
+          <div className="Form_lables_n_inputs_style">
+            <label htmlFor="cast">Cast:</label>
+            <input
+              type="text"
+              id="cast"
+              name="cast"
+              placeholder="Enter Cast Members (e.g., Actor 01, Actor 02)"
+              value={items.cast}
+              onChange={handleCastChange}
+            />
+          </div>
+
+          <div className="Form_lables_n_inputs_style">
+            <label htmlFor="movieDetails">Movie Details:</label>
+            <textarea
+              id="movieDetails"
+              name="movieDetails"
+              placeholder="Enter Movie Description"
+              value={items.moviedetails}
+              onChange={handleMovieDetailsChange}
+              style={{ height: "200px" }}
+            />
+          </div>
+
+          <div className="Form_lables_n_inputs_style">
+            <label htmlFor="bannerImage">Upload Banner: </label>
+            <input
+              type="file"
+              id="bannerImage"
+              name="bannerImage"
+              accept="image/*"
+              onChange={handleBannerImageChange}
+            />
+          </div>
+
+          <div className="Form_lables_n_inputs_style">
+            <label htmlFor="videoLink">Link (Trailer Video):</label>
+            <input
+              type="link"
+              id="videoLink"
+              name="videoLink"
+              placeholder="Enter Video Link"
+              value={items.link}
+              onChange={handleVideoLinkChange}
+            />
+          </div>
+
+          <div className="Form_lables_n_inputs_style">
+            <div className="set-prices">
+              <label htmlFor="odcPrice">ODC Price: </label>
+              <input
+                type="text"
+                id="odcPrice"
+                name="odcPrice"
+                placeholder="Enter ODC Price"
+                value={items.odc}
+                onChange={handleODCPriceChange}
+              />
+
+              <label htmlFor="boxPrice">Box Price: </label>
+              <input
+                type="text"
+                id="boxPrice"
+                name="boxPrice"
+                placeholder="Enter Box Price"
+                value={items.box}
+                onChange={handleBoxPriceChange}
+              />
+            </div>
+          </div>
+
+          <div className="button-group">
+            <button className="Edit_Movie_Submit_Button" type="submit">
+              Update
+            </button>
+            <button
+              className="Edit_Movie_Cancel_Button"
+              type="button"
+              onClick={handleCancel}
+            >
+              Cancel
+            </button>
+          </div>
+          <br />
+        </form>
+      ))}
     </div>
   );
-}
+};
 
-export default Admin_Edit_Upcoming;
\ No newline at end of file
+export default Admin_Edit_Upcoming;
diff --git a/client/src/pages/Admin/Movie_Data.json b/client/src/pages/Admin/Movie_Data.json
index 1f97555..316186a 100644
--- a/client/src/pages/Admin/Movie_Data.json
+++ b/client/src/pages/Admin/Movie_Data.json
@@ -1,13 +1,13 @@
 [
    {
     "id": "1",
-    "title": "Avatar",
+    "title": "Wonka",
     "category": "ActionAdventure",
-    "cast":"Sam Worthington, Zoe Saldana, Sigourney Weaver",
-    "moviedetails":"Jake Sully (Sam Worthington), a paralyzed former Marine, becomes mobile again through one such Avatar and falls in love with a Na'vi woman (Zoe Saldana). As a bond with her grows, he is drawn into a battle for the survival of her world. Content collapsed.",
-    "image":"../assets/Avatar.jpg", 
+    "cast":"Timothée Chalamet, Keegan-Michael Key, Paterson Joseph, Matt Lucas, Mathew Baynton",
+    "moviedetails":"The analysis shows that Willy Wonka is innovative, flamboyant, stubborn, arrogant, and authoritarian. He loves to be the center of attention by putting on outrageous attire. He cannot stand questions and considers them as criticisms or threat. He always brags the products he creates to his guests.",
+    "image":"../assets/movies/premiering/wonka.jpg", 
     "link":"link",
-    "odc": "5000",
-    "box": "2000"
-   } 
+    "odc":"5000",
+    "box":"2000"
+}
 ]
\ No newline at end of file
diff --git a/client/src/pages/Admin/Movie_Data_Upcoming.json b/client/src/pages/Admin/Movie_Data_Upcoming.json
new file mode 100644
index 0000000..88d66d6
--- /dev/null
+++ b/client/src/pages/Admin/Movie_Data_Upcoming.json
@@ -0,0 +1,13 @@
+[
+   {
+    "id": "1",
+    "title": "Hanuman 2024",
+    "category": "ActionAdventure",
+    "cast":"Teja Sajja, Amritha Aiyer, Varalaxmi Sarathkumar",
+    "moviedetails":"Hanu Man is an upcoming Indian Telugu-language superhero film written and directed by Prasanth Varma and produced by Niranjan Reddy Kandagatla under Primeshow Entertainment.",
+    "image":"../assets/Hanuman.jpg", 
+    "link":"link",
+    "odc": "5000",
+    "box": "2000"
+   } 
+]
\ No newline at end of file
diff --git a/client/src/pages/Profile/Booking.json b/client/src/pages/Profile/Booking.json
index 87eaa19..43d0e24 100644
--- a/client/src/pages/Profile/Booking.json
+++ b/client/src/pages/Profile/Booking.json
@@ -2,7 +2,7 @@
     {
         "id": "1",
         "user": "Ashan",
-        "movie": "Transformers",
+        "movie": "Wonka",
         "date": "2024-01-07, 10:00 AM",
         "category": "ODC",
         "seats": "A1,A2,A3,A4"
@@ -22,29 +22,5 @@
         "date": "2023-12-27, 11:00 AM",
         "category": "BOX",
         "seats": "C1, D1"
-    },
-    {
-        "id": "4",
-        "user": "Amith",
-        "movie": "Black Adam",
-        "date": "2023-12-27, 11:00 AM",
-        "category": "BOX",
-        "seats": "C1, D1"
-    },
-    {
-        "id": "5",
-        "user": "Amith",
-        "movie": "Black Adam",
-        "date": "2023-12-27, 11:00 AM",
-        "category": "BOX",
-        "seats": "C1, D1"
-    },
-    {
-        "id": "6",
-        "user": "Amith",
-        "movie": "Black Adam",
-        "date": "2023-12-27, 11:00 AM",
-        "category": "BOX",
-        "seats": "C1, D1"
     }
 ]
\ No newline at end of file
diff --git a/client/src/pages/Profile/BookingHistory.jsx b/client/src/pages/Profile/BookingHistory.jsx
index 7e87425..8762c37 100644
--- a/client/src/pages/Profile/BookingHistory.jsx
+++ b/client/src/pages/Profile/BookingHistory.jsx
@@ -9,19 +9,17 @@ function Profile() {
           <h1>Booking History</h1>
           <table className="booking-table">
             <tr>
-              <th>User</th>
               <th>Movie</th>
               <th>Date/Time</th>
-              <th>Categary</th>
                 <th>Seats</th>
             </tr>
             {
                 Booking.map((item) => (
                     <tr key={item.id}>
-                        <td>{item.user}</td>
+                     
                         <td>{item.movie}</td>
                         <td>{item.date}</td>
-                        <td>{item.category}</td>
+                
                         <td>{item.seats}</td>
                     </tr>
                 ))