small changes

MarvinBo44 · Aug 21, 2023 · 11f2ba1 · 11f2ba1
1 parent 06c839d
commit 11f2ba1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/frontend/src/DayView.css b/frontend/src/DayView.css
@@ -1,13 +1,16 @@
+*{
+
+}
 
 h2{
     text-align: center;
 }
 
 .flex-container {
     display: flex;
+    justify-content: space-evenly;
     flex-direction: row;
     flex-wrap: wrap;
-    flex-flow: row wrap;
 }
 
 .activityOutput{
@@ -17,7 +20,7 @@ h2{
     border-radius: 15px;
     margin: 10px;
     padding-left: 10px;
-    width: 500px;
+    width: 350px;
 }
 
 .btnDetails{
@@ -27,3 +30,8 @@ h2{
     border-radius: 15px;
 }
 
+.activityBox{
+    font-family: "Roboto", Helvetica, sans-serif;
+    font-weight: normal;
+    text-align: center;
+}
diff --git a/frontend/src/DayView.tsx b/frontend/src/DayView.tsx
@@ -4,7 +4,7 @@ import {Weather, Activity} from "./HomePage.tsx";
 
 type WeatherProps = {
     weather: Weather | undefined;
-    dayActivities: Activity;
+    dayActivities: Activity[];
 }
 
 
@@ -48,13 +48,13 @@ export default function DayView(props: WeatherProps) {
     }
 
     function isMiddle() {
-        if (props.weather.current.temp_c <= 24 && props.weather.current.temp_c >= 17){
+        if (props.weather.current.temp_c >= 10 && props.weather.current.temp_c <= 24){
             return true;
         }
     }
 
     function isCold() {
-        if (props.weather.current.temp_c <= 16) {
+        if (props.weather.current.temp_c < 10) {
             return true;
         }
     }
@@ -68,7 +68,8 @@ export default function DayView(props: WeatherProps) {
     const filterAcitivities = props.dayActivities.filter((activity) =>{
         return (activity.possibleWhenWarm === isWarm()  ||
             activity.possibleWhenMiddle === isMiddle()  ||
-            activity.possibleWhenCold === isCold()) && (activity.possibleWhenRaining ? true : activity.possibleWhenRaining === !isRaining)
+            activity.possibleWhenCold === isCold()) &&
+            (activity.possibleWhenRaining ? true : activity.possibleWhenRaining === !isRaining)
     });
 
         // const filterAcitivities = props.dayActivities.filter(activity =>
@@ -85,11 +86,11 @@ export default function DayView(props: WeatherProps) {
                     <div>
                         {/*<h2>{getCurrentDate()}</h2>*/}
                         <h2>Heute</h2>
-                        <ul>
+                        <div className={"activityBox"}>
                             {filterAcitivities.map(daily =>
                                 <ActivityCard key={daily.id} dayActivity={daily} />
                             )}
-                        </ul>
+                        </div>
                     </div>
                 )}
             </div>
@@ -98,11 +99,11 @@ export default function DayView(props: WeatherProps) {
                     <div>
                         {/*<h2>{tomorrowWeather.date}</h2>*/}
                         <h2>Morgen</h2>
-                        <ul>
+                        <div className={"activityBox"}>
                             {filterAcitivities.map(daily =>
                                 <ActivityCard key={daily.id} dayActivity={daily} />
                             )}
-                        </ul>
+                        </div>
                     </div>
                 ) : <p>No forecast for tomorrow available</p>}
             </div>
@@ -111,11 +112,11 @@ export default function DayView(props: WeatherProps) {
                     <div>
                         {/*<h2>{dayAfterTomorrowWeather.date}</h2>*/}
                         <h2>Übermorgen</h2>
-                        <ul>
+                        <div className={"activityBox"}>
                             {filterAcitivities.map(daily =>
                                 <ActivityCard key={daily.id} dayActivity={daily} />
                             )}
-                        </ul>
+                        </div>
                     </div>
                 ) : <p>keine Daten verfügbar</p>}
             </div>

diff --git a/frontend/src/Menubar/AddActivity.tsx b/frontend/src/Menubar/AddActivity.tsx
@@ -111,7 +111,7 @@ export default function AddActivity(props) {
                                           checked={possibleWhenWarm}
                                           onChange={updatePossibleWhenWarm}/>
 
-                        <FormControlLabel control={<Checkbox/>} label="Mittel (15°C - 25°C)"
+                        <FormControlLabel control={<Checkbox/>} label="Mittel (15°C - 24°C)"
                                           checked={possibleWhenMiddle}
                                           onChange={() => updatePossibleWhenMiddle()}/>