update
This commit is contained in:
parent
27f654837b
commit
5537edb6c5
11 changed files with 82 additions and 68 deletions
|
|
@ -1,20 +1,19 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||
import 'package:gap/gap.dart';
|
||||
import 'package:pharmacy_mobile/auth/auth_service.dart';
|
||||
// import 'package:gap/gap.dart';
|
||||
// import 'package:pharmacy_mobile/auth/auth_service.dart';
|
||||
import 'package:pharmacy_mobile/pages/customer_pages/customer_additem_page.dart';
|
||||
import 'package:pharmacy_mobile/pages/customer_pages/customer_cart_page.dart';
|
||||
import 'package:pharmacy_mobile/pages/customer_pages/customer_main_page.dart';
|
||||
import 'package:pharmacy_mobile/pages/customer_pages/customer_profile_page.dart';
|
||||
import 'package:pharmacy_mobile/pages/customer_pages/customer_search_page.dart';
|
||||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/logo_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/menu_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
// import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
// import 'package:pharmacy_mobile/widgets/logo_widget.dart';
|
||||
// import 'package:pharmacy_mobile/widgets/menu_widget.dart';
|
||||
// import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
// import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
// import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
||||
import 'package:animated_notch_bottom_bar/animated_notch_bottom_bar/animated_notch_bottom_bar.dart';
|
||||
|
||||
class CustomerPage extends StatefulWidget {
|
||||
|
|
@ -25,17 +24,11 @@ class CustomerPage extends StatefulWidget {
|
|||
}
|
||||
|
||||
class _CustomerPageState extends State<CustomerPage> {
|
||||
final _authService = AuthService();
|
||||
final _pageController = PageController(initialPage: 0);
|
||||
final NotchBottomBarController _notchController = NotchBottomBarController(index: 0);
|
||||
|
||||
void sample() {}
|
||||
|
||||
void signOut() async {
|
||||
// ignore: use_build_context_synchronously
|
||||
await _authService.signOut().then((_) => {context.go('/'), showNotification(context, 'Logged Out', true)});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final List<Widget> bottomBarPages = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,30 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:gap/gap.dart';
|
||||
import 'package:pharmacy_mobile/auth/auth_service.dart';
|
||||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/title_widget.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:animated_notch_bottom_bar/animated_notch_bottom_bar/animated_notch_bottom_bar.dart';
|
||||
|
||||
class CustomerMainPage extends StatelessWidget {
|
||||
class CustomerMainPage extends StatefulWidget {
|
||||
final NotchBottomBarController? controller;
|
||||
const CustomerMainPage({super.key, this.controller});
|
||||
|
||||
@override
|
||||
State<CustomerMainPage> createState() => _CustomerMainPageState();
|
||||
}
|
||||
|
||||
class _CustomerMainPageState extends State<CustomerMainPage> {
|
||||
final _authService = AuthService();
|
||||
|
||||
void signOut() async {
|
||||
// ignore: use_build_context_synchronously
|
||||
await _authService.signOut().then((_) => {context.go('/'), showNotification(context, 'Logged Out', true)});
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
|
|
@ -22,6 +38,7 @@ class CustomerMainPage extends StatelessWidget {
|
|||
const Gap(32),
|
||||
const TextWidget(text: 'Menu'),
|
||||
const Gap(16),
|
||||
ButtonWidget(text: 'Log Out', onPressed: signOut)
|
||||
],
|
||||
)
|
||||
],
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
|
|||
import 'package:go_router/go_router.dart';
|
||||
import 'package:gap/gap.dart';
|
||||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/logo_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/slogan_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||
|
|
@ -26,8 +27,7 @@ class IndexPage extends StatelessWidget {
|
|||
child: Column(
|
||||
children: [
|
||||
const Gap(88),
|
||||
Image.asset('assets/ofa_logo.webp',
|
||||
width: 90, cacheWidth: (90 * MediaQuery.of(context).devicePixelRatio).round()),
|
||||
const LogoWidget(size: 90),
|
||||
const Gap(8),
|
||||
const TitleWidget(firstTextSize: 24, secondTextSize: 32),
|
||||
const Gap(32),
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import 'package:gap/gap.dart';
|
|||
import 'package:pharmacy_mobile/auth/auth_service.dart';
|
||||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/logo_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||
|
|
@ -116,7 +117,8 @@ class _LoginPageState extends State<LoginPage> {
|
|||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
const Gap(96),
|
||||
const TitleWidget(firstTextSize: 20, secondTextSize: 32),
|
||||
const LogoWidget(size: 90),
|
||||
const TitleWidget(firstTextSize: 14, secondTextSize: 24),
|
||||
const Gap(32),
|
||||
const TextWidget(text: 'Login'),
|
||||
const Gap(16),
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import 'package:internet_connection_checker/internet_connection_checker.dart';
|
|||
import 'package:pharmacy_mobile/auth/auth_service.dart';
|
||||
import 'package:pharmacy_mobile/widgets/button_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/input_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/logo_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/page_background_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/snackbar_widget.dart';
|
||||
import 'package:pharmacy_mobile/widgets/text_widget.dart';
|
||||
|
|
@ -109,7 +110,8 @@ class _RegisterPageState extends State<RegisterPage> {
|
|||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
const Gap(96),
|
||||
const TitleWidget(firstTextSize: 20, secondTextSize: 32),
|
||||
const LogoWidget(size: 90),
|
||||
const TitleWidget(firstTextSize: 14, secondTextSize: 24),
|
||||
const Gap(32),
|
||||
const TextWidget(text: 'Register'),
|
||||
const Gap(16),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue