Merge pull request #4 from LEG-Industries/registration

Registration
This commit is contained in:
Benjamin Ramhorst 2022-02-11 18:15:06 +00:00 committed by GitHub
commit d3381b2e46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 549 additions and 5 deletions

View file

@ -1,6 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.legbarkr.leg_barkr_app"> package="com.legbarkr.leg_barkr_app">
<application <uses-permission android:name="android.permission.INTERNET"/>
<application
android:label="leg_barkr_app" android:label="leg_barkr_app"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
@ -34,5 +35,5 @@
<meta-data <meta-data
android:name="flutterEmbedding" android:name="flutterEmbedding"
android:value="2" /> android:value="2" />
</application> </application>
</manifest> </manifest>

60
lib/firebase_options.dart Normal file
View file

@ -0,0 +1,60 @@
// File generated by FlutterFire CLI.
// ignore_for_file: lines_longer_than_80_chars
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart'
show defaultTargetPlatform, kIsWeb, TargetPlatform;
/// Default [FirebaseOptions] for use with your Firebase apps.
///
/// Example:
/// ```dart
/// import 'firebase_options.dart';
/// // ...
/// await Firebase.initializeApp(
/// options: DefaultFirebaseOptions.currentPlatform,
/// );
/// ```
class DefaultFirebaseOptions {
static FirebaseOptions get currentPlatform {
if (kIsWeb) {
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for web - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
}
// ignore: missing_enum_constant_in_switch
switch (defaultTargetPlatform) {
case TargetPlatform.android:
return android;
case TargetPlatform.iOS:
return ios;
case TargetPlatform.macOS:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for macos - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
}
throw UnsupportedError(
'DefaultFirebaseOptions are not supported for this platform.',
);
}
static const FirebaseOptions android = FirebaseOptions(
apiKey: 'AIzaSyAmUEAR1SB7bf29XoGNpOExo_GWoNl68J8',
appId: '1:903921644523:android:8b1be795cfa3b71a079fae',
messagingSenderId: '903921644523',
projectId: 'leg-barkr',
storageBucket: 'leg-barkr.appspot.com',
);
static const FirebaseOptions ios = FirebaseOptions(
apiKey: 'AIzaSyA6haaqDGLGt5gYLc_z1r0P-jWl0bF3Xlc',
appId: '1:903921644523:ios:9294b2d611ff71fc079fae',
messagingSenderId: '903921644523',
projectId: 'leg-barkr',
storageBucket: 'leg-barkr.appspot.com',
iosClientId: '903921644523-cq15mvp7kj64spro7ugkh781kvp4bm42.apps.googleusercontent.com',
iosBundleId: 'com.legbarkr.app',
);
}

