diff --git a/LeftOvers/App.tsx b/LeftOvers/App.tsx
index 150d43d..8eea4ad 100644
--- a/LeftOvers/App.tsx
+++ b/LeftOvers/App.tsx
@@ -9,11 +9,11 @@ import FiltersSelection from './screens/FiltersSelection';
export default function App(props) {
return(
-
+ //
//
//
//
//
- //
+
);
}
\ No newline at end of file
diff --git a/LeftOvers/components/ProfileElement.tsx b/LeftOvers/components/ProfileElement.tsx
index 614caa5..658820e 100644
--- a/LeftOvers/components/ProfileElement.tsx
+++ b/LeftOvers/components/ProfileElement.tsx
@@ -10,6 +10,7 @@ type Profile = {
export default function ProfileElement(props : Profile) {
const [waiting, setWaiting] = useState("none")
+ const [separator, setSeparator] = useState("none")
const changeStatus = () => {
if (props.disableSelection){
setWaiting("none")
@@ -20,7 +21,13 @@ export default function ProfileElement(props : Profile) {
else{
setWaiting("flex")
}
- console.log(waiting, props.name)
+ if (props.isActive == "flex" && waiting == "none"){
+ setSeparator("flex")
+ }
+ else{
+ setSeparator("none")
+ }
+ console.log(waiting, separator, props.name)
};
return (
@@ -33,7 +40,7 @@ export default function ProfileElement(props : Profile) {
Activated
-
+
Waiting...
diff --git a/LeftOvers/components/ValidateButton.tsx b/LeftOvers/components/ValidateButton.tsx
index de00a10..1ad4d82 100644
--- a/LeftOvers/components/ValidateButton.tsx
+++ b/LeftOvers/components/ValidateButton.tsx
@@ -21,6 +21,7 @@ export default function ValidateButton(props: ValidateButtonProps) {
borderColor: props.colour,
backgroundColor: props.backColour,
alignItems: 'center',
+ justifyContent: "center",
flexDirection: "row",
padding: 5,
paddingRight: 10,}}>
diff --git a/LeftOvers/screens/HomePage.tsx b/LeftOvers/screens/HomePage.tsx
index 549988e..dcf7ce7 100644
--- a/LeftOvers/screens/HomePage.tsx
+++ b/LeftOvers/screens/HomePage.tsx
@@ -87,7 +87,7 @@ export default function HomePage(props) {
Selected Ingredient
-
+
@@ -97,9 +97,9 @@ export default function HomePage(props) {
-
+
-
+
@@ -145,18 +145,17 @@ const styles = StyleSheet.create({
},
nbSelected: {
fontSize: 11,
- //flex: 0.2,
color: "#3F3C42",
textAlign: "right",
},
profilesSelection: {
- //maxWidth: 370,
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
borderRadius: 20,
backgroundColor: '#F2F0E4',
+ paddingTop: 5,
marginHorizontal: 10,
},
welcome: {
diff --git a/LeftOvers/screens/ModifyProfile.tsx b/LeftOvers/screens/ModifyProfile.tsx
index 212fc03..1a8b096 100644
--- a/LeftOvers/screens/ModifyProfile.tsx
+++ b/LeftOvers/screens/ModifyProfile.tsx
@@ -14,7 +14,7 @@ export default function ModifyProfile(props) {
-
+