small fixes

MarvinBo44 · Aug 21, 2023 · 67f8272 · 67f8272
1 parent 1913e79
commit 67f8272
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/frontend/src/DayView.tsx b/frontend/src/DayView.tsx
@@ -3074,19 +3074,11 @@ export default function DayView({weather} : {weather: WeatherProps}) {
         }
     }
 
-/*    const filterAcitivities = dayActivities.filter(activity =>
-        (activity.possibleWhenRaining === isRaining() || !isRaining()) &&
-        (activity.possibleWhenWarm === isWarm()) &&
-        (activity.possibleWhenMiddle === isMiddle()) &&
-        (activity.possibleWhenCold === isCold())
-    );*/
-
-        const filterAcitivities = dayActivities.filter(activity =>
-        (activity.possibleWhenRaining || !isRaining()) &&
-        (activity.possibleWhenWarm || !isWarm()) &&
-        (activity.possibleWhenMiddle || !isMiddle()) &&
-        (activity.possibleWhenCold || !isCold())
-        );
+        const filteredActivities = dayActivities.filter((activity) =>{
+            return (activity.possibleWhenWarm === isWarm()  ||
+                activity.possibleWhenMiddle === isMiddle()  ||
+                activity.possibleWhenCold === isCold()) && (activity.possibleWhenRaining ? true : activity.possibleWhenRaining === !isRaining)
+        });
 
     return (
         <div className={"flex-container"}>
@@ -3095,7 +3087,7 @@ export default function DayView({weather} : {weather: WeatherProps}) {
                     <div>
                         <h2>{getCurrentDate()}</h2>
                         <ul>
-                            {filterAcitivities.map(daily =>
+                            {filteredActivities.map(daily =>
                                 <ActivityCard key={daily.id} dayActivity={daily} />
                             )}
                         </ul>
@@ -3107,7 +3099,7 @@ export default function DayView({weather} : {weather: WeatherProps}) {
                     <div>
                         <h2>{tomorrowWeather.date}</h2>
                         <ul>
-                            {filterAcitivities.map(daily =>
+                            {filteredActivities.map(daily =>
                                 <ActivityCard key={daily.id} dayActivity={daily} />
                             )}
                         </ul>
@@ -3119,7 +3111,7 @@ export default function DayView({weather} : {weather: WeatherProps}) {
                     <div>
                         <h2>{dayAfterTomorrowWeather.date}</h2>
                         <ul>
-                            {filterAcitivities.map(daily =>
+                            {filteredActivities.map(daily =>
                                 <ActivityCard key={daily.id} dayActivity={daily} />
                             )}
                         </ul>

diff --git a/frontend/src/HomePage.tsx b/frontend/src/HomePage.tsx
@@ -11,7 +11,7 @@ export default function HomePage(){
     useEffect(() => {
         axios({
             // url: "http://api.weatherapi.com/v1/forecast.json?key=6cc628764c7547e298d143025230108&q="+ort+"&days=3&aqi=yes&alerts=no",
-            url: "https://api.weatherapi.com/v1/forecast.json?key=6cc628764c7547e298d143025230108&q=Berlin&days=3&aqi=yes&alerts=no",
+            url: "https://api.weatherapi.com/v1/forecast.json?key=dcf0dc2ec78e416e81375800232108&q=Berlin&days=3&aqi=yes&alerts=no",
             method: "get"
         }).then(function (response) {
             setWeather(response.data);

diff --git a/frontend/src/Menubar/WeatherAPI.tsx b/frontend/src/Menubar/WeatherAPI.tsx
@@ -3018,7 +3018,7 @@ export default function WeatherApi() {
 
     useEffect(() => {
         axios({
-            url: "https://api.weatherapi.com/v1/forecast.json?key=6cc628764c7547e298d143025230108&q=Berlin&days=3&aqi=yes&alerts=yes",
+            url: "https://api.weatherapi.com/v1/forecast.json?key=dcf0dc2ec78e416e81375800232108&q=Berlin&days=3&aqi=yes&alerts=no",
             method: "get"
         }).then(function (response) {
             setWeather(response.data);

diff --git a/frontend/src/Settings.tsx b/frontend/src/Settings.tsx
@@ -21,7 +21,7 @@ export default function Settings() {
                   wrap={'wrap'}
             >
                 <AddActivity/>
-                <TextField color={"warning"} size={"small"} placeholder={"Berlin"}
+                <TextField color={"warning"} size={"small"} placeholder={"Stadt"}
                            InputProps={{style: {background: 'white'}}}></TextField>
             </Grid>
         </Grid>