diff --git a/app_petty_cash/images/background_card.png b/app_petty_cash/images/background_card.png new file mode 100644 index 0000000..6b62cc1 Binary files /dev/null and b/app_petty_cash/images/background_card.png differ diff --git a/app_petty_cash/images/pizza_icon.png b/app_petty_cash/images/pizza_icon.png new file mode 100644 index 0000000..bebaff8 Binary files /dev/null and b/app_petty_cash/images/pizza_icon.png differ diff --git a/app_petty_cash/lib/app/route.dart b/app_petty_cash/lib/app/route.dart index e4cdefc..837cd70 100644 --- a/app_petty_cash/lib/app/route.dart +++ b/app_petty_cash/lib/app/route.dart @@ -1,3 +1,5 @@ +import 'package:app_petty_cash/screen/home/homepage_screen.dart'; + import '../screen/change_company/change_company.dart'; import 'package:flutter/material.dart'; @@ -98,7 +100,8 @@ class AppRoute { textScaleFactor: 1.0, padding: EdgeInsets.all(0), ), - child: HomeScreen(), + // child: HomeScreen(), + child: HomePageScreen(), ); }); } diff --git a/app_petty_cash/lib/main.dart b/app_petty_cash/lib/main.dart index f3acc47..a941cdd 100644 --- a/app_petty_cash/lib/main.dart +++ b/app_petty_cash/lib/main.dart @@ -38,11 +38,12 @@ class MyApp extends StatelessWidget { }, ), debugShowCheckedModeBanner: false, - initialRoute: loginRoute, + // initialRoute: loginRoute, // initialRoute: splashScreen, // initialRoute: transaksiRoute, // initialRoute: reportRoute, // initialRoute: testFilePickerRoute, + initialRoute: homeRoute, onGenerateRoute: AppRoute.generateRoute, ); } diff --git a/app_petty_cash/lib/screen/home/homepage_screen.dart b/app_petty_cash/lib/screen/home/homepage_screen.dart new file mode 100644 index 0000000..0c3813c --- /dev/null +++ b/app_petty_cash/lib/screen/home/homepage_screen.dart @@ -0,0 +1,220 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_hooks/flutter_hooks.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; + +import '../../app/constant.dart'; +import '../../app/route.dart'; +import '../../provider/current_user_provider.dart'; +import '../../widget/custom_drawer.dart'; + +class HomePageScreen extends HookConsumerWidget { + const HomePageScreen({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + useEffect(() { + WidgetsBinding.instance.addPostFrameCallback((timeStamp) async { + final userID = ref.read(currentUserProvider)?.model.M_UserID ?? "0"; + if (userID == "0") { + //not login + Navigator.of(context) + .pushNamedAndRemoveUntil(loginRoute, (route) => true); + + // Navigator.popAndPushNamed(context, loginRoute); + return; + } + }); + return () {}; + }, []); + + return Padding( + padding: EdgeInsets.only( + top: Constant.getActualYPhone(context: context, y: 30), + ), + child: Scaffold( + appBar: AppBar( + title: Text( + 'Home Screen', + style: TextStyle(color: Constant.textWhite), + ), + backgroundColor: Constant.pcBtnBackgroundColor, + iconTheme: IconThemeData( + color: Constant.textWhite, + ), + ), + drawer: CustomDrawer(), + body: SafeArea( + child: Center( + child: Container( + width: Constant.getActualXPhone(context: context, x: 390), + height: Constant.getActualYPhone(context: context, y: 844), + child: Column( + children: [ + SizedBox( + height: Constant.getActualYPhone(context: context, y: 36), + ), + //Card + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + image: DecorationImage( + image: AssetImage('images/background_card.png'), + fit: BoxFit.cover, + ), + ), + child: Padding( + padding: EdgeInsets.only( + left: Constant.getActualXPhone(context: context, x: 34), + right: + Constant.getActualXPhone(context: context, x: 34), + ), + child: Container( + width: + Constant.getActualXPhone(context: context, x: 332), + height: + Constant.getActualYPhone(context: context, y: 173), + + //Isi Card + child: Container( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + // Text1 & Text2 + Padding( + padding: EdgeInsets.only( + top: Constant.getActualYPhone( + context: context, y: 17), + left: Constant.getActualXPhone( + context: context, x: 81), + right: Constant.getActualXPhone( + context: context, x: 81), + ), + child: Container( + child: Column( + children: [ + Text('Account Balance'), + Text('Rp. 1,440,000'), + ], + )), + ), + + SizedBox( + height: Constant.getActualYPhone( + context: context, y: 25), + ), + + //Debit dan Kredit + Row( + mainAxisAlignment: MainAxisAlignment + .center, // Menengahkan secara horizontal + children: [ + // Spasi di sebelah kiri "Check In" + Padding( + padding: EdgeInsets.only( + bottom: Constant.getActualYPhone( + context: context, y: 17), + left: Constant.getActualXPhone( + context: context, x: 20), + ), + child: Container( + child: Column( + children: [ + Text('Debit'), + Text('Rp. 2,000,000'), + ], + ), + ), + ), + + SizedBox( + width: Constant.getActualXPhone( + context: context, x: 51), + ), // Jarak antara "Check In" dan "Check Out" + + Padding( + padding: EdgeInsets.only( + bottom: Constant.getActualYPhone( + context: context, y: 17), + right: Constant.getActualXPhone( + context: context, x: 28), + ), + child: Container( + child: Column( + children: [ + Text('Credit'), + Text('Rp. 560,000'), + ], + ), + ), + ), + ], + ), + SizedBox( + height: Constant.getActualYPhone( + context: context, y: 16), + ), + ], + ), + ), + ), + ), + ), + + SizedBox( + height: Constant.getActualYPhone(context: context, y: 44), + ), + + Padding( + padding: EdgeInsets.only( + left: Constant.getActualXPhone(context: context, x: 20), + right: Constant.getActualXPhone(context: context, x: 20), + ), + child: Container( + // color: Colors.amber, + alignment: Alignment.centerLeft, + + child: Column(children: [ + Text('Transaksi Terkini'), + SizedBox( + height: + Constant.getActualYPhone(context: context, y: 24), + ), + Container( + width: Constant.getActualXPhone( + context: context, x: 350), + child: Row( + children: [ + Column( + children: [ + Container( + child: Image( + image: + AssetImage('images/pizza_icon.png'), + ), + ), + ], + ), + SizedBox( + width: Constant.getActualXPhone( + context: context, x: 12), + ), + + Container( + + ) + + ], + ), + ) + ]), + ), + ) + ], + ), + ), + ), + ), + ), + ); + } +} diff --git a/app_petty_cash/pubspec.lock b/app_petty_cash/pubspec.lock index d9ea55c..780bb0c 100644 --- a/app_petty_cash/pubspec.lock +++ b/app_petty_cash/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.1" + version: "1.18.0" convert: dependency: transitive description: @@ -240,14 +240,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.17.0" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" lints: dependency: transitive description: @@ -260,26 +252,26 @@ packages: dependency: transitive description: name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.15" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" open_file: dependency: "direct main" description: @@ -465,18 +457,18 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" state_notifier: dependency: transitive description: @@ -489,10 +481,10 @@ packages: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -513,10 +505,10 @@ packages: dependency: transitive description: name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.5.1" + version: "0.6.1" top_snackbar_flutter: dependency: "direct main" description: @@ -629,6 +621,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + url: "https://pub.dev" + source: hosted + version: "0.3.0" win32: dependency: transitive description: @@ -654,5 +654,5 @@ packages: source: hosted version: "6.3.0" sdks: - dart: ">=3.0.6 <4.0.0" + dart: ">=3.2.0-194.0.dev <4.0.0" flutter: ">=3.10.0"