Skip to content

Lb/client #28

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

Open
Leah3232 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Lb/client #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
500b783
Jeff commit
Leah3232 Mar 6, 2022
50685de
hi more buttons
Leah3232 Mar 7, 2022
43b6175
Merge branch 'main' into LB/client
Leah3232 Mar 7, 2022
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
6 changes: 5 additions & 1 deletion client/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import { BrowserRouter as Router, Route, Switch} from 'react-router-dom';
import { BrowserRouter as Router, Route, Switch} from "react-router-dom";
import {
ApolloClient,
InMemoryCache,
Expand Down Expand Up @@ -35,6 +35,10 @@ const client = new ApolloClient({
link: authLink.concat(httpLink),
cache: new InMemoryCache(),
});

console.log(client)


function App() {
return (
<ApolloProvider client={client}>
Expand Down
143 changes: 29 additions & 114 deletions client/src/Pages/Options/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ function Options(props) {

// const handleProteinSelect = (e) => {
// setProteinSelection(e)
// console.log(e)
// }

const handleDietSelect = (e) => {
setDietSelection(e);
console.log(e);

};

const handleMealSelect = (e) => {
Expand Down Expand Up @@ -110,121 +105,41 @@ function Options(props) {
<option value='beef'>BEEF</option>
<option value='pork'>PORK</option>
<option value='veggies'>VEGGIES</option>
<option value='not picky'>NOT PICKY</option>
<option value='chicken'>NOT PICKY</option>
</Form.Select>
</Form.Group>


<Form.Group className="mb-3">
<Form.Label htmlFor='course'>Meal Type</Form.Label>
<Form.Select name='course' id='course'>
<option value='breakfast'>Breakfast</option>
<option value='lunch'>Lunch</option>
<option value='dinner'>Dinner</option>
<option value='snack'>Snack</option>
<option value='lunch'>NOT PICKY</option>
</Form.Select>
</Form.Group>

<Form.Group className="mb-3">
<Form.Label htmlFor='diet'>Dietary Preferences</Form.Label>
<Form.Select name='diet' id='diet'>
<option value='soy free'>Soy-Free</option>
<option value='dairy free'>Dairy-Free</option>
<option value='gluten free'>Gluten-Free</option>
<option value='egg free'>Egg-Free</option>
<option value='peanut free'>Peanut-Free</option>
</Form.Select>
</Form.Group>

https://stackoverflow.com/questions/49078351/checkbox-not-working-in-react

<Button variant="primary">
submit
</Button>
</Form>
</Container>
);
};
/* <h1>What do you want to eat today?</h1>
<Form.Group>
<h2>Protein Choice</h2>
<InputGroup className="mb-3">
<DropdownButton
variant="outline-secondary"
title="Dietary Preferences"
id="input-group-dropdown-1"
>
<Dropdown.Item href="#">Beef</Dropdown.Item>
<Dropdown.Item href="#">Chicken</Dropdown.Item>
<Dropdown.Item href="#">Fish</Dropdown.Item>
<Dropdown.Item href="#">Pork</Dropdown.Item>
<Dropdown.Item href="#">Veggies</Dropdown.Item>
</DropdownButton>
</InputGroup>
</Form.Group>

<Form.Group>
<h2>Dietary Preferences</h2>
<InputGroup className="mb-3">
<DropdownButton
variant="outline-secondary"
title="Dietary Preferences"
id="input-group-dropdown-1"
>
<Dropdown.Item href="#">Vegetarian</Dropdown.Item>
<Dropdown.Item href="#">Vegan</Dropdown.Item>
<Dropdown.Item href="#">Pescatarian</Dropdown.Item>
<Dropdown.Item href="#">Not Picky</Dropdown.Item>
</DropdownButton>
</InputGroup>
</Form.Group>

<Form.Group>
<h2>Meal Course</h2>
<InputGroup className="mb-3">
<DropdownButton
variant="outline-secondary"
title="Meal Course"
id="input-group-dropdown-1"
>
<Dropdown.Item href="#">Breakfast</Dropdown.Item>
<Dropdown.Item href="#">Lunch</Dropdown.Item>
<Dropdown.Item href="#">Dinner</Dropdown.Item>
<Dropdown.Item href="#">Snack</Dropdown.Item>
<Dropdown.Item href="#">Not Picky</Dropdown.Item>
</DropdownButton>
</InputGroup>
</Form.Group>

<Form.Group>
<h2>Allergies</h2>
<InputGroup className="mb-3">
{["checkbox"].map((type) => (
<div key={`default-${type}`} className="mb-3">
<Form.Check
type={type}
id={`default-${type}`}
label={`Gluten-Free`}
value="gluten"
onChange={(e) => choicesArr.push(e.currentTarget.value)}
/>
<Form.Check
type={type}
id={`default-${type}`}
label={`Soy-Free`}
value="soy"
onChange={(e) => {
choicesArr.push(e.currentTarget.value);
}}
/>
<Form.Check
type={type}
id={`default-${type}`}
label={`Peanut-Free`}
value="nutfree"
onChange={(e) => choicesArr.push(e.currentTarget.value)}
/>
<Form.Check
type={type}
id={`default-${type}`}
label={`Shellfish-Free`}
/>
<Form.Check
type={type}
id={`default-${type}`}
label={`Egg-Free`}
/>

<Form.Check
type={type}
label={`Dairy-Free`}
id={`disabled-default-${type}`}
/>
<Button variant="primary" onClick={() => getApistuff()}>
submit
</Button>
</div>
))}
</InputGroup>
</Form.Group>
</Form> */





export default Options;
2 changes: 2 additions & 0 deletions client/src/Pages/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ function Search() {
console.log(e)
}



const onChange = (e) => {
const checked = e.target.checked;
const newFormInfo = {
Expand Down
11 changes: 11 additions & 0 deletions client/src/components/Recipe/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,27 @@ function Recipe(props) {
<Card style={{ width: '30rem' }}>
{/* <Card.Img variant="top" src={props.data.recipe.image}/> */}
<Card.Body>

{/* <Card.Title>{props.data.recipe.label}</Card.Title> */}
{/* <Card.Text> */}
{/* {props.data.recipe.ingredientLines.map(ingredient=>{

{/* <Card.Title>{props.data.recipe.label}</Card.Title>
<Card.Text>
{props.data.recipe.ingredientLines.map(ingredient=>{

return(
<div>
<p>{ingredient}</p>
</div>
)

})} */}
{/* </Card.Text> */}

})}
</Card.Text> */}

<Button variant="primary">Favorite</Button>
</Card.Body>
</Card>
Expand Down