View file

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:leg_barkr_app/view/metrics/metrics_page.dart'; import 'package:leg_barkr_app/view/metrics/metrics_page.dart';
import 'package:leg_barkr_app/view/steps/steps_page.dart'; import 'package:leg_barkr_app/view/steps/steps_page.dart';
import 'package:leg_barkr_app/view/map_page.dart'; import 'package:leg_barkr_app/view/map_page.dart';
@ -15,6 +16,16 @@ class _HomeScreenState extends State<HomeScreen> {
int _page = 0; int _page = 0;
PageController _pageController = PageController(); PageController _pageController = PageController();
_HomeScreenState(){
FirebaseAuth.instance
.authStateChanges()
.listen((User? user) {
if (user == null) {
Navigator.pushNamed(context, "/login");
}
});
}
void onBottomBarPressed(int page) { void onBottomBarPressed(int page) {
setState(() { setState(() {
_page = page; _page = page;

View file

@ -1,10 +1,18 @@
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:leg_barkr_app/home.dart'; import 'package:leg_barkr_app/home.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:leg_barkr_app/view/auth/login_form.dart';
import 'package:leg_barkr_app/view/auth/register_form.dart';
import 'firebase_options.dart';
void main() { void main() async {
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(statusBarColor: Colors.black12)); SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(statusBarColor: Colors.black12));
runApp(const Main()); WidgetsFlutterBinding.ensureInitialized();
await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform,
);
runApp(Main());
} }
class Main extends StatelessWidget { class Main extends StatelessWidget {
@ -14,7 +22,13 @@ class Main extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MaterialApp( return MaterialApp(
theme: ThemeData.light(), theme: ThemeData.light(),
home: HomeScreen() //home: HomeScreen(),
initialRoute: '/',
routes: {
'/': (context) => const HomeScreen(),
'/login': (context) => const LoginForm(),
'/register': (context) => const RegisterForm()
}
); );
} }
} }

3
lib/utils/endpoints.dart Normal file
View file

@ -0,0 +1,3 @@
const String home = "https://leg-barkr.nw.r.appspot.com/";
const String register = "https://leg-barkr.nw.r.appspot.com/authentication/register";
const String verify = "https://leg-barkr.nw.r.appspot.com/authentication/verify";

7
lib/utils/resources.dart Normal file
View file

@ -0,0 +1,7 @@
import 'package:flutter/material.dart';
class Resources {
static final Color primaryColour = Colors.green;
static final Color primaryAccentColour = Colors.greenAccent;
}

View file

@ -0,0 +1,150 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
class LoginForm extends StatefulWidget {
const LoginForm({Key? key}) : super(key: key);
@override
_LoginFormState createState() => _LoginFormState();
}
class _LoginFormState extends State<LoginForm> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
late String _email, _password;
bool _loggingIn = false;
void attemptLogin(){
final form = _formKey.currentState;
if (form!.validate()) {
form.save();
setState(() { _loggingIn = true; });
loginUser();
} else {
setState(() { _loggingIn = false; });
}
}
Future<void> loginUser() async {
try {
await FirebaseAuth.instance.signInWithEmailAndPassword(email: _email, password: _password);
Navigator.pushNamed(context, "/");
} on FirebaseAuthException catch (e) {
if (e.code == 'user-not-found') {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Invalid email")));
setState(() { _loggingIn = false; });
} else if (e.code == 'wrong-password') {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Incorrect password")));
setState(() { _loggingIn = false; });
}
}
}
@override
Widget build(BuildContext context) {
final TextFormField emailInput = TextFormField(
autofocus: false,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'Email',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) => value!.isEmpty ? "Please enter email" : null,
onSaved: (value) => _email = value!,
);
final TextFormField passwordInput = TextFormField(
autofocus: false,
obscureText: true,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'Password',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) => value!.isEmpty ? "Please enter password" : null,
onSaved: (value) => _password = value!,
);
final Container loading = Container(
alignment: Alignment.center,
child: CircularProgressIndicator(
backgroundColor: Colors.green,
color: Colors.green,
),
);
final Container loginBtn = Container(
width: double.infinity,
height: 50,
child: ElevatedButton(
onPressed: attemptLogin,
child: Text('Sign In'),
style: ElevatedButton.styleFrom(
alignment: Alignment.center,
primary: Colors.green,
)
)
);
final Container registerBtn = Container(
width: double.infinity,
height: 50,
child: ElevatedButton(
onPressed: (){ Navigator.pushNamed(context, '/register'); },
child: Text('No account? Register now!',
style: TextStyle(
color: Colors.black,
fontSize: 15
)
),
style: ElevatedButton.styleFrom(
alignment: Alignment.center,
primary: Colors.white,
side: BorderSide(
color: Colors.green,
width: 2
)
)
)
);
return Scaffold(
appBar: null,
body: Center(
child: SingleChildScrollView(
child: Form(
key: _formKey,
child:Container(
padding: EdgeInsets.all(10),
child: Column(
children: [
emailInput,
SizedBox(height: 20),
passwordInput,
SizedBox(height: 20),
_loggingIn ? loading : loginBtn,
SizedBox(height: 20),
_loggingIn ? Text("") : registerBtn
]
)
)
),
)
)
);
}
}

View file

