Skip to content

Commit

Permalink
Merge pull request #22 from FlyX-Official/mahesh-latest
Browse files Browse the repository at this point in the history
Login Stable
  • Loading branch information
Mravuri96 authored Apr 19, 2019
2 parents 251b643 + a6a2c41 commit 9907447
Show file tree
Hide file tree
Showing 63 changed files with 3,154 additions and 29 deletions.
62 changes: 37 additions & 25 deletions lib/HomePage/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:flyx/Json/data.dart';

import 'package:flyx/Auth/auth.dart';
import 'package:flyx/HomePage/oldhome.dart';
import 'package:flyx/JsonClasses/post.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:geohash/geohash.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
Expand All @@ -18,8 +19,6 @@ import 'package:rubber/rubber.dart';
import 'package:http/http.dart' as http;
import 'package:date_range_picker/date_range_picker.dart' as DateRangePicker;

final GoogleSignIn _googleSignIn = GoogleSignIn();

class HomePage extends StatefulWidget {
HomePage({Key key}) : super(key: key);

Expand Down Expand Up @@ -587,34 +586,47 @@ class _HomePageState extends State<HomePage>
});
}

Map<String, Object> postToHerokuServerData() {
return {
'oneWay': false,
'from': "${_from.text}",
'to': '${_to.text}',
'radiusFrom': _fromSlider,
'radiusTo': _toSlider,
"departureWindow": {
'start': _originDate[0].toString(),
'end': _originDate[1].toString(),
}, //_originDate.toList(),
"returnDepartureWindow": {
'start': _destinationDate[0].toString(),
'end': _destinationDate[1].toString(),
}, // _destinationDate.toList(),
//"TimeStamp": DateTime.now(),
};
}
// Map<String, Object> postToHerokuServerData() {
// return {
// 'oneWay': false,
// 'from': "${_from.text}",
// 'to': '${_to.text}',
// 'radiusFrom': _fromSlider,
// 'radiusTo': _toSlider,
// "departureWindow": {
// 'start': _originDate[0].toString(),
// 'end': _originDate[1].toString(),
// }, //_originDate.toList(),
// "returnDepartureWindow": {
// 'start': _destinationDate[0].toString(),
// 'end': _destinationDate[1].toString(),
// }, // _destinationDate.toList(),
// //"TimeStamp": DateTime.now(),
// };
// }

postToHerokuServer() {
var testData = postToHerokuServerData();
var testDataEnc = json.encode(testData);
print(testDataEnc);
var url =
String url =
"https://flyx-web-hosted.herokuapp.com/search"; //https://olivine-pamphlet.glitch.me/testpost";
http.post(
url,
body: testDataEnc,
body: postToJson(
Post(
oneWay: false,
from: "${_from.text}",
to: '${_to.text}',
radiusFrom: _fromSlider,
radiusTo: _toSlider,
departureWindow: DepartureWindow(
start: DateTime.parse(_originDate[0].toString()),
end: DateTime.parse(_originDate[1].toString()),
),
returnDepartureWindow: ReturnDepartureWindow(
start: DateTime.parse(_destinationDate[0].toString()),
end: DateTime.parse(_destinationDate[1].toString()),
),
),
),
headers: {"Content-Type": "application/json"},
).then(
(response) {
Expand Down
3 changes: 0 additions & 3 deletions lib/HomePage/oldhome.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1551,8 +1551,6 @@ class PageItem extends StatelessWidget {
final List data;
@override
Widget build(BuildContext context) {


final MediaQueryData mediaQuery = MediaQuery.of(context);

return Stack(children: <Widget>[
Expand Down Expand Up @@ -2040,5 +2038,4 @@ class PageItem extends StatelessWidget {
}
}


// Login Page Code
95 changes: 95 additions & 0 deletions lib/JsonClasses/post.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
// To parse this JSON data, do
//
// final post = postFromJson(jsonString);

import 'dart:convert';

Post postFromJson(String str) {
final jsonData = json.decode(str);
return Post.fromJson(jsonData);
}

String postToJson(Post data) {
final dyn = data.toJson();
return json.encode(dyn);
}

class Post {
bool oneWay;
String from;
String to;
double radiusFrom;
double radiusTo;
DepartureWindow departureWindow;
ReturnDepartureWindow returnDepartureWindow;

Post({
this.oneWay,
this.from,
this.to,
this.radiusFrom,
this.radiusTo,
this.departureWindow,
this.returnDepartureWindow,
});

factory Post.fromJson(Map<String, dynamic> json) => new Post(
oneWay: json["oneWay"] == null ? null : json["oneWay"],
from: json["from"] == null ? null : json["from"],
to: json["to"] == null ? null : json["to"],
radiusFrom: json["radiusFrom"] == null ? null : json["radiusFrom"].toDouble(),
radiusTo: json["radiusTo"] == null ? null : json["radiusTo"].toDouble(),
departureWindow: json["departureWindow"] == null ? null : DepartureWindow.fromJson(json["departureWindow"]),
returnDepartureWindow: json["returnDepartureWindow"] == null ? null : ReturnDepartureWindow.fromJson(json["returnDepartureWindow"]),
);

Map<String, dynamic> toJson() => {
"oneWay": oneWay == null ? null : oneWay,
"from": from == null ? null : from,
"to": to == null ? null : to,
"radiusFrom": radiusFrom == null ? null : radiusFrom,
"radiusTo": radiusTo == null ? null : radiusTo,
"departureWindow": departureWindow == null ? null : departureWindow.toJson(),
"returnDepartureWindow": returnDepartureWindow == null ? null : returnDepartureWindow.toJson(),
};
}

class DepartureWindow {
DateTime start;
DateTime end;

DepartureWindow({
this.start,
this.end,
});

factory DepartureWindow.fromJson(Map<String, dynamic> json) => new DepartureWindow(
start: json["start"] == null ? null : DateTime.parse(json["start"]),
end: json["end"] == null ? null : DateTime.parse(json["end"]),
);

Map<String, dynamic> toJson() => {
"start": start == null ? null : start.toIso8601String(),
"end": end == null ? null : end.toIso8601String(),
};
}

class ReturnDepartureWindow {
DateTime start;
DateTime end;

ReturnDepartureWindow({
this.start,
this.end,
});

factory ReturnDepartureWindow.fromJson(Map<String, dynamic> json) => new ReturnDepartureWindow(
start: json["start"] == null ? null : DateTime.parse(json["start"]),
end: json["end"] == null ? null : DateTime.parse(json["end"]),
);

Map<String, dynamic> toJson() => {
"start": start == null ? null : start.toIso8601String(),
"end": end == null ? null : end.toIso8601String(),
};
}
Loading

0 comments on commit 9907447

Please sign in to comment.