Skip to content

F
feelver
Commit c2e95add by art
Options

update

parents a73af0d6 4f2a7a1b
Showing with 153 additions and 27 deletions
lib/model/Login/login_model.dart
......@@ -3,10 +3,7 @@ class LoginModel {
int expires;
User user;
LoginModel({this.token,
this.expires,
this.user
});
LoginModel({this.token, this.expires, this.user});
LoginModel.fromJson(Map<String, dynamic> json) {
token = json['token'];
......@@ -27,17 +24,17 @@ class LoginModel {
class User {
int id;
String roleId;
Null roleId;
String name;
String email;
String avatar;
String emailVerifiedAt;
Null emailVerifiedAt;
int status;
int fvRoleId;
String settings;
String createdAt;
String updatedAt;
String customerInfo;
Null settings;
Null createdAt;
Null updatedAt;
CustomerInfo customerInfo;
User(
{this.id,
......@@ -65,23 +62,112 @@ class User {
settings = json['settings'];
createdAt = json['created_at'];
updatedAt = json['updated_at'];
customerInfo = json['customer_info'];
customerInfo = json['customer_info'] != null
? new CustomerInfo.fromJson(json['customer_info'])
: null;
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id']= this.id;
data['role_id']==null?[]: data['role_id'] = this.roleId;
data['id'] = this.id;
data['role_id'] = this.roleId;
data['name'] = this.name;
data['email'] = this.email;
data['avatar'] = this.avatar;
data['email_verified_at']==null?[]: data['email_verified_at'] = this.emailVerifiedAt;
data['email_verified_at'] = this.emailVerifiedAt;
data['status'] = this.status;
data['fv_role_id'] = this.fvRoleId;
data['settings']==null?[]: data['settings'] = this.settings;
data['created_at']==null?[]: data['created_at'] = this.createdAt;
data['updated_at']==null?[]: data['updated_at'] = this.updatedAt;
data['customer_info']==null?[]: data['customer_info'] = this.customerInfo;
data['settings'] = this.settings;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
if (this.customerInfo != null) {
data['customer_info'] = this.customerInfo.toJson();
}
return data;
}
}
class CustomerInfo {
int id;
String prefix;
String name;
String lastname;
String displayName;
String image;
String email;
String age;
String sex;
String phone;
String address;
String socialRegister;
String socialType;
String status;
String approved;
String createdAt;
String updatedAt;
int userId;
CustomerInfo(
{this.id,
this.prefix,
this.name,
this.lastname,
this.displayName,
this.image,
this.email,
this.age,
this.sex,
this.phone,
this.address,
this.socialRegister,
this.socialType,
this.status,
this.approved,
this.createdAt,
this.updatedAt,
this.userId});
CustomerInfo.fromJson(Map<String, dynamic> json) {
id = json['id'];
prefix = json['prefix'];
name = json['name'];
lastname = json['lastname'];
displayName = json['display_name'];
image = json['image'];
email = json['email'];
age = json['age'];
sex = json['sex'];
phone = json['phone'];
address = json['address'];
socialRegister = json['social_register'];
socialType = json['social_type'];
status = json['status'];
approved = json['approved'];
createdAt = json['created_at'];
updatedAt = json['updated_at'];
userId = json['user_id'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['id'] = this.id;
data['prefix'] = this.prefix;
data['name'] = this.name;
data['lastname'] = this.lastname;
data['display_name'] = this.displayName;
data['image'] = this.image;
data['email'] = this.email;
data['age'] = this.age;
data['sex'] = this.sex;
data['phone'] = this.phone;
data['address'] = this.address;
data['social_register'] = this.socialRegister;
data['social_type'] = this.socialType;
data['status'] = this.status;
data['approved'] = this.approved;
data['created_at'] = this.createdAt;
data['updated_at'] = this.updatedAt;
data['user_id'] = this.userId;
return data;
}
}
lib/model/register/register_model.dart 0 → 100644
class RegisterModel {
String message;
RegisterModel({this.message});
RegisterModel.fromJson(Map<String, dynamic> json) {
message = json['message'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['message'] = this.message;
return data;
}
}
lib/service/api.dart
......@@ -2,6 +2,7 @@ import 'dart:convert';
import 'package:feelverapp/model/Login/login_model.dart';
import 'package:feelverapp/model/base/base.dart';
import 'package:feelverapp/model/register/register_model.dart';
import 'package:http/http.dart' as http;
......@@ -40,6 +41,27 @@ class Api<T>{
}
Future<Response<T>> register(Object body) async {
var _model;
var _fail;
var result;
// (body as Map)['lang'] = allTranslations.currentLanguage;
await _httpConnection(
"${this._baseApi}/register", this._headerApi, body)
.then((response) {
print("ผลลัพ เท่ากับบบบ "+"${response.body}");
if (response.statusCode == 200 ) {
_model = RegisterModel.fromJson(json.decode(response.body));
} else {
_fail = FailModel.fromJson(json.decode(response.body));
}
result = new Response<T>(_model, _fail);
});
return result;
}
///api environment
Future<http.Response> _httpConnection(
......
lib/ui/login/login.dart
import 'package:feelverapp/ui/home/home.dart';
import 'package:feelverapp/ui/login/login_presenter.dart';
//import 'package:feelverapp/ui/login/login_presenter.dart';
import 'package:feelverapp/ui/register/register_email.dart';
//import 'package:feelverapp/ui/login/login_presenter.dart';
import 'package:feelverapp/util/SizeConfig.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
......@@ -421,13 +422,13 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
size: 20,
),
),
Text(
'Login with Facebook',
style: TextStyle(
fontSize: SizeConfig.getFontSize(12),
),
textAlign: TextAlign.center,
),
// Text(
// 'Login with Facebook',
// style: TextStyle(fontSize: SizeConfig.getFontSize(12)),
// textAlign: TextAlign.center,
// ),
],
),
),
......@@ -476,9 +477,11 @@ class _LoginPageState extends State<LoginPage> with TickerProviderStateMixin {
alignment: Alignment.centerRight,
child: GestureDetector(
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => RegisterPage()),
MaterialPageRoute(builder: (context) => Registerpage()),
);
},
child: Text(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment