diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..46c4e66
--- /dev/null
+++ b/.env.example
@@ -0,0 +1 @@
+REACT_APP_WEATHER_API_KEY="b03a640e5ef6980o4da35b006t5f2942"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index b512c09..1dcef2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-node_modules
\ No newline at end of file
+node_modules
+.env
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 0000000..672bc4e
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,6 @@
+# Ignore all MDX files to prevent unwanted JSX line wrapping
+# https://jasongerbes.com/blog/mdx-remove-unwanted-paragraph-tags
+*.mdx
+dist
+build
+node_modules
\ No newline at end of file
diff --git a/prettier.config.js b/prettier.config.js
new file mode 100644
index 0000000..4422986
--- /dev/null
+++ b/prettier.config.js
@@ -0,0 +1,4 @@
+module.exports = {
+  printWidth: 100,
+  tabWidth: 2,
+};
diff --git a/src/components/App.js b/src/components/App.js
index 282d49d..3542d21 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -7,11 +7,11 @@ import "../styles.css";
 import '@fortawesome/fontawesome-free/css/all.min.css';
 
 function App() {
-  const [query, setQuery] = useState("");
+  const [query, setQuery] = useState("Rabat");
   const [weather, setWeather] = useState({
     loading: true,
     data: {},
-    error: false
+    error: false,
   });
 
   const toDate = () => {
@@ -27,48 +27,47 @@ function App() {
       "September",
       "October",
       "November",
-      "December"
-    ];
-    const days = [
-      "Sunday",
-      "Monday",
-      "Tuesday",
-      "Wednesday",
-      "Thursday",
-      "Friday",
-      "Saturday"
+      "December",
     ];
+    const days = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
 
     const currentDate = new Date();
-    const date = `${days[currentDate.getDay()]} ${currentDate.getDate()} ${months[currentDate.getMonth()]
-      }`;
+    const date = `${days[currentDate.getDay()]} ${currentDate.getDate()} ${
+      months[currentDate.getMonth()]
+    }`;
     return date;
   };
-  //new search function
-  const search = async (event) => {
-    event.preventDefault();
-    if (event.type === "click" || (event.type === "keypress" && event.key === "Enter")) {
-      setWeather({ ...weather, loading: true });
-      const apiKey = "b03a640e5ef6980o4da35b006t5f2942";
-      const url = `https://api.shecodes.io/weather/v1/current?query=${query}&key=${apiKey}`;
 
-      await axios
-        .get(url)
-        .then((res) => {
-          console.log("res", res);
-          setWeather({ data: res.data, loading: false, error: false });
-        })
-        .catch((error) => {
-          setWeather({ ...weather, data: {}, error: true });
-          console.log("error", error);
-        });
+  useEffect(() => {
+    if (navigator.geolocation) {
+      navigator.geolocation.getCurrentPosition(
+        async (position) => {
+          const { latitude, longitude } = position.coords;
+          try {
+            const response = await axios.get(
+              `https://nominatim.openstreetmap.org/reverse?lat=${latitude}&lon=${longitude}&format=json`
+            );
+            const data = await response.data;
+            const city = data.address.city || data.address.town || data.address.village;
+            setQuery(city);
+          } catch (err) {
+            console.error("Failed to fetch city data:", err);
+          }
+        },
+        (err) => {
+          console.error("Geolocation error:", err.message);
+        }
+      );
+    } else {
+      console.error("Geolocation is not supported by your browser");
     }
-  };
+  }, []);
 
+  
   useEffect(() => {
     const fetchData = async () => {
-      const apiKey = "b03a640e5ef6980o4da35b006t5f2942";
-      const url = `https://api.shecodes.io/weather/v1/current?query=Rabat&key=${apiKey}`;
+      const apiKey = process.env.REACT_APP_WEATHER_API_KEY;
+      const url = `https://api.shecodes.io/weather/v1/current?query=${query}&key=${apiKey}`;
 
       try {
         const response = await axios.get(url);
@@ -78,15 +77,12 @@ function App() {
         console.log("error", error);
       }
     };
-
     fetchData();
-  }, []);
+  }, [query]);
 
   return (
     <div className="App">
-
-      {/* SearchEngine component */}
-      <SearchEngine query={query} setQuery={setQuery} search={search} />
+      <SearchEngine query={query} setQuery={setQuery} />
 
       {weather.loading && (
         <>
@@ -101,15 +97,12 @@ function App() {
           <br />
           <br />
           <span className="error-message">
-            <span style={{ fontFamily: "font" }}>
-              Sorry city not found, please try again.
-            </span>
+            <span style={{ fontFamily: "font" }}>Sorry city not found, please try again.</span>
           </span>
         </>
       )}
 
       {weather && weather.data && weather.data.condition && (
-        // Forecast component
         <Forecast weather={weather} toDate={toDate} />
       )}
     </div>
diff --git a/src/components/SearchEngine.js b/src/components/SearchEngine.js
index b2b614b..da83975 100644
--- a/src/components/SearchEngine.js
+++ b/src/components/SearchEngine.js
@@ -1,26 +1,27 @@
-import React from "react";
+import React, { useState } from "react";
 
-function SearchEngine({ query, setQuery, search }) {
-  //handler function
-  const handleKeyPress = (e) => {
-    if (e.key === 'Enter') {
-      search(e);
-    }
+function SearchEngine({ query, setQuery }) {
+  const [value, setValue] = useState("");
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    setQuery(value);
   };
 
   return (
-    <div className="SearchEngine">
+    <form className="SearchEngine" onSubmit={handleSubmit}>
       <input
         type="text"
         className="city-search"
-        placeholder="enter city name"
-        name="query"
-        value={query}
-        onChange={(e) => setQuery(e.target.value)}
-        onKeyPress={handleKeyPress}
+        placeholder="Enter city name"
+        name="city"
+        value={value}
+        onChange={(e) => setValue(e.target.value)}
       />
-      <button onClick={search}><i className="fas fa-search" style={{ fontSize: "18px" }}></i></button>
-    </div>
+      <button type="submit">
+        <i className="fas fa-search" style={{ fontSize: "18px" }}></i>
+      </button>
+    </form>
   );
 }