Nav Recipe Suggestion Modal
continuous-integration/drone/push Build is passing Details

pull/22/head^2
Louison PARANT 1 year ago
parent a384a3bea2
commit 6338018d59

@ -83,6 +83,7 @@ export default function ValidateButton(props: ValidateButtonProps) {
<Text style={{ <Text style={{
fontSize: 15, fontSize: 15,
color: props.colour, color: props.colour,
fontWeight: "bold",
}}>{props.title}</Text> }}>{props.title}</Text>
</View> </View>
</Pressable> </Pressable>

@ -12,6 +12,7 @@ import IngredientSelection from '../screens/IngredientSelection';
import RecipeSuggestion from '../screens/RecipeSuggestion'; import RecipeSuggestion from '../screens/RecipeSuggestion';
import FiltersSelection from '../screens/FiltersSelection'; import FiltersSelection from '../screens/FiltersSelection';
import RecipeDetails from '../screens/RecipeDetails'; import RecipeDetails from '../screens/RecipeDetails';
import ModifyProfile from '../screens/ModifyProfile';
const HomeStack = createNativeStackNavigator() const HomeStack = createNativeStackNavigator()
@ -98,6 +99,16 @@ export default function HomeStackScreen() {
) )
}} }}
/> />
<HomeStack.Screen
name='ProfileModification'
component={ModifyProfile}
options={{
headerStyle: {backgroundColor: colors.cardBackground},
headerTitle: () => (
<HeaderTitle title='Profile Modification'/>
)
}}
/>
</HomeStack.Navigator> </HomeStack.Navigator>
) )
} }

@ -160,14 +160,6 @@ export default function HomePage({ navigation, props }) {
<ValidateButton title="Modify Profiles" image="parameter.png" colour={colors.buttonDetail} backColour={colors.buttonBackground} todo={() => navigation.navigate('Profiles')}/> <ValidateButton title="Modify Profiles" image="parameter.png" colour={colors.buttonDetail} backColour={colors.buttonBackground} todo={() => navigation.navigate('Profiles')}/>
</View> </View>
<View style={styles.separator}/> <View style={styles.separator}/>
<View style={styles.profilesSelection}>
<View style={styles.filterBar}>
<Text style={styles.filters}>Ingredient Stocks</Text>
</View>
<View style={{marginTop: "4%"}}/>
<ValidateButton title="Manage Stocks" image="warehouse.png" colour={colors.buttonDetail} backColour={colors.buttonBackground} todo={() => console.log('ManageStocks')}/>
</View>
<View style={styles.separator}/>
<View style={styles.profilesSelection}> <View style={styles.profilesSelection}>
<View style={styles.filterBar}> <View style={styles.filterBar}>
<Text style={styles.filters}>Cooking</Text> <Text style={styles.filters}>Cooking</Text>

@ -48,14 +48,14 @@ export default function RecipeSuggestion(props) {
const handleChildEventGoFilters = () => { const handleChildEventGoFilters = () => {
setVisibleIngredients(false); setVisibleIngredients(false);
setVisibleFilters(true); setVisibleFilters(true);
setColorFilters("#59BDCD") setColorFilters(colors.buttonDetail)
setColorIngredients(colors.cardDetail) setColorIngredients(colors.cardDetail)
} }
const handleChildEventGoIngredients = () => { const handleChildEventGoIngredients = () => {
setVisibleFilters(false); setVisibleFilters(false);
setVisibleIngredients(true); setVisibleIngredients(true);
setColorFilters(colors.cardDetail) setColorFilters(colors.cardDetail)
setColorIngredients("#59BDCD") setColorIngredients(colors.buttonDetail)
} }
const decreaseCounter = () => { const decreaseCounter = () => {
@ -172,7 +172,8 @@ export default function RecipeSuggestion(props) {
title="Vichyssoise" title="Vichyssoise"
textList={ingredientListV2} textList={ingredientListV2}
description="Cold soup of vegetables. Difficult recipe. Not advised to beginners. 1h or more." description="Cold soup of vegetables. Difficult recipe. Not advised to beginners. 1h or more."
duration="1h and a half"/> duration="1h and a half"
navigateDetails={goDetails}/>
<View style={{marginHorizontal: 10}}/> <View style={{marginHorizontal: 10}}/>
</ScrollView> </ScrollView>
<View style={{marginBottom: "20%"}}/> <View style={{marginBottom: "20%"}}/>
@ -209,7 +210,7 @@ export default function RecipeSuggestion(props) {
<View style={{marginTop: "3%"}}/> <View style={{marginTop: "3%"}}/>
<ListWithoutSelect title="Allergies" content={all}></ListWithoutSelect> <ListWithoutSelect title="Allergies" content={all}></ListWithoutSelect>
<View style={{marginTop: "3%"}}/> <View style={{marginTop: "3%"}}/>
<ValidateButton title="Add Allergy" image="plus.png" colour={colors.buttonDetail} backColour={colors.buttonBackground} todo={() => props.navigation.navigate("IngredientSelection")}></ValidateButton> <ValidateButton title="Change Filters" image="update.png" colour={colors.buttonDetail} backColour={colors.buttonBackground} todo={() => props.navigation.navigate("FiltersSelection")}></ValidateButton>
</View> </View>
<View style={{marginTop: "6%"}}/> <View style={{marginTop: "6%"}}/>
<View> <View>

@ -3,8 +3,6 @@ const Alabaster = '#F2F0E4'
const Jet = '#3F3C42' const Jet = '#3F3C42'
const Moonstone = '#59BDCD' const Moonstone = '#59BDCD'
const Cerulean = '#2680AA' const Cerulean = '#2680AA'
const Celeste = '#ADF3EA'
const Tan = '#E0C293'
const Pearl = '#E3DEC9' const Pearl = '#E3DEC9'
const EerieBlack = '#222222' const EerieBlack = '#222222'
const CarolinaBlue = '#8DB4D9' const CarolinaBlue = '#8DB4D9'

Loading…
Cancel
Save