Finished the project, edited readme

TothKristof · TothKristof · commit f28e404d8988 · 2025-05-20T13:24:25.000+02:00
diff --git a/Frontend/solarWatch/src/pages/Content.jsx b/Frontend/solarWatch/src/pages/Content.jsx
@@ -1,11 +1,13 @@
 import { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
 import { fetchData } from "../utils";
 import Globe from "../components/Globe";
 import CityList from "../components/CityList";
 import Searchbar from "../components/Searchbar/Searchbar";
 import Notification from "../components/Notification";
 
 export default function Content() {
+  const navigate = useNavigate();
   const [recommendations, setRecommendations] = useState([]);
   const [query, setQuery] = useState("");
   const [selectedDate, setSelectedDate] = useState(new Date().toISOString().split('T')[0]);
@@ -14,6 +16,17 @@ export default function Content() {
   const jwt = localStorage.getItem("jwt");
   const [notification, setNotification] = useState(null);
 
+  useEffect(() => {
+    if (!jwt) {
+      navigate("/");
+    }
+  }, [jwt, navigate]);
+
+  const handleLogout = () => {
+    localStorage.removeItem("jwt");
+    navigate("/");
+  };
+
   useEffect(() => {
     const loadRecommendations = async () => {
       const data = await fetchData("report/cityNames", "GET", null, jwt);
@@ -44,6 +57,12 @@ export default function Content() {
 
   return (
     <div className="p-6 w-full flex flex-col gap-4 z-10 h-screen box-border">
+      <button
+        onClick={handleLogout}
+        className="absolute top-4 right-4 px-4 py-2 bg-red-500 text-white rounded-md hover:bg-red-600 transition-colors"
+      >
+        Logout
+      </button>
       <Searchbar
         recommendations={recommendations}
         setQuery={setQuery}
diff --git a/README.md b/README.md
@@ -1 +1,88 @@
-No starter code is provided. Start from scratch!
+# Solar Watch
+
+A modern web application that provides solar information for cities around the world, featuring an interactive 3D globe visualization.
+
+## 🌟 Features
+
+- Interactive 3D globe visualization using Three.js
+- City search with autocomplete
+- Solar information display for selected cities
+- User authentication system
+- Responsive design
+- Real-time data updates
+
+## 🛠️ Technology Stack
+
+### Frontend
+- ![React](https://img.shields.io/badge/React-19.0.0-61DAFB?style=for-the-badge&logo=react&logoColor=white)
+- ![Vite](https://img.shields.io/badge/Vite-6.2.0-646CFF?style=for-the-badge&logo=vite&logoColor=white)
+- ![React Router](https://img.shields.io/badge/React_Router-7.5.0-CA4245?style=for-the-badge&logo=reactrouter&logoColor=white)
+- ![Tailwind CSS](https://img.shields.io/badge/Tailwind_CSS-4.1.3-06B6D4?style=for-the-badge&logo=tailwindcss&logoColor=white)
+- ![DaisyUI](https://img.shields.io/badge/DaisyUI-5.0.13-5A0EF8?style=for-the-badge&logo=daisyui&logoColor=white)
+- ![Framer Motion](https://img.shields.io/badge/Framer_Motion-12.6.3-0055FF?style=for-the-badge&logo=framer&logoColor=white)
+- ![Three.js](https://img.shields.io/badge/Three.js-0.175.0-000000?style=for-the-badge&logo=threedotjs&logoColor=white)
+
+### Backend
+- ![Spring Boot](https://img.shields.io/badge/Spring_Boot-3.2.0-6DB33F?style=for-the-badge&logo=springboot&logoColor=white)
+- ![PostgreSQL](https://img.shields.io/badge/PostgreSQL-Latest-336791?style=for-the-badge&logo=postgresql&logoColor=white)
+- ![JWT](https://img.shields.io/badge/JWT-black?style=for-the-badge&logo=jsonwebtokens&logoColor=white)
+- ![Hibernate](https://img.shields.io/badge/Hibernate-6.4.0-BC2E1F?style=for-the-badge&logo=hibernate&logoColor=white)
+
+### DevOps & Infrastructure
+- ![Docker](https://img.shields.io/badge/Docker-Latest-2496ED?style=for-the-badge&logo=docker&logoColor=white)
+- ![Docker Compose](https://img.shields.io/badge/Docker_Compose-Latest-2496ED?style=for-the-badge&logo=docker&logoColor=white)
+- ![Nginx](https://img.shields.io/badge/Nginx-Latest-009639?style=for-the-badge&logo=nginx&logoColor=white)
+- ![PostgreSQL](https://img.shields.io/badge/PostgreSQL-Latest-336791?style=for-the-badge&logo=postgresql&logoColor=white)
+
+## 🚀 Getting Started
+
+### Prerequisites
+- Docker and Docker Compose
+- Node.js (for local frontend development)
+- Java JDK (for local backend development)
+
+### Installation
+
+1. Clone the repository:
+```bash
+git clone [repository-url]
+```
+
+2. Start the application using Docker Compose:
+```bash
+docker-compose up --build
+```
+
+3. Access the application:
+- Frontend: http://localhost:5173
+- Backend API: http://localhost:8081
+
+### Development
+
+#### Frontend Development
+```bash
+cd Frontend/solarWatch
+npm install
+npm run dev
+```
+
+#### Backend Development
+```bash
+cd solar-watch
+./mvnw spring-boot:run
+```
+
+## 🔧 Environment Variables
+
+### Backend
+- `DB_USERNAME`: PostgreSQL username
+- `DB_PASSWORD`: PostgreSQL password
+- `DB_URL`: Database connection URL
+- `SECRET_KEY`: JWT secret key
+- `EXPIRATION`: JWT token expiration time
+- `PIC_API`: API key for external services
+- `SPRING_JPA_HIBERNATE_DDL_AUTO`: Database schema update mode
+- `SPRING_JPA_DATABASE_PLATFORM`: Hibernate dialect
+
+### Frontend
+- Environment variables are configured in the Vite configuration
diff --git a/solar-watch/src/main/java/com/codecool/solarwatch/controller/SolarWatchController.java b/solar-watch/src/main/java/com/codecool/solarwatch/controller/SolarWatchController.java
@@ -7,7 +7,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Mono;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -25,9 +24,9 @@ public SolarWatchController(SolarWatchService solarWatchService) {
     }
 
     @GetMapping("/report")
-    public Mono<FormattedSolarReport> getSunReport(@RequestParam(defaultValue = "Budapest") String city, @RequestParam(required = false) String date) {
+    public ResponseEntity<FormattedSolarReport> getSunReport(@RequestParam(defaultValue = "Budapest") String city, @RequestParam(required = false) String date) {
         LocalDate parsedDate = parseDate(date);
-        return solarWatchService.getCitySolarData(city, parsedDate);
+        return ResponseEntity.ok(solarWatchService.getCitySolarData(city, parsedDate).block());
     }
 
     @GetMapping("/reports")
diff --git a/solar-watch/src/main/java/com/codecool/solarwatch/service/GeocodeService.java b/solar-watch/src/main/java/com/codecool/solarwatch/service/GeocodeService.java
@@ -20,24 +20,18 @@ public GeocodeService(WebClient webClient) {
         this.webClient = webClient;
     }
 
-    public Mono<GeocodeReport> getCityGeocode(String city) {
+    public GeocodeReport getCityGeocode(String city) {
         String url = String.format("http://api.openweathermap.org/geo/1.0/direct?q=%s&limit=%s&appid=%s", city, limit, API_KEY);
 
-        return getGeocodeReport(url)
-                .filter(response -> response != null && response.length > 0)
-                .map(response -> {
-                    if (response != null && response.length > 0) {
-                        GeocodeReport firstResult = response[0];
-                        logger.info("First geocode result: {}", firstResult);
-                        return firstResult;
-                    } else {
-                        throw new CityError();
-                    }
-                })
-                .switchIfEmpty(Mono.error(new CityError()));
-    }
-
+        GeocodeReport[] response = getGeocodeReport(url).block();
+        if (response == null || response.length == 0) {
+            throw new CityError();
+        }
 
+        GeocodeReport firstResult = response[0];
+        logger.info("First geocode result: {}", firstResult);
+        return firstResult;
+    }
 
     private Mono<GeocodeReport[]> getGeocodeReport(String url) {
         return webClient
@@ -47,5 +41,4 @@ private Mono<GeocodeReport[]> getGeocodeReport(String url) {
                 .bodyToMono(GeocodeReport[].class)
                 .log();
     }
-
 }
diff --git a/solar-watch/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java b/solar-watch/src/main/java/com/codecool/solarwatch/service/SolarWatchService.java
@@ -2,6 +2,7 @@
 
 import com.codecool.solarwatch.model.*;
 import com.codecool.solarwatch.model.dto.FormattedSolarReport;
+import com.codecool.solarwatch.model.dto.GeocodeReport;
 import com.codecool.solarwatch.model.dto.SolarResults;
 import com.codecool.solarwatch.model.dto.SolarWatchReport;
 import com.codecool.solarwatch.repository.CityRepository;
@@ -41,47 +42,43 @@ public SolarWatchService(WebClient webClient, GeocodeService geocodeService, Sol
     }
 
     public Mono<FormattedSolarReport> getCitySolarData(String city, LocalDate date) {
-        return Mono.defer(() -> {
-            return cityRepository.findByName(city)
-                    .map(Mono::just)
-                    .orElseGet(() -> geocodeService.getCityGeocode(city)
-                            .map(geoRep -> {
-                                String imageUrl = null;
-                                try {
-                                    imageUrl = pictureProviderService.getPictureUrl(geoRep.name());
-                                } catch (IOException | InterruptedException e) {
-                                    e.printStackTrace();
-                                }
-                                return new City(geoRep.name(), geoRep.country(), imageUrl, geoRep.lon(), geoRep.lat());
-                            })
-                            .flatMap(newCity -> Mono.fromCallable(() -> cityRepository.save(newCity)))
-                    );
-        }).flatMap(searchedCity -> {
-            double lon = searchedCity.getLon();
-            double lat = searchedCity.getLat();
-            return Mono.justOrEmpty(solarDataRepository.findByCityAndDate(searchedCity, date))
-                    .switchIfEmpty(Mono.defer(() -> {
-                        String url = (date != null)
-                                ? String.format("https://api.sunrise-sunset.org/json?lat=%s&lng=%s&date=%s", lat, lon, date)
-                                : String.format("https://api.sunrise-sunset.org/json?lat=%s&lng=%s", lat, lon);
-
-                        return getSolarWatchReport(url)
-                                .map(response -> new SolarData(searchedCity, response.results().sunrise(), response.results().sunset(), date))
-                                .flatMap(solarData -> Mono.fromCallable(() -> solarDataRepository.save(solarData)));
-                    }))
-                    .then(Mono.fromCallable(() -> solarDataRepository.findAllByCity(searchedCity)))
-                    .map(solarDataList -> new FormattedSolarReport(
-                            searchedCity.getName(),
-                            searchedCity.getCountry(),
-                            searchedCity.getPictureUrl(),
-                            searchedCity.getLon(),
-                            searchedCity.getLat(),
-                            getAllSolarDataByCity(searchedCity)
-                    ));
-        });
+        City searchedCity = cityRepository.findByName(city)
+                .orElseGet(() -> {
+                    try {
+                        GeocodeReport geoRep = geocodeService.getCityGeocode(city);
+                        String imageUrl = pictureProviderService.getPictureUrl(geoRep.name());
+                        return cityRepository.save(new City(geoRep.name(), geoRep.country(), imageUrl, geoRep.lon(), geoRep.lat()));
+                    } catch (Exception e) {
+                        logger.error("Error getting city geocode", e);
+                        throw new RuntimeException("Error getting city geocode", e);
+                    }
+                });
+
+        double lon = searchedCity.getLon();
+        double lat = searchedCity.getLat();
+
+        SolarData solarData = solarDataRepository.findByCityAndDate(searchedCity, date)
+                .orElseGet(() -> {
+                    String url = (date != null)
+                            ? String.format("https://api.sunrise-sunset.org/json?lat=%s&lng=%s&date=%s", lat, lon, date)
+                            : String.format("https://api.sunrise-sunset.org/json?lat=%s&lng=%s", lat, lon);
+
+                    SolarWatchReport response = getSolarWatchReport(url).block();
+                    SolarData newData = new SolarData(searchedCity, response.results().sunrise(), response.results().sunset(), date);
+                    return solarDataRepository.save(newData);
+                });
+
+        List<SolarData> allSolarData = solarDataRepository.findAllByCity(searchedCity);
+        return Mono.just(new FormattedSolarReport(
+                searchedCity.getName(),
+                searchedCity.getCountry(),
+                searchedCity.getPictureUrl(),
+                searchedCity.getLon(),
+                searchedCity.getLat(),
+                getAllSolarDataByCity(searchedCity)
+        ));
     }
 
-
     private Mono<SolarWatchReport> getSolarWatchReport(String url) {
         return webClient
                 .get()
@@ -91,7 +88,6 @@ private Mono<SolarWatchReport> getSolarWatchReport(String url) {
                 .log();
     }
 
-
     public List<FormattedSolarReport> getAllFormattedReports() {
         List<City> cities = cityRepository.findAll();
 
diff --git a/solar-watch/src/test/java/com/codecool/solarwatch/service/GeocodeServiceTs.java b/solar-watch/src/test/java/com/codecool/solarwatch/service/GeocodeServiceTs.java
@@ -10,8 +10,8 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
 
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
 
@@ -49,10 +49,15 @@ void getCityGeocode_whenValidCity_returnsGeocodeReport() {
         when(responseSpec.bodyToMono(GeocodeReport[].class))
                 .thenReturn(Mono.just(new GeocodeReport[]{expectedReport}));
 
-        // Act & Assert
-        StepVerifier.create(geocodeService.getCityGeocode(cityName))
-                .expectNext(expectedReport)
-                .verifyComplete();
+        // Act
+        GeocodeReport result = geocodeService.getCityGeocode(cityName);
+
+        // Assert
+        assertNotNull(result);
+        assertEquals(expectedReport.name(), result.name());
+        assertEquals(expectedReport.country(), result.country());
+        assertEquals(expectedReport.lon(), result.lon());
+        assertEquals(expectedReport.lat(), result.lat());
     }
 
     @Test
@@ -64,9 +69,7 @@ void getCityGeocode_whenInvalidCity_throwsCityError() {
                 .thenReturn(Mono.just(new GeocodeReport[0]));
 
         // Act & Assert
-        StepVerifier.create(geocodeService.getCityGeocode(nonExistentCity))
-                .expectError(CityError.class)
-                .verify();
+        assertThrows(CityError.class, () -> geocodeService.getCityGeocode(nonExistentCity));
     }
 
     @Test
@@ -78,8 +81,6 @@ void getCityGeocode_whenApiReturnsEmpty_throwsCityError() {
                 .thenReturn(Mono.empty());
 
         // Act & Assert
-        StepVerifier.create(geocodeService.getCityGeocode(cityName))
-                .expectError(CityError.class)
-                .verify();
+        assertThrows(CityError.class, () -> geocodeService.getCityGeocode(cityName));
     }
 }
diff --git a/solar-watch/src/test/java/com/codecool/solarwatch/service/SolarWatchServiceTs.java b/solar-watch/src/test/java/com/codecool/solarwatch/service/SolarWatchServiceTs.java
