Merge pull request #52 from nimblehq/release/0.2.0

[Release] 0.2.0

.env.sample

@@ -1,2 +1,3 @@
-SECRET=
 REST_API_ENDPOINT=
+CLIENT_ID=
+CLIENT_SECRET=

integration_test/utils/test_util.dart

@@ -9,7 +9,7 @@ class TestUtil {
   /// localization, routes, etc)
   static Widget pumpWidgetWithRealApp(String initialRoute) {
     _initDependencies();
-    return MyApp();
+    return App();
   }
 
   /// We normally use this function to test a specific [widget] without

ios/Podfile.lock

@@ -37,4 +37,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 632d6ac0b577d6e268ff7a13a105bbc4f7941989
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.12.1

lib/api/authentication_api_service.dart

@@ -0,0 +1,17 @@
+import 'package:dio/dio.dart';
+import 'package:survey_flutter/model/request/login_request.dart';
+import 'package:survey_flutter/model/response/login_response.dart';
+import 'package:retrofit/retrofit.dart';
+
+part 'authentication_api_service.g.dart';
+
+@RestApi()
+abstract class AuthenticationApiService {
+  factory AuthenticationApiService(Dio dio, {String baseUrl}) =
+      _AuthenticationApiService;
+
+  @POST('/oauth/token')
+  Future<LoginResponse> login(
+    @Body() LoginRequest body,
+  );
+}

lib/api/response_decoder.dart

@@ -0,0 +1,7 @@
+import 'package:japx/japx.dart';
+
+class ResponseDecoder {
+  static Map<String, dynamic> decode(Map<String, dynamic> json) {
+    return Japx.decode(json)['data'];
+  }
+}

lib/env.dart

@@ -4,4 +4,12 @@ class Env {
   static String get restApiEndpoint {
     return FlutterConfig.get('REST_API_ENDPOINT');
   }
+
+  static String get clientId {
+    return FlutterConfig.get('CLIENT_ID');
+  }
+
+  static String get clientSecret {
+    return FlutterConfig.get('CLIENT_SECRET');
+  }
 }

lib/l10n/app_en.arb

@@ -1,3 +1,7 @@
 {
-  "hello": "Hello!"
+    "emailInputHint": "Email",
+    "passwordInputHint": "Password",
+    "loginButton": "Log in",
+    "invalidEmailError": "Please enter the valid email format.",
+    "invalidPasswordError": "Password must be at least 8 characters long."
 }

lib/main.dart

@@ -1,47 +1,46 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_config/flutter_config.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:survey_flutter/gen/assets.gen.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
-import 'package:package_info_plus/package_info_plus.dart';
+import 'package:survey_flutter/screens/login/login_screen.dart';
+import 'package:survey_flutter/screens/splash/splash_screen.dart';
+import 'package:survey_flutter/theme/app_theme.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   await FlutterConfig.loadEnvVariables();
-  runApp(MyApp());
+  runApp(
+    ProviderScope(
+      child: App(),
+    ),
+  );
 }
 
-const routePathRootScreen = '/';
-const routePathSecondScreen = 'second';
+const routePathSplashScreen = '/';
 
