conflict merge
Showing
51 changed files
with
780 additions
and
0 deletions
components/layout/DropdownUserProfile.js
0 → 100644
components/login/Login.js
0 → 100644
components/signup/Signup.js
0 → 100644
This diff is collapsed.
Click to expand it.
components/user/MyBookings.js
0 → 100644
components/user/MyGiftCard.js
0 → 100644
components/user/MyProfile.js
0 → 100644
This diff is collapsed.
Click to expand it.
components/user/MyWhishList.js
0 → 100644
components/vendor/ActivityDetails.js
0 → 100644
This diff is collapsed.
Click to expand it.
components/vendor/BusinessDetails.js
0 → 100644
This diff is collapsed.
Click to expand it.
pages/login/[type]/index.js
0 → 100644
pages/signup/[type]/index.js
0 → 100644
pages/user/bookings/index.js
0 → 100644
pages/user/giftcard/index.js
0 → 100644
pages/user/profile/index.js
0 → 100644
pages/user/whishlist/index.js
0 → 100644
pages/vendor/activity-details/index.js
0 → 100644
pages/vendor/business-details/index.js
0 → 100644
pages/vendor/dashboard/index.js
0 → 100644
public/fonts/SofiaPro-Bold.ttf
0 → 100644
No preview for this file type
public/fonts/SofiaPro-Light.otf
0 → 100644
No preview for this file type
public/images/login/banner-image.jpg
0 → 100644

1020 KB
public/images/login/banner.png
0 → 100644

4.14 MB
public/images/login/icon-apple.png
0 → 100644

574 Bytes
public/images/login/icon-fb.png
0 → 100644

612 Bytes
public/images/login/icon-fb1.png
0 → 100644

457 Bytes
public/images/login/icon-google.png
0 → 100644

1.18 KB
public/images/login/icon-resend.png
0 → 100644

423 Bytes
public/images/login/success.png
0 → 100644

3.39 KB
public/images/user/arrow-down.svg
0 → 100644
public/images/user/arrow-right.svg
0 → 100644
public/images/user/heart.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public/images/user/icon-rebook.svg
0 → 100644
public/images/user/icon-upload.svg
0 → 100644
public/images/user/image1.png
0 → 100644

151 KB
public/images/user/image2.png
0 → 100644

141 KB
public/images/user/image3.png
0 → 100644

118 KB
public/images/user/image4.png
0 → 100644

122 KB
public/images/user/star.svg
0 → 100644
public/images/user/user-big.jpg
0 → 100644

4.52 KB
public/images/user/user-big.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public/images/user/user-small.svg
0 → 100644
This diff is collapsed.
Click to expand it.
public/images/vendor/activities.svg
0 → 100644
public/images/vendor/call.svg
0 → 100644
public/images/vendor/orders.svg
0 → 100644
public/images/vendor/question.svg
0 → 100644
public/images/zango-logo.svg
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
-
Please register or sign in to post a comment