diff --git a/.env b/.env deleted file mode 100644 index 4d94932..0000000 --- a/.env +++ /dev/null @@ -1,7 +0,0 @@ -BACKEND_URL='http://10.0.2.2:4320' -# BACKEND_SERVER='https://ocboapps.davaocity.gov.ph/esign-server' - -HEAD=ARCH. KHASHAYAR L. TOGHYANI -PESO=₱ -HEADID=276 -PUBLICIP=58.69.136.59 \ No newline at end of file diff --git a/lib/functions/get_api.dart b/lib/functions/get_api.dart deleted file mode 100644 index 139d47e..0000000 --- a/lib/functions/get_api.dart +++ /dev/null @@ -1,27 +0,0 @@ -import 'dart:convert'; -import 'package:dio/dio.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; -import 'package:dio_smart_retry/dio_smart_retry.dart'; - -Future> getApi(String method, String? data, String? data2) async { - final dio = Dio(); - dio.interceptors.add(RetryInterceptor(dio: dio, retries: 3, retryDelays: const [Duration(seconds: 1)])); - - final url = dotenv.env['BACKEND_URL']; - - late String endpoint; - if (data != null && data2 != null) { - endpoint = '$method/$data/$data2/fetch-data'; - } else if (data != null) { - endpoint = '$method/$data/fetch-data'; - } else { - endpoint = method; - } - - final response = await dio.get('$url/api/$endpoint'); - final status = response.statusCode; - final result = status == 200 ? json.encode(response.data) : json.encode(null); - final Map resultMap = json.decode(result); - - return resultMap; -} diff --git a/lib/main.dart b/lib/main.dart index 8370435..d8b8c43 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:go_router/go_router.dart'; import 'package:ocbo_esign_validator/pages/approval_page.dart'; import 'package:ocbo_esign_validator/pages/index_page.dart'; @@ -7,8 +6,7 @@ import 'package:ocbo_esign_validator/pages/login_page.dart'; import 'package:ocbo_esign_validator/pages/validate_page.dart'; import 'package:ocbo_esign_validator/pages/validation_result_page.dart'; -Future main() async { - await dotenv.load(fileName: ".env"); +void main() { runApp(const MyApp()); } diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index f6b4a84..9fbf443 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -1,10 +1,5 @@ -import 'dart:developer'; - import 'package:flutter/material.dart'; -import 'package:flutter_dotenv/flutter_dotenv.dart'; import 'package:gap/gap.dart'; -import 'package:hashlib/hashlib.dart'; -import 'package:ocbo_esign_validator/functions/get_api.dart'; import 'package:ocbo_esign_validator/widgets/box_widget.dart'; import 'package:ocbo_esign_validator/widgets/button_widget.dart'; import 'package:ocbo_esign_validator/widgets/image_widget.dart'; @@ -20,8 +15,7 @@ class LoginPage extends StatefulWidget { class _LoginPageState extends State { final _passwordController = TextEditingController(); - final _approver = dotenv.env['HEAD']!; - final _approverId = dotenv.env['HEADID']!; + final _approver = "ARCH. KHASHAYAR L. TOGHYANI"; late ValueNotifier passwordNotifier; @override @@ -33,45 +27,8 @@ class _LoginPageState extends State { }); } - Future _checkConnection() async { - try { - final connection = await getApi('check-connection', null, null); - return connection["result"]; - } catch (e) { - return false; - } - } - - Future _getPassword(String employeeid) async { - try { - final response = await getApi('get-password', employeeid, null); - return (response["result"]); - } catch (e) { - return "0"; - } - } - - Future _securePassword(String password) async { - final firstHash = sha1.string(password); - final secondHash = sha384.string(firstHash.toString()); - final thirdHash = sha1.string(secondHash.toString()); - - return thirdHash.toString(); - } - - void _login() async { - final connected = await _checkConnection(); - - if (connected) { - final employeeid = _approverId; - final dbpassword = await _getPassword(employeeid); - final hashPassword = await _securePassword(_passwordController.text); - if (dbpassword == hashPassword) { - log('yeah'); - } else { - log('no'); - } - } + void _login() { + debugPrint("Login button clicked"); } void _ignoreButton() {} diff --git a/lib/pages/validate_page.dart b/lib/pages/validate_page.dart index 47b5035..d1eca99 100644 --- a/lib/pages/validate_page.dart +++ b/lib/pages/validate_page.dart @@ -43,20 +43,11 @@ class _BarcodeScannerScreenState extends State { ), child: Center( child: Padding( - padding: const EdgeInsets.only(top: 88, left: 16, right: 16), + padding: const EdgeInsets.only(top: 64, left: 16, right: 16), child: Column( children: [ - Container( - padding: EdgeInsets.only(top: 8, bottom: 8, left: 20, right: 20), - decoration: BoxDecoration( - color: Color.fromARGB(149, 16, 22, 28), - borderRadius: BorderRadius.circular(8), - ), - child: TextWidget(text: 'Scan OCBO e-Sign QR Code', size: 14, bold: true), - ), - Gap(50), - SizedBox( - height: 350, + Expanded( + flex: 2, child: ClipRRect( borderRadius: BorderRadius.circular(20), // Adjust the radius as needed child: MobileScanner( @@ -72,6 +63,15 @@ class _BarcodeScannerScreenState extends State { ), ), ), + Expanded( + flex: 2, + child: Column( + children: [ + Gap(20), + TextWidget(text: 'Scan OCBO e-Sign QR', size: 20, bold: true), + ], + ), + ), ], ), ), diff --git a/pubspec.lock b/pubspec.lock index 031a2f2..d92b9b9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,30 +1,6 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - adaptive_dialog: - dependency: "direct main" - description: - name: adaptive_dialog - sha256: "46e235feb99475d36a55fb6a424fe4e4aea1235c41089b847c4a20087582f029" - url: "https://pub.dev" - source: hosted - version: "2.6.0" - animations: - dependency: transitive - description: - name: animations - sha256: "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - appkit_ui_element_colors: - dependency: transitive - description: - name: appkit_ui_element_colors - sha256: b88a7c35d440fa3ac75222d0e2b7e3259200e531e33b5d2468e358119f3481dc - url: "https://pub.dev" - source: hosted - version: "1.0.1" args: dependency: transitive description: @@ -113,14 +89,6 @@ packages: url: "https://pub.dev" source: hosted version: "5.9.0" - dio_smart_retry: - dependency: "direct main" - description: - name: dio_smart_retry - sha256: c8e20da5f49289fa7dce5c9c6b5b120928e3661aefa0fa2d206ea6d93f580928 - url: "https://pub.dev" - source: hosted - version: "7.0.1" dio_web_adapter: dependency: transitive description: @@ -129,14 +97,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - dynamic_color: - dependency: transitive - description: - name: dynamic_color - sha256: "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c" - url: "https://pub.dev" - source: hosted - version: "1.8.1" equatable: dependency: transitive description: @@ -166,22 +126,14 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_dotenv: - dependency: "direct main" - description: - name: flutter_dotenv - sha256: d4130c4a43e0b13fefc593bc3961f2cb46e30cb79e253d4a526b1b5d24ae1ce4 - url: "https://pub.dev" - source: hosted - version: "6.0.0" flutter_lints: dependency: "direct dev" description: name: flutter_lints - sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" + sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1" url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "5.0.0" flutter_test: dependency: "direct dev" description: flutter @@ -204,10 +156,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: eff94d2a6fc79fa8b811dde79c7549808c2346037ee107a1121b4a644c745f2a + sha256: c92d18e1fe994cb06d48aa786c46b142a5633067e8297cff6b5a3ac742620104 url: "https://pub.dev" source: hosted - version: "17.0.1" + version: "17.0.0" google_fonts: dependency: "direct main" description: @@ -216,30 +168,6 @@ packages: url: "https://pub.dev" source: hosted version: "6.3.3" - gradient_borders: - dependency: transitive - description: - name: gradient_borders - sha256: "492bc88ab8d88a4117a7f00e525a669b65f19973bea7ee677f9d9de7603bf037" - url: "https://pub.dev" - source: hosted - version: "1.0.2" - hashlib: - dependency: "direct main" - description: - name: hashlib - sha256: "408af9bfb16289d433822635f0b6890e4440b74fe7acd40014983abeef6d33f0" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - hashlib_codecs: - dependency: transitive - description: - name: hashlib_codecs - sha256: "0e1a17c47792fd131a9bf49b811c394b22516287746ee14cd0b0c22a34136699" - url: "https://pub.dev" - source: hosted - version: "3.0.1" http: dependency: transitive description: @@ -264,14 +192,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.1" - intersperse: - dependency: transitive - description: - name: intersperse - sha256: "2f8a905c96f6cbba978644a3d5b31b8d86ddc44917662df7d27a61f3df66a576" - url: "https://pub.dev" - source: hosted - version: "2.0.0" leak_tracker: dependency: transitive description: @@ -300,10 +220,10 @@ packages: dependency: transitive description: name: lints - sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 + sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 url: "https://pub.dev" source: hosted - version: "6.0.0" + version: "5.1.1" logging: dependency: transitive description: @@ -312,22 +232,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" - macos_ui: - dependency: transitive - description: - name: macos_ui - sha256: "09fb51d65b6a2d328ba5aa429ba0f7aabad5bc770193ea6e49da9f29bf95d835" - url: "https://pub.dev" - source: hosted - version: "2.2.2" - macos_window_utils: - dependency: transitive - description: - name: macos_window_utils - sha256: d4df3501fd32ac0d2d7590cb6a8e4758337d061c8fa0db816fdd636be63a8438 - url: "https://pub.dev" - source: hosted - version: "1.9.0" matcher: dependency: transitive description: @@ -456,6 +360,30 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.8" + qr: + dependency: transitive + description: + name: qr + sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + qr_code_scanner_plus: + dependency: "direct main" + description: + name: qr_code_scanner_plus + sha256: b764e5004251c58d9dee0c295e6006e05bd8d249e78ac3383abdb5afe0a996cd + url: "https://pub.dev" + source: hosted + version: "2.0.14" + qr_flutter: + dependency: "direct main" + description: + name: qr_flutter + sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097" + url: "https://pub.dev" + source: hosted + version: "4.1.0" sky_engine: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index d66982f..2720231 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,22 +15,19 @@ dependencies: go_router: ^17.0.0 gap: ^3.0.1 internet_connection_checker: ^3.0.1 + qr_flutter: ^4.1.0 + qr_code_scanner_plus: ^2.0.14 mobile_scanner: ^7.1.3 dio: ^5.9.0 - flutter_dotenv: ^6.0.0 - dio_smart_retry: ^7.0.1 - hashlib: ^2.2.0 - adaptive_dialog: ^2.6.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^6.0.0 + flutter_lints: ^5.0.0 flutter: uses-material-design: true assets: - - .env - assets/logo.png