-class MyApp extends StatelessWidget {
-  MyApp({Key? key}) : super(key: key);
+class App extends StatelessWidget {
+  App({Key? key}) : super(key: key);
 
   final GoRouter _router = GoRouter(
     routes: <GoRoute>[
       GoRoute(
-        path: routePathRootScreen,
-        builder: (BuildContext context, GoRouterState state) =>
-            const HomeScreen(),
-        routes: [
-          GoRoute(
-            path: routePathSecondScreen,
-            builder: (BuildContext context, GoRouterState state) =>
-                const SecondScreen(),
-          ),
-        ],
+        path: routePathSplashScreen,
+        builder: (_, __) => const SplashScreen(),
+      ),
+      GoRoute(
+        path: routePathLoginScreen,
+        pageBuilder: (_, __) => const NoTransitionPage<void>(
+          child: LoginScreen(),
+        ),
       ),
     ],
   );
 
   @override
   Widget build(BuildContext context) {
     return MaterialApp.router(
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-        brightness: Brightness.light,
-        fontFamily: Assets.fonts.neuzeit,
-      ),
+      theme: AppTheme.light,
       localizationsDelegates: AppLocalizations.localizationsDelegates,
       supportedLocales: AppLocalizations.supportedLocales,
       routeInformationProvider: _router.routeInformationProvider,
@@ -50,62 +49,3 @@ class MyApp extends StatelessWidget {
     );
   }
 }
-
-class HomeScreen extends StatelessWidget {
-  const HomeScreen({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: FutureBuilder<PackageInfo>(
-            future: PackageInfo.fromPlatform(),
-            builder: (context, snapshot) {
-              return snapshot.hasData
-                  ? Text(snapshot.data?.appName ?? "")
-                  : const SizedBox.shrink();
-            }),
-      ),
-      body: Center(
-        child: Column(
-          children: [
-            const SizedBox(height: 24),
-            FractionallySizedBox(
-              widthFactor: 0.5,
-              child: Image.asset(
-                Assets.images.nimbleLogo.path,
-                fit: BoxFit.fitWidth,
-              ),
-            ),
-            const SizedBox(height: 24),
-            Text(AppLocalizations.of(context)!.hello),
-            Text(
-              FlutterConfig.get('SECRET'),
-              style: const TextStyle(color: Colors.black, fontSize: 24),
-            ),
-            const SizedBox(height: 24),
-            ElevatedButton(
-              onPressed: () => context.go('/$routePathSecondScreen'),
-              child: const Text("Navigate to Second Screen"),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class SecondScreen extends StatelessWidget {
-  const SecondScreen({
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text("Second Screen"),
-      ),
-    );
-  }
-}

lib/model/login_model.dart

@@ -0,0 +1,23 @@
+import 'package:equatable/equatable.dart';
+
+class LoginModel extends Equatable {
+  final String id;
+  final String accessToken;
+  final double expiresIn;
+  final String refreshToken;
+
+  const LoginModel({
+    required this.id,
+    required this.accessToken,
+    required this.expiresIn,
+    required this.refreshToken,
+  });
+
+  @override
+  List<Object?> get props => [
+        id,
+        accessToken,
+        expiresIn,
+        refreshToken,
+      ];
+}

lib/model/request/login_request.dart

@@ -0,0 +1,22 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'login_request.g.dart';
+
+@JsonSerializable()
+class LoginRequest {
+  final String grantType;
+  final String email;
+  final String password;
+  final String clientId;
+  final String clientSecret;
+
+  LoginRequest({
+    required this.grantType,
+    required this.email,
+    required this.password,
+    required this.clientId,
+    required this.clientSecret,
+  });
+
+  Map<String, dynamic> toJson() => _$LoginRequestToJson(this);
+}

lib/model/response/login_response.dart

@@ -0,0 +1,45 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:survey_flutter/api/response_decoder.dart';
+import 'package:survey_flutter/model/login_model.dart';
+
+part 'login_response.g.dart';
+
+@JsonSerializable()
+class LoginResponse {
+  final String id;
+  final String accessToken;
+  final String tokenType;
+  final double expiresIn;
+  final String refreshToken;
+  final int createdAt;
+
+  LoginResponse({
+    required this.id,
+    required this.accessToken,
+    required this.tokenType,
+    required this.expiresIn,
+    required this.refreshToken,
+    required this.createdAt,
+  });
+
+  factory LoginResponse.fromJson(Map<String, dynamic> json) =>
+      _$LoginResponseFromJson(ResponseDecoder.decode(json));
+
+  LoginModel toLoginModel() => LoginModel(
+        id: id,
+        accessToken: accessToken,
+        expiresIn: expiresIn,
+        refreshToken: refreshToken,
+      );
+
+  static LoginResponse dummy() {
+    return LoginResponse(
+      id: "",
+      accessToken: "",
+      tokenType: "",
+      expiresIn: 0,
+      refreshToken: "",
+      createdAt: 0,
+    );
+  }
+}