No errors grocery page
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
import { Text, View } from 'react-native'
|
import { Text, TouchableOpacity, View } from 'react-native'
|
||||||
|
|
||||||
const WrapperDropdown = styled(View)`
|
const WrapperDropdown = styled(View)`
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -17,7 +17,7 @@ const WrapperDropdown = styled(View)`
|
|||||||
border-bottom-left-radius: 10px;
|
border-bottom-left-radius: 10px;
|
||||||
border-bottom-right-radius: 10px;
|
border-bottom-right-radius: 10px;
|
||||||
`
|
`
|
||||||
const DropdownItem = styled(Text)`
|
const DropdownItem = styled(TouchableOpacity)`
|
||||||
color: ${({ theme }) => theme.colors.textW2};
|
color: ${({ theme }) => theme.colors.textW2};
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
`
|
`
|
||||||
@@ -41,7 +41,7 @@ const Dropdown = (props) => {
|
|||||||
let dropdownList = newArray.map((element, index) => {
|
let dropdownList = newArray.map((element, index) => {
|
||||||
return (
|
return (
|
||||||
<View key={index}>
|
<View key={index}>
|
||||||
<DropdownItem onClick={() => props.setElement(element)}>{element}</DropdownItem>
|
<DropdownItem onPress={() => props.setElement(element)}>{element}</DropdownItem>
|
||||||
<HorizontalSeperator />
|
<HorizontalSeperator />
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -15,10 +15,10 @@ const TabMenu = (props) => {
|
|||||||
return (
|
return (
|
||||||
<Wrapper>
|
<Wrapper>
|
||||||
<WrapperSelected previousPos = {previousPos} currenttab={props.currentTab}/>
|
<WrapperSelected previousPos = {previousPos} currenttab={props.currentTab}/>
|
||||||
<WrapperGroceries currenttab={props.currentTab} onClick={()=>handleTabPress("Groceries")}>
|
<WrapperGroceries currenttab={props.currentTab} onPress={()=>handleTabPress("Groceries")}>
|
||||||
{/* <IconGroceries currenttab={props.currentTab}/> */}
|
{/* <IconGroceries currenttab={props.currentTab}/> */}
|
||||||
</WrapperGroceries>
|
</WrapperGroceries>
|
||||||
<WrapperProducts currenttab={props.currentTab} onClick={()=>handleTabPress("Products")}>
|
<WrapperProducts currenttab={props.currentTab} onPress={()=>handleTabPress("Products")}>
|
||||||
{/* <IconProducts currenttab={props.currentTab}/> */}
|
{/* <IconProducts currenttab={props.currentTab}/> */}
|
||||||
</WrapperProducts>
|
</WrapperProducts>
|
||||||
</Wrapper>
|
</Wrapper>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ const SelectAllItemsButton = (props) => {
|
|||||||
listId && setToggleAnim(!toggleAnim)
|
listId && setToggleAnim(!toggleAnim)
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<WrapperSelect toggle={toggleAnim} visible={props.visible} onClick={handlePress}>
|
<WrapperSelect toggle={toggleAnim} visible={props.visible} onPress={handlePress}>
|
||||||
{/* <CheckIcon /> */}
|
{/* <CheckIcon /> */}
|
||||||
</WrapperSelect>
|
</WrapperSelect>
|
||||||
)
|
)
|
||||||
@@ -33,7 +33,7 @@ const RemoveItemsButton = (props) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<WrapperRemove toggle={toggleAnim} visible={props.visible} onClick={handlePress}>
|
<WrapperRemove toggle={toggleAnim} visible={props.visible} onPress={handlePress}>
|
||||||
{/* <RemoveIcon /> */}
|
{/* <RemoveIcon /> */}
|
||||||
</WrapperRemove>
|
</WrapperRemove>
|
||||||
)
|
)
|
||||||
@@ -45,7 +45,7 @@ export const ContainerButtons = (props) => {
|
|||||||
<>
|
<>
|
||||||
<SelectAllItemsButton visible={visible} />
|
<SelectAllItemsButton visible={visible} />
|
||||||
<RemoveItemsButton visible={visible} />
|
<RemoveItemsButton visible={visible} />
|
||||||
<WrapperButtons toggle={visible} onClick={() => setVisible(!visible)}>
|
<WrapperButtons toggle={visible} onPress={() => setVisible(!visible)}>
|
||||||
{/* <MenuIcon /> */}
|
{/* <MenuIcon /> */}
|
||||||
</WrapperButtons >
|
</WrapperButtons >
|
||||||
</>
|
</>
|
||||||
@@ -59,7 +59,7 @@ export const AddItemButton = (props) => {
|
|||||||
if (lists.find((list) => list.open === true)) {
|
if (lists.find((list) => list.open === true)) {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<WrapperAddItem toggle={visibleItem} onClick={() => setVisibleItem(true)}>
|
<WrapperAddItem toggle={visibleItem} onPress={() => setVisibleItem(true)}>
|
||||||
{/* <PlusIcon /> */}
|
{/* <PlusIcon /> */}
|
||||||
</WrapperAddItem>
|
</WrapperAddItem>
|
||||||
<ModalAddItem visible={visibleItem} closeModal={() => setVisibleItem(false)} />
|
<ModalAddItem visible={visibleItem} closeModal={() => setVisibleItem(false)} />
|
||||||
@@ -68,7 +68,7 @@ export const AddItemButton = (props) => {
|
|||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<WrapperAddList toggle={visibleList} onClick={() => setVisibleList(true)}>
|
<WrapperAddList toggle={visibleList} onPress={() => setVisibleList(true)}>
|
||||||
{/* <ListIcon /> */}
|
{/* <ListIcon /> */}
|
||||||
</WrapperAddList>
|
</WrapperAddList>
|
||||||
<ModalAddList visible={visibleList} closeModal={() => setVisibleList(false)} />
|
<ModalAddList visible={visibleList} closeModal={() => setVisibleList(false)} />
|
||||||
|
|||||||
@@ -15,15 +15,15 @@ const ListedItem = React.memo((props) => {
|
|||||||
return (
|
return (
|
||||||
<Wrapper>
|
<Wrapper>
|
||||||
<DarkLayer>
|
<DarkLayer>
|
||||||
<WrapperItem person={item.person} color={tag.color} checked={item.checked} onClick={() => { props.setVisible(true); return dispatch(modalToggle(item._id)) }}>
|
<WrapperItem person={item.person} color={tag.color} checked={item.checked} onPress={() => { props.setVisible(true); return dispatch(modalToggle(item._id)) }}>
|
||||||
<TextProductName >{item.productName}</TextProductName>
|
<TextProductName >{item.productName}</TextProductName>
|
||||||
<TextDetails>{item.details}</TextDetails>
|
<TextDetails>{item.details}</TextDetails>
|
||||||
<TextAmount>{item.amount.am}{item.amount.qt && " " + item.amount.qt}</TextAmount>
|
<TextAmount>{item.amount.am}{item.amount.qt && " " + item.amount.qt}</TextAmount>
|
||||||
<TextPerson>{item.person && item.person}</TextPerson>
|
<TextPerson>{item.person && item.person}</TextPerson>
|
||||||
{/* {product.image && <Image src={product.image} />} */}
|
{/* {product.image && <Image source={product.image} />} */}
|
||||||
</WrapperItem>
|
</WrapperItem>
|
||||||
</DarkLayer>
|
</DarkLayer>
|
||||||
<WrapperButton onClick={() => dispatch(checkToggle(item._id))} >
|
<WrapperButton onPress={() => dispatch(checkToggle(item._id))} >
|
||||||
<CheckButton checked = {item.checked} />
|
<CheckButton checked = {item.checked} />
|
||||||
</WrapperButton>
|
</WrapperButton>
|
||||||
</Wrapper>
|
</Wrapper>
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ export const TextTotalAmount = styled(Text)`
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
align-self: flex-end;
|
align-self: flex-end;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
top:60px;
|
top:70px;
|
||||||
right:0px;
|
right:0px;
|
||||||
font-size: 20px;
|
font-size: 20px;
|
||||||
color: ${({ theme }) => theme.colors.textW1};
|
color: ${({ theme }) => theme.colors.textW1};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Text, View, Image} from 'react-native'
|
import { Text, View, Image, TouchableOpacity} from 'react-native'
|
||||||
import styled, { css } from 'styled-components'
|
import styled, { css } from 'styled-components'
|
||||||
|
|
||||||
export const Wrapper = styled(View)`
|
export const Wrapper = styled(View)`
|
||||||
@@ -17,7 +17,7 @@ export const DarkLayer = styled(View)`
|
|||||||
margin-left: 7px;
|
margin-left: 7px;
|
||||||
`
|
`
|
||||||
|
|
||||||
export const WrapperItem = styled(View)`
|
export const WrapperItem = styled(TouchableOpacity)`
|
||||||
box-shadow: ${({ theme }) => theme.colors.shadow};
|
box-shadow: ${({ theme }) => theme.colors.shadow};
|
||||||
display: flex;
|
display: flex;
|
||||||
min-height: ${props => props.person ? css`60px` : css`30px`};
|
min-height: ${props => props.person ? css`60px` : css`30px`};
|
||||||
@@ -30,7 +30,7 @@ export const WrapperItem = styled(View)`
|
|||||||
|
|
||||||
background-color: ${props => props.checked ? props.theme.colors.itemSelected : props.color + '66'};
|
background-color: ${props => props.checked ? props.theme.colors.itemSelected : props.color + '66'};
|
||||||
`
|
`
|
||||||
export const WrapperButton = styled(View)`
|
export const WrapperButton = styled(TouchableOpacity)`
|
||||||
height: 30px;
|
height: 30px;
|
||||||
width: 40px;
|
width: 40px;
|
||||||
`
|
`
|
||||||
@@ -90,7 +90,7 @@ export const TextPerson = styled(Text)`
|
|||||||
`
|
`
|
||||||
export const StyledImage = styled(Image)`
|
export const StyledImage = styled(Image)`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
opacity: 0.05;
|
opacity: 0.05;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
|
|||||||
@@ -13,15 +13,15 @@ const ListedProduct = React.memo((props) => {
|
|||||||
const tag = useSelector(state => findTag(state, product.tag))
|
const tag = useSelector(state => findTag(state, product.tag))
|
||||||
return (
|
return (
|
||||||
<Wrapper>
|
<Wrapper>
|
||||||
<WrapperProduct color={tag.color} checked={product.checked} onClick={()=>{props.setVisible(true); return dispatch(modalToggle(product._id))}}>
|
<WrapperProduct color={tag.color} checked={product.checked} onPress={()=>{props.setVisible(true); return dispatch(modalToggle(product._id))}}>
|
||||||
<WrapperText>
|
<WrapperText>
|
||||||
<TextProductName >{product.productName}</TextProductName>
|
<TextProductName >{product.productName}</TextProductName>
|
||||||
<TextTag color={tag.color}>{tag.tagName}</TextTag>
|
<TextTag color={tag.color}>{tag.tagName}</TextTag>
|
||||||
{product.price !== 0&& <TextPrice>€ {product.price}</TextPrice>}
|
{/* {product.price !== 0&& <TextPrice>€ {product.price}</TextPrice>} */}
|
||||||
</WrapperText>
|
</WrapperText>
|
||||||
{product.image && <StyledImage src={product.image}/>}
|
{/* {product.image && <StyledImage source={product.image}/>} */}
|
||||||
</WrapperProduct>
|
</WrapperProduct>
|
||||||
<WrapperButton onClick={()=>dispatch(checkToggle(product._id))} >
|
<WrapperButton onPress={()=>dispatch(checkToggle(product._id))} >
|
||||||
<CheckButton checked={product.checked}>
|
<CheckButton checked={product.checked}>
|
||||||
{/* <IconCheck checked={product.checked} /> */}
|
{/* <IconCheck checked={product.checked} /> */}
|
||||||
</CheckButton>
|
</CheckButton>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { View, Text, Image } from 'react-native'
|
import { View, Text, Image, TouchableOpacity } from 'react-native'
|
||||||
import styled, { css } from 'styled-components'
|
import styled, { css } from 'styled-components'
|
||||||
//dependencies
|
//dependencies
|
||||||
import { HiCheck } from 'react-icons/hi'
|
import { HiCheck } from 'react-icons/hi'
|
||||||
@@ -15,7 +15,7 @@ export const Wrapper = styled(View)`
|
|||||||
width: 100vw;
|
width: 100vw;
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
export const WrapperProduct = styled(View)`
|
export const WrapperProduct = styled(TouchableOpacity)`
|
||||||
box-shadow: ${({theme})=> theme.colors.shadow};
|
box-shadow: ${({theme})=> theme.colors.shadow};
|
||||||
display: flex;
|
display: flex;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@@ -28,7 +28,7 @@ export const WrapperProduct = styled(View)`
|
|||||||
|
|
||||||
background-color: ${props => props.checked ? props.theme.colors.itemSelected : props.color + '66'};
|
background-color: ${props => props.checked ? props.theme.colors.itemSelected : props.color + '66'};
|
||||||
`
|
`
|
||||||
export const WrapperButton = styled(View)`
|
export const WrapperButton = styled(TouchableOpacity)`
|
||||||
height: 60px;
|
height: 60px;
|
||||||
width: 40px;
|
width: 40px;
|
||||||
`
|
`
|
||||||
@@ -45,7 +45,7 @@ export const CheckButton = styled(View)`
|
|||||||
background-color: ${props => props.checked ? props.theme.colors.selected : props.theme.colors.buttonGrey};
|
background-color: ${props => props.checked ? props.theme.colors.selected : props.theme.colors.buttonGrey};
|
||||||
`
|
`
|
||||||
|
|
||||||
export const WrapperText = styled(View)`
|
export const WrapperText = styled(Text)`
|
||||||
flex:1;
|
flex:1;
|
||||||
max-width:600px;
|
max-width:600px;
|
||||||
@media ${({ theme }) => theme.mediaQueries.below768}{
|
@media ${({ theme }) => theme.mediaQueries.below768}{
|
||||||
@@ -80,7 +80,7 @@ export const StyledImage = styled(Image)`
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top:0;
|
top:0;
|
||||||
right:0;
|
right:0;
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
width: 100px;
|
width: 100px;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
max-height:120px;
|
max-height:120px;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { View } from 'react-native'
|
import { TouchableOpacity, View } from 'react-native'
|
||||||
import styled, { css } from 'styled-components'
|
import styled, { css } from 'styled-components'
|
||||||
import { RiShoppingBasketLine } from 'react-icons/ri'
|
import { RiShoppingBasketLine } from 'react-icons/ri'
|
||||||
import { FaAppleAlt } from 'react-icons/fa'
|
import { FaAppleAlt } from 'react-icons/fa'
|
||||||
@@ -7,7 +7,7 @@ import { FaAppleAlt } from 'react-icons/fa'
|
|||||||
const iconSize = '2.0px'
|
const iconSize = '2.0px'
|
||||||
const iconSizeSelected = '2.5px'
|
const iconSizeSelected = '2.5px'
|
||||||
|
|
||||||
const WrapperIcon = styled(View)`
|
const WrapperIcon = styled(TouchableOpacity)`
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ const ModalAddItem = (props) => {
|
|||||||
return (
|
return (
|
||||||
<StyledModal show={props.visible} centered={true} onHide={props.closeModal} >
|
<StyledModal show={props.visible} centered={true} onHide={props.closeModal} >
|
||||||
<ModalHeader>Add product</ModalHeader>
|
<ModalHeader>Add product</ModalHeader>
|
||||||
{/* {product && product.image && <Image src={product.image} />} */}
|
{/* {product && product.image && <Image source={product.image} />} */}
|
||||||
<WrapperInput>
|
<WrapperInput>
|
||||||
<IconProduct />
|
<IconProduct />
|
||||||
<Input onFocus={() => setFocusedProduct(true)} onBlur={() => { setTimeout(() => { setFocusedProduct(false) }, 100) }}
|
<Input onFocus={() => setFocusedProduct(true)} onBlur={() => { setTimeout(() => { setFocusedProduct(false) }, 100) }}
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ export const ModalAddProduct = (props) => {
|
|||||||
onChange={(text) => setImage(text.target.value)}
|
onChange={(text) => setImage(text.target.value)}
|
||||||
placeholder="Image link" />
|
placeholder="Image link" />
|
||||||
</WrapperInput>
|
</WrapperInput>
|
||||||
{image && <StyledImage src={image} alt={'No link...'} />}
|
{image && <StyledImage source={image} alt={'No link...'} />}
|
||||||
<WrapperButtons>
|
<WrapperButtons>
|
||||||
<Button onClick={props.closeModal}>Close</Button>
|
<Button onClick={props.closeModal}>Close</Button>
|
||||||
<VerticalSeperator />
|
<VerticalSeperator />
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ const ModalEditItem = (props) => {
|
|||||||
return (
|
return (
|
||||||
<StyledModal show={props.visible} centered={true} onHide={closeModal} >
|
<StyledModal show={props.visible} centered={true} onHide={closeModal} >
|
||||||
<WrapperProduct color={tagState.color}>
|
<WrapperProduct color={tagState.color}>
|
||||||
{product && product.image && <StyledImage src={product.image} />}
|
{product && product.image && <StyledImage source={product.image} />}
|
||||||
<WrapperProductInfo>
|
<WrapperProductInfo>
|
||||||
<TextPrice>€ {price}</TextPrice>
|
<TextPrice>€ {price}</TextPrice>
|
||||||
<TextTag color={tagState.color}>{tagState.tagName}</TextTag>
|
<TextTag color={tagState.color}>{tagState.tagName}</TextTag>
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ const ModalEditProduct = (props) => {
|
|||||||
return (
|
return (
|
||||||
<StyledModal show={props.visible} centered={true} onHide={closeModal} >
|
<StyledModal show={props.visible} centered={true} onHide={closeModal} >
|
||||||
<WrapperProduct color={usedTag.color}>
|
<WrapperProduct color={usedTag.color}>
|
||||||
{image && <StyledImage src={image} alt="No image found" />}
|
{image && <StyledImage source={image} alt="No image found" />}
|
||||||
<WrapperProductInfo>
|
<WrapperProductInfo>
|
||||||
<TextPrice>€ {price}</TextPrice>
|
<TextPrice>€ {price}</TextPrice>
|
||||||
<TextTag color={usedTag.color}>{usedTag.tagName}</TextTag>
|
<TextTag color={usedTag.color}>{usedTag.tagName}</TextTag>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { Image } from 'react-native'
|
|||||||
|
|
||||||
export const StyledImage = styled(Image)`
|
export const StyledImage = styled(Image)`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
z-index:0;
|
z-index:0;
|
||||||
opacity: 0.1;
|
opacity: 0.1;
|
||||||
width: 70%;
|
width: 70%;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { Image } from 'react-native'
|
|||||||
|
|
||||||
export const StyledImage = styled(Image)`
|
export const StyledImage = styled(Image)`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
width: 35%;
|
width: 35%;
|
||||||
height: 50%;
|
height: 50%;
|
||||||
right:0;
|
right:0;
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ export const TextTag = styled(Text)`
|
|||||||
margin: 0px 5px;
|
margin: 0px 5px;
|
||||||
`
|
`
|
||||||
export const StyledImage = styled(Image)`
|
export const StyledImage = styled(Image)`
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
width: 150px;
|
width: 150px;
|
||||||
height: 150px;
|
height: 150px;
|
||||||
margin-top:-50px;
|
margin-top:-50px;
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ const ModalAddIngredients = (props) => {
|
|||||||
min={amountOfServings}
|
min={amountOfServings}
|
||||||
step={amountOfServings}
|
step={amountOfServings}
|
||||||
placeholder="Multiplier" />
|
placeholder="Multiplier" />
|
||||||
<p style={{ marginLeft: 5 }}>servings</p>
|
<Text style={{ marginLeft: 5 }}>servings</Text>
|
||||||
</WrapperInput>
|
</WrapperInput>
|
||||||
{IngredientsList}
|
{IngredientsList}
|
||||||
<WrapperButtons>
|
<WrapperButtons>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ const RecipeCard = (props) => {
|
|||||||
let recipe = props.recipe
|
let recipe = props.recipe
|
||||||
return (
|
return (
|
||||||
<WrapperRecipeCard to={"/recipes/"+recipe._id}>
|
<WrapperRecipeCard to={"/recipes/"+recipe._id}>
|
||||||
{recipe.image && <ImageRecipe src={recipe.image} />}
|
{recipe.image && <ImageRecipe source={recipe.image} />}
|
||||||
<RecipeName>{recipe.name}</RecipeName>
|
<RecipeName>{recipe.name}</RecipeName>
|
||||||
</WrapperRecipeCard>
|
</WrapperRecipeCard>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export const RecipeName = styled(Text)`
|
|||||||
`
|
`
|
||||||
|
|
||||||
export const ImageRecipe = styled(Image)`
|
export const ImageRecipe = styled(Image)`
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
border-radius: 20px;
|
border-radius: 20px;
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ const GroceryListPage = () => {
|
|||||||
{
|
{
|
||||||
currentTab === "Groceries" ? <Groceries /> : <Products />
|
currentTab === "Groceries" ? <Groceries /> : <Products />
|
||||||
}
|
}
|
||||||
{/* <TabMenu currentTab={currentTab} setCurrentTab={setCurrentTab} /> */}
|
<TabMenu currentTab={currentTab} setCurrentTab={setCurrentTab} />
|
||||||
</WrapperGroceryPage>
|
</WrapperGroceryPage>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { useSelector } from 'react-redux'
|
|||||||
const Groceries = () => {
|
const Groceries = () => {
|
||||||
const statusItems = useSelector(state => state.items.status)
|
const statusItems = useSelector(state => state.items.status)
|
||||||
return (
|
return (
|
||||||
<View>
|
<View style={{height: '100%'}}>
|
||||||
{statusItems === 'loading' ? <LoadAnimation/>
|
{statusItems === 'loading' ? <LoadAnimation/>
|
||||||
: <GroceryList />}
|
: <GroceryList />}
|
||||||
<ContainerButtons />
|
<ContainerButtons />
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ const AddRecipe = () => {
|
|||||||
<>
|
<>
|
||||||
<HeaderPadding/>
|
<HeaderPadding/>
|
||||||
<Wrapper >
|
<Wrapper >
|
||||||
{image && <StyledImage src={image} alt="Recipe" />}
|
{image && <StyledImage source={image} alt="Recipe" />}
|
||||||
<WrapperRecipe>
|
<WrapperRecipe>
|
||||||
<View id="row">
|
<View id="row">
|
||||||
{/* <IconRecipe /> */}
|
{/* <IconRecipe /> */}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ const Recipe = () => {
|
|||||||
<>
|
<>
|
||||||
<HeaderPadding/>
|
<HeaderPadding/>
|
||||||
<Wrapper >
|
<Wrapper >
|
||||||
{recipe.image && <StyledImage src={recipe.image} />}
|
{recipe.image && <StyledImage source={recipe.image} />}
|
||||||
<WrapperRecipe>
|
<WrapperRecipe>
|
||||||
<Text>{recipe.name}</Text>
|
<Text>{recipe.name}</Text>
|
||||||
<Hr />
|
<Hr />
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ export const InputInstructions = styled(Text)`
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
`
|
`
|
||||||
export const StyledImage = styled(Image)`
|
export const StyledImage = styled(Image)`
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
width: 100px;
|
width: 100px;
|
||||||
height: 100px;
|
height: 100px;
|
||||||
`
|
`
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ export const InstructionNumber = styled(Text)`
|
|||||||
|
|
||||||
export const StyledImage = styled(Image)`
|
export const StyledImage = styled(Image)`
|
||||||
margin-top: -70px;
|
margin-top: -70px;
|
||||||
object-fit: cover;
|
resize-mode: contain;
|
||||||
height: 200px;
|
height: 200px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@media ${({theme}) => theme.mediaQueries.above768}{
|
@media ${({theme}) => theme.mediaQueries.above768}{
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { View } from "react-native"
|
import { TouchableOpacity, View } from "react-native"
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
import styled, { css } from 'styled-components'
|
import styled, { css } from 'styled-components'
|
||||||
//deps
|
//deps
|
||||||
@@ -6,7 +6,7 @@ import { HiCheck } from 'react-icons/hi'
|
|||||||
|
|
||||||
import LightenDarken from '../functions'
|
import LightenDarken from '../functions'
|
||||||
//standard button layout
|
//standard button layout
|
||||||
export const Button = styled(View)`
|
export const Button = styled(TouchableOpacity)`
|
||||||
box-shadow: ${({ theme }) => theme.colors.shadow};
|
box-shadow: ${({ theme }) => theme.colors.shadow};
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
Reference in New Issue
Block a user