Merge branch 'main' into feature/custom-testing-base-url

Author: DrAdamRoe

backend/src/main.py

@@ -7,7 +7,7 @@
 
 app = FastAPI()
 
-origins = ["http://localhost:5173"]
+origins = ["http://localhost:5173", "https://thf-climate-frontend-run-1020174331409.europe-west3.run.app"]
 
 app.add_middleware(
     CORSMiddleware,

backend/src/validation/utils.py

@@ -26,3 +26,17 @@ def validate_timestamp_start_date_before_end_date(startDate, endDate):
         raise HTTPException(
             status_code=400, detail="endDate must be after startDate")
     return endDate
+
+
+def validate_temperature_timestamp_in_range(start, end):
+    min_timestamp = -946771200  # 01/01/1940
+    max_timestamp = int(time.time()) # now
+    print(end)
+    print(max_timestamp)
+    if (start < min_timestamp or end > max_timestamp):
+        raise HTTPException(
+            status_code=400, detail=f"Timestamp must be between {min_timestamp} and {max_timestamp}")
+    elif end <= start:
+        raise HTTPException(
+            status_code=400, detail="endDate must be after startDate")
+    return end

backend/src/weather/schemas.py

@@ -4,7 +4,7 @@
 
 from src.constants import AggregationMethod, LocationName, TemporalResolution, Unit
 from src.validation.utils import (
-    validate_timestamp_in_range,
+    validate_temperature_timestamp_in_range,
     validate_timestamp_start_date_before_end_date,
 )
 
@@ -33,14 +33,9 @@ class WeatherDataRequest(BaseModel):
     )
     aggregation: AggregationMethod = Field(..., description="Aggregation method")
 
-    # Custom validator to check if timestamps are valid and in the correct order
-    @field_validator("startDate")
-    def validate_timestamp_in_range(cls, v):
-        return validate_timestamp_in_range(v)
-
     @field_validator("endDate")
-    def end_date_must_be_after_start_date(cls, v, info: ValidationInfo):
-        return validate_timestamp_start_date_before_end_date(
+    def validate_temperature_timestamp_in_range(cls, v, info: ValidationInfo):
+        return validate_temperature_timestamp_in_range(
             info.data.get("startDate"), v
         )
 

frontend/src/App.vue

@@ -1,33 +1,27 @@
 <template>
   <h1 id="app">
-    <TestComponent />
-    <MedianTempGraph />
-    <MeanSoilTempGraph />
-    <MeanSoilMoistureGraph />
-    <AugustMeanSoilTempGraph />
-    <SelectMonthMeanSoilTempGraph />
+    <Header />
+    <IntroSection />
+    <MainSection />
+    <Footer />
   </h1>
 </template>
 
 <script>
-  import TestComponent from "./components/TestComponent.vue"
-  import MedianTempGraph from "./components/TestGraphOne.vue"
-  import MeanSoilTempGraph from "./components/SoilTempGraph.vue"
-  import MeanSoilMoistureGraph from "./components/SoilMoistureGraph.vue"
-  import AugustMeanSoilTempGraph from "./components/AugustSoilTempGraph.vue"
-  import SelectMonthMeanSoilTempGraph from "./components/SelectMonthSoilTempGraph.vue"
+  import Header from "./components/Header.vue"
+  import IntroSection from "./components/IntroSection.vue"
+  import MainSection from "./components/MainSection.vue"
+  import Footer from "./components/Footer.vue"
 
   export default {
     name: 'App',
     components: {
-      //TestComponent,
-      MedianTempGraph,
-      MeanSoilTempGraph,
-      MeanSoilMoistureGraph,
-      AugustMeanSoilTempGraph,
-      SelectMonthMeanSoilTempGraph
+      Header,
+      IntroSection,
+      MainSection,
+      Footer
     }
-  };
+  }
 </script>
 
 <style scoped></style>

frontend/src/assets/images/Berlin_Tempelhofer_Feld_UAV_05-2017.jpg

@@ -0,0 +1,21 @@
+<template>
+  <v-container class="footer-container" fluid>
+    <p class="footer-text">CODE University of Applied Sciences, 2024</p>
+  </v-container>
+</template>
+
+<script>
+
+</script>
+
+<style scoped>
+.footer-container {
+  margin: 50px 0 0 0;
+  text-align: center;
+}
+
+.footer-text {
+  font-size: 0.7rem;
+  font-weight: 300;
+}
+</style>