snehalathad
/
KonectarApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'snehalatha_dev' (#10) from snehalatha_dev into dev 

Reviewed-on: #10
This commit is contained in:
snehalathad 2024-12-19 05:58:25 +00:00
parent a3b7bcd756 6bc1eb0433
commit b21c6866e3
9 changed files with 257 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
assets/api_constants.json
View File

@ -3,68 +3,68 @@
"api": "loadFutureEvents", "api": "loadFutureEvents",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "saveUserInterestedEvent", "api": "saveUserInterestedEvent",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "saveUserAttendingEvent", "api": "saveUserAttendingEvent",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "eventOverview", "api": "eventOverview",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "getSpecialitiesDonutChart", "api": "getSpecialitiesDonutChart",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "getTopicCloudChart", "api": "getTopicCloudChart",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "getTopAffiliationBarChart", "api": "getTopAffiliationBarChart",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "eventSpeakers", "api": "eventSpeakers",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "saveEventsTopicNote", "api": "saveEventsTopicNote",
"interval": 5, "interval": 5,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "eventUserAnalytics", "api": "eventUserAnalytics",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "saveEventOffline", "api": "saveEventOffline",
"interval": 0, "interval": 0,
"method": "POST", "method": "POST",
"module": "eventapis" "module": "apis/v1/events"
}, },
{ {
"api": "contactslistapi", "api": "contactslistapi",

16
lib/main.dart
View File

@ -598,19 +598,7 @@ Future main() async {
print("checkhere before:$isloggedIn"); print("checkhere before:$isloggedIn");
String secretkey = instance.getString('secretkey') ?? ""; String secretkey = instance.getString('secretkey') ?? "";
OverlaySupportEntry entry;
Connectivity().onConnectivityChanged.listen((event) {
print("CHECK INTERNET");
print(event);
if (event.toString().contains("ConnectivityResult.none")) {
entry = showOverlayNotification((context) {
return Text("this is a message from simple notification");
}, duration: Duration(hours: 1));
}
});
OverlaySupport overlaySupport = OverlaySupport.global(
child: Text("ONLINE"),
);
runApp( runApp(
MultiProvider( MultiProvider(
providers: [ providers: [
@ -681,7 +669,7 @@ Future main() async {
print("isLoggedIn_is : $isLoggedIn"); print("isLoggedIn_is : $isLoggedIn");
print("secret : $secretkey"); print("secret : $secretkey");
return isLoggedIn return isLoggedIn
? IntroductionAnimationScreen() ? NavigationHomeScreen()
: IntroductionAnimationScreen(); : IntroductionAnimationScreen();
} }
}, },

262
lib/utils/apicall.dart
View File

@ -32,9 +32,18 @@ class ApiCall {
final dio = Dio(); final dio = Dio();
final Future<SharedPreferences> _prefs = SharedPreferences.getInstance(); final Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
late Future<String> _token; String token = "";
String newtoken = ApiCall() {
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzZWNyZXRlVG9rZW4iOiJiYjNmOTZmYmI5Y2U3ZjA2ZTliOTlkMzRiMGM3YjZkZTBlNjBmYWYzYmM1NDFhZjY0MGQ5ZjAzMGRlNzMxOWM4ZTAwZWNkMCIsImlhdCI6MTczNDM0OTUwNywiZXhwIjoxNzM0MzUxMzA3fQ.nN5XtgmWHVGGdyLEdICY6jTmlg1070rGFwsdyOd4CYY"; init();
print("constructor");
}
init() async {
token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
}
//K1 API CALLS //K1 API CALLS
Future<dynamic> parseInfo() async { Future<dynamic> parseInfo() async {
Dio dio = Dio(); Dio dio = Dio();
@ -117,41 +126,44 @@ class ApiCall {
Future<List<EventsList>> getEventsFromK1({int? type}) async { Future<List<EventsList>> getEventsFromK1({int? type}) async {
Dio dio = Dio(); Dio dio = Dio();
(dio.httpClientAdapter as IOHttpClientAdapter).onHttpClientCreate = // (dio.httpClientAdapter as IOHttpClientAdapter).onHttpClientCreate =
(HttpClient client) { // (HttpClient client) {
client.badCertificateCallback = // client.badCertificateCallback =
(X509Certificate cert, String host, int port) => true; // (X509Certificate cert, String host, int port) => true;
return client; // return client;
}; // };
Response response; Response response;
String date = "2024-12-17"; String date = "2024-12-12";
var formData = var formData = FormData.fromMap({
FormData.fromMap({"start": date, "order_by": 7, 'type': type ?? 1}); "start": "2024-12-16",
"order_by": 7,
'type': type ?? 1,
});
// "end": DateTime(2024, 12, 14).toIso8601String(), // "end": DateTime(2024, 12, 14).toIso8601String(),
_token = _prefs.then((SharedPreferences prefs) { token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? ""; return prefs.getString('token') ?? "";
}); });
print("SAVED TOKEN :${await _token}"); print("SAVED TOKEN :${token}");
//http://192.168.2.130/konectar-staging/apiauths/logout/
try { try {
// dio.options.contentType = Headers.multipartFormDataContentType;
// dio.options.baseUrl = "https://cardio-staging.konectar.io/";
// dio.options.headers["Authorization"] = "Bearer ${newtoken}";
response = await dio.post( response = await dio.post(
'https://cardio-staging.konectar.io/apis/v1/events/loadFutureEvents/', '${EventsConstants.url}${EventsConstants.eventslistapi}',
options: Options( options: Options(
contentType: "multipart/form-data", followRedirects: true,
followRedirects: false,
// will not throw errors
validateStatus: (status) => true, validateStatus: (status) => true,
preserveHeaderCase: true,
headers: { headers: {
'Authorization': 'Bearer ${newtoken}', 'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}), }),
data: formData); data: formData);
print("RESPONSE"); print("RESPONSE ${dio.options.headers}");
print(response.data.toString()); print(response);
Map<String, dynamic> jsondata = json.decode(response.data); Map<String, dynamic> jsondata = json.decode(response.data);
EventsData eventresponse = EventsData.fromJson(jsondata); EventsData eventresponse = EventsData.fromJson(jsondata);
@ -173,13 +185,24 @@ class ApiCall {
return client; return client;
}; };
Response response; Response response;
var formData = FormData.fromMap( String token = await _prefs.then((SharedPreferences prefs) {
{"user_email": "vinodh@aissel.com", "eid": eventid, "flag": flag}); return prefs.getString('token') ?? "";
});
var formData = FormData.fromMap({"eid": eventid, "flag": flag});
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.followUnfollowEvent}', '${EventsConstants.url}${EventsConstants.followUnfollowEvent}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
queryParameters: { queryParameters: {
"user_email": "vinodh@aissel.com",
"eid": eventid, "eid": eventid,
"flag": flag, "flag": flag,
}, },
@ -198,14 +221,25 @@ class ApiCall {
(X509Certificate cert, String host, int port) => true; (X509Certificate cert, String host, int port) => true;
return client; return client;
}; };
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
Response response; Response response;
var formData = FormData.fromMap( var formData = FormData.fromMap({"eid": eventid, "flag": flag});
{"user_email": "vinodh@aissel.com", "eid": eventid, "flag": flag});
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.attendNotAttendEvent}', '${EventsConstants.url}${EventsConstants.attendNotAttendEvent}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
queryParameters: { queryParameters: {
"user_email": "vinodh@aissel.com",
"eid": eventid, "eid": eventid,
"flag": flag, "flag": flag,
}, },
@ -222,6 +256,9 @@ class ApiCall {
required String endDate, required String endDate,
required bool client, required bool client,
}) async { }) async {
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
print( print(
"FORMAT_CHECK_DATE $startDate $endDate $eventid ${DateTime(2024, 12, 03).toIso8601String()}"); "FORMAT_CHECK_DATE $startDate $endDate $eventid ${DateTime(2024, 12, 03).toIso8601String()}");
Dio dio = Dio(); Dio dio = Dio();
@ -236,7 +273,6 @@ class ApiCall {
var formData; var formData;
if (client) { if (client) {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"eventId": eventid, "eventId": eventid,
"sd": startDate, "sd": startDate,
"ed": endDate, "ed": endDate,
@ -245,7 +281,6 @@ class ApiCall {
}); });
} else { } else {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"eventId": eventid, "eventId": eventid,
"sd": startDate, "sd": startDate,
"ed": endDate, "ed": endDate,
@ -255,7 +290,17 @@ class ApiCall {
print("FORMDATA:${formData.toString()},$startDate,$endDate"); print("FORMDATA:${formData.toString()},$startDate,$endDate");
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.specialtyOfSpeakers}', '${EventsConstants.url}${EventsConstants.specialtyOfSpeakers}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
data: formData); data: formData);
print("response SPECIALTY SPEAKERS here!!!!!!!!!!!!!!!!!!!!! "); print("response SPECIALTY SPEAKERS here!!!!!!!!!!!!!!!!!!!!! ");
@ -275,6 +320,9 @@ class ApiCall {
required String startDate, required String startDate,
required String endDate, required String endDate,
required bool client}) async { required bool client}) async {
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
Dio dio = Dio(); Dio dio = Dio();
(dio.httpClientAdapter as IOHttpClientAdapter).onHttpClientCreate = (dio.httpClientAdapter as IOHttpClientAdapter).onHttpClientCreate =
(HttpClient client) { (HttpClient client) {
@ -286,7 +334,6 @@ class ApiCall {
var formData; var formData;
if (client) { if (client) {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"eventId": eventid, "eventId": eventid,
"sd": startDate, "sd": startDate,
"ed": endDate, "ed": endDate,
@ -295,7 +342,6 @@ class ApiCall {
}); });
} else { } else {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"eventId": eventid, "eventId": eventid,
"sd": startDate, "sd": startDate,
"ed": endDate, "ed": endDate,
@ -305,7 +351,17 @@ class ApiCall {
print("FORMDATA:${formData.toString()},$startDate,$endDate"); print("FORMDATA:${formData.toString()},$startDate,$endDate");
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.insightsTopicsCloud}', '${EventsConstants.url}${EventsConstants.insightsTopicsCloud}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
data: formData); data: formData);
print("response SPECIALTY SPEAKERS here!!!!!!!!!!!!!!!!!!!!! "); print("response SPECIALTY SPEAKERS here!!!!!!!!!!!!!!!!!!!!! ");
@ -327,6 +383,9 @@ class ApiCall {
required String startDate, required String startDate,
required String endDate, required String endDate,
required bool client}) async { required bool client}) async {
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
Dio dio = Dio(); Dio dio = Dio();
(dio.httpClientAdapter as IOHttpClientAdapter).onHttpClientCreate = (dio.httpClientAdapter as IOHttpClientAdapter).onHttpClientCreate =
(HttpClient client) { (HttpClient client) {
@ -338,7 +397,6 @@ class ApiCall {
var formData; var formData;
if (client) { if (client) {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"eventId": eventid, "eventId": eventid,
"sd": startDate, "sd": startDate,
"ed": endDate, "ed": endDate,
@ -347,7 +405,6 @@ class ApiCall {
}); });
} else { } else {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"eventId": eventid, "eventId": eventid,
"sd": startDate, "sd": startDate,
"ed": endDate, "ed": endDate,
@ -357,7 +414,17 @@ class ApiCall {
print("FORMDATA:${formData.toString()},$startDate,$endDate"); print("FORMDATA:${formData.toString()},$startDate,$endDate");
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.insightsBarChart}', '${EventsConstants.url}${EventsConstants.insightsBarChart}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
data: formData); data: formData);
print("response SPECIALTY SPEAKERS here!!!!!!!!!!!!!!!!!!!!! "); print("response SPECIALTY SPEAKERS here!!!!!!!!!!!!!!!!!!!!! ");
@ -384,14 +451,25 @@ class ApiCall {
}; };
Response response; Response response;
var formData = FormData.fromMap({ var formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"event_id": eventid, "event_id": eventid,
}); });
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.eventdetailsapi}', '${EventsConstants.url}${EventsConstants.eventdetailsapi}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
queryParameters: { queryParameters: {
"user_email": "vinodh@aissel.com",
"event_id": eventid, "event_id": eventid,
}, },
data: formData); data: formData);
@ -415,17 +493,28 @@ class ApiCall {
}; };
Response response; Response response;
var formData = FormData.fromMap({ var formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"event_id": eventid, "event_id": eventid,
"project_id": 1, "project_id": 1,
}); });
// "sd": "2024-07-30", // "sd": "2024-07-30",
// "ed": "2024-08-03", // "ed": "2024-08-03",
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.speakerslistapi}', '${EventsConstants.url}${EventsConstants.speakerslistapi}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
queryParameters: { queryParameters: {
"user_email": "vinodh@aissel.com",
"event_id": eventid, "event_id": eventid,
}, },
data: formData); data: formData);
@ -450,15 +539,27 @@ class ApiCall {
Response response; Response response;
print("formdata : eventid:$eventid kolid:$kolid kid:$kid"); print("formdata : eventid:$eventid kolid:$kolid kid:$kid");
var formData = FormData.fromMap({ var formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"event_id": eventid, "event_id": eventid,
"kol_id": kolid, "kol_id": kolid,
"k_id": kid, "k_id": kid,
}); });
// "proj_kol_id": 0, // "proj_kol_id": 0,
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.showEventsTopicsAndSession}', '${EventsConstants.url}${EventsConstants.showEventsTopicsAndSession}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
queryParameters: { queryParameters: {
"user_email": "vinodh@aissel.com", "user_email": "vinodh@aissel.com",
"event_id": eventid, "event_id": eventid,
@ -492,10 +593,12 @@ class ApiCall {
return client; return client;
}; };
var formData; var formData;
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
Response response; Response response;
if (filename != "") { if (filename != "") {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"kol_events_id": eventid, "kol_events_id": eventid,
"kol_id": kolid, "kol_id": kolid,
"event_attendees_id": event_attendees_id, "event_attendees_id": event_attendees_id,
@ -505,7 +608,6 @@ class ApiCall {
}); });
} else { } else {
formData = FormData.fromMap({ formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"kol_events_id": eventid, "kol_events_id": eventid,
"kol_id": kolid, "kol_id": kolid,
"event_attendees_id": event_attendees_id, "event_attendees_id": event_attendees_id,
@ -517,7 +619,17 @@ class ApiCall {
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.saveEventsTopicNote}', '${EventsConstants.url}${EventsConstants.saveEventsTopicNote}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
data: formData); data: formData);
print("response user ADDSESSION here!!!!!!!!!!!!!!!!!!!!! "); print("response user ADDSESSION here!!!!!!!!!!!!!!!!!!!!! ");
print(response.data.toString()); print(response.data.toString());
@ -539,15 +651,26 @@ class ApiCall {
return client; return client;
}; };
Response response; Response response;
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
var formData = FormData.fromMap({ var formData = FormData.fromMap({
"user_email": "vinodh@aissel.com",
"kol_events_id": eventid, "kol_events_id": eventid,
}); });
// "proj_kol_id": 0, // "proj_kol_id": 0,
response = await dio.post( response = await dio.post(
'${EventsConstants.url}${EventsConstants.eventUserAnalytics}', '${EventsConstants.url}${EventsConstants.eventUserAnalytics}',
options: Options(), options: Options(
followRedirects: true,
validateStatus: (status) => true,
preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
data: formData); data: formData);
print("response user ALLSESSIONNOTES here!!!!!!!!!!!!!!!!!!!!! "); print("response user ALLSESSIONNOTES here!!!!!!!!!!!!!!!!!!!!! ");
List<AllSessionNotesResponse> data = []; List<AllSessionNotesResponse> data = [];
@ -567,7 +690,9 @@ class ApiCall {
dynamic jsonResult = dynamic jsonResult =
jsonDecode(await rootBundle.loadString("assets/api_constants.json")); jsonDecode(await rootBundle.loadString("assets/api_constants.json"));
//dynamic jsonResult = await MockApiCall().getConfigDataMedical(); //dynamic jsonResult = await MockApiCall().getConfigDataMedical();
String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? "";
});
List<ApiConstantsResponse> responseData = List<ApiConstantsResponse> responseData =
apiConstantsResponseFromJson(jsonResult); apiConstantsResponseFromJson(jsonResult);
print('Response_data_is: $responseData'); print('Response_data_is: $responseData');
@ -610,6 +735,8 @@ class ApiCall {
}); });
try { try {
response = await dio.post( response = await dio.post(
//'http://192.168.2.130/konectar-staging/apiauths/getVerificationCode/',
//'https://cardio-staging.konectar.io/apiauths/getVerificationCode/',
'${url}${EventsConstants.loginmodule}/${EventsConstants.getVerificationCode}', '${url}${EventsConstants.loginmodule}/${EventsConstants.getVerificationCode}',
options: Options(), options: Options(),
data: formData); data: formData);
@ -644,7 +771,10 @@ class ApiCall {
"verification_code": code, "verification_code": code,
"email_id": email, "email_id": email,
}); });
print("LOGIN : API http://192.168.2.130/konectar-staging/apiauths/login");
response = await dio.post( response = await dio.post(
//'http://192.168.2.130/konectar-staging/apiauths/login',
//'http://192.168.2.130/konectar-staging/apiauths/login/',
'${EventsConstants.loginUrl}${EventsConstants.login}', '${EventsConstants.loginUrl}${EventsConstants.login}',
options: Options(), options: Options(),
data: formData); data: formData);
@ -670,7 +800,7 @@ class ApiCall {
return client; return client;
}; };
print("email : $email,device : $deviceid"); print("email : $email,device : $deviceid");
_token = _prefs.then((SharedPreferences prefs) { String token = await _prefs.then((SharedPreferences prefs) {
return prefs.getString('token') ?? ""; return prefs.getString('token') ?? "";
}); });
Response response; Response response;
@ -680,13 +810,19 @@ class ApiCall {
"device_id": deviceid, "device_id": deviceid,
}); });
response = await dio.post( response = await dio.post(
//'http://192.168.2.130/konectar-staging/apiauths/logout/',
'${EventsConstants.loginUrl}${EventsConstants.logout}', '${EventsConstants.loginUrl}${EventsConstants.logout}',
options: Options( options: Options(
contentType: "application/x-www-form-urlencoded", followRedirects: true,
followRedirects: false,
// will not throw errors
validateStatus: (status) => true, validateStatus: (status) => true,
headers: {"Authorization": "Bearer $_token"}), preserveHeaderCase: true,
headers: {
'Authorization': 'Bearer $token',
"Content-Type":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*',
"Accept":
'application/json, application/x-www-form-urlencoded, multipart/form-data, */*'
}),
data: formData, data: formData,
// queryParameters: { // queryParameters: {
// "token": token, // "token": token,

2
lib/utils/constants.dart
View File

@ -29,7 +29,7 @@ class EventsConstants {
static const String url = stagingUrl; static const String url = stagingUrl;
static const String devUrl = static const String devUrl =
"http://192.168.2.130/konectar-sandbox/$moduleName/"; "http://192.168.2.130/konectar-staging/$moduleName/";
static const String loginUrl = static const String loginUrl =
"https://cardio-staging.konectar.io/$loginmodule/"; "https://cardio-staging.konectar.io/$loginmodule/";

1
lib/view/home.dart
View File

@ -185,6 +185,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
} }
init() async { init() async {
await ApiCall().fetchApiConstants();
await Provider.of<EventsProvider>(context, listen: false) await Provider.of<EventsProvider>(context, listen: false)
.initConfigModules(); .initConfigModules();
// await Provider.of<EventsProvider>(context, listen: false).initFiltersData(); // await Provider.of<EventsProvider>(context, listen: false).initFiltersData();

78
lib/view/login.dart
View File

@ -95,7 +95,7 @@ class _LoginScreenState extends State<LoginScreen> {
if (!mounted) return; if (!mounted) return;
deviceId = _deviceId; deviceId = "stagingdevice123456789hhuuww";
print("DEVICE ID########################## :$deviceId"); print("DEVICE ID########################## :$deviceId");
} }
@ -142,7 +142,7 @@ class _LoginScreenState extends State<LoginScreen> {
List<Widget> _buildBody(Orientation orientation, LoginProvider provider) { List<Widget> _buildBody(Orientation orientation, LoginProvider provider) {
return [ return [
SizedBox( SizedBox(
height: 10, height: 40,
), ),
SvgPicture.asset( SvgPicture.asset(
"assets/images/konectar_logo.svg", "assets/images/konectar_logo.svg",
@ -152,29 +152,9 @@ class _LoginScreenState extends State<LoginScreen> {
flex: 2, flex: 2,
child: Center( child: Center(
child: Container( child: Container(
// decoration: const BoxDecoration(
// gradient: LinearGradient(
// begin: Alignment.topRight,
// end: Alignment.bottomLeft,
// colors: [
// Color.fromARGB(255, 126, 134, 147),
// Color.fromARGB(255, 193, 198, 209),
// Color.fromARGB(255, 214, 217, 223),
// ],
// )),
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(
horizontal: 30, horizontal: 30,
vertical: orientation == Orientation.portrait ? 20 : 0), vertical: orientation == Orientation.portrait ? 20 : 0),
// decoration: const BoxDecoration(
// gradient: LinearGradient(
// begin: Alignment.topRight,
// end: Alignment.bottomLeft,
// colors: [
// Color.fromARGB(255, 126, 134, 147),
// Color.fromARGB(255, 193, 198, 209),
// Color.fromARGB(255, 214, 217, 223),
// ],
// )),
child: _buildform(provider), child: _buildform(provider),
), ),
), ),
@ -246,8 +226,8 @@ class _LoginScreenState extends State<LoginScreen> {
labelStyle: TextStyle(fontSize: isTablet ? 18.0 : 16), labelStyle: TextStyle(fontSize: isTablet ? 18.0 : 16),
labelText: "Domain", labelText: "Domain",
hintStyle: TextStyle(fontSize: isTablet ? 18.0 : 16), hintStyle: TextStyle(fontSize: isTablet ? 18.0 : 16),
prefix: Text("https://"), prefix: Text("https:// "),
suffix: Text(".io/"), suffix: Text(" .konectar.io/"),
hintText: "Enter your Domain"), hintText: "Enter your Domain"),
), ),
), ),
@ -290,14 +270,13 @@ class _LoginScreenState extends State<LoginScreen> {
provider.loading = true; provider.loading = true;
}); });
print("email:${emailTextController.text}"); print("email:${emailTextController.text}");
print("FIRST LOGIN"); print("FIRST LOGIN");
if (!provider.showCodeField) { if (!provider.showCodeField) {
provider.email = emailTextController.text; provider.email = emailTextController.text;
// String encoded = // String encoded =
// base64.encode(utf8.encode(deviceId)); // base64.encode(utf8.encode(deviceId));
String domain = String domain =
"https://${domainTextConrtroller.text}.io/"; "https://${domainTextConrtroller.text}.konectar.io/";
var resp = await provider.verifyEmail(domain, var resp = await provider.verifyEmail(domain,
emailTextController.text, deviceId!, platform); emailTextController.text, deviceId!, platform);
if (resp != null) { if (resp != null) {
@ -377,50 +356,24 @@ class _LoginScreenState extends State<LoginScreen> {
secretKeyTextConrtroller.text = provider.code!; secretKeyTextConrtroller.text = provider.code!;
}); });
} }
// }
//_joinMeeting(roomText.text, "demo meet2");
// _saveprefs(
// emailTextController.text,
// true)
// .then((value) {
// Navigator.of(context).pushReplacement(
// MaterialPageRoute(
// builder: (context) => FirebaseExample(
// title: secretKeyTextConrtroller.text,
// )),
// );
// }
// );
} else { } else {
_displaySnackBar(textFieldsValidation(provider)); _displaySnackBar(textFieldsValidation(provider));
} }
}, },
// onPressed: () async {
// await ApiCall().fetchApiConstants().then(
// (value) {
// Navigator.of(context).pushReplacement(
// MaterialPageRoute(
// builder: (context) => NavigationHomeScreen()),
// );
// },
// );
// },
textColor: Colors.white, textColor: Colors.white,
fontsize: isTablet ? 22 : 18, fontsize: isTablet ? 22 : 18,
title: provider.showCodeField ? "Verify" : "Sign In"), title: provider.showCodeField ? "Verify Code" : "Sign In"),
), ),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
provider.showMessage Center(
? Text(provider.message!) child: provider.showMessage
: provider.loading ? Text(provider.message!)
? Center(child: CircularProgressIndicator()) : provider.loading
: SizedBox.shrink(), ? Center(child: CircularProgressIndicator())
: SizedBox.shrink(),
),
]), ]),
); );
} }
@ -458,16 +411,11 @@ class _LoginScreenState extends State<LoginScreen> {
return isloggedout; return isloggedout;
}); });
}); });
// await SessionManager().setLoggedIn(isloggedin);
// UserData userData =
// UserData(email: email, name: token, domainUrl: domain, secretkey: key);
// await provider.saveUserData(userData);
} }
_displaySnackBar(String msg) { _displaySnackBar(String msg) {
final snackBar = SnackBar(content: Text(msg)); final snackBar = SnackBar(content: Text(msg));
ScaffoldMessenger.of(context).showSnackBar(snackBar); ScaffoldMessenger.of(context).showSnackBar(snackBar);
//scaffoldKeyLogin.currentState!.showSnackBar(snackBar);
} }
String textFieldsValidation(LoginProvider provider) { String textFieldsValidation(LoginProvider provider) {

14
lib/view/login_components/care_view.dart
View File

@ -82,6 +82,20 @@ class CareView extends StatelessWidget {
// // width: MediaQuery.of(context).size.width, // // width: MediaQuery.of(context).size.width,
// // height: MediaQuery.of(context).size.height, // // height: MediaQuery.of(context).size.height,
// ), // ),
Align(
alignment: Alignment.centerRight,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(100),
topLeft: Radius.circular(100)),
color: const Color.fromARGB(255, 167, 203, 234),
shape: BoxShape.rectangle,
),
height: MediaQuery.of(context).size.height / 2,
width: MediaQuery.of(context).size.width / 4,
),
),
Container( Container(
padding: const EdgeInsets.only(bottom: 100), padding: const EdgeInsets.only(bottom: 100),
child: Column( child: Column(

2
lib/widgets/home_drawer.dart
View File

@ -279,7 +279,7 @@ class _HomeDrawerState extends State<HomeDrawer> {
child: ListView.builder( child: ListView.builder(
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.all(0.0), padding: const EdgeInsets.all(0.0),
itemCount: drawerList?.length, itemCount: drawerList?.length ?? 0,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
return inkwell(drawerList![index]); return inkwell(drawerList![index]);
}, },

30
pubspec.lock
View File

@ -253,10 +253,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.18.0" version: "1.19.0"
connectivity_plus: connectivity_plus:
dependency: "direct main" dependency: "direct main"
description: description:
@ -892,18 +892,18 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.5" version: "10.0.7"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.5" version: "3.0.8"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
@ -1340,7 +1340,7 @@ packages:
dependency: transitive dependency: transitive
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.99" version: "0.0.0"
sliver_tools: sliver_tools:
dependency: transitive dependency: transitive
description: description:
@ -1401,10 +1401,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.11.1" version: "1.12.0"
state_notifier: state_notifier:
dependency: transitive dependency: transitive
description: description:
@ -1433,10 +1433,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.0" version: "1.3.0"
syncfusion_flutter_charts: syncfusion_flutter_charts:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1489,10 +1489,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.2" version: "0.7.3"
textfield_tags: textfield_tags:
dependency: "direct dev" dependency: "direct dev"
description: description:
@ -1641,10 +1641,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "14.2.5" version: "14.3.0"
watcher: watcher:
dependency: transitive dependency: transitive
description: description: