Skip to content

Commit

Permalink
last cmnt
Browse files Browse the repository at this point in the history
  • Loading branch information
@Aliza02
Aliza02 committed Oct 30, 2023
1 parent 3155999 commit c623008
Show file tree
Hide file tree
Showing 30 changed files with 337 additions and 328 deletions.
12 changes: 10 additions & 2 deletions android/app/google-services.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@
},
"oauth_client": [
{
"client_id": "761926075595-1ruiiuul899r1pkp8ill9c3v2qqs76sd.apps.googleusercontent.com",
"client_id": "761926075595-cb1dgmfn90orpnom2d024ouma6au5ijt.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.example.eventually_user",
"certificate_hash": "975824ea990eef59dcc871c7775f089b89b02a87"
}
},
{
"client_id": "761926075595-i5iaf81fvopefosrsfdfhi9rckf0ig9i.apps.googleusercontent.com",
"client_type": 3
}
],
Expand Down Expand Up @@ -50,7 +58,7 @@
},
"oauth_client": [
{
"client_id": "761926075595-1ruiiuul899r1pkp8ill9c3v2qqs76sd.apps.googleusercontent.com",
"client_id": "761926075595-i5iaf81fvopefosrsfdfhi9rckf0ig9i.apps.googleusercontent.com",
"client_type": 3
}
],
Expand Down
2 changes: 2 additions & 0 deletions android/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.eventually_vendor">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />


