From 608b067d8936c04b4bc9d67594e084fc4d85eb5f Mon Sep 17 00:00:00 2001 From: Khawaja Fashi Ud Din Abdullah Date: Tue, 15 Oct 2024 03:05:15 +0500 Subject: [PATCH 01/10] Ui change --- index.html | 918 +++++++++++++++++++++++++++-------------------------- 1 file changed, 472 insertions(+), 446 deletions(-) diff --git a/index.html b/index.html index fad2fc0..a821299 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - + AmbuFlow @@ -14,83 +14,91 @@ +
@@ -511,8 +499,6 @@
Ambulance Monitoring System Logo
- -<<<<<<< HEAD - -

Find Nearby Hospital

-

Track or call an ambulance and check nearby hospitals for emergency services

- -
- -
- AIIMS Delhi - AIIMS Delhi -

Location: Ansari Nagar, New Delhi

-
- - -
- Fortis Escorts Heart Institute - Fortis Escorts Heart Institute -

Location: Okhla Road, New Delhi

-
- - -
- Max Super Speciality Hospital - Max Super Speciality Hospital -

Location: Saket, New Delhi

-
- - -
- BLK Super Speciality Hospital - BLK Super Speciality Hospital -

Location: Pusa Road, New Delhi

-
- - -
- Sir Ganga Ram Hospital - Sir Ganga Ram Hospital -

Location: Rajinder Nagar, New Delhi

-
- - -
- Apollo Hospitals Delhi - Apollo Hospitals Delhi -

Location: Karol Bagh, New Delhi

-
- - -
- Holy Family Hospital - Holy Family Hospital -

Location: Okhla, New Delhi

-
- - -
- Safdarjung Hospital - Safdarjung Hospital -

Location: Safdarjung Enclave, New Delhi

-
- - -
- Moolchand Medcity - Moolchand Medcity -

Location: Lajpat Nagar, New Delhi

-
- - -
- Deen Dayal Upadhyay Hospital - Deen Dayal Upadhyay Hospital -

Location: Hari Nagar, New Delhi

-
- - -
- Artemis Hospitals - Artemis Hospitals -

Location: Dwarka, New Delhi

-
- - -
- Venkateshwar Hospital - Venkateshwar Hospital -

Location: Sector 18A, Dwarka, New Delhi

-
-
@@ -275,6 +178,125 @@

Track or call an ambulance and check nearby hospitals for emergency services +

Find Nearby Hospital

+

Track or call an ambulance and check nearby hospitals for emergency services

+ +
+ +
+ +
+ +
+ + diff --git a/up.html b/up.html index 372b885..0086758 100644 --- a/up.html +++ b/up.html @@ -1,566 +1,3 @@ - - - - - - From 2e5d98fa6a18dbc336cd56ce2c92cf99bccd4703 Mon Sep 17 00:00:00 2001 From: Khawaja Fashi Ud Din Abdullah Date: Fri, 18 Oct 2024 03:34:24 +0500 Subject: [PATCH 09/10] Sycned with upstream/original --- Feedback.html | 2 +- contact.html | 4 +- index.html | 21 +----- team.html | 173 +++++++------------------------------------------- 4 files changed, 27 insertions(+), 173 deletions(-) diff --git a/Feedback.html b/Feedback.html index bd6a105..fa528d3 100644 --- a/Feedback.html +++ b/Feedback.html @@ -451,7 +451,7 @@

Subscribe to
+ style="background-color: #C4D7FF; color: #000000; display: flex; justify-content: center; align-items: center; padding: 10px 20px;">

© 2024 AmbuFlow. All rights reserved.

 diff --git a/contact.html b/contact.html index 239e074..e7da191 100644 --- a/contact.html +++ b/contact.html @@ -361,15 +361,13 @@

Subscribe to style="background-color: #e81a1a; color: white; padding: 10px 20px; border: none; cursor: pointer; border-radius: 5px;">Subscribe

-

-
+ style="background-color: #C4D7FF; color: #000000; display: flex; justify-content: center; align-items: center; padding: 10px 20px;">

© 2024 AmbuFlow. All rights reserved.

 diff --git a/index.html b/index.html index f53347f..9b2fe07 100644 --- a/index.html +++ b/index.html @@ -710,10 +710,10 @@

© 2024 AmbuFlow. All rights reserved.

- - + + + +
+ style="background-color: #C4D7FF; color: #000000; display: flex; justify-content: center; align-items: center; padding: 10px 20px; border-top: 1px solid #a0c0ff;">

© 2024 AmbuFlow. All rights reserved.

 - - - -
- - - - -
- -
- - - - - - - - - - - - - - - -
- -

© 2024 AmbuFlow. All rights reserved.

- - - -
- -
- - - - - + + +
+ +
+ + + + + \ No newline at end of file From 644aa614af15916b3621a55528067c5e336bbab8 Mon Sep 17 00:00:00 2001 From: Khawaja Fashi Ud Din Abdullah Date: Fri, 18 Oct 2024 03:40:39 +0500 Subject: [PATCH 10/10] Synced changes with upstream --- up.html | 740 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 500 insertions(+), 240 deletions(-) diff --git a/up.html b/up.html index 8dabec1..372b885 100644 --- a/up.html +++ b/up.html @@ -1,4 +1,4 @@ - + + + + + + + + + + + + + Register & Login + + + + + + + +
+ + + + +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+ +
+
@@ -177,13 +656,16 @@

One of us ?

- - - + + - - - - --> - - - - - - - - - - - Register & Login - - - - - - -
- - - - -
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
- -
-
-
-

New here ?

-

Discover new experiences with AmbuFlow!
Get access to exclusive content and features.
Create your account.

- -
-
-
-
-

One of us ?

-

Welcome to our community

- -
-
-
-
- - - - + animateCircles(); + + \ No newline at end of file