diff --git a/src/assets/styles/index.ts b/src/assets/styles/index.ts index f459017..ef0cc89 100644 --- a/src/assets/styles/index.ts +++ b/src/assets/styles/index.ts @@ -1,9 +1,9 @@ import { StyleSheet } from "react-native" -import { screenBackground } from "../../constants/colors" +import colors from "../../constants/colors" const styles = StyleSheet.create({ - container: { - backgroundColor: screenBackground, + appContainer: { + backgroundColor: colors.screenBackground, width: "100%", height: "100%", }, diff --git a/src/components/common/buttons/wideButton/wideButtonStyles.ts b/src/components/common/buttons/wideButton/wideButtonStyles.ts index 8d2b5fc..70a1712 100644 --- a/src/components/common/buttons/wideButton/wideButtonStyles.ts +++ b/src/components/common/buttons/wideButton/wideButtonStyles.ts @@ -7,7 +7,7 @@ const wideButtonStyles = StyleSheet.create({ paddingVertical: 20, width: "90%", alignSelf: "center", - marginVertical: 20, + marginVertical: 10, borderRadius: 10, }, buttonText: { diff --git a/src/screens/dashboard/Dashboard.tsx b/src/screens/dashboard/Dashboard.tsx index e1ba3fb..c0269ae 100644 --- a/src/screens/dashboard/Dashboard.tsx +++ b/src/screens/dashboard/Dashboard.tsx @@ -1,44 +1,46 @@ import { NavBar, Heading, StateCard } from "../../components" -import { View, ScrollView } from "react-native" +import { View, ScrollView, SafeAreaView } from "react-native" import styles from "../../assets/styles" import dashboardStyles from "./dashboardStyles" const Dashboard = (): JSX.Element => { return ( - + - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + ) } diff --git a/src/screens/dashboard/dashboardStyles.ts b/src/screens/dashboard/dashboardStyles.ts index 2668fad..e7e4370 100644 --- a/src/screens/dashboard/dashboardStyles.ts +++ b/src/screens/dashboard/dashboardStyles.ts @@ -3,6 +3,7 @@ import { StyleSheet } from "react-native" const dashboardStyles = StyleSheet.create({ container: { padding: 20, + marginBottom: 50, }, wrapper: { flexDirection: "row", diff --git a/src/screens/patients/patientDetails/PatientDetails.tsx b/src/screens/patients/patientDetails/PatientDetails.tsx index 773c7d1..fc72e79 100644 --- a/src/screens/patients/patientDetails/PatientDetails.tsx +++ b/src/screens/patients/patientDetails/PatientDetails.tsx @@ -1,7 +1,8 @@ -import { View, Text, Image, ScrollView } from "react-native" +import { View, Text, Image, ScrollView, SafeAreaView } from "react-native" import { NavBar, SimpleCard, DetailsCard } from "../../../components" import { PatientStackNavProps } from "../../../navigation/stacks/patientStack/@types" import patientDetailsStyles from "./patientDetailsStyles" +import styles from "../../../assets/styles" const PatientDetails = ({ navigation, @@ -9,51 +10,54 @@ const PatientDetails = ({ navigation: PatientStackNavProps<"PatientDetails">["navigation"] }): JSX.Element => { return ( - + - - + + + Khalid Redouani + 6 odonnances + + {/* General informations */} + - Khalid Redouani - 6 odonnances - - {/* General informations */} - - - - - + + + + + + ) } diff --git a/src/screens/patients/patientsList/PatientsList.tsx b/src/screens/patients/patientsList/PatientsList.tsx index fb281f2..3af535f 100644 --- a/src/screens/patients/patientsList/PatientsList.tsx +++ b/src/screens/patients/patientsList/PatientsList.tsx @@ -1,30 +1,40 @@ -import { ScrollView, View } from "react-native" -import { NavBar, PatientCard } from "../../../components" +import { ScrollView, View, SafeAreaView, FlatList } from "react-native" +import { NavBar, PatientCard, Header, TextButton } from "../../../components" import { PatientStackNavProps } from "../../../navigation/stacks/patientStack/@types" import patientsListStyles from "./patientsListStyles" -import { Header } from "../../../components" import patients from "../../../helpers/data/patients" +import styles from "../../../assets/styles" const PatientsList = ({ navigation }: { navigation: PatientStackNavProps<"PatientsList">["navigation"] }) => { return ( - + -
- - {patients.map(patient => ( - navigation.navigate("PatientDetails", { patientId: patient.patientId })} + +
+ + item.patientId} + renderItem={({ item }) => ( + navigation.navigate("PatientDetails", { patientId: item.patientId })} + /> + )} /> - ))} - - + + + + + + + ) } diff --git a/src/screens/patients/patientsList/patientsListStyles.ts b/src/screens/patients/patientsList/patientsListStyles.ts index 875139c..803175d 100644 --- a/src/screens/patients/patientsList/patientsListStyles.ts +++ b/src/screens/patients/patientsList/patientsListStyles.ts @@ -9,6 +9,10 @@ const patientsListStyles = StyleSheet.create({ borderTopColor: "#ddd", borderTopWidth: 1, }, + btnCenter: { + alignSelf: "center", + marginVertical: 10, + }, }) export default patientsListStyles diff --git a/src/screens/prescriptions/addPrescription/AddPrescription.tsx b/src/screens/prescriptions/addPrescription/AddPrescription.tsx index 79d5e05..0166615 100644 --- a/src/screens/prescriptions/addPrescription/AddPrescription.tsx +++ b/src/screens/prescriptions/addPrescription/AddPrescription.tsx @@ -1,4 +1,4 @@ -import { View, ScrollView, Touchable, TouchableOpacity, Text } from "react-native" +import { View, ScrollView, TouchableOpacity, Text, SafeAreaView } from "react-native" import { NavBar, PrescriptionHeader, @@ -11,6 +11,7 @@ import { import { PrescreptionsStackNavProps } from "../../../navigation/stacks/prescriptionsStack/@types" import addPrescriptionStyles from "./addPrescriptionStyles" import Ionicons from "react-native-vector-icons/Ionicons" +import styles from "../../../assets/styles" const AddPrescription = ({ navigation, @@ -39,43 +40,46 @@ const AddPrescription = ({ ] return ( - + - - - - - + + + + + + + + + {/* Select patient */} + } + /> + {/* Select product */} + } + /> + {/* Select dosage */} + } + /> + {/* Enter duration */} + } + /> + + Ajouter un produit + + + - - {/* Select patient */} - } - /> - {/* Select product */} - } - /> - {/* Select dosage */} - } - /> - {/* Enter duration */} - } - /> - - Ajouter un produit - - - - - - + + + + ) } diff --git a/src/screens/prescriptions/prescriptionDetails/PrescriptionDetails.tsx b/src/screens/prescriptions/prescriptionDetails/PrescriptionDetails.tsx index b09d435..0f67b70 100644 --- a/src/screens/prescriptions/prescriptionDetails/PrescriptionDetails.tsx +++ b/src/screens/prescriptions/prescriptionDetails/PrescriptionDetails.tsx @@ -1,7 +1,8 @@ -import { View, Text, ScrollView } from "react-native" +import { View, Text, ScrollView, SafeAreaView } from "react-native" import { NavBar, PrescriptionHeader, WideButton } from "../../../components" import { PrescreptionsStackNavProps } from "../../../navigation/stacks/prescriptionsStack/@types" import prescriptionDetailsStyles from "./prescriptionDetailsStyles" +import styles from "../../../assets/styles" const PrescriptionDetails = ({ navigation, @@ -9,29 +10,32 @@ const PrescriptionDetails = ({ navigation: PrescreptionsStackNavProps<"PrescriptionDetails">["navigation"] }): JSX.Element => { return ( - + - - - - Nom du patient : - John Doe - + + + + + Nom du patient : + John Doe + - - some doliprane thing or whatever - - - Prendre pendant 3 semaine - - - 1 comprimé après chaque repas - + + some doliprane thing or whatever + + + Prendre pendant 3 semaine + + + 1 comprimé après chaque repas + + - - - + + + + ) } diff --git a/src/screens/prescriptions/prescriptionsList/PrescriptionsList.tsx b/src/screens/prescriptions/prescriptionsList/PrescriptionsList.tsx index bd68ec2..78c5639 100644 --- a/src/screens/prescriptions/prescriptionsList/PrescriptionsList.tsx +++ b/src/screens/prescriptions/prescriptionsList/PrescriptionsList.tsx @@ -1,8 +1,9 @@ -import { View, ScrollView } from "react-native" +import { View, ScrollView, SafeAreaView, FlatList } from "react-native" import { NavBar, Header, PrescriptionCard, TextButton } from "../../../components" import { PrescreptionsStackNavProps } from "../../../navigation/stacks/prescriptionsStack/@types" import prescriptionsListStyles from "./prescriptionsListStyles" import prescriptions from "../../../helpers/data/prescriptions" +import styles from "../../../assets/styles" const PrescriptionsList = ({ navigation, @@ -10,30 +11,39 @@ const PrescriptionsList = ({ navigation: PrescreptionsStackNavProps<"PrescriptionsList">["navigation"] }): JSX.Element => { return ( - + -
navigation.navigate("AddPrescription")} - /> - - {prescriptions.map(prescription => ( - - navigation.navigate("PrescriptionDetails", { prescriptionId: prescription.prescriptionId }) - } + +
navigation.navigate("AddPrescription")} + /> + + item.prescriptionId} + renderItem={({ item }) => ( + + navigation.navigate("PrescriptionDetails", { + prescriptionId: item.prescriptionId, + }) + } + /> + )} /> - ))} - - - - - + + + + + + + ) } diff --git a/src/screens/prescriptions/prescriptionsList/prescriptionsListStyles.ts b/src/screens/prescriptions/prescriptionsList/prescriptionsListStyles.ts index 7b76694..3e061ab 100644 --- a/src/screens/prescriptions/prescriptionsList/prescriptionsListStyles.ts +++ b/src/screens/prescriptions/prescriptionsList/prescriptionsListStyles.ts @@ -11,7 +11,7 @@ const prescriptionsListStyles = StyleSheet.create({ }, btnCenter: { alignSelf: "center", - marginVertical: 20, + marginVertical: 10, }, }) diff --git a/src/screens/products/productDetails/ProductDetails.tsx b/src/screens/products/productDetails/ProductDetails.tsx index aa68df8..216da78 100644 --- a/src/screens/products/productDetails/ProductDetails.tsx +++ b/src/screens/products/productDetails/ProductDetails.tsx @@ -1,7 +1,8 @@ -import { View, Text, ScrollView, Image } from "react-native" +import { View, Text, ScrollView, Image, SafeAreaView } from "react-native" import { NavBar, DetailsCard } from "../../../components" import { ProductsStackNavProps } from "../../../navigation/stacks/productsStack/@types" import productDetailsStyles from "./productDetailsStyles" +import styles from "../../../assets/styles" const ProductDetails = ({ navigation, @@ -9,59 +10,60 @@ const ProductDetails = ({ navigation: ProductsStackNavProps<"ProductDetails">["navigation"] }): JSX.Element => { return ( - + - - + + + DOLIPRANE CO 500MG B20 COMP + PARACETAMOL + + {/* General informations */} + - DOLIPRANE CO 500MG B20 COMP - PARACETAMOL - - {/* General informations */} - - {/* Dosages */} - - - - + {/* Dosages */} + + + + ) } diff --git a/src/screens/products/productsList/ProductsList.tsx b/src/screens/products/productsList/ProductsList.tsx index 6a26b5f..59fa443 100644 --- a/src/screens/products/productsList/ProductsList.tsx +++ b/src/screens/products/productsList/ProductsList.tsx @@ -1,8 +1,9 @@ -import { View, ScrollView } from "react-native" +import { View, ScrollView, SafeAreaView, FlatList } from "react-native" import { NavBar, Heading, SubHeading, TextButton, SearchInput, ProductCard } from "../../../components" import { ProductsStackNavProps } from "../../../navigation/stacks/productsStack/@types" import productsListStyles from "./productsListStyles" import products from "../../../helpers/data/products" +import styles from "../../../assets/styles" const ProductsList = ({ navigation, @@ -10,31 +11,37 @@ const ProductsList = ({ navigation: ProductsStackNavProps<"ProductsList">["navigation"] }): JSX.Element => { return ( - + - - - - - + + + + + + + + - + - - - {products.map((product, index) => ( - navigation.navigate("ProductDetails", { productId: product.productId })} - key={index} + item.productId} + renderItem={({ item }) => ( + navigation.navigate("ProductDetails", { productId: item.productId })} + /> + )} /> - ))} - - - - + + + + + + ) } diff --git a/src/screens/products/productsList/productsListStyles.ts b/src/screens/products/productsList/productsListStyles.ts index ad353d6..9a6e9d7 100644 --- a/src/screens/products/productsList/productsListStyles.ts +++ b/src/screens/products/productsList/productsListStyles.ts @@ -11,7 +11,7 @@ const productsListStyles = StyleSheet.create({ }, btnCenter: { alignSelf: "center", - marginVertical: 20, + marginVertical: 10, }, }) diff --git a/src/screens/settings/EditClinicScreen/EditClinic.tsx b/src/screens/settings/EditClinicScreen/EditClinic.tsx index 83248f3..903b5db 100644 --- a/src/screens/settings/EditClinicScreen/EditClinic.tsx +++ b/src/screens/settings/EditClinicScreen/EditClinic.tsx @@ -1,7 +1,8 @@ -import { View, Text, ScrollView } from "react-native" +import { View, SafeAreaView, ScrollView } from "react-native" import { NavBar, Heading, CustomContainer, CustomTextInput, WideButton, SelectOption } from "../../../components" import { SettingsStackNavProps } from "../../../navigation/stacks/settingsStack/@types" import editClinicStyles from "./editClinicStyles" +import styles from "../../../assets/styles" const EditClinic = ({ navigation }: { navigation: SettingsStackNavProps<"EditClinic">["navigation"] }): JSX.Element => { const cities = [ @@ -16,30 +17,33 @@ const EditClinic = ({ navigation }: { navigation: SettingsStackNavProps<"EditCli { name: "oujda" }, ] return ( - + - - - - } - /> - } - /> - } - /> - } /> - } /> - } /> - + + + + + } + /> + } + /> + } + /> + } /> + } /> + } /> + + - - + + + ) } diff --git a/src/screens/settings/EditProfileScreen/EditProfile.tsx b/src/screens/settings/EditProfileScreen/EditProfile.tsx index 976ff3f..635f9f6 100644 --- a/src/screens/settings/EditProfileScreen/EditProfile.tsx +++ b/src/screens/settings/EditProfileScreen/EditProfile.tsx @@ -1,7 +1,8 @@ -import { View, Text, ScrollView } from "react-native" +import { View, SafeAreaView, ScrollView } from "react-native" import { NavBar, Heading, CustomContainer, CustomTextInput, WideButton } from "../../../components" import { SettingsStackNavProps } from "../../../navigation/stacks/settingsStack/@types" import editProfileStyles from "./editProfileStyles" +import styles from "../../../assets/styles" const EditProfile = ({ navigation, @@ -9,28 +10,33 @@ const EditProfile = ({ navigation: SettingsStackNavProps<"EditProfile">["navigation"] }): JSX.Element => { return ( - + - - - - - } - /> - } - /> - } /> - } /> - } /> - } /> - + + + + + } + /> + } + /> + } /> + } /> + } + /> + } /> + + - - + + + ) } diff --git a/src/screens/settings/profileScreen/Profile.tsx b/src/screens/settings/profileScreen/Profile.tsx index f5e54fe..052eb54 100644 --- a/src/screens/settings/profileScreen/Profile.tsx +++ b/src/screens/settings/profileScreen/Profile.tsx @@ -1,81 +1,88 @@ -import { View, Image, ScrollView } from "react-native" +import { View, Image, ScrollView, SafeAreaView } from "react-native" import { NavBar, TextButton, DetailsCard } from "../../../components" import { SettingsStackNavProps } from "../../../navigation/stacks/settingsStack/@types" import profileStyles from "./profileStyles" +import styles from "../../../assets/styles" const Profile = ({ navigation }: { navigation: SettingsStackNavProps<"Profile">["navigation"] }): JSX.Element => { return ( - + - - - - - {/* General Infos */} - navigation.navigate("EditProfile")} - /> - {/* Cabinet */} - navigation.navigate("EditClinic")} - /> - + + + + + + {/* General Infos */} + navigation.navigate("EditProfile")} + /> + {/* Cabinet */} + navigation.navigate("EditClinic")} + /> + + + ) } diff --git a/src/screens/settings/settingsList/SettingsList.tsx b/src/screens/settings/settingsList/SettingsList.tsx index c77e936..584c653 100644 --- a/src/screens/settings/settingsList/SettingsList.tsx +++ b/src/screens/settings/settingsList/SettingsList.tsx @@ -1,7 +1,8 @@ -import { View } from "react-native" +import { View, SafeAreaView, ScrollView } from "react-native" import { NavBar, SimpleCard, Heading } from "../../../components" import { SettingsStackNavProps } from "../../../navigation/stacks/settingsStack/@types" import settingsListStyles from "./settingsListStyles" +import styles from "../../../assets/styles" const SettingsList = ({ navigation, @@ -9,14 +10,17 @@ const SettingsList = ({ navigation: SettingsStackNavProps<"SettingsList">["navigation"] }): JSX.Element => { return ( - - - - - - navigation.navigate("Profile")} /> - - + + + + + + + navigation.navigate("Profile")} /> + + + + ) }