diff --git a/.github/workflows/front-end.yml b/.github/workflows/front-end.yml
index 5c06625410..b87fa10112 100644
--- a/.github/workflows/front-end.yml
+++ b/.github/workflows/front-end.yml
@@ -30,13 +30,3 @@ jobs:
           aws-region: eu-north-1
       - name: Deploy static site to S3 bucket
         run: 'aws s3 sync ./client/build s3://fullstackprojectaws'
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
->>>>>>> 1d0f65ee (creating yml file)
diff --git a/.gitignore b/.gitignore
index 6a6fdbc041..51c664feba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,39 @@
 
 node_modules
-.env
\ No newline at end of file
+.env
+
+# Local .terraform directories
+
+**/.terraform/*/*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+crash.*.log
+
+# Exclude all .tfvars files, which are likely to contain sensitive data, such as
+# password, private keys, and other secrets. These should not be part of version 
+# control as they are data points which are potentially sensitive and subject 
+# to change depending on the environment.
+*.tfvars
+*.tfvars.json
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Include override files you do wish to add to version control using negated pattern
+# !example_override.tf
+
+# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# example: *tfplan*
+
+# Ignore CLI configuration files
+.terraformrc
+terraform.rc
\ No newline at end of file
diff --git a/client/.gitignore b/client/.gitignore
index b512c09d47..51c664feba 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -1 +1,39 @@
-node_modules
\ No newline at end of file
+
+node_modules
+.env
+
+# Local .terraform directories
+
+**/.terraform/*/*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Crash log files
+crash.log
+crash.*.log
+
+# Exclude all .tfvars files, which are likely to contain sensitive data, such as
+# password, private keys, and other secrets. These should not be part of version 
+# control as they are data points which are potentially sensitive and subject 
+# to change depending on the environment.
+*.tfvars
+*.tfvars.json
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+
+# Include override files you do wish to add to version control using negated pattern
+# !example_override.tf
+
+# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
+# example: *tfplan*
+
+# Ignore CLI configuration files
+.terraformrc
+terraform.rc
\ No newline at end of file
diff --git a/client/src/App.js b/client/src/App.js
index b9c3f82ad4..fbf66c5426 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -1,20 +1,19 @@
-import React, {useState,useEffect } from "react";
-import { BrowserRouter as Router, Route, Routes, Link } from "react-router-dom"; 
+import React, { useState, useEffect } from "react";
+import { BrowserRouter as Router, Route, Routes, Link } from "react-router-dom";
 
 import "./App.css";
 import Videos from "./Videos.js";
 
 function App() {
-  
   const [showVideos, setShowVideos] = useState(false);
   const [loadVideo, setLoadVideo] = useState([]);
-  const [order,setOrder]=useState("ase");
+  const [order, setOrder] = useState("ase");
 
   useEffect(() => {
     const getData = async () => {
       try {
         const response = await fetch(
-          "http://ec2-16-171-32-223.eu-north-1.compute.amazonaws.com:3000/videos"
+          "http://ec2-13-49-244-227.eu-north-1.compute.amazonaws.com:3000/videos"
         );
         if (!response.ok) {
           throw new Error("something went wrong");
@@ -30,7 +29,6 @@ function App() {
     getData();
   }, []);
 
-
   function orderClickHandler(e, newOrder) {
     e.preventDefault();
 
@@ -56,9 +54,19 @@ function App() {
         <nav className="nav">
           <div className="orderBtn">
             <p>order by rate : </p>
-            <button onClick={(e) => orderClickHandler(e, "asc")} disabled={order === "asc"}>Ase</button>
-            
-            <button onClick={(e)=>orderClickHandler(e,"desc")} disabled={order==="desc"}>Desc</button>
+            <button
+              onClick={(e) => orderClickHandler(e, "asc")}
+              disabled={order === "asc"}
+            >
+              Ase
+            </button>
+
+            <button
+              onClick={(e) => orderClickHandler(e, "desc")}
+              disabled={order === "desc"}
+            >
+              Desc
+            </button>
           </div>
           <div style={{ backgroundColor: "#55BCC9" }}></div>
           <Link
diff --git a/client/src/Videos.js b/client/src/Videos.js
index d32b016f9b..fbf66c5426 100644
--- a/client/src/Videos.js
+++ b/client/src/Videos.js
@@ -1,264 +1,104 @@
-import React, {useState } from "react";
-import ThumbUpIcon from "@mui/icons-material/ThumbUp";
-import ThumbDownIcon from "@mui/icons-material/ThumbDown";
-function Videos(props) {
-  const { loadVideo,setLoadVideo}=props;
-  const [title, setTitleData] = useState("");
-  const [url, setUrlData] = useState("");
-
-  
-  
-  function cancelBtnHandler(e) {
-    props.setShow(false);
-  }
-
-  function addClickHandeler(e) {
-    e.preventDefault();
-    //const newVideo = { title: titleData, url: urlData};
-    const newVideo = { title: title, url: url, rating: 0 };
-
-    //adding video
-    fetch(
-      "http://ec2-16-171-32-223.eu-north-1.compute.amazonaws.com:3000/videos",
-      {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify(newVideo),
-      }
-    )
-      .then((response) => response.json())
-      .then((data) => {
-        const updatedData = [...loadVideo, data];
-
-        setLoadVideo(updatedData);
-
-        setTitleData("");
-        setUrlData("");
-      })
-      .catch((err) => {
-        console.error("Error adding video:", err);
-      });
-  }
-
-  // //deleting video
-  // function deleteBtnHandler(item) {
-  //   const deletevideo = {
-  //     id: item.id,
-  //     title: item.title,
-  //     url: item.url,
-  //   };
-
-  //   fetch(`http://localhost:3000/videos/${item.id}`, {
-  //     method: "DELETE",
-  //     headers: {
-  //       "Content-Type": "application/json",
-  //     },
-  //     body: JSON.stringify(deletevideo),
-  //   })
-  //     .then((response) => response.json())
-  //     .then((data) => {
-  //       const updatedData = loadData.filter((video) => video.id !== item.id);
-  //       setLoadData(updatedData);
-  //     })
-  //     .catch((error) => {
-  //       console.error("Error deleting video:", error);
-  //     });
-  // }
-
-  //deleting video
-  function deleteBtnHandler(item) {
-    fetch(
-      `http://ec2-16-171-32-223.eu-north-1.compute.amazonaws.com:3000/videos/${item.id}`,
-      {
-        method: "DELETE",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify(item),
-      }
-    )
-      .then((response) => {
+import React, { useState, useEffect } from "react";
+import { BrowserRouter as Router, Route, Routes, Link } from "react-router-dom";
+
+import "./App.css";
+import Videos from "./Videos.js";
+
+function App() {
+  const [showVideos, setShowVideos] = useState(false);
+  const [loadVideo, setLoadVideo] = useState([]);
+  const [order, setOrder] = useState("ase");
+
+  useEffect(() => {
+    const getData = async () => {
+      try {
+        const response = await fetch(
+          "http://ec2-13-49-244-227.eu-north-1.compute.amazonaws.com:3000/videos"
+        );
         if (!response.ok) {
-          throw new Error("Failed to delete video");
+          throw new Error("something went wrong");
         }
-        return response.json();
-      })
-      .then(() => {
-        const updatedData = loadVideo.filter((video) => video.id !== item.id);
-        setLoadVideo(updatedData);
-      })
-      .catch((error) => {
-        console.error("Error deleting video:", error);
-      });
-  }
-
-
-  function thumbUpHandeler(item) {
-    const newRating = item.rating + 1; // Increment the rating locally
-
-    const newVideo = {
-      id: item.id,
-      title: item.title,
-      url: item.url,
-      rating: newRating, // Use the updated rating
-    };
-
-    fetch(
-      `http://ec2-16-171-32-223.eu-north-1.compute.amazonaws.com:3000/videos/${item.id}`,
-      {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify(newVideo),
+        const data = await response.json();
+        //desending acording to the rating
+        data.sort((a, b) => b.rating - a.rating);
+        return setLoadVideo(data);
+      } catch (error) {
+        console.error("Error fetching data:", error);
       }
-    )
-      .then((response) => response.json())
-      .then((data) => {
-        const updatedData = loadVideo.map((video) => {
-          if (video.id === item.id) {
-            return { ...video, rating: newRating };
-          }
-          return video;
-        });
-        console.log(updatedData);
-        setLoadVideo(updatedData);
-      })
-      .catch((error) => {
-        console.error("Error updating video:", error);
-      });
-  }
-
-  function thumbDownHandeler(item) {
-    const newRating = item.rating - 1;
-    const newVideo = {
-      id: item.id,
-      title: item.title,
-      url: item.url,
-      rating: newRating,
     };
+    getData();
+  }, []);
 
-    fetch(
-      `http://ec2-16-171-32-223.eu-north-1.compute.amazonaws.com:3000/videos/${item.id}`,
-      {
-        method: "PUT",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify(newVideo),
-      }
-    )
-      .then((response) => response.json())
-      .then((data) => {
-        const updatedData = loadVideo.map((video) => {
-          if (video.id === item.id) {
-            return { ...video, rating: newRating };
-          }
-          return video;
-        });
-        setLoadVideo(updatedData);
-      });
+  function orderClickHandler(e, newOrder) {
+    e.preventDefault();
+
+    if (newOrder === "asc") {
+      const sortedVideos = [...loadVideo].sort((a, b) => a.rating - b.rating);
+      setLoadVideo(sortedVideos);
+      setOrder("asc");
+    } else {
+      const sortedVideos = [...loadVideo].sort((a, b) => b.rating - a.rating);
+      setLoadVideo(sortedVideos);
+      setOrder("desc");
+    }
   }
 
   return (
-    <>
-      <div className="main" style={{ width: "100vw" }}>
-        {props.show && (
-          <form
-            className="formDiv"
-            style={{ width: "100vw" }}
-            onSubmit={addClickHandeler}
+    <Router>
+      <div className="App">
+        <header className="appHeader">
+          <h1 style={{ background: "#97CAEF", color: "black" }}>
+            Video Recommendation
+          </h1>
+        </header>
+        <nav className="nav">
+          <div className="orderBtn">
+            <p>order by rate : </p>
+            <button
+              onClick={(e) => orderClickHandler(e, "asc")}
+              disabled={order === "asc"}
+            >
+              Ase
+            </button>
+
+            <button
+              onClick={(e) => orderClickHandler(e, "desc")}
+              disabled={order === "desc"}
+            >
+              Desc
+            </button>
+          </div>
+          <div style={{ backgroundColor: "#55BCC9" }}></div>
+          <Link
+            to="/videos"
+            style={{
+              color: "#FC4445",
+              marginLeft: 20,
+              textDecoration: "none",
+              fontWeight: "bold",
+            }}
+            onClick={() => setShowVideos(true)}
           >
-            <div className="input-group">
-              
-              <label htmlFor="title">Title</label>
-              <input
-                className="lineInput"
-                id="title"
-                value={title}
-                onChange={(e) => {
-                  setTitleData(e.target.value);
-                }}
-                required
+            Videos
+          </Link>
+        </nav>
+        <Routes>
+          {" "}
+          <Route
+            path="/videos"
+            element={
+              <Videos
+                show={showVideos}
+                setShow={setShowVideos}
+                loadVideo={loadVideo}
+                setLoadVideo={setLoadVideo}
               />
-            </div>
-            <div className="input-group">
-              <label htmlFor="url">Url</label>
-              <input
-                className="lineInput"
-                id="url"
-                value={url}
-                onChange={(e) => setUrlData(e.target.value)}
-                required
-              />
-            </div>
-
-            <div className="addCancelBtn">
-              <button
-                style={{ borderRadius: 5 }}
-                type="button"
-                onClick={cancelBtnHandler}
-              >
-                Cancel
-              </button>
-              <button style={{ borderRadius: 5 }} type="submit">
-                Add
-              </button>
-            </div>
-          </form>
-        )}
-        <div className="mainShowVideos">
-          {loadVideo.length > 0 ? (
-            loadVideo.map((item, index) => {
-              const videoId = item.url.split("v=")[1];
-              return (
-                <div key={index} className="showVideo">
-                  <div style={{ display: "flex", marginBottom: 10 }}>
-                    <button
-                      className="thumbBtn"
-                      onClick={() => thumbUpHandeler(item)}
-                    >
-                      <ThumbUpIcon />
-                    </button>
-                    <p style={{ margin: 5 }}>{item.title}</p>
-                    <button
-                      className="thumbBtn"
-                      onClick={() => thumbDownHandeler(item)}
-                    >
-                      <ThumbDownIcon />
-                    </button>
-                  </div>
-                  <p style={{ color: "black"}}>
-                    {item.rating}
-                  </p>
-
-                  <iframe
-                    width="350"
-                    height="200"
-                    src={`http://www.youtube.com/embed/${videoId}`}
-                    title="YouTube video player"
-                    frameBorder="0"
-                    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
-                    allowFullScreen
-                  ></iframe>
-
-                  <button
-                    className="btnShowVideo"
-                    onClick={() => deleteBtnHandler(item)}
-                  >
-                    Delete
-                  </button>
-                </div>
-              );
-            })
-          ) : (
-            <p style={{fontWeight:"bold",color:"white"}}>Loading . . .</p>
-          )}
-        </div>
+            }
+          />
+        </Routes>
       </div>
-    </>
+    </Router>
   );
 }
-export default Videos;
+
+export default App;
diff --git a/infrastructure/.terraform.lock.hcl b/infrastructure/.terraform.lock.hcl
new file mode 100644
index 0000000000..e90e04b236
--- /dev/null
+++ b/infrastructure/.terraform.lock.hcl
@@ -0,0 +1,24 @@
+# This file is maintained automatically by "terraform init".
+# Manual edits may be lost in future updates.
+
+provider "registry.terraform.io/hashicorp/aws" {
+  version = "5.39.1"
+  hashes = [
+    "h1:cXnNy35JewgDL4IZ0X9afy8crWMxUZY640V+uvVdGHI=",
+    "zh:05c50a5d8edb3ba4ebc4eb6e0d0b5e319142f5983b27821710ed7d475d335bdc",
+    "zh:082986a5784dd21957e632371b289e549f051a4ea21d5c78c6d744c3537f03c5",
+    "zh:192ae622ba562eacc4921ed549a794506179233d724fdd15a4f147f3400724a0",
+    "zh:19a1d4637a62de90b0da174c0bf01000cd900488f7e8f709d8a37f082c59756b",
+    "zh:1d7689a8583515f1705972d7ce57ccfab96215b19905530d2c78c02dcfaff583",
+    "zh:22c446a21209a52ab74b4ba1ede0b220531e97ce479430047e493a2c45e1d8cb",
+    "zh:4154de82290ab4e9f81bac1ea62342de8b3b7a608f99258c190d4dd1c6663e47",
+    "zh:6bc4859ccdc54f28af9286b2fa090a31dcb345138d68c471510b737f6a052011",
+    "zh:73c69e000e0b321e78a4a12fef60d37285f2afec0ea7be9e06163d985101cb59",
+    "zh:890a3422f5e445b49bae30facf448d0ec9cd647e9155d0b685b5b39e9d331a94",
+    "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425",
+    "zh:9cd88bec0f5205df9032e3126d4e57edd1c5cc8d45cda25626882dafc485a3b0",
+    "zh:a3a8e3276d0fbf051bbafa192a2998b05745f2cf285ac8c36a9ad167a75c037f",
+    "zh:d47e4dcf4c0ad71b9a7c720be4f3a89f6786a82e77bbe8d950794562792a1da5",
+    "zh:f74e5b2af508c7de80a6ae5198df54a795eeba5058a0cd247828943f0c54f6e0",
+  ]
+}
diff --git a/infrastructure/mainS3Ec2Rds.tf b/infrastructure/mainS3Ec2Rds.tf
new file mode 100644
index 0000000000..742eaf7a3d
--- /dev/null
+++ b/infrastructure/mainS3Ec2Rds.tf
@@ -0,0 +1,99 @@
+provider "aws" {
+    access_key = "${var.aws_access_key}"
+    secret_key = "${var.aws_secret_key}"
+    region = "${var.region}"
+}
+
+module "s3" {
+    source = "./s3"
+   
+    bucket_name = "reccomendation"       
+}
+
+resource "aws_instance" "example_server" {
+  ami = "ami-0171207a7acd2a570"
+  instance_type = "t2.micro"
+  vpc_security_group_ids = [local.recommendationRds_id]
+
+  tags = {
+    Name = "reccomendationserver"
+  }
+  provisioner "remote-exec" {
+    connection {
+      type        = "ssh"
+      user        = "ubuntu"  
+      host        = self.public_ip
+      private_key = file("/Users/shadifakhri/Downloads/recommendationKey.pem")
+    }
+inline = [
+      "sudo npm update -y",
+      "sudo npm install docker -y",
+      "sudo systemctl start docker",
+      "sudo systemctl enable docker"
+    ]
+
+  
+}
+}
+
+resource "aws_security_group" "recommendationRds" {
+  name        = "reccomendation_security_group"
+  description = "Allow ports 22, 8080, and 3000"
+
+ 
+  ingress {
+    from_port   = 5432
+    to_port     = 5432
+    protocol    = "tcp"
+     cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  ingress {
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  ingress {
+    from_port   = 8080
+    to_port     = 8080
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  ingress {
+    from_port   = 3000
+    to_port     = 3000
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}
+
+
+
+locals {
+  recommendationRds_id = aws_security_group.recommendationRds.id
+}
+
+resource "aws_db_instance" "default" {
+  allocated_storage = 10
+  engine = "postgres"
+  instance_class = "db.t3.micro"
+  db_name = "recommendation"
+  username = "postgres"
+  password = var.db-password
+  publicly_accessible   = true
+  vpc_security_group_ids = [local.recommendationRds_id]
+  
+  skip_final_snapshot = true // required to destroy
+   
+}
+
diff --git a/infrastructure/s3/bucket.tf b/infrastructure/s3/bucket.tf
new file mode 100644
index 0000000000..03c7831170
--- /dev/null
+++ b/infrastructure/s3/bucket.tf
@@ -0,0 +1,25 @@
+resource "aws_s3_bucket" "demos3" {
+    bucket = "${var.bucket_name}" 
+    acl = "${var.acl_value}"   
+}
+
+resource "aws_s3_bucket_public_access_block" "example" {
+    bucket = aws_s3_bucket.demos3.id
+
+    block_public_acls = false
+    block_public_policy = false
+}
+resource "aws_s3_bucket_policy" "public_access" {
+  bucket = aws_s3_bucket.demos3.id
+
+  policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [{
+      Sid       = "PublicReadGetObject"
+      Effect    = "Allow"
+      Principal = "*"
+      Action    = "s3:GetObject"
+      Resource  = "${aws_s3_bucket.demos3.arn}/*"
+    }]
+  })
+}
\ No newline at end of file
diff --git a/infrastructure/s3/var.tf b/infrastructure/s3/var.tf
new file mode 100644
index 0000000000..1221223754
--- /dev/null
+++ b/infrastructure/s3/var.tf
@@ -0,0 +1,5 @@
+variable "bucket_name" {}
+
+variable "acl_value" {
+    default = "public-read"
+}
\ No newline at end of file
diff --git a/infrastructure/variable.tf b/infrastructure/variable.tf
new file mode 100644
index 0000000000..4326f189e5
--- /dev/null
+++ b/infrastructure/variable.tf
@@ -0,0 +1,14 @@
+variable "aws_access_key" {
+default = "AKIATCKAOW2XKM2ACVVU"
+}
+variable "aws_secret_key" {
+default = "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"
+ }
+variable "region" {
+    default = "eu-west-2"
+}
+
+variable "db-password" {
+ type = string
+  default = "0991shadI"
+}
\ No newline at end of file
diff --git a/server/package.json b/server/package.json
index 9c095c831e..e1bd683079 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,7 +1,6 @@
 {
   "name": "server",
   "version": "1.0.0",
-  "description": "",
   "main": "server.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -15,5 +14,8 @@
     "express": "^4.18.2",
     "express-validator": "^7.0.1",
     "pg": "^8.11.3"
-  }
+  },
+  "keywords": [],
+  "devDependencies": {},
+  "description": ""
 }
diff --git a/server/server.js b/server/server.js
index e5d53b1bdf..a91eca612c 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1,35 +1,30 @@
-
 const express = require("express");
 const app = express();
- const cors = require ("cors");
+const cors = require("cors");
 const corsOptions = {
-  origin: "http://localhost:3000"
+  origin: "http://localhost:3000",
 };
 app.use(cors());
-require('dotenv').config(); // Load environment variables from .env file
-const bodyParser = require("body-parser")
-app.use(bodyParser.json())
- 
+require("dotenv").config(); // Load environment variables from .env file
+const bodyParser = require("body-parser");
+app.use(bodyParser.json());
+
 app.use(express.json());
 const { body, validationResult } = require("express-validator");
 const port = process.env.PORT || 3000;
 const { Pool } = require("pg");
 
-
-
-
-
 const db = new Pool({
-  connectionString:process.env.DB_URL
+  connectionString: process.env.DB_URL,
   // user: process.env.DB_USER,
   // host: process.env.DB_HOST,
   // database: process.env.DB_NAME,
   // password: process.env.DB_PASSWORD,
   // port: process.env.DB_PORT,
-//   ssl: process.env.DB_SSL === "true" ? { rejectUnauthorized: true } : false
- });
+  //   ssl: process.env.DB_SSL === "true" ? { rejectUnauthorized: true } : false
+});
 
-// 
+//
 app.get("/", function (req, res) {
   res.status(200).json("wellcome");
 });
@@ -41,7 +36,6 @@ app.get("/", function (req, res) {
 //   res.json(videos);
 // });
 
-
 // GET "/videos"
 app.get("/videos", async function (req, res) {
   const result = await db.query("SELECT * FROM videos");
@@ -77,7 +71,7 @@ app.get("/videos", async function (req, res) {
 //   }
 //   const order = req.query.order;
 //   let orderVideos;
-  
+
 //   if (order === "asc") {
 //     orderVideos = result.rows.sort((a, b) => a.rating - b.rating);
 //   } else if (order === "desc") {
@@ -88,7 +82,6 @@ app.get("/videos", async function (req, res) {
 //   return res.status(200).json(orderVideos);
 //});
 
-
 //ordering by assending and dessending for example /videos?order=asc
 app.get("/videos", async function (req, res) {
   try {
@@ -154,7 +147,7 @@ app.post(
     const query =
       //// Include "RETURNING *" to return the newly created row
       "INSERT INTO videos (title, url, rating) VALUES($1, $2, $3) RETURNING *";
-    db.query(query, [newTitle, newUrl, newRating], (err,result) => {
+    db.query(query, [newTitle, newUrl, newRating], (err, result) => {
       if (err) {
         res.status(500).send("Internal Server Error");
       } else {
@@ -177,8 +170,7 @@ app.get("/videos/search", function (req, res) {
   res.json(filteredVideo);
 });
 
-
- //search video by id for example/videos/:id
+//search video by id for example/videos/:id
 // app.get("/videos/:id", function (req, res) {
 //   const videoId = parseInt(req.params.id);
 //   const video = videos.find((m) => m.id === videoId);
@@ -190,8 +182,8 @@ app.get("/videos/search", function (req, res) {
 
 //search video by id for example/videos/:id
 app.get("/videos/:id", async function (req, res) {
-  const videoId=req.params.id;
-  const result = await db.query('SELECT * FROM videos where id=$1',[videoId]);
+  const videoId = req.params.id;
+  const result = await db.query("SELECT * FROM videos where id=$1", [videoId]);
   if (result.rows.length === 0) {
     return res.status(404).json({ error: "no videos found" });
   }
@@ -216,15 +208,19 @@ app.get("/videos/:id", async function (req, res) {
 // });
 
 //updating video with id
-app.put("/videos/:id",async function (req,res) {
+app.put("/videos/:id", async function (req, res) {
   const newId = req.params.id;
-  const newRating= req.body.rating;
-  try{const result = db.query("UPDATE videos SET rating=$2 WHERE id=$1",[newId,newRating])
-res.json(`video with id:${newId} updated`)}
-catch(error){
-  res.status(500).json({ error: "Internal Server Error" });
-}
-})
+  const newRating = req.body.rating;
+  try {
+    const result = db.query("UPDATE videos SET rating=$2 WHERE id=$1", [
+      newId,
+      newRating,
+    ]);
+    res.json(`video with id:${newId} updated`);
+  } catch (error) {
+    res.status(500).json({ error: "Internal Server Error" });
+  }
+});
 
 //delete video
 // app.delete("/videos/:id", function (req, res) {
@@ -243,9 +239,7 @@ app.delete("/videos/:id", async function (req, res) {
   try {
     const result = await db.query("DELETE FROM videos WHERE id=$1", [videoId]);
     if (result.rowCount === 0) {
-      return res
-        .status(404)
-        .json( `Video with id ${videoId} not found`);
+      return res.status(404).json(`Video with id ${videoId} not found`);
     }
     res.json(`Video with id ${videoId} deleted`);
   } catch (error) {
@@ -254,5 +248,4 @@ app.delete("/videos/:id", async function (req, res) {
   }
 });
 
-
-app.listen(port, () => console.log(`Listening on port ${port}`));
\ No newline at end of file
+app.listen(port, () => console.log(`Listening on port ${port}`));