Skip to content
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

Fix: Remove Unused Icons and Fix app Issues #155

Merged
merged 1 commit into from
Jul 26, 2024
Merged

Fix: Remove Unused Icons and Fix app Issues #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions app/Appointments/details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const pkgs = {
period: "30 mins",
icon: chatIcon,
button: {
title: "Message (Start at 16:00 PM)",
title: "Message ",
icon: chatIconWhite,
nextTo: "/messagingAppointment/messaging",
},
Expand All @@ -43,7 +43,7 @@ const pkgs = {
period: "30 mins",
icon: callIcon,
button: {
title: "Voice Call (Start at 14:00 PM)",
title: "Voice Call ",
icon: callIconWhite,
nextTo: "/Appointments/voice-call/call",
},
Expand All @@ -56,7 +56,7 @@ const pkgs = {
period: "30 mins",
icon: callIcon,
button: {
title: "Video Call (Start at 10:00 AM)",
title: "Video Call",
icon: videoIconWhite,
nextTo: "/videoCallAppointment",
},
Expand Down Expand Up @@ -111,14 +111,14 @@ const VideoCallAppointment = ({ route }: any) => {
<NavigationHeader
title={"My Appointment"}
onBack={router.back}
children={
<Touchable>
<Image
source={require("../../assets/doctors/menu.png")}
className="w-7 h-7"
/>
</Touchable>
}
// children={
// // <Touchable>
// // <Image
// // source={require("../../assets/doctors/menu.png")}
// // className="w-7 h-7"
// // />
// // </Touchable>
// }
/>
</View>
<ScrollView className={`flex-1 pt-2`}>
Expand Down
12 changes: 9 additions & 3 deletions app/Appointments/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function Screen() {
`
)
.eq("patient_id", userId)
.eq("status", "Booked").order("appointment_date", { ascending: true })
.eq("status", "Approved").order("appointment_date", { ascending: true })
.order("appointment_time", { ascending: true })

if (error) {
Expand Down Expand Up @@ -225,7 +225,7 @@ function Screen() {
</View>
<View>
<View className="flex flex-row items-center justify-center gap-4">
<Image
{/* <Image
className="w-[25px] h-[25px]"
source={require("../../assets/doctors/searchIcon.png")}
/>
Expand All @@ -234,7 +234,7 @@ function Screen() {
className="w-[25px] h-[25px]"
source={require("../../assets/doctors/menu.png")}
/>
</TouchableOpacity>
</TouchableOpacity> */}
</View>
</View>
</View>
Expand Down Expand Up @@ -291,6 +291,7 @@ function Screen() {
>
{cancels && (
<View style={styles.content}>
<ScrollView showsVerticalScrollIndicator={false}>
{canceledData.map((canceled, index) => (
<Cardcomponent
key={index}
Expand All @@ -304,11 +305,13 @@ function Screen() {
styles={styles.cancelStyles}
/>
))}
</ScrollView>
</View>
)}

{complete && (
<View style={styles.content}>
<ScrollView showsVerticalScrollIndicator={false}>
{completAppointment.map((appointment:any, index:any) => (
<Cardscomponent
key={index}
Expand All @@ -335,11 +338,13 @@ function Screen() {
params:{doctorId:appointment.doctor.id, }})}
/>
))}
</ScrollView>
</View>
)}

{upcoming && (
<View style={styles.content}>
<ScrollView showsVerticalScrollIndicator={false}>
{appointments.map((appointment: any, index: any) => (
<Cardscomponent
key={index}
Expand Down Expand Up @@ -368,6 +373,7 @@ function Screen() {
cancle={() => openCancelModal(appointment)}
/>
))}
</ScrollView>
</View>
)}

Expand Down
2 changes: 1 addition & 1 deletion app/Appointments/voice-call/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export default function VoiceCallScreen() {
height={20}
/>
<Text className="text-white font-UrbanistBold">
Voice Call (Start at 14:00 PM)
Voice Call
</Text>
</TouchableOpacity>
</View>
Expand Down
4 changes: 2 additions & 2 deletions app/articles/ArticlesDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,12 +262,12 @@ export default function ArticlesDetails() {
source={require("../../assets/articlesImages/rwiza.png")}
/>
</TouchableOpacity>
<TouchableOpacity onPress={more}>
{/* <TouchableOpacity onPress={more}>
<Image
style={{ height: 1.17, width: 1.17, padding: 10 }}
source={require("../../assets/articlesImages/Group.png")}
/>
</TouchableOpacity>
</TouchableOpacity> */}
</View>
</View>

Expand Down
4 changes: 2 additions & 2 deletions app/articles/ArticlesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ export default function Article() {
</View>
<View style={styles.headerRight}>
<TouchableOpacity>
<Image
{/* <Image
style={styles.headerIcon}
source={require("../../assets/articlesImages/Search.png")}
/>
/> */}
</TouchableOpacity>
<TouchableOpacity
onPress={() =>
Expand Down
8 changes: 4 additions & 4 deletions app/articles/BookMarkedArticle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,12 @@ export default function BookMarkedArticle() {
padding: 15,
}}
>
<TouchableOpacity>
{/* <TouchableOpacity>
<Image source={require("../../assets/articlesImages/Search.png")} />
</TouchableOpacity>
<TouchableOpacity>
</TouchableOpacity> */}
{/* <TouchableOpacity>
<Image source={require("../../assets/articlesImages/Group.png")} />
</TouchableOpacity>
</TouchableOpacity> */}
</View>
</View>

Expand Down
8 changes: 4 additions & 4 deletions app/articles/SeeAllArticles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,18 @@ export default function SeeAllArticles() {
padding: 15,
}}
>
<TouchableOpacity>
{/* <TouchableOpacity>
<Image
style={{ position: "relative", marginTop: 10 }}
source={require("../../assets/articlesImages/Search.png")}
/>
</TouchableOpacity>
<TouchableOpacity>
</TouchableOpacity> */}
{/* <TouchableOpacity>
<Image
style={{ position: "relative", marginTop: 12 }}
source={require("../../assets/articlesImages/Group.png")}
/>
</TouchableOpacity>
</TouchableOpacity> */}
</View>
</View>
<View style={{ padding: 5 }}>
Expand Down
8 changes: 4 additions & 4 deletions app/messagingAppointment/messaging.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@ export default function messagingAppointment() {
return (
<View className="flex-1 bg-white py-10 px-6">
<NavigationHeader title={appointment.doctor.name} onBack={router.back}>
<TouchableOpacity>
{/* <TouchableOpacity>
<Image
source={require("@/assets/icons/search.png")}
className="w-6 h-6 mr-3"
/>
</TouchableOpacity>
<TouchableOpacity onPress={toggleModal}>
<SvgXml xml={Menu} />
</TouchableOpacity>
</TouchableOpacity> */}
<Modal
visible={visible}
animationType="fade"
Expand All @@ -134,7 +134,7 @@ export default function messagingAppointment() {
<TouchableWithoutFeedback onPress={() => setVisible(false)}>
<View className={` absolute w-[100%] right-0 z-[0] top-[5px]`}>
<View className="w-[100%]">
<View className="w-[37%] relative top-[50px] left-[59%] p-4 right-0 bg-white rounded-xl">
{/* <View className="w-[37%] relative top-[50px] left-[59%] p-4 right-0 bg-white rounded-xl">
<TouchableOpacity className="flex-row gap-2 py-2">
<SvgXml xml={deleteBtn} />
<Text className="font-UrbanistSemiBold">Clear chat</Text>
Expand All @@ -144,7 +144,7 @@ export default function messagingAppointment() {
<SvgXml xml={download} />
<Text className="font-UrbanistSemiBold">Export chat</Text>
</TouchableOpacity>
</View>
</View> */}
</View>
</View>
</TouchableWithoutFeedback>
Expand Down
0 assets/icons/radiologist.ts → assets/icons/cardiologist.ts
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions assets/icons/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { more } from "./more";
import { neurologist } from "./neurologist";
import { nutritionist } from "./nutritionist";
import { opthamologist } from "./opthamologist";
import { pediatric } from "./pediatric";
import { radiologist } from "./radiologist";
import { pediatric } from "./pediatrician";
import { radiologist } from "./cardiologist";

export enum TabsType {
HOME = "Home",
Expand Down
0 assets/icons/pediatric.ts → assets/icons/pediatrician.ts
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions components/cards/DocButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ const DocButton: React.FC<DocButtonProps> = ({ selectedCategory, onCategorySelec
<Text style={getButtonTextStyle("nutritionist")}>Nutritionist</Text>
</TouchableOpacity>
<TouchableOpacity
style={getButtonStyle("pediatric")}
onPress={() => onCategorySelect("pediatric")}
style={getButtonStyle("pediatrician")}
onPress={() => onCategorySelect("pediatrician")}
>
<Text style={getButtonTextStyle("pediatric")}>Pediatric</Text>
<Text style={getButtonTextStyle("pediatrician")}>Pediatrician</Text>
</TouchableOpacity>
<TouchableOpacity
style={getButtonStyle("neurologist")}
Expand All @@ -67,10 +67,10 @@ const DocButton: React.FC<DocButtonProps> = ({ selectedCategory, onCategorySelec
<Text style={getButtonTextStyle("neurologist")}>Neurologist</Text>
</TouchableOpacity>
<TouchableOpacity
style={getButtonStyle("radiologist")}
onPress={() => onCategorySelect("radiologist")}
style={getButtonStyle("cardiologist")}
onPress={() => onCategorySelect("cardiologist")}
>
<Text style={getButtonTextStyle("radiologist")}>Radiologist</Text>
<Text style={getButtonTextStyle("cardiologist")}>Cardiologist</Text>
</TouchableOpacity>
<TouchableOpacity
style={getButtonStyle("more")}
Expand Down
8 changes: 4 additions & 4 deletions components/cards/packages/appointmentPackage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ const AppointmentPkg: React.FC<Props> = ({
<Text className="text-[16px] font-UrbanistBold text-greyscale-900">
{title}
</Text>
<Text className="text-[18px] font-UrbanistBold text-primary-500">
{/* <Text className="text-[18px] font-UrbanistBold text-primary-500">
{price}
</Text>
</Text> */}
</View>
<View className="flex-row w-full justify-between items-center">
<Text className="text-[12px] font-UrbanistMedium text-greyscale-700">
{description}
</Text>
<Text className="text-[10px] font-UrbanistMedium text-greyscale-700">
{/* <Text className="text-[10px] font-UrbanistMedium text-greyscale-700">
(paid)
</Text>
</Text> */}
</View>
</View>
</View>
Expand Down
Loading