Merge branch 'master' of https://git.mokkon.com/sainw/fcs

lib/pages/home_page.dart

@@ -1,3 +1,9 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
+import 'package:intl/intl.dart';
+import 'package:logging/logging.dart';
+import 'package:provider/provider.dart';
 import 'dart:math' as math;
 import 'package:fcs/charts/bar_chart.dart';
 import 'package:fcs/charts/delivery_do_line.dart';
@@ -16,7 +22,6 @@ import 'package:fcs/pages/contact.dart';
 import 'package:fcs/pages/delivery/delivery_list.dart';
 import 'package:fcs/pages/manual/manual_page.dart';
 import 'package:fcs/pages/notification_list.dart';
-import 'package:fcs/pages/settings.dart';
 import 'package:fcs/pages/term.dart';
 import 'package:fcs/reports/report_list.dart';
 import 'package:fcs/widget/banner.dart';
@@ -33,8 +38,16 @@ import 'package:provider/provider.dart';
 
 import '../theme/theme.dart';
 import 'announcement_list.dart';
+import 'buying_online.dart';
 import 'do/do_list.dart';
-import 'employee_list.dart';
+import 'my_registeration.dart';
+import 'pd/pd_list.dart';
+import 'po/shipment_list.dart';
+import 'products_list.dart';
+import 'profile_page.dart';
+import 'signin_page.dart';
+import 'staff_list.dart';
+
 import 'fcs_profile_page.dart';
 import 'pd/pd_list.dart';
 import 'pickup_list.dart';
@@ -160,7 +173,7 @@ class _HomePageState extends State<HomePage> {
         btnCallback: () => Navigator.of(context)
             .push(MaterialPageRoute(builder: (_) => DOList())));
 
-    final deliveryBtn = _buildBtn("delivery.title",
+    final shipmentBtn = _buildBtn("shipment.title",
         imgIcon: Image.asset(
           "assets/truck.png",
           width: 50,
@@ -168,7 +181,7 @@ class _HomePageState extends State<HomePage> {
           color: primaryColor,
         ),
         btnCallback: () => Navigator.of(context)
-            .push(MaterialPageRoute(builder: (_) => DeliveryList())));
+            .push(MaterialPageRoute(builder: (_) => ShipmentList())));
 
     final storageBtn = _buildBtn("storage.title",
         imgIcon: Image.asset(
@@ -190,16 +203,7 @@ class _HomePageState extends State<HomePage> {
         btnCallback: () => Navigator.of(context)
             .push(MaterialPageRoute(builder: (_) => PDList())));
 
-    final employeeBtn = _buildBtn("employee.title",
-        imgIcon: Image.asset(
-          "assets/employee.png",
-          width: 40,
-          height: 40,
-          color: primaryColor,
-        ),
-        btnCallback: () => Navigator.of(context)
-            .push(MaterialPageRoute(builder: (_) => EmployeeList())));
-
+    
     final termBtn = _buildBtn2("term.title",
         icon: FontAwesomeIcons.fileContract,
         imgIcon: Image.asset(
@@ -219,14 +223,38 @@ class _HomePageState extends State<HomePage> {
       );
     });
 
-    final settingsBtn =
-        _buildBtn("setting.title", icon: Icons.settings, btnCallback: () {
+    final signinBtn = _buildBtn2("login",
+        icon: FontAwesomeIcons.signInAlt,
+        btnCallback: () => Navigator.of(context)
+            .push(MaterialPageRoute(builder: (_) => SigninPage())));
+
+    final buyingBtn =
+        _buildBtn2("buy_online", icon: Icons.person, btnCallback: () {
       Navigator.push(
         context,
-        MaterialPageRoute(builder: (context) => Settings()),
+        MaterialPageRoute(builder: (context) => BuyingOnlinePage()),
       );
     });
 
+    final notiBtn = _buildBtn2("notifications.title", icon: Icons.notifications,
+        btnCallback: () {
+      Navigator.push(
+        context,
+        MaterialPageRoute(builder: (context) => NotificationList()),
+      );
+    });
+
+    final staffBtn = _buildBtn("staff.title",
+        imgIcon: Image.asset(
+          "assets/employee.png",
+          width: 40,
+          height: 40,
+          color: primaryColor,
+        ),
+        btnCallback: () => Navigator.of(context)
+            .push(MaterialPageRoute(builder: (_) => StaffList())));
+
+    
     final _bankAccountsBtn = _buildBtn2("banks.title",
         icon: FontAwesomeIcons.moneyCheck, btnCallback: () {
       Navigator.push(
@@ -236,6 +264,12 @@ class _HomePageState extends State<HomePage> {
     });
 
     List<Widget> widgets = [helpBtn];
+    widgets.add(signinBtn);
+    widgets.add(buyingBtn);
+    widgets.add(shipmentBtn);
+    widgets.add(notiBtn);
+    widgets.add(staffBtn);
+    // widgets.add(_bankAccountsBtn);
     widgets.add(announcementBtn);
     widgets.add(pickUpBtn);
     widgets.add(fcsProfileBtn);