From 97b51904421d7252a8200f50a6ee8160ca451b8c Mon Sep 17 00:00:00 2001
From: "theis.gaedigk" <theis.gaedigk@icloud.com>
Date: Fri, 1 Aug 2025 19:49:59 +0200
Subject: [PATCH 1/5] docs: update version information in README to reflect
 current development status

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f390e6d..9678fee 100644
--- a/README.md
+++ b/README.md
@@ -53,4 +53,4 @@ This is a simple weather application that allows users to view current weather d
 
 ## Version
 
-**1.0.0**
+**On this branch you will find the latest version of the weather app, which includes several improvements and bug fixes. But it is not yet fully functional. The app is still in development, and some features may not work as expected.**

From 62094299d41d0c22ed9084b9282f357a87953151 Mon Sep 17 00:00:00 2001
From: "theis.gaedigk" <theis.gaedigk@icloud.com>
Date: Fri, 1 Aug 2025 20:25:03 +0200
Subject: [PATCH 2/5] fix: change button type to submit in ChangeAPI component
 and update temperature unit logic in WeatherData component

---
 frontend/src/components/ChangeAPI.tsx   | 2 +-
 frontend/src/components/WeatherData.tsx | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/ChangeAPI.tsx b/frontend/src/components/ChangeAPI.tsx
