Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Frontend/api fix #24

Merged
merged 2 commits into from
Aug 21, 2023
Merged

Frontend/api fix #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
805e3c0
fixes
Aug 21, 2023
c8fe27d
fixes over fixes
Aug 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,083 changes: 38 additions & 3,045 deletions frontend/src/DayView.tsx
View file
Open in desktop

Large diffs are not rendered by default.

3,042 changes: 3,035 additions & 7 deletions frontend/src/HomePage.tsx
View file
Open in desktop

Large diffs are not rendered by default.

70 changes: 40 additions & 30 deletions frontend/src/Menubar/AddActivity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ import axios from "axios";
import 'reactjs-popup/dist/index.css';
import {useState} from "react";
import {
Button, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions,
FormGroup, FormControlLabel, FormLabel, Checkbox, TextField
} from '@mui/material';
Button, Dialog, DialogTitle, DialogContent, DialogContentText, DialogActions,
FormGroup, FormControlLabel, FormLabel, Checkbox, TextField
} from '@mui/material';
import {useNavigate} from "react-router-dom";

export default function AddActivity() {


export default function AddActivity(props) {

const [possibleWhenWarm, setPossibleWhenWarm] = useState(false)
const [possibleWhenMiddle, setPossibleWhenMiddle] = useState(false)
Expand Down Expand Up @@ -34,17 +37,17 @@ export default function AddActivity() {
setPossibleWhenRaining(!possibleWhenRaining)
}

function updatePossibleWithChildren() {
setPossibleWithChildren(!possibleWithChildren)
}

function updateInsideActivity() {
setInsideActivity(!insideActivity)
}

function updateOutsideActivity() {
setOutsideActivity(!outsideActivity)
}
// function updatePossibleWithChildren() {
// setPossibleWithChildren(!possibleWithChildren)
// }
//
// function updateInsideActivity() {
// setInsideActivity(!insideActivity)
// }
//
// function updateOutsideActivity() {
// setOutsideActivity(!outsideActivity)
// }

function resetAllFields() {
setActivityName("Name der Aktivität");
Expand All @@ -57,7 +60,9 @@ export default function AddActivity() {
setPossibleWhenWarm(false);
}

function submit() {
const navigate = useNavigate()

function submit() {
setOpenDialog(false);
axios({
method: 'post',
Expand All @@ -73,9 +78,14 @@ export default function AddActivity() {
outsideActivity
}
}).then(() => {
resetAllFields();
})
}
resetAllFields();
axios.get('/api').then((data) => props.setDayActivity(data.data))
navigate('/home')
}
);
}



return <>
<Button size={"small"}
Expand Down Expand Up @@ -112,20 +122,20 @@ export default function AddActivity() {
<FormControlLabel control={<Checkbox/>} label="Regen"
checked={possibleWhenRaining}
onChange={() => updatePossibleWhenRaining()}/>
<br/>
<FormLabel>Wo und mit wem ist die Aktivität möglich ?</FormLabel>
{/*<br/>*/}
{/*<FormLabel>Wo und mit wem ist die Aktivität möglich ?</FormLabel>*/}

<FormControlLabel control={<Checkbox/>} label="drinnen"
checked={insideActivity}
onChange={() => updateInsideActivity()}/>
{/*<FormControlLabel control={<Checkbox/>} label="drinnen"*/}
{/* checked={insideActivity}*/}
{/* onChange={() => updateInsideActivity()}/>*/}

<FormControlLabel control={<Checkbox/>} label="draußen"
checked={outsideActivity}
onChange={() => updateOutsideActivity()}/>
{/*<FormControlLabel control={<Checkbox/>} label="draußen"*/}
{/* checked={outsideActivity}*/}
{/* onChange={() => updateOutsideActivity()}/>*/}

<FormControlLabel control={<Checkbox/>} label="mit Kindern"
checked={possibleWithChildren}
onChange={() => updatePossibleWithChildren()}/>
{/*<FormControlLabel control={<Checkbox/>} label="mit Kindern"*/}
{/* checked={possibleWithChildren}*/}
{/* onChange={() => updatePossibleWithChildren()}/>*/}
</FormGroup>
</DialogContentText>
</DialogContent>
Expand Down
16 changes: 12 additions & 4 deletions frontend/src/Menubar/MenuBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
import WeatherApi from "./WeatherAPI.tsx";
import WeatherWidgets from "./WeatherWidgets.tsx";
import {Grid, Typography} from '@mui/material';
import LogoutButton from "./LogoutButton.tsx";
import {Weather} from "../HomePage.tsx";

export default function MenuBar() {
return <Grid container
type WeatherProps = {
weather: Weather | undefined;
city: string;
}


export default function MenuBar(props: WeatherProps) {
return props.weather === undefined ? <div>loading</div> :
<Grid container
direction="row"
justifyContent="space-around"
alignItems="center"
Expand All @@ -14,7 +22,7 @@ export default function MenuBar() {
color={"white"}
fontFamily={"Copperplate, Papyrus, fantasy"}>To Be Able
</Typography>
<WeatherApi/>
<WeatherWidgets weather={props.weather} city={props.city}/>
<LogoutButton/>
</Grid>
}
Loading