<application
android:label="eventually_vendor"
Expand Down
Binary file added assets/images/girl.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 6 additions & 3 deletions lib/OTPMethods/otpmethods.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ Future sendEmail(
{required String email,
required String subject,
required String message}) async {
const serviceId = 'service_hyta9ug';
// print('send');
const serviceId = 'service_jj7w46j';
const templateId = 'template_msvsubc';
final url = Uri.parse('https://api.emailjs.com/api/v1.0/email/send');
print(url);
final response = await http.post(
url,
headers: {
Expand All @@ -41,14 +43,15 @@ Future sendEmail(
body: json.encode({
'service_id': serviceId,
'template_id': templateId,
'user_id': 'NDyE00Tk9HPhXioxy',
'accessToken': 'CGiWPCJQEM0VHqHeIW4y6',
'user_id': 'i4Gwvjef3t3JpMTZh',
'accessToken': 's_UDdFSxxhjZ1z_2YX3yd',
'template_params': {
'to_email': email,
'user_subject': subject,
'message': message,
},
}),
);

print(response.body);
}
4 changes: 4 additions & 0 deletions lib/controller/order_controller.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ class OrderController extends GetxController {
].obs;
// doc id of orders collection of user to retreieve order information
RxString userOrderDocId = ''.obs;

RxList<String> unavailabilityTime = <String>[].obs;
RxString unavailabilityDate=''.obs;

}
17 changes: 5 additions & 12 deletions lib/firebaseMethods/userAuthentication.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,18 @@ Future Signup(
required String businessLocation,
required String CNIC,
required String phone}) async {
signupcontroller.successfullSignup.value = true;
try {
userCredentials = await auth.createUserWithEmailAndPassword(
email: email,
password: password,
);
user = userCredentials?.user;

if (user != null) {
user?.updateDisplayName(name);
user?.updateEmail(email);

await user?.reload();
}
// await store.collection('User').doc(businessCategory).set({
// 'userName': ' ',
// });
await FirebaseFirestore.instance
.collection('User')
.doc(auth.currentUser?.uid)
Expand All @@ -63,11 +58,9 @@ Future Signup(
'Profile image': "abc",
});
Get.toNamed('/drawer');
signupcontroller.successfullSignup.value = false;
} on FirebaseException catch (e) {
switch (e.code) {
case "email-already-in-use":
signupcontroller.NewUser.value = false;
Get.showSnackbar(
const GetSnackBar(
title: 'Email Already Exists',
Expand All @@ -79,7 +72,6 @@ Future Signup(
);
break;
}

print(e);
}
}
Expand All @@ -106,13 +98,13 @@ Future Signin({
}

Future Signout() async {
await auth.signOut();
SharedPreferences prefs = await SharedPreferences.getInstance();
prefs.setBool('rememberMe', false);
}

Future<UserCredential> signInWithGoogle() async {
Future<void> signInWithGoogle() async {
// Trigger the authentication flow

final GoogleSignInAccount? googleUser = await GoogleSignIn().signIn();

// Obtain the auth details from the request
Expand All @@ -125,6 +117,7 @@ Future<UserCredential> signInWithGoogle() async {
idToken: googleAuth?.idToken,
);

// Once signed in, return the UserCredential
return await FirebaseAuth.instance.signInWithCredential(credential);
UserCredential? user =
await FirebaseAuth.instance.signInWithCredential(credential);
Get.toNamed('/drawer');
}
11 changes: 9 additions & 2 deletions lib/main.dart
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'dart:io';
import 'package:eventually_vendor/bindings/all_controller_bindings.dart';
import 'package:eventually_vendor/controller/order_controller.dart';
import 'package:eventually_vendor/controller/signinController.dart';
Expand Down Expand Up @@ -40,10 +41,16 @@ void main() async {
SharedPreferences prefs = await SharedPreferences.getInstance();
isViewed = prefs.getInt('onboard');
isLoggedin = prefs.getBool('rememberMe');

HttpOverrides.global = MyHttpOverrides();
runApp(MyApp());
}

class MyHttpOverrides extends HttpOverrides{
@override
HttpClient createHttpClient(SecurityContext? context){
return super.createHttpClient(context)
..badCertificateCallback = (X509Certificate cert, String host, int port)=> true;
}
}
class MyApp extends StatelessWidget {
const MyApp({super.key});

Expand Down
4 changes: 2 additions & 2 deletions lib/models/chat_user.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ class ChatUser {
required this.about,
required this.lastActive,
required this.id,
required this.isOnline,
required this.pushToken,
// required this.isOnline,
// required this.pushToken,
required this.email,
});
late String name;
Expand Down
4 changes: 1 addition & 3 deletions lib/screens/AddService/addService.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class _AddServiceState extends State<AddService> {
}
}

// delete selected image from firebase storage


void validateAddService() async {
if (servicecontroller.serviceName.text.isEmpty ||
Expand Down Expand Up @@ -124,7 +124,6 @@ class _AddServiceState extends State<AddService> {
image1URL: servicecontroller.uploadImage[0],
image2URL: servicecontroller.uploadImage[1],
image3URL: servicecontroller.uploadImage[2]);

Get.showSnackbar(
const GetSnackBar(
title: 'Service Added',
Expand All @@ -134,7 +133,6 @@ class _AddServiceState extends State<AddService> {
icon: Icon(Icons.incomplete_circle_rounded),
),
);

servicecontroller.serviceDescription.clear();
servicecontroller.noOfPerson.clear();
servicecontroller.priceRange.clear();
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/Help_center/complaint.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Complaint extends StatelessWidget {
label: "Submit",
onPressed: () {
Get.to(() => ComplainSuccess());
// FirebaseFirestore.instance.collection('Complaints')

}),
),
)
Expand Down
31 changes: 23 additions & 8 deletions lib/screens/Help_center/complaint_success.dart
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'package:eventually_vendor/constants/colors.dart';
import 'package:eventually_vendor/constants/font.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';

Expand All @@ -8,6 +10,8 @@ class ComplainSuccess extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: AppColors.appBar.withOpacity(0.3),
elevation: 0.0,
leading: IconButton(
onPressed: () {
Get.back();
Expand All @@ -17,7 +21,10 @@ class ComplainSuccess extends StatelessWidget {
color: Colors.black,
),
),
title: const Text('Help Center'),
title: const Text('Help Center',
style: TextStyle(
color: AppColors.grey,
)),
centerTitle: true,
),
body: Center(
Expand All @@ -37,20 +44,28 @@ class ComplainSuccess extends StatelessWidget {
alignment: Alignment.center,
width: 296,
height: 66,
child: Text(
" Your Complaint is Successfully registered",
style: TextStyle(
fontSize: 24, color: Color.fromRGBO(203, 88, 90, 1)),
child: Center(
child: Text(
" Your Complaint is Successfully registered",
style: TextStyle(
fontSize: Get.width * 0.06,
color: Color.fromRGBO(203, 88, 90, 1),
fontFamily: AppFonts.manrope,
fontWeight: AppFonts.extraBold,
),
),
)),
),
Padding(
padding: const EdgeInsets.fromLTRB(30, 0, 0, 0),
child: Container(
width: 324,
height: 44,
child: Text(
"Your complaint will be soon entertained by \n EventuAlly’s help desk team.",
style: TextStyle(fontSize: 16),
child: Center(
child: Text(
"Your complaint will be soon entertained by \n help desk team.",
style: TextStyle(fontSize: 16),
),
)),
)
],
Expand Down
30 changes: 19 additions & 11 deletions lib/screens/ManageAvailability/makeOtherDayUnavailable.dart
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:eventually_vendor/constants/colors.dart';
import 'package:eventually_vendor/controller/order_controller.dart';
import 'package:eventually_vendor/widget/BottomNavBar/bottomNavBar.dart';
import 'package:eventually_vendor/widget/button.dart';
import 'package:eventually_vendor/widget/manageAvailability/header.dart';
Expand All @@ -21,6 +22,7 @@ class makeOtherDayUnavailable extends StatefulWidget {
}

class _makeOtherDayUnavailableState extends State<makeOtherDayUnavailable> {
final orderController = Get.put(OrderController());
@override
Widget build(BuildContext context) {
return SafeArea(
Expand All @@ -29,15 +31,15 @@ class _makeOtherDayUnavailableState extends State<makeOtherDayUnavailable> {
appBar: AppBar(
backgroundColor: Colors.transparent,
elevation: 0.0,
leading: IconButton(
onPressed: () {
Get.back();
},
icon: const Icon(
Icons.arrow_back_ios,
color: AppColors.grey,
),
),
// leading: IconButton(
// onPressed: () {
// Get.back();
// },
// icon: const Icon(
// Icons.arrow_back_ios,
// color: AppColors.grey,
// ),
// ),
),
bottomNavigationBar: bottomNavBar(),
body: SizedBox(
Expand All @@ -63,7 +65,8 @@ class _makeOtherDayUnavailableState extends State<makeOtherDayUnavailable> {
fontColor: AppColors.grey,
),
text(
title: 'April 5th,2023, 6:00PM-11:00PM',
title:
"${orderController.unavailabilityDate} ${orderController.unavailabilityTime[0]}- ${orderController.unavailabilityTime[1]}",
fontSize: Get.width * 0.035,
fontWeight: AppFonts.bold,
fontColor: AppColors.grey,
Expand All @@ -72,7 +75,12 @@ class _makeOtherDayUnavailableState extends State<makeOtherDayUnavailable> {
margin: EdgeInsets.only(top: Get.height * 0.05),
child: button(
label: 'Manage other days',
onpressed: () {},
onpressed: () {
Get.offAllNamed('/drawer');

orderController.unavailabilityDate.value = '';
orderController.unavailabilityTime.clear();
},
borderRadius: 15.0,
),
),
Expand Down
24 changes: 21 additions & 3 deletions lib/screens/ManageAvailability/makeUnavailable.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:eventually_vendor/constants/icons.dart';
import 'package:eventually_vendor/controller/order_controller.dart';
import 'package:eventually_vendor/controller/pagecontroller.dart';
import 'package:eventually_vendor/firebaseMethods/addService.dart';
import 'package:eventually_vendor/screens/ManageAvailability/makeOtherDayUnavailable.dart';
import 'package:eventually_vendor/widget/button.dart';
import 'package:eventually_vendor/widget/manageAvailability/text.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -37,6 +41,7 @@ class _makeUnavailableState extends State<makeUnavailable> {
11: 'Nov',
12: 'Dec',
};
final orderController = Get.put(OrderController());

return SafeArea(
child: Scaffold(
Expand Down Expand Up @@ -81,6 +86,8 @@ class _makeUnavailableState extends State<makeUnavailable> {
);
if (date != null) {
pageController.date.value = date;
orderController.unavailabilityDate.value =
"${pageController.date.value.day}-${pageController.date.value.month}-${pageController.date.value.year}";
}
},
child: SvgPicture.asset(AppIcons.calendar),
Expand Down Expand Up @@ -113,9 +120,20 @@ class _makeUnavailableState extends State<makeUnavailable> {
child: const Text('No'),
),
TextButton(
onPressed: () {
Get.back();
Get.back();
onPressed: () async {
await FirebaseFirestore.instance
.collection('User')
.doc(auth.currentUser!.uid)
.set({
'unavailable': "true",
'unavailable Date':
orderController.unavailabilityDate.value,
'unavailable start time':
orderController.unavailabilityTime[0],
'unavailable end time':
orderController.unavailabilityTime[1],
}, SetOptions(merge: true));
Get.to(() => makeOtherDayUnavailable());
},
child: const Text('Yes'),
),
Expand Down
Loading

0 comments on commit c623008

Please sign in to comment.