index 52d4c4b..ded28d8 100644
--- a/frontend/src/components/ChangeAPI.tsx
+++ b/frontend/src/components/ChangeAPI.tsx
@@ -64,7 +64,7 @@ const ChangeAPI: React.FC<Props> = ({ currentAPIKey, onClose }) => {
           />
         </div>
         <button
-          type="button"
+          type="submit"
           className="bg-gradient-to-r from-blue-600 to-blue-400 text-white font-bold px-6 py-3 rounded-xl shadow-lg hover:from-blue-700 hover:to-blue-500 transition-all"
           onClick={handleUpdate}
         >
diff --git a/frontend/src/components/WeatherData.tsx b/frontend/src/components/WeatherData.tsx
index 6cc5266..005d88b 100644
--- a/frontend/src/components/WeatherData.tsx
+++ b/frontend/src/components/WeatherData.tsx
@@ -24,7 +24,9 @@ const WeatherData: React.FC = () => {
             ? "°C"
             : localStorage.getItem("unit") === "imperial"
             ? "°F"
-            : "K"}
+            : localStorage.getItem("unit") === "standard"
+            ? "K"
+            : "°C"}
         </p>
         <p className="flex items-center justify-center gap-2">
           {weatherData?.sys?.country && (

From ee6469379f9805d88997e3715435b92dd9e9dcbd Mon Sep 17 00:00:00 2001
From: "theis.gaedigk" <theis.gaedigk@icloud.com>
Date: Fri, 1 Aug 2025 21:23:58 +0200
Subject: [PATCH 3/5] added docker functionality

---
 docker-compose.yml  | 33 ++++++++++++++++-----------------
 frontend/Dockerfile |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5a0d0f3..e490ed1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,21 +1,20 @@
 services:
-  # frontend:
-  #   container_name: frontend
-  #   build: ./frontend
-  #   ports:
-  #     - "7002:7002"
-  #   environment:
-  #     - CHOKIDAR_USEPOLLING=true
-  #   volumes:
-  #     - ./frontend:/app
-  #     - /app/node_modules
-  #   restart: unless-stopped
-
-  backend:
-    container_name: backend
-    build: ./backend
+  frontend:
+    container_name: frontend
+    build: ./frontend
     ports:
-      - "7001:7001"
+      - "7002:7002"
+    environment:
+      - CHOKIDAR_USEPOLLING=true
     volumes:
-      - ./backend:/bikelane-backend
+      - ./frontend:/app
+      - /app/node_modules
     restart: unless-stopped
+#  backend:
+#   container_name: backend
+#  build: ./backend
+# ports:
+#  - "7001:7001"
+#volumes:
+#  - ./backend:/bikelane-backend
+# restart: unless-stopped
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
index 5f3667f..7d384f8 100644
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -9,4 +9,4 @@ COPY . .
 
 EXPOSE 7002
 
-CMD ["npm", "start"]
\ No newline at end of file
+CMD ["npm", "run", "dev"]
\ No newline at end of file

From e56e998467564842b9591bfeb547a138e23f8c99 Mon Sep 17 00:00:00 2001
From: "theis.gaedigk" <theis.gaedigk@icloud.com>
Date: Fri, 1 Aug 2025 21:43:02 +0200
Subject: [PATCH 4/5] docs: enhance installation instructions and clarify
 Docker usage in README

---
 README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9678fee..51b1271 100644
--- a/README.md
+++ b/README.md
@@ -13,24 +13,63 @@ This is a simple weather application that allows users to view current weather d
 - Display weather data in a user-friendly format
 
 ## Installation
+### Prerequisites
 
-1. Clone the repository:
+To install and run this application, you need the following tools:
+
+- Git (for cloning the repository)
+
+**and**
+
+- Node.js (v14 or higher)
+- npm (Node Package Manager)
+
+**or**
+
+- Docker (for running the app in a container)
+
+### 1st step - Get the source code
+**You can either clone the repository or download the latest release. Keep in mind that the cloned version may contain bugs.**
+- Clone the repository:
    ```bash
    git clone https://git.the1s.de/theis.gaedigk/weather-app.git
    ```
-2. Navigate to the frontend project directory:
+
+**or**
+
+- Download the latest release from the [releases page](https://git.the1s.de/theis.gaedigk/weather-app/releases/latest).
+- Unzip the downloaded file to your desired location.
+
+#### 2nd step - Using Node.js and npm
+
+1. Navigate to the frontend project directory:
    ```bash
    cd weather-app/frontend
    ```
-3. Install dependencies:
+2. Install dependencies:
    ```bash
    npm install
    ```
-4. Start the development server:
+3. Start the development server:
    ```bash
    npm run dev
    ```
-5. Open your browser and go to `http://localhost:7002` to view the app.
+4. Open your browser and go to `http://localhost:7002` to view the app.
+   **Note:** There is also a backend server directory, which is currently not in use. - You can ignore it for now.
+
+**or**
+
+#### 2nd step - Using Docker
+
+1. Navigate to the root path project directory:
+   ```bash
+   cd weather-app
+   ```
+2. Run in a Docker container:
+   ```bash
+   docker compose up -d --build
+   ```
+3. Open your browser and go to `http://localhost:7002` to view the app.
    **Note:** There is also a backend server directory, which is currently not in use. - You can ignore it for now.
 
 ## Usage
@@ -53,4 +92,4 @@ This is a simple weather application that allows users to view current weather d
 
 ## Version
 
-**On this branch you will find the latest version of the weather app, which includes several improvements and bug fixes. But it is not yet fully functional. The app is still in development, and some features may not work as expected.**
+**On this branch (main) you will find the latest version of the weather app, which includes several improvements and bug fixes. But it is not yet fully functional. The app is still in development, and some features may not work as expected.**

From d98fab004fb8a03a6846582125527b4f376d1c1c Mon Sep 17 00:00:00 2001
From: "theis.gaedigk" <theis.gaedigk@icloud.com>
Date: Fri, 1 Aug 2025 21:49:23 +0200
Subject: [PATCH 5/5] fix: correct numbering in installation instructions for
 clarity

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 51b1271..49402db 100644
--- a/README.md
+++ b/README.md
@@ -30,15 +30,15 @@ To install and run this application, you need the following tools:
 
 ### 1st step - Get the source code
 **You can either clone the repository or download the latest release. Keep in mind that the cloned version may contain bugs.**
-- Clone the repository:
+1. Clone the repository:
    ```bash
    git clone https://git.the1s.de/theis.gaedigk/weather-app.git
    ```
 
 **or**
 
-- Download the latest release from the [releases page](https://git.the1s.de/theis.gaedigk/weather-app/releases/latest).
-- Unzip the downloaded file to your desired location.
+1. Download the latest release from the [releases page](https://git.the1s.de/theis.gaedigk/weather-app/releases/latest).
+2. Unzip the downloaded file to your desired location.
 
 #### 2nd step - Using Node.js and npm