@ -0,0 +1,239 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:leg_barkr_app/home.dart';
import 'package:leg_barkr_app/utils/endpoints.dart' as Endpoints;
import 'package:leg_barkr_app/view/auth/login_form.dart';
class RegisterForm extends StatefulWidget {
const RegisterForm({Key? key}) : super(key: key);
@override
_RegisterFormState createState() => _RegisterFormState();
}
class _RegisterFormState extends State<RegisterForm> {
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
late String _firstName, _lastName, _email, _password, _confirmPassword, _deviceId;
bool _registering = false;
void attemptRegistration(){
final form = _formKey.currentState;
if (form!.validate()) {
form.save();
if (_password != _confirmPassword) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Passwords do not match")));
setState(() { _registering = false; });
}
form.save();
setState(() { _registering = true; });
registerUser();
} else {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Please enter all required fields")));
setState(() { _registering = false; });
}
}
void registerUser() async {
final response = await http.post(
Uri.parse(Endpoints.register),
headers: <String, String>{
'Content-Type': 'application/json; charset=UTF-8',
},
body: jsonEncode(<String, String>{
'name': _firstName + _lastName,
'deviceid': _deviceId,
'email': _email,
'password': _password
}),
);
if (response.statusCode == 201){
Navigator.push(context, MaterialPageRoute(builder: (context) => LoginForm()));
} else if (response.statusCode == 400){
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Fields missing!")));
} else if (response.statusCode == 409){
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("User with given email already exists")));
} else {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text("Failed registration, please try again later")));
}
setState(() {
_registering = false;
});
}
@override
Widget build(BuildContext context) {
final TextFormField firstNameInput = TextFormField(
autofocus: false,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'First Name',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) => value!.isEmpty ? "Please enter first name" : null,
onSaved: (value) => _firstName = value!,
);
final TextFormField lastNameInput = TextFormField(
autofocus: false,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'Last Name',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) => value!.isEmpty ? "Please enter last name" : null,
onSaved: (value) => _lastName = value!,
);
final TextFormField deviceInput = TextFormField(
autofocus: false,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'Device ID',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) => value!.isEmpty ? "Please enter device ID" : null,
onSaved: (value) => _deviceId = value!,
);
final TextFormField emailInput = TextFormField(
autofocus: false,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'Email',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) => value!.isEmpty ? "Please enter email" : null,
onSaved: (value) => _email = value!,
);
final TextFormField passwordInput = TextFormField(
autofocus: false,
obscureText: true,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'Password',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) {
if (value == null || value.isEmpty) {
return 'Please enter password';
}
return null;
},
onSaved: (value) => _password = value!,
);
final TextFormField confirmPasswordInput = TextFormField(
autofocus: false,
obscureText: true,
cursorColor: Colors.green,
decoration: const InputDecoration(
border: OutlineInputBorder(),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Colors.green,
width: 2
)
),
hintText: 'Confirm password',
//labelStyle: TextStyle(color: Colors.green),
),
validator: (value) {
if (value == null || value.isEmpty) {
return 'Please confirm password';
}
return null;
},
onSaved: (value) => _confirmPassword = value!,
);
final Container loading = Container(
alignment: Alignment.center,
child: CircularProgressIndicator(
backgroundColor: Colors.green,
color: Colors.green,
),
);
final Container registerBtn = Container(
width: double.infinity,
height: 50,
child: ElevatedButton(
onPressed: attemptRegistration,
child: Text('Register'),
style: ElevatedButton.styleFrom(
alignment: Alignment.center,
primary: Colors.green,
)
)
);
return Scaffold(
appBar: null,
body: SingleChildScrollView(
child: Form(
key: _formKey,
child:Container(
padding: EdgeInsets.all(10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 100),
firstNameInput,
SizedBox(height: 20),
lastNameInput,
SizedBox(height: 20),
deviceInput,
SizedBox(height: 20),
emailInput,
SizedBox(height: 20),
passwordInput,
SizedBox(height: 20),
confirmPasswordInput,
SizedBox(height: 20),
_registering ? loading : registerBtn
]
)
)
),
)
);
}
}

View file

@ -78,6 +78,48 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.0"
firebase_auth:
dependency: "direct main"
description:
name: firebase_auth
url: "https://pub.dartlang.org"
source: hosted
version: "3.3.7"
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.11"
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
url: "https://pub.dartlang.org"
source: hosted
version: "3.3.7"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
url: "https://pub.dartlang.org"
source: hosted
version: "1.12.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "4.2.4"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.4"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -142,6 +184,20 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.15.0" version: "0.15.0"
http:
dependency: "direct main"
description:
name: http
url: "https://pub.dartlang.org"
source: hosted
version: "0.13.4"
http_parser:
dependency: transitive
description:
name: http_parser
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.0"
intl: intl:
dependency: transitive dependency: transitive
description: description:

View file

@ -38,6 +38,9 @@ dependencies:
google_maps_flutter_web: ^0.3.2+1 google_maps_flutter_web: ^0.3.2+1
charts_flutter: ^0.12.0 charts_flutter: ^0.12.0
syncfusion_flutter_gauges: ^19.4.50 syncfusion_flutter_gauges: ^19.4.50
http: ^0.13.4
firebase_core: ^1.12.0
firebase_auth: ^3.3.7
dev_dependencies: dev_